IMKBilin material updates

1) removal of unnecessary code that was originally intended for smooth transition between loading branches. 2) removal of unnecessary global variables. 3) bug fix for residual strength plateau. 4) bug fix for relatively large strain increments. 5) exchanging several "if" statements with " elseif" statements for efficiency. 6) replacing zero strength and stiffness values with 1.e-6 to avoid convergence issues.
zhuminjie · Nov 4, 2021 · b32a57b · b32a57b
2 parents cd5cb85 + b626614
commit b32a57b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/SRC/material/uniaxial/IMKBilin.cpp b/SRC/material/uniaxial/IMKBilin.cpp
@@ -336,7 +336,7 @@ int IMKBilin::setTrialStrain(double strain, double strainRate)
 	}
 
 	//  Simple and unified notation for current bacbone parameters
-	Mi_temp = Mi_1 + K_j * (Ri - Ri_1);
+	double Mi_temp = Mi_1 + K_j * (Ri - Ri_1);
 	if (Mi_temp >= 0.0) {
 		Ki = K_j;
 		slope_pi = slope_p_pos_j;

diff --git a/SRC/material/uniaxial/IMKBilin.h b/SRC/material/uniaxial/IMKBilin.h
@@ -158,7 +158,15 @@ class IMKBilin : public UniaxialMaterial
 	double Mreversal, cMreversal;
 	double TangentK, cTangentK;
 
-
+<<<<<<< HEAD
+
+=======
+	double beta_Sx, cbeta_Sx;
+	double slope_p_x, cslope_p_x;
+	double Mpe_x, cMpe_x;
+	double Theta_y_x, cTheta_y_x;
+	double MpeProject_x, cMpeProject_x;
+>>>>>>> b6266149a97dc285d766a59024ab57dafc9c1437
 };
 
 
@@ -237,4 +245,4 @@ Energy_Excrsni_1	Dissipated energy in previous excursion
 Energy_Excrsn 		Dissipated energy in current excursion
 Energy_Rev 			Total dissipated energy till previous load reversal point
 Energy_total 		Total dissipated energy till current step
-*/
+*/