Merge branch 'master' into mpm/change-application-name

KratosMultiphysics · Feb 5, 2024 · 9ef092f · 9ef092f
2 parents 4e0ee43 + 1161ecb
commit 9ef092f
Show file tree

Hide file tree

Showing 270 changed files with 16,123 additions and 24,631 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -273,7 +273,7 @@ jobs:
 
     - name: Cache Build
       id: cache-build
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.ccache
         key: ${{ runner.os }}-no-unity-ccache-${{ github.sha }}

diff --git a/applications/ConstitutiveLawsApplication/constitutive_laws_application.cpp b/applications/ConstitutiveLawsApplication/constitutive_laws_application.cpp
@@ -101,6 +101,30 @@ void KratosConstitutiveLawsApplication::Register()
     KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainIsotropicPlasticity3DTrescaMohrCoulomb", mSmallStrainIsotropicPlasticity3DTrescaMohrCoulomb);
     KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainIsotropicPlasticity3DDruckerPragerMohrCoulomb", mSmallStrainIsotropicPlasticity3DDruckerPragerMohrCoulomb);
 
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainIsotropicPlasticityPlaneStrainVonMisesVonMises", mSmallStrainIsotropicPlasticityPlaneStrainVonMisesVonMises);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainIsotropicPlasticityPlaneStrainVonMisesModifiedMohrCoulomb", mSmallStrainIsotropicPlasticityPlaneStrainVonMisesModifiedMohrCoulomb);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainIsotropicPlasticityPlaneStrainVonMisesDruckerPrager", mSmallStrainIsotropicPlasticityPlaneStrainVonMisesDruckerPrager);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainIsotropicPlasticityPlaneStrainVonMisesTresca", mSmallStrainIsotropicPlasticityPlaneStrainVonMisesTresca);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainIsotropicPlasticityPlaneStrainModifiedMohrCoulombVonMises", mSmallStrainIsotropicPlasticityPlaneStrainModifiedMohrCoulombVonMises);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainIsotropicPlasticityPlaneStrainModifiedMohrCoulombModifiedMohrCoulomb", mSmallStrainIsotropicPlasticityPlaneStrainModifiedMohrCoulombModifiedMohrCoulomb);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainIsotropicPlasticityPlaneStrainModifiedMohrCoulombDruckerPrager", mSmallStrainIsotropicPlasticityPlaneStrainModifiedMohrCoulombDruckerPrager);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainIsotropicPlasticityPlaneStrainModifiedMohrCoulombTresca", mSmallStrainIsotropicPlasticityPlaneStrainModifiedMohrCoulombTresca);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainIsotropicPlasticityPlaneStrainTrescaVonMises", mSmallStrainIsotropicPlasticityPlaneStrainTrescaVonMises);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainIsotropicPlasticityPlaneStrainTrescaModifiedMohrCoulomb", mSmallStrainIsotropicPlasticityPlaneStrainTrescaModifiedMohrCoulomb);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainIsotropicPlasticityPlaneStrainTrescaDruckerPrager", mSmallStrainIsotropicPlasticityPlaneStrainTrescaDruckerPrager);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainIsotropicPlasticityPlaneStrainTrescaTresca", mSmallStrainIsotropicPlasticityPlaneStrainTrescaTresca);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainIsotropicPlasticityPlaneStrainDruckerPragerVonMises", mSmallStrainIsotropicPlasticityPlaneStrainDruckerPragerVonMises);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainIsotropicPlasticityPlaneStrainDruckerPragerModifiedMohrCoulomb", mSmallStrainIsotropicPlasticityPlaneStrainDruckerPragerModifiedMohrCoulomb);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainIsotropicPlasticityPlaneStrainDruckerPragerDruckerPrager", mSmallStrainIsotropicPlasticityPlaneStrainDruckerPragerDruckerPrager);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainIsotropicPlasticityPlaneStrainDruckerPragerTresca", mSmallStrainIsotropicPlasticityPlaneStrainDruckerPragerTresca);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainIsotropicPlasticityPlaneStrainVonMisesMohrCoulomb", mSmallStrainIsotropicPlasticityPlaneStrainVonMisesMohrCoulomb);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainIsotropicPlasticityPlaneStrainMohrCoulombVonMises", mSmallStrainIsotropicPlasticityPlaneStrainMohrCoulombVonMises);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainIsotropicPlasticityPlaneStrainMohrCoulombMohrCoulomb", mSmallStrainIsotropicPlasticityPlaneStrainMohrCoulombMohrCoulomb);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainIsotropicPlasticityPlaneStrainMohrCoulombDruckerPrager", mSmallStrainIsotropicPlasticityPlaneStrainMohrCoulombDruckerPrager);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainIsotropicPlasticityPlaneStrainMohrCoulombTresca", mSmallStrainIsotropicPlasticityPlaneStrainMohrCoulombTresca);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainIsotropicPlasticityPlaneStrainTrescaMohrCoulomb", mSmallStrainIsotropicPlasticityPlaneStrainTrescaMohrCoulomb);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainIsotropicPlasticityPlaneStrainDruckerPragerMohrCoulomb", mSmallStrainIsotropicPlasticityPlaneStrainDruckerPragerMohrCoulomb);
+
     KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainKinematicPlasticity3DVonMisesVonMises", mSmallStrainKinematicPlasticity3DVonMisesVonMises);
     KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainKinematicPlasticity3DVonMisesModifiedMohrCoulomb", mSmallStrainKinematicPlasticity3DVonMisesModifiedMohrCoulomb);
     KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainKinematicPlasticity3DVonMisesDruckerPrager", mSmallStrainKinematicPlasticity3DVonMisesDruckerPrager);
@@ -125,6 +149,30 @@ void KratosConstitutiveLawsApplication::Register()
     KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainKinematicPlasticity3DTrescaMohrCoulomb", mSmallStrainKinematicPlasticity3DTrescaMohrCoulomb);
     KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainKinematicPlasticity3DDruckerPragerMohrCoulomb", mSmallStrainKinematicPlasticity3DDruckerPragerMohrCoulomb);
 
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainKinematicPlasticitypePlaneStrainVonMisesVonMises", mSmallStrainKinematicPlasticityPlaneStrainVonMisesVonMises);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainKinematicPlasticityPlaneStrainVonMisesModifiedMohrCoulomb", mSmallStrainKinematicPlasticityPlaneStrainVonMisesModifiedMohrCoulomb);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainKinematicPlasticityPlaneStrainVonMisesDruckerPrager", mSmallStrainKinematicPlasticityPlaneStrainVonMisesDruckerPrager);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainKinematicPlasticityPlaneStrainVonMisesTresca", mSmallStrainKinematicPlasticityPlaneStrainVonMisesTresca);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainKinematicPlasticityPlaneStrainModifiedMohrCoulombVonMises", mSmallStrainKinematicPlasticityPlaneStrainModifiedMohrCoulombVonMises);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainKinematicPlasticityPlaneStrainModifiedMohrCoulombModifiedMohrCoulomb", mSmallStrainKinematicPlasticityPlaneStrainModifiedMohrCoulombModifiedMohrCoulomb);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainKinematicPlasticityPlaneStrainModifiedMohrCoulombDruckerPrager", mSmallStrainKinematicPlasticityPlaneStrainModifiedMohrCoulombDruckerPrager);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainKinematicPlasticityPlaneStrainModifiedMohrCoulombTresca", mSmallStrainKinematicPlasticityPlaneStrainModifiedMohrCoulombTresca);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainKinematicPlasticityPlaneStrainTrescaVonMises", mSmallStrainKinematicPlasticityPlaneStrainTrescaVonMises);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainKinematicPlasticityPlaneStrainTrescaModifiedMohrCoulomb", mSmallStrainKinematicPlasticityPlaneStrainTrescaModifiedMohrCoulomb);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainKinematicPlasticityPlaneStrainTrescaDruckerPrager", mSmallStrainKinematicPlasticityPlaneStrainTrescaDruckerPrager);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainKinematicPlasticityPlaneStrainTrescaTresca", mSmallStrainKinematicPlasticityPlaneStrainTrescaTresca);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainKinematicPlasticityPlaneStrainDruckerPragerVonMises", mSmallStrainKinematicPlasticityPlaneStrainDruckerPragerVonMises);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainKinematicPlasticityPlaneStrainDruckerPragerModifiedMohrCoulomb", mSmallStrainKinematicPlasticityPlaneStrainDruckerPragerModifiedMohrCoulomb);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainKinematicPlasticityPlaneStrainDruckerPragerDruckerPrager", mSmallStrainKinematicPlasticityPlaneStrainDruckerPragerDruckerPrager);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainKinematicPlasticityPlaneStrainDruckerPragerTresca", mSmallStrainKinematicPlasticityPlaneStrainDruckerPragerTresca);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainKinematicPlasticityPlaneStrainVonMisesMohrCoulomb", mSmallStrainKinematicPlasticityPlaneStrainVonMisesMohrCoulomb);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainKinematicPlasticityPlaneStrainMohrCoulombVonMises", mSmallStrainKinematicPlasticityPlaneStrainMohrCoulombVonMises);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainKinematicPlasticityPlaneStrainMohrCoulombMohrCoulomb", mSmallStrainKinematicPlasticityPlaneStrainMohrCoulombMohrCoulomb);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainKinematicPlasticityPlaneStrainMohrCoulombDruckerPrager", mSmallStrainKinematicPlasticityPlaneStrainMohrCoulombDruckerPrager);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainKinematicPlasticityPlaneStrainMohrCoulombTresca", mSmallStrainKinematicPlasticityPlaneStrainMohrCoulombTresca);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainKinematicPlasticityPlaneStrainTrescaMohrCoulomb", mSmallStrainKinematicPlasticityPlaneStrainTrescaMohrCoulomb);
+    KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainKinematicPlasticityPlaneStrainDruckerPragerMohrCoulomb", mSmallStrainKinematicPlasticityPlaneStrainDruckerPragerMohrCoulomb);
+
     //Plastic Damage Model
     KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainPlasticDamageModel3DVonMisesVonMisesVonMises", mSmallStrainPlasticDamageModel3DVonMisesVonMisesVonMises);
     KRATOS_REGISTER_CONSTITUTIVE_LAW("SmallStrainPlasticDamageModel3DVonMisesVonMisesDruckerPrager", mSmallStrainPlasticDamageModel3DVonMisesVonMisesDruckerPrager);