Merge branch 'master' of https://github.com/thelfer/MFrontGallery

thelfer · Aug 1, 2024 · 8e59876 · 8e59876
2 parents 6310201 + 915bf56
commit 8e59876
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/generic-behaviours/hyperelasticity/Signorini.mfront b/generic-behaviours/hyperelasticity/Signorini.mfront
@@ -13,10 +13,13 @@
 @MaterialProperty stress C01;
 
 @LocalVariable StiffnessTensor dS_dC;
+@LocalVariable real I1b;
+@LocalVariable real I2b;
+@LocalVariable real J;
 
 @Integrator{
   const auto id = Stensor::Id();
-  const auto J  = det(F1);
+  J  = det(F1);
   const auto C  = computeRightCauchyGreenTensor(F1);
   const auto C2 = square(C);
   /* invariants and derivatives */
@@ -37,7 +40,8 @@
   const auto iJb4       =  iJb2*iJb2;
   const auto diJb_dI3   = -iJb4/3;
   const auto diJb_dC    = diJb_dI3*dI3_dC;
-  const auto I1b        =  I1*iJb;
+             I1b        =  I1*iJb;
+             I2b        =  I2*iJb*iJb;
   const auto dI1b_dC    =  iJb*id+I1*diJb_dC;
   const auto dI2b_dC    = iJb2*dI2_dC+2*I2*iJb*diJb_dC;
   const auto dPi_dI1b   = C10+2*C20*(I1b-3);
@@ -70,7 +74,7 @@
     const auto d2Pi_dI1b2 = 2*C20;
     const auto dSi_dC =
       2*(d2Pi_dI1b2*(dI1b_dC^dI1b_dC)+dPi_dI1b*d2I1b_dC2+
-	                             +dPi_dI2b*d2I2b_dC2);
+                                     +dPi_dI2b*d2I2b_dC2);
     dS_dC = dSv_dC+dSi_dC;
   }
 }
@@ -80,3 +84,7 @@
   static_cast<void>(smt);
   Dt = dS_dC;
 }
+
+@InternalEnergy{
+     Psi_s = C10 * (I1b - 3.) + C20 * power<2>(I1b - 3.) + C01 * (I2b - 3) + 1./2. * K * power<2>(J - 1);
+}
diff --git a/generic-behaviours/hyperviscoelasticity/SignoriniHyperviscoelasticity.mfront b/generic-behaviours/hyperviscoelasticity/SignoriniHyperviscoelasticity.mfront
@@ -16,8 +16,8 @@ K.setGlossaryName("BulkModulus");
 @MaterialProperty stress C20;
 @MaterialProperty stress C01;
 
-@MaterialProperty stress tau[Nv];
-@MaterialProperty stress g[Nv];
+@MaterialProperty time tau[Nv];
+@MaterialProperty real g[Nv];
 
 @StateVariable StressStensor Si;
 Si.setEntryName("IsochoricElasticStress");