updating plane stress

Author: AlejandroCornejo

applications/ConstitutiveLawsApplication/custom_constitutive/thermal/small_strains/elastic/thermal_linear_plane_stress.cpp

@@ -29,91 +29,6 @@ namespace Kratos
 /***********************************************************************************/
 /***********************************************************************************/
 
-void ThermalLinearPlaneStress::CalculateMaterialResponsePK2(ConstitutiveLaw::Parameters& rValues)
-{
-    KRATOS_TRY
-
-    Flags& r_constitutive_law_options = rValues.GetOptions();
-    ConstitutiveLaw::StrainVectorType& r_strain_vector = rValues.GetStrainVector();
-
-    if (r_constitutive_law_options.IsNot(ConstitutiveLaw::USE_ELEMENT_PROVIDED_STRAIN)) {
-        // Since we are in small strains, any strain measure works, e.g. CAUCHY_GREEN
-        CalculateCauchyGreenStrain(rValues, r_strain_vector);
-    }
-
-    // We add the thermal contribution
-    AdvancedConstitutiveLawUtilities<3>::SubstractThermalStrain(r_strain_vector, mReferenceTemperature, rValues);
-
-    // We add the initial strains
-    AddInitialStrainVectorContribution<StrainVectorType>(r_strain_vector);
-
-
-    if (r_constitutive_law_options.Is(ConstitutiveLaw::COMPUTE_STRESS)) {
-        ConstitutiveLaw::StressVectorType &r_stress_vector = rValues.GetStressVector();
-        CalculatePK2Stress(r_strain_vector, r_stress_vector, rValues);
-        AddInitialStressVectorContribution<StressVectorType>(r_stress_vector);
-    }
-
-    if (r_constitutive_law_options.Is(ConstitutiveLaw::COMPUTE_CONSTITUTIVE_TENSOR)) {
-        ConstitutiveLaw::VoigtSizeMatrixType &r_constitutive_matrix = rValues.GetConstitutiveMatrix();
-        CalculateElasticMatrix(r_constitutive_matrix, rValues);
-    }
-
-    KRATOS_CATCH("")
-}
-
-/***********************************************************************************/
-/***********************************************************************************/
-
-int ThermalLinearPlaneStress::Check(
-    const Properties& rMaterialProperties,
-    const GeometryType& rElementGeometry,
-    const ProcessInfo& rCurrentProcessInfo
-    ) const
-{
-    KRATOS_ERROR_IF_NOT(rElementGeometry[0].SolutionStepsDataHas(TEMPERATURE))  << "The TEMPERATURE variable is not available at the nodes." << std::endl;
-    KRATOS_ERROR_IF_NOT(rMaterialProperties.Has(THERMAL_EXPANSION_COEFFICIENT)) << "The THERMAL_EXPANSION_COEFFICIENT is not set in the material properties." << std::endl;
-    KRATOS_ERROR_IF(rMaterialProperties[THERMAL_EXPANSION_COEFFICIENT] < 0.0)   << "The THERMAL_EXPANSION_COEFFICIENT is negative..." << std::endl;
-    KRATOS_ERROR_IF_NOT(rElementGeometry.Has(REFERENCE_TEMPERATURE) || rMaterialProperties.Has(REFERENCE_TEMPERATURE)) << "The REFERENCE_TEMPERATURE is not given in the material properties nor via SetValue()" << std::endl;
-    BaseType::Check(rMaterialProperties, rElementGeometry, rCurrentProcessInfo);
-    return 0;
-}
-
-/***********************************************************************************/
-/***********************************************************************************/
-
-double& ThermalLinearPlaneStress::CalculateValue(
-    ConstitutiveLaw::Parameters& rParameterValues,
-    const Variable<double>& rThisVariable, double& rValue
-    )
-{
-    if (rThisVariable == REFERENCE_TEMPERATURE) {
-        rValue = mReferenceTemperature;
-    } else {
-        BaseType::CalculateValue(rParameterValues, rThisVariable, rValue);
-    }
-    return (rValue);
-}
-
-/***********************************************************************************/
-/***********************************************************************************/
-
-void ThermalLinearPlaneStress::InitializeMaterial(
-    const Properties& rMaterialProperties,
-    const GeometryType& rElementGeometry,
-    const Vector& rShapeFunctionsValues
-    )
-{
-    if (rElementGeometry.Has(REFERENCE_TEMPERATURE)) {
-        mReferenceTemperature = rElementGeometry.GetValue(REFERENCE_TEMPERATURE);
-    } else if (rMaterialProperties.Has(REFERENCE_TEMPERATURE)) {
-        mReferenceTemperature = rMaterialProperties[REFERENCE_TEMPERATURE];
-    }
-}
-
-/***********************************************************************************/
-/***********************************************************************************/
-
 void ThermalLinearPlaneStress::CalculatePK2Stress(
     const Vector& rStrainVector,
     ConstitutiveLaw::StressVectorType& rStressVector,
@@ -149,4 +64,17 @@ void ThermalLinearPlaneStress::CalculateElasticMatrix(
 /***********************************************************************************/
 /***********************************************************************************/
 
+void ThermalLinearPlaneStress::SubstractThermalStrain(
+    ConstitutiveLaw::StrainVectorType &rStrainVector,
+    const double ReferenceTemperature,
+    ConstitutiveLaw::Parameters &rParameters,
+    const bool IsPlaneStrain
+    )
+{
+    AdvancedConstitutiveLawUtilities<3>::SubstractThermalStrain(rStrainVector, ReferenceTemperature, rParameters, false);
+}
+
+/***********************************************************************************/
+/***********************************************************************************/
+
 } // Namespace Kratos

applications/ConstitutiveLawsApplication/custom_constitutive/thermal/small_strains/elastic/thermal_linear_plane_stress.h

@@ -18,7 +18,7 @@
 // External includes
 
 // Project includes
-#include "custom_constitutive/linear_plane_stress.h"
+#include "thermal_linear_plane_strain.h"
 
 namespace Kratos
 {
@@ -49,14 +49,14 @@ namespace Kratos
  * @author Alejandro Cornejo
  */
 class KRATOS_API(CONSTITUTIVE_LAWS_APPLICATION) ThermalLinearPlaneStress
-    : public LinearPlaneStress
+    : public ThermalLinearPlaneStrain
 {
 public:
 
     ///@name Type Definitions
     ///@{
 
-    using BaseType = LinearPlaneStress;
+    using BaseType = ThermalLinearPlaneStrain;
 
     /// Counted pointer of LinearPlaneStrain
     KRATOS_CLASS_POINTER_DEFINITION(ThermalLinearPlaneStress);
@@ -88,8 +88,7 @@ class KRATOS_API(CONSTITUTIVE_LAWS_APPLICATION) ThermalLinearPlaneStress
     * Copy constructor.
     */
     ThermalLinearPlaneStress(const ThermalLinearPlaneStress &rOther)
-        : BaseType(rOther),
-        mReferenceTemperature(rOther.mReferenceTemperature)
+        : BaseType(rOther)
     {
     }
 
@@ -101,54 +100,6 @@ class KRATOS_API(CONSTITUTIVE_LAWS_APPLICATION) ThermalLinearPlaneStress
     ///@name Operations
     ///@{
 
-    /**
-     * @brief Computes the material response:
-     * @details PK2 stresses and algorithmic ConstitutiveMatrix
-     * @param rValues The internal values of the law
-     * @see   Parameters
-     */
-    void CalculateMaterialResponsePK2(ConstitutiveLaw::Parameters &rValues) override;
-
-    /**
-     * @brief This function provides the place to perform checks on the completeness of the input.
-     * @details It is designed to be called only once (or anyway, not often) typically at the beginning of the calculations, so to verify that nothing is missing from the input or that no common error is found.
-     * @param rMaterialProperties The properties of the material
-     * @param rElementGeometry The geometry of the element
-     * @param rCurrentProcessInfo The current process info instance
-     * @return 0 if OK, 1 otherwise
-     */
-    int Check(
-        const Properties& rMaterialProperties,
-        const GeometryType& rElementGeometry,
-        const ProcessInfo& rCurrentProcessInfo
-        ) const override;
-
-    /**
-     * @brief It calculates the value of a specified variable (double case)
-     * @param rParameterValues the needed parameters for the CL calculation
-     * @param rThisVariable the variable to be returned
-     * @param rValue a reference to the returned value
-     * @return rValue output: the value of the specified variable
-     */
-    double& CalculateValue(
-        ConstitutiveLaw::Parameters& rParameterValues,
-        const Variable<double>& rThisVariable,
-        double& rValue
-        ) override;
-
-    /**
-     * This is to be called at the very beginning of the calculation
-     * (e.g. from InitializeElement) in order to initialize all relevant
-     * attributes of the constitutive law
-     * @param rMaterialProperties the Properties instance of the current element
-     * @param rElementGeometry the geometry of the current element
-     * @param rShapeFunctionsValues the shape functions values in the current integration point
-     */
-    void InitializeMaterial(
-        const Properties &rMaterialProperties,
-        const GeometryType &rElementGeometry,
-        const Vector &rShapeFunctionsValues) override;
-
     /**
      * @brief It calculates the stress vector
      * @param rStrainVector The strain vector in Voigt notation
@@ -173,6 +124,19 @@ class KRATOS_API(CONSTITUTIVE_LAWS_APPLICATION) ThermalLinearPlaneStress
         ConstitutiveLaw::Parameters& rValues
         ) override;
 
+    /**
+    * @brief It calculates and substracts the thermal strain
+    * @param rStrainVector The strain vector
+    * @param ReferenceTemperature the reference temeprature
+    * @param ReferenceTemperature Parameters of the constitutive law
+    * @param IsPlaneStrain indicator of plane strain
+    */
+    void SubstractThermalStrain(
+        ConstitutiveLaw::StrainVectorType &rStrainVector,
+        const double ReferenceTemperature,
+        ConstitutiveLaw::Parameters &rParameters,
+        const bool IsPlaneStrain = false) override;
+
     ///@}
     ///@name Access
     ///@{
@@ -219,7 +183,6 @@ class KRATOS_API(CONSTITUTIVE_LAWS_APPLICATION) ThermalLinearPlaneStress
     ///@name Member Variables
     ///@{
 
-    double mReferenceTemperature = 0.0;
 
     ///@}
     ///@name Private Operators
@@ -235,39 +198,19 @@ class KRATOS_API(CONSTITUTIVE_LAWS_APPLICATION) ThermalLinearPlaneStress
     ///@{
     ///@}
 
-    /**
-     * @brief Retrieves the reference temperature
-     * @return The reference temperature
-     */
-    double& GetReferenceTemperature()
-    {
-        return mReferenceTemperature;
-    }
-
-    /**
-     * @brief Sets the reference temperature
-     * @param ToRefTemperature The reference temperature
-     */
-    void SetReferenceTemperature(const double ToRefTemperature)
-    {
-        mReferenceTemperature = ToRefTemperature;
-    }
-
     ///@}
     ///@name Serialization
     ///@{
     friend class Serializer;
 
     void save(Serializer& rSerializer) const override
     {
-        KRATOS_SERIALIZE_SAVE_BASE_CLASS(rSerializer, ElasticIsotropic3D)
-        rSerializer.save("ReferenceTemperature", mReferenceTemperature);
+        KRATOS_SERIALIZE_SAVE_BASE_CLASS(rSerializer, ThermalLinearPlaneStrain)
     }
 
     void load(Serializer& rSerializer) override
     {
-        KRATOS_SERIALIZE_LOAD_BASE_CLASS(rSerializer, ElasticIsotropic3D)
-        rSerializer.load("ReferenceTemperature", mReferenceTemperature);
+        KRATOS_SERIALIZE_LOAD_BASE_CLASS(rSerializer, ThermalLinearPlaneStrain)
     }