diff --git a/src/coreComponents/constitutive/solid/DruckerPrager.hpp b/src/coreComponents/constitutive/solid/DruckerPrager.hpp index 52d732340b1..93411f8e945 100644 --- a/src/coreComponents/constitutive/solid/DruckerPrager.hpp +++ b/src/coreComponents/constitutive/solid/DruckerPrager.hpp @@ -65,7 +65,7 @@ class DruckerPragerUpdates : public ElasticIsotropicUpdates arrayView1d< real64 const > const & thermalExpansionCoefficient, real64 const & dThermalExpansionCoefficient_dTemperature, real64 const & referenceTemperature, -string const & drainedLinearTECTableName, + string const & drainedLinearTECTableName, arrayView3d< real64, solid::STRESS_USD > const & newStress, arrayView3d< real64, solid::STRESS_USD > const & oldStress, bool const & disableInelasticity ): @@ -74,7 +74,7 @@ string const & drainedLinearTECTableName, thermalExpansionCoefficient, dThermalExpansionCoefficient_dTemperature, referenceTemperature, -drainedLinearTECTableName, + drainedLinearTECTableName, newStress, oldStress, disableInelasticity ), @@ -447,7 +447,7 @@ class DruckerPrager : public ElasticIsotropic m_thermalExpansionCoefficient, m_dThermalExpansionCoefficient_dTemperature, m_referenceTemperature, -m_drainedLinearTECTableName, + m_drainedLinearTECTableName, m_newStress, m_oldStress, m_disableInelasticity ); @@ -474,7 +474,7 @@ m_drainedLinearTECTableName, m_thermalExpansionCoefficient, m_dThermalExpansionCoefficient_dTemperature, m_referenceTemperature, -m_drainedLinearTECTableName, + m_drainedLinearTECTableName, m_newStress, m_oldStress, m_disableInelasticity ); diff --git a/src/coreComponents/constitutive/solid/DruckerPragerExtended.hpp b/src/coreComponents/constitutive/solid/DruckerPragerExtended.hpp index 7f96d654949..7307273b3fc 100644 --- a/src/coreComponents/constitutive/solid/DruckerPragerExtended.hpp +++ b/src/coreComponents/constitutive/solid/DruckerPragerExtended.hpp @@ -59,7 +59,7 @@ class DruckerPragerExtendedUpdates : public ElasticIsotropicUpdates arrayView1d< real64 const > const & thermalExpansionCoefficient, real64 const & dThermalExpansionCoefficient_dTemperature, real64 const & referenceTemperature, -string const & drainedLinearTECTableName, + string const & drainedLinearTECTableName, arrayView3d< real64, solid::STRESS_USD > const & newStress, arrayView3d< real64, solid::STRESS_USD > const & oldStress, bool const & disableInelasticity ): @@ -68,7 +68,7 @@ string const & drainedLinearTECTableName, thermalExpansionCoefficient, dThermalExpansionCoefficient_dTemperature, referenceTemperature, -drainedLinearTECTableName, + drainedLinearTECTableName, newStress, oldStress, disableInelasticity ), @@ -484,7 +484,7 @@ class DruckerPragerExtended : public ElasticIsotropic m_thermalExpansionCoefficient, m_dThermalExpansionCoefficient_dTemperature, m_referenceTemperature, -m_drainedLinearTECTableName, + m_drainedLinearTECTableName, m_newStress, m_oldStress, m_disableInelasticity ); @@ -513,7 +513,7 @@ m_drainedLinearTECTableName, m_thermalExpansionCoefficient, m_dThermalExpansionCoefficient_dTemperature, m_referenceTemperature, -m_drainedLinearTECTableName, + m_drainedLinearTECTableName, m_newStress, m_oldStress, m_disableInelasticity ); diff --git a/src/coreComponents/constitutive/solid/ElasticIsotropic.hpp b/src/coreComponents/constitutive/solid/ElasticIsotropic.hpp index 12f7ebb12ac..8830af3a8fa 100644 --- a/src/coreComponents/constitutive/solid/ElasticIsotropic.hpp +++ b/src/coreComponents/constitutive/solid/ElasticIsotropic.hpp @@ -54,7 +54,7 @@ class ElasticIsotropicUpdates : public SolidBaseUpdates arrayView1d< real64 const > const & thermalExpansionCoefficient, real64 const & dThermalExpansionCoefficient_dTemperature, real64 const & referenceTemperature, -string const & drainedLinearTECTableName, + string const & drainedLinearTECTableName, arrayView3d< real64, solid::STRESS_USD > const & newStress, arrayView3d< real64, solid::STRESS_USD > const & oldStress, const bool & disableInelasticity ): @@ -63,7 +63,7 @@ string const & drainedLinearTECTableName, thermalExpansionCoefficient, dThermalExpansionCoefficient_dTemperature, referenceTemperature, -drainedLinearTECTableName, + drainedLinearTECTableName, disableInelasticity ), m_bulkModulus( bulkModulus ), m_shearModulus( shearModulus ) @@ -517,7 +517,7 @@ class ElasticIsotropic : public SolidBase m_thermalExpansionCoefficient, m_dThermalExpansionCoefficient_dTemperature, m_referenceTemperature, -m_drainedLinearTECTableName, + m_drainedLinearTECTableName, m_newStress, m_oldStress, m_disableInelasticity ); @@ -529,7 +529,7 @@ m_drainedLinearTECTableName, m_thermalExpansionCoefficient, m_dThermalExpansionCoefficient_dTemperature, m_referenceTemperature, -m_drainedLinearTECTableName, + m_drainedLinearTECTableName, arrayView3d< real64, solid::STRESS_USD >(), arrayView3d< real64, solid::STRESS_USD >(), m_disableInelasticity ); @@ -553,7 +553,7 @@ m_drainedLinearTECTableName, m_thermalExpansionCoefficient, m_dThermalExpansionCoefficient_dTemperature, m_referenceTemperature, -m_drainedLinearTECTableName, + m_drainedLinearTECTableName, m_newStress, m_oldStress, m_disableInelasticity ); diff --git a/src/coreComponents/constitutive/solid/ElasticIsotropicPressureDependent.hpp b/src/coreComponents/constitutive/solid/ElasticIsotropicPressureDependent.hpp index 618459c0c8f..7f87b066dd2 100644 --- a/src/coreComponents/constitutive/solid/ElasticIsotropicPressureDependent.hpp +++ b/src/coreComponents/constitutive/solid/ElasticIsotropicPressureDependent.hpp @@ -59,7 +59,7 @@ class ElasticIsotropicPressureDependentUpdates : public SolidBaseUpdates arrayView1d< real64 const > const & thermalExpansionCoefficient, real64 const & dThermalExpansionCoefficient_dTemperature, real64 const & referenceTemperature, -string const & drainedLinearTECTableName, + string const & drainedLinearTECTableName, arrayView3d< real64, solid::STRESS_USD > const & newStress, arrayView3d< real64, solid::STRESS_USD > const & oldStress, bool const & disableInelasticity ): @@ -68,7 +68,7 @@ string const & drainedLinearTECTableName, thermalExpansionCoefficient, dThermalExpansionCoefficient_dTemperature, referenceTemperature, -drainedLinearTECTableName, + drainedLinearTECTableName, disableInelasticity ), m_refPressure( refPressure ), m_refStrainVol( refStrainVol ), @@ -533,7 +533,7 @@ class ElasticIsotropicPressureDependent : public SolidBase m_thermalExpansionCoefficient, m_dThermalExpansionCoefficient_dTemperature, m_referenceTemperature, -m_drainedLinearTECTableName, + m_drainedLinearTECTableName, m_newStress, m_oldStress, m_disableInelasticity ); @@ -547,7 +547,7 @@ m_drainedLinearTECTableName, m_thermalExpansionCoefficient, m_dThermalExpansionCoefficient_dTemperature, m_referenceTemperature, -m_drainedLinearTECTableName, + m_drainedLinearTECTableName, arrayView3d< real64, solid::STRESS_USD >(), arrayView3d< real64, solid::STRESS_USD >(), m_disableInelasticity ); @@ -573,7 +573,7 @@ m_drainedLinearTECTableName, m_thermalExpansionCoefficient, m_dThermalExpansionCoefficient_dTemperature, m_referenceTemperature, -m_drainedLinearTECTableName, + m_drainedLinearTECTableName, m_newStress, m_oldStress, m_disableInelasticity ); diff --git a/src/coreComponents/constitutive/solid/ElasticOrthotropic.hpp b/src/coreComponents/constitutive/solid/ElasticOrthotropic.hpp index 43372b1c311..1991f7fdba3 100644 --- a/src/coreComponents/constitutive/solid/ElasticOrthotropic.hpp +++ b/src/coreComponents/constitutive/solid/ElasticOrthotropic.hpp @@ -67,7 +67,7 @@ class ElasticOrthotropicUpdates : public SolidBaseUpdates arrayView1d< real64 const > const & thermalExpansionCoefficient, real64 const & dThermalExpansionCoefficient_dTemperature, real64 const & referenceTemperature, -string const & drainedLinearTECTableName, + string const & drainedLinearTECTableName, arrayView3d< real64, solid::STRESS_USD > const & newStress, arrayView3d< real64, solid::STRESS_USD > const & oldStress, bool const & disableInelasticity ): @@ -76,7 +76,7 @@ string const & drainedLinearTECTableName, thermalExpansionCoefficient, dThermalExpansionCoefficient_dTemperature, referenceTemperature, -drainedLinearTECTableName, + drainedLinearTECTableName, disableInelasticity ), m_c11( c11 ), m_c12( c12 ), @@ -707,7 +707,7 @@ class ElasticOrthotropic : public SolidBase m_thermalExpansionCoefficient, m_dThermalExpansionCoefficient_dTemperature, m_referenceTemperature, -m_drainedLinearTECTableName, + m_drainedLinearTECTableName, m_newStress, m_oldStress, m_disableInelasticity ); @@ -737,7 +737,7 @@ m_drainedLinearTECTableName, m_thermalExpansionCoefficient, m_dThermalExpansionCoefficient_dTemperature, m_referenceTemperature, -m_drainedLinearTECTableName, + m_drainedLinearTECTableName, m_newStress, m_oldStress, m_disableInelasticity ); diff --git a/src/coreComponents/constitutive/solid/ElasticTransverseIsotropic.hpp b/src/coreComponents/constitutive/solid/ElasticTransverseIsotropic.hpp index 4af35be6c4e..8bb2ff695e8 100644 --- a/src/coreComponents/constitutive/solid/ElasticTransverseIsotropic.hpp +++ b/src/coreComponents/constitutive/solid/ElasticTransverseIsotropic.hpp @@ -61,7 +61,7 @@ class ElasticTransverseIsotropicUpdates : public SolidBaseUpdates arrayView1d< real64 const > const & thermalExpansionCoefficient, real64 const & dThermalExpansionCoefficient_dTemperature, real64 const & referenceTemperature, -string const & drainedLinearTECTableName, + string const & drainedLinearTECTableName, arrayView3d< real64, solid::STRESS_USD > const & newStress, arrayView3d< real64, solid::STRESS_USD > const & oldStress, bool const & disableInelasticity ): @@ -70,7 +70,7 @@ string const & drainedLinearTECTableName, thermalExpansionCoefficient, dThermalExpansionCoefficient_dTemperature, referenceTemperature, -drainedLinearTECTableName, + drainedLinearTECTableName, disableInelasticity ), m_c11( c11 ), m_c13( c13 ), @@ -556,7 +556,7 @@ class ElasticTransverseIsotropic : public SolidBase m_thermalExpansionCoefficient, m_dThermalExpansionCoefficient_dTemperature, m_referenceTemperature, -m_drainedLinearTECTableName, + m_drainedLinearTECTableName, m_newStress, m_oldStress, m_disableInelasticity ); @@ -582,7 +582,7 @@ m_drainedLinearTECTableName, m_thermalExpansionCoefficient, m_dThermalExpansionCoefficient_dTemperature, m_referenceTemperature, -m_drainedLinearTECTableName, + m_drainedLinearTECTableName, m_newStress, m_oldStress, m_disableInelasticity ); diff --git a/src/coreComponents/constitutive/solid/ModifiedCamClay.hpp b/src/coreComponents/constitutive/solid/ModifiedCamClay.hpp index f57f29ea2a5..29a64e1559b 100644 --- a/src/coreComponents/constitutive/solid/ModifiedCamClay.hpp +++ b/src/coreComponents/constitutive/solid/ModifiedCamClay.hpp @@ -69,7 +69,7 @@ class ModifiedCamClayUpdates : public ElasticIsotropicPressureDependentUpdates arrayView1d< real64 const > const & thermalExpansionCoefficient, real64 const & dThermalExpansionCoefficient_dTemperature, real64 const & referenceTemperature, -string const & drainedLinearTECTableName, + string const & drainedLinearTECTableName, arrayView3d< real64, solid::STRESS_USD > const & newStress, arrayView3d< real64, solid::STRESS_USD > const & oldStress, bool const & disableInelasticity ): @@ -80,7 +80,7 @@ string const & drainedLinearTECTableName, thermalExpansionCoefficient, dThermalExpansionCoefficient_dTemperature, referenceTemperature, -drainedLinearTECTableName, + drainedLinearTECTableName, newStress, oldStress, disableInelasticity ), @@ -571,7 +571,7 @@ class ModifiedCamClay : public ElasticIsotropicPressureDependent m_thermalExpansionCoefficient, m_dThermalExpansionCoefficient_dTemperature, m_referenceTemperature, -m_drainedLinearTECTableName, + m_drainedLinearTECTableName, m_newStress, m_oldStress, m_disableInelasticity ); @@ -599,7 +599,7 @@ m_drainedLinearTECTableName, m_thermalExpansionCoefficient, m_dThermalExpansionCoefficient_dTemperature, m_referenceTemperature, -m_drainedLinearTECTableName, + m_drainedLinearTECTableName, m_newStress, m_oldStress, m_disableInelasticity ); diff --git a/src/coreComponents/constitutive/solid/PerfectlyPlastic.hpp b/src/coreComponents/constitutive/solid/PerfectlyPlastic.hpp index e11e9da75c2..9ad93722bc2 100644 --- a/src/coreComponents/constitutive/solid/PerfectlyPlastic.hpp +++ b/src/coreComponents/constitutive/solid/PerfectlyPlastic.hpp @@ -56,7 +56,7 @@ class PerfectlyPlasticUpdates : public ElasticIsotropicUpdates arrayView1d< real64 const > const & thermalExpansionCoefficient, real64 const & dThermalExpansionCoefficient_dTemperature, real64 const & referenceTemperature, -string const & drainedLinearTECTableName, + string const & drainedLinearTECTableName, arrayView3d< real64, solid::STRESS_USD > const & newStress, arrayView3d< real64, solid::STRESS_USD > const & oldStress, bool const & disableInelasticity ): @@ -65,7 +65,7 @@ string const & drainedLinearTECTableName, thermalExpansionCoefficient, dThermalExpansionCoefficient_dTemperature, referenceTemperature, -drainedLinearTECTableName, + drainedLinearTECTableName, newStress, oldStress, disableInelasticity ), @@ -310,7 +310,7 @@ class PerfectlyPlastic : public ElasticIsotropic m_thermalExpansionCoefficient, m_dThermalExpansionCoefficient_dTemperature, m_referenceTemperature, -m_drainedLinearTECTableName, + m_drainedLinearTECTableName, m_newStress, m_oldStress, m_disableInelasticity ); @@ -333,7 +333,7 @@ m_drainedLinearTECTableName, m_thermalExpansionCoefficient, m_dThermalExpansionCoefficient_dTemperature, m_referenceTemperature, -m_drainedLinearTECTableName, + m_drainedLinearTECTableName, m_newStress, m_oldStress, m_disableInelasticity );