Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions src/coreComponents/constitutive/solid/CeramicDamage.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,11 @@ class CeramicDamageUpdates : public ElasticIsotropicUpdates
* @param[in] bulkModulus The ArrayView holding the bulk modulus data for each element.
* @param[in] shearModulus The ArrayView holding the shear modulus data for each element.
* @param[in] thermalExpansionCoefficient The ArrayView holding the thermal expansion coefficient data for each element.
* @param[in] anelasticStrainMagnitude The ArrayView holding the anelastic strain magnitude data for each element.
* @param[in] newStress The ArrayView holding the new stress data for each quadrature point.
* @param[in] oldStress The ArrayView holding the old stress data for each quadrature point.
* @param[in] disableInelasticity Flag to disable plasticity for inelastic models
* @param[in] enableAnelasticStrain Flag to enable stress modification due to anelastic strain
*/
CeramicDamageUpdates( arrayView2d< real64 > const & damage,
arrayView2d< real64 > const & jacobian,
Expand All @@ -80,10 +83,15 @@ class CeramicDamageUpdates : public ElasticIsotropicUpdates
arrayView1d< real64 const > const & bulkModulus,
arrayView1d< real64 const > const & shearModulus,
arrayView1d< real64 const > const & thermalExpansionCoefficient,
arrayView1d< real64 const > const & anelasticStrainIncrement,
arrayView1d< real64 > const & newAnelasticStrainMagnitude,
arrayView1d< real64 > const & oldAnelasticStrainMagnitude,
arrayView3d< real64, solid::STRESS_USD > const & newStress,
arrayView3d< real64, solid::STRESS_USD > const & oldStress,
bool const & disableInelasticity ):
ElasticIsotropicUpdates( bulkModulus, shearModulus, thermalExpansionCoefficient, newStress, oldStress, disableInelasticity ),
bool const & disableInelasticity,
const integer & enableAnelasticStrain ):
ElasticIsotropicUpdates( bulkModulus, shearModulus, thermalExpansionCoefficient, anelasticStrainIncrement, newAnelasticStrainMagnitude, oldAnelasticStrainMagnitude, newStress, oldStress,
disableInelasticity, enableAnelasticStrain ),
m_damage( damage ),
m_jacobian( jacobian ),
m_lengthScale( lengthScale ),
Expand Down Expand Up @@ -472,9 +480,13 @@ class CeramicDamage : public ElasticIsotropic
m_bulkModulus,
m_shearModulus,
m_thermalExpansionCoefficient,
m_anelasticStrainIncrement,
m_newAnelasticStrainMagnitude,
m_oldAnelasticStrainMagnitude,
m_newStress,
m_oldStress,
m_disableInelasticity );
m_disableInelasticity,
m_enableAnelasticStrain );
}

/**
Expand All @@ -498,9 +510,13 @@ class CeramicDamage : public ElasticIsotropic
m_bulkModulus,
m_shearModulus,
m_thermalExpansionCoefficient,
m_anelasticStrainIncrement,
m_newAnelasticStrainMagnitude,
m_oldAnelasticStrainMagnitude,
m_newStress,
m_oldStress,
m_disableInelasticity );
m_disableInelasticity,
m_enableAnelasticStrain );
}


Expand Down
23 changes: 19 additions & 4 deletions src/coreComponents/constitutive/solid/DelftEgg.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,11 @@ class DelftEggUpdates : public ElasticIsotropicUpdates
* @param[in] bulkModulus The ArrayView holding the bulk modulus data for each element.
* @param[in] shearModulus The ArrayView holding the shear modulus data for each element.
* @param[in] thermalExpansionCoefficient The ArrayView holding the thermal expansion coefficient data for each element.
* @param[in] anelasticStrainMagnitude The ArrayView holding the anelastic strain magnitude data for each element.
* @param[in] newStress The ArrayView holding the new stress data for each quadrature point.
* @param[in] oldStress The ArrayView holding the old stress data from the previous converged state for each point
* @param[in] disableInelasticity Flag to disable plastic response
* @param[in] enableAnelasticStrain Flag to enable stress modification due to anelastic strain
*/
DelftEggUpdates( arrayView1d< real64 const > const & recompressionIndex,
arrayView1d< real64 const > const & virginCompressionIndex,
Expand All @@ -67,10 +69,15 @@ class DelftEggUpdates : public ElasticIsotropicUpdates
arrayView1d< real64 const > const & bulkModulus,
arrayView1d< real64 const > const & shearModulus,
arrayView1d< real64 const > const & thermalExpansionCoefficient,
arrayView1d< real64 const > const & anelasticStrainIncrement,
arrayView1d< real64 > const & newAnelasticStrainMagnitude,
arrayView1d< real64 > const & oldAnelasticStrainMagnitude,
arrayView3d< real64, solid::STRESS_USD > const & newStress,
arrayView3d< real64, solid::STRESS_USD > const & oldStress,
const bool & disableInelasticity ):
ElasticIsotropicUpdates( bulkModulus, shearModulus, thermalExpansionCoefficient, newStress, oldStress, disableInelasticity ),
const bool & disableInelasticity,
const integer & enableAnelasticStrain ):
ElasticIsotropicUpdates( bulkModulus, shearModulus, thermalExpansionCoefficient, anelasticStrainIncrement, newAnelasticStrainMagnitude, oldAnelasticStrainMagnitude, newStress, oldStress,
disableInelasticity, enableAnelasticStrain ),
m_recompressionIndex( recompressionIndex ),
m_virginCompressionIndex( virginCompressionIndex ),
m_cslSlope( cslSlope ),
Expand Down Expand Up @@ -524,9 +531,13 @@ class DelftEgg : public ElasticIsotropic
m_bulkModulus,
m_shearModulus,
m_thermalExpansionCoefficient,
m_anelasticStrainIncrement,
m_newAnelasticStrainMagnitude,
m_oldAnelasticStrainMagnitude,
m_newStress,
m_oldStress,
m_disableInelasticity );
m_disableInelasticity,
m_enableAnelasticStrain );
}

/**
Expand All @@ -549,9 +560,13 @@ class DelftEgg : public ElasticIsotropic
m_bulkModulus,
m_shearModulus,
m_thermalExpansionCoefficient,
m_anelasticStrainIncrement,
m_newAnelasticStrainMagnitude,
m_oldAnelasticStrainMagnitude,
m_newStress,
m_oldStress,
m_disableInelasticity );
m_disableInelasticity,
m_enableAnelasticStrain );
}


Expand Down
24 changes: 20 additions & 4 deletions src/coreComponents/constitutive/solid/DruckerPrager.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,11 @@ class DruckerPragerUpdates : public ElasticIsotropicUpdates
* @param[in] thermalExpansionCoefficient The ArrayView holding the thermal expansion coefficient data for each element.
* @param[in] shearModulus The ArrayView holding the shear modulus data for each element.
* @param[in] thermalExpansionCoefficient The ArrayView holding the thermal expansion coefficient data for each element.
* @param[in] anelasticStrainMagnitude The ArrayView holding the anelastic strain magnitude data for each element.
* @param[in] newStress The ArrayView holding the new stress data for each quadrature point.
* @param[in] oldStress The ArrayView holding the old stress data for each quadrature point.
* @param[in] disableInelasticity Flag to disable plasticity for inelastic models
* @param[in] enableAnelasticStrain Flag to enable stress modification due to anelastic strain
*/
DruckerPragerUpdates( arrayView1d< real64 const > const & friction,
arrayView1d< real64 const > const & dilation,
Expand All @@ -64,10 +67,15 @@ class DruckerPragerUpdates : public ElasticIsotropicUpdates
arrayView1d< real64 const > const & bulkModulus,
arrayView1d< real64 const > const & shearModulus,
arrayView1d< real64 const > const & thermalExpansionCoefficient,
arrayView1d< real64 const > const & anelasticStrainIncrement,
arrayView1d< real64 > const & newAnelasticStrainMagnitude,
arrayView1d< real64 > const & oldAnelasticStrainMagnitude,
arrayView3d< real64, solid::STRESS_USD > const & newStress,
arrayView3d< real64, solid::STRESS_USD > const & oldStress,
bool const & disableInelasticity ):
ElasticIsotropicUpdates( bulkModulus, shearModulus, thermalExpansionCoefficient, newStress, oldStress, disableInelasticity ),
bool const & disableInelasticity,
const integer & enableAnelasticStrain ):
ElasticIsotropicUpdates( bulkModulus, shearModulus, thermalExpansionCoefficient, anelasticStrainIncrement, newAnelasticStrainMagnitude, oldAnelasticStrainMagnitude, newStress, oldStress,
disableInelasticity, enableAnelasticStrain ),
m_friction( friction ),
m_dilation( dilation ),
m_hardening( hardening ),
Expand Down Expand Up @@ -410,9 +418,13 @@ class DruckerPrager : public ElasticIsotropic
m_bulkModulus,
m_shearModulus,
m_thermalExpansionCoefficient,
m_anelasticStrainIncrement,
m_newAnelasticStrainMagnitude,
m_oldAnelasticStrainMagnitude,
m_newStress,
m_oldStress,
m_disableInelasticity );
m_disableInelasticity,
m_enableAnelasticStrain );
}

/**
Expand All @@ -434,9 +446,13 @@ class DruckerPrager : public ElasticIsotropic
m_bulkModulus,
m_shearModulus,
m_thermalExpansionCoefficient,
m_anelasticStrainIncrement,
m_newAnelasticStrainMagnitude,
m_oldAnelasticStrainMagnitude,
m_newStress,
m_oldStress,
m_disableInelasticity );
m_disableInelasticity,
m_enableAnelasticStrain );
}


Expand Down
23 changes: 19 additions & 4 deletions src/coreComponents/constitutive/solid/DruckerPragerExtended.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ class DruckerPragerExtendedUpdates : public ElasticIsotropicUpdates
* @param[in] bulkModulus The ArrayView holding the bulk modulus data for each element.
* @param[in] shearModulus The ArrayView holding the shear modulus data for each element.
* @param[in] thermalExpansionCoefficient The ArrayView holding the thermal expansion coefficient data for each element.
* @param[in] anelasticStrainMagnitude The ArrayView holding the anelastic strain magnitude data for each element.
* @param[in] stress The ArrayView holding the stress data for each quadrature point.
* @param[in] enableAnelasticStrain Flag to enable stress modification due to anelastic strain
*/
DruckerPragerExtendedUpdates( arrayView1d< real64 const > const & initialFriction,
arrayView1d< real64 const > const & residualFriction,
Expand All @@ -58,10 +60,15 @@ class DruckerPragerExtendedUpdates : public ElasticIsotropicUpdates
arrayView1d< real64 const > const & bulkModulus,
arrayView1d< real64 const > const & shearModulus,
arrayView1d< real64 const > const & thermalExpansionCoefficient,
arrayView1d< real64 const > const & anelasticStrainIncrement,
arrayView1d< real64 > const & newAnelasticStrainMagnitude,
arrayView1d< real64 > const & oldAnelasticStrainMagnitude,
arrayView3d< real64, solid::STRESS_USD > const & newStress,
arrayView3d< real64, solid::STRESS_USD > const & oldStress,
bool const & disableInelasticity ):
ElasticIsotropicUpdates( bulkModulus, shearModulus, thermalExpansionCoefficient, newStress, oldStress, disableInelasticity ),
bool const & disableInelasticity,
const integer & enableAnelasticStrain ):
ElasticIsotropicUpdates( bulkModulus, shearModulus, thermalExpansionCoefficient, anelasticStrainIncrement, newAnelasticStrainMagnitude, oldAnelasticStrainMagnitude, newStress, oldStress,
disableInelasticity, enableAnelasticStrain ),
m_initialFriction( initialFriction ),
m_residualFriction( residualFriction ),
m_dilationRatio( dilationRatio ),
Expand Down Expand Up @@ -441,9 +448,13 @@ class DruckerPragerExtended : public ElasticIsotropic
m_bulkModulus,
m_shearModulus,
m_thermalExpansionCoefficient,
m_anelasticStrainIncrement,
m_newAnelasticStrainMagnitude,
m_oldAnelasticStrainMagnitude,
m_newStress,
m_oldStress,
m_disableInelasticity );
m_disableInelasticity,
m_enableAnelasticStrain );
}

/**
Expand All @@ -467,9 +478,13 @@ class DruckerPragerExtended : public ElasticIsotropic
m_bulkModulus,
m_shearModulus,
m_thermalExpansionCoefficient,
m_anelasticStrainIncrement,
m_newAnelasticStrainMagnitude,
m_oldAnelasticStrainMagnitude,
m_newStress,
m_oldStress,
m_disableInelasticity );
m_disableInelasticity,
m_enableAnelasticStrain );
}


Expand Down
Loading
Loading