Renaming to ModCamClay_semiExpl.mfront and ~_absP.mfront

MaterialLib/SolidModels/MFront/CMakeLists.txt

@@ -18,9 +18,9 @@ mfront_behaviours_check_library(
     GuentherSalzer
     Lubby2
     Lubby2mod
+    ModCamClay_semiExpl
+    ModCamClay_semiExpl_absP
     ModCamClay_semiExpl_constE
-    ModCamClay_semiExplParaInitNLnu_abs
-    ModCamClay_semiExplParaInitNLnu_inc
     MohrCoulombAbboSloan
     MohrCoulombAbboSloanAniso
     MohrCoulombAbboSloanOrtho

MaterialLib/SolidModels/MFront/ModCamClay_TriaxTest.py

@@ -8,15 +8,15 @@ m.setMaximumNumberOfSubSteps(20)
 m.setModellingHypothesis("Axisymmetrical")
 
 mcc_models = [
+    "ModCamClay_semiExpl",
+    "ModCamClay_semiExpl_absP",
     "ModCamClay_semiExpl_constE",
-    "ModCamClay_semiExplParaInitNLnu_inc",
-    "ModCamClay_semiExplParaInitNLnu_abs",
 ]
 controls = ["stress", "strain"]
 
 # Set MCC material model implementation and path
 lib_path = "./src/libBehaviour.so"
-mcc_model = mcc_models[1]
+mcc_model = mcc_models[0]
 control = controls[0]
 
 m.setBehaviour("generic", lib_path, mcc_model)
@@ -54,8 +54,8 @@ if mcc_model == "ModCamClay_semiExpl_constE":
     m.setParameter("AmbientPressure", pamb)
     print("Young Modulus set to E =", E0 / 1e6, " MPa")
 if mcc_model in (
-    "ModCamClay_semiExplParaInitNLnu_inc",
-    "ModCamClay_semiExplParaInitNLnu_abs",
+    "ModCamClay_semiExpl",
+    "ModCamClay_semiExpl_absP",
 ):
     m.setMaterialProperty("InitialVolumeRatio", v0)
 m.setMaterialProperty("PoissonRatio", nu)

MaterialLib/SolidModels/MFront/ModCamClay_semiExplParaInitNLnu_inc.mfront → MaterialLib/SolidModels/MFront/ModCamClay_semiExpl.mfront

 @DSL Implicit;
-@Behaviour ModCamClay_semiExplParaInitNLnu_inc;
+@Behaviour ModCamClay_semiExpl;
 @Author Christian Silbermann, Eric Simo, Miguel Mánica, Thomas Helfer, Thomas Nagel;
 @Date 10/01/2023;
 @Description{

MaterialLib/SolidModels/MFront/ModCamClay_semiExplParaInitNLnu_abs.mfront → MaterialLib/SolidModels/MFront/ModCamClay_semiExpl_absP.mfront

 @DSL Implicit;
-@Behaviour ModCamClay_semiExplParaInitNLnu_abs;
+@Behaviour ModCamClay_semiExpl_absP;
 @Author Christian Silbermann, Eric Simo, Miguel Mánica, Thomas Helfer, Thomas Nagel;
 @Date 16/01/2023;
 @Description{

Tests/Data/Mechanics/ModifiedCamClay/triaxtest_original.prj

@@ -15,7 +15,7 @@
             <integration_order>2</integration_order>
             <constitutive_relation>
                 <type>MFront</type>
-                <behaviour>ModCamClay_semiExplParaInitNLnu_inc</behaviour> 
+                <behaviour>ModCamClay_semiExpl</behaviour> 
                 <material_properties>
                     <material_property name="PoissonRatio" parameter="PoissonRatio"/>
                     <material_property name="CriticalStateLineSlope" parameter="CriticalStateLineSlope"/>

Tests/Data/Mechanics/ModifiedCamClay/triaxtest_original_abs.prj

@@ -15,7 +15,7 @@
             <integration_order>2</integration_order>
             <constitutive_relation>
                 <type>MFront</type>
-                <behaviour>ModCamClay_semiExplParaInitNLnu_abs</behaviour> 
+                <behaviour>ModCamClay_semiExpl_absP</behaviour> 
                 <material_properties>
                     <material_property name="PoissonRatio" parameter="PoissonRatio"/>
                     <material_property name="CriticalStateLineSlope" parameter="CriticalStateLineSlope"/>