Merge branch 'master' into servol_loading_with_periodic_boundary

Author: ChengshunShang1996

applications/ConstitutiveLawsApplication/custom_constitutive/small_strains/fatigue/generic_small_strain_high_cycle_fatigue_law.h

@@ -451,7 +451,7 @@ class KRATOS_API(CONSTITUTIVE_LAWS_APPLICATION) GenericSmallStrainHighCycleFatig
 
     void save(Serializer &rSerializer) const override
     {
-        KRATOS_SERIALIZE_SAVE_BASE_CLASS(rSerializer, ConstitutiveLaw)
+        KRATOS_SERIALIZE_SAVE_BASE_CLASS(rSerializer, BaseType)
         rSerializer.save("FatigueReductionFactor", mFatigueReductionFactor);
         rSerializer.save("PreviousStresses", mPreviousStresses);
         rSerializer.save("MaxStress", mMaxStress);
@@ -476,7 +476,7 @@ class KRATOS_API(CONSTITUTIVE_LAWS_APPLICATION) GenericSmallStrainHighCycleFatig
 
     void load(Serializer &rSerializer) override
     {
-        KRATOS_SERIALIZE_LOAD_BASE_CLASS(rSerializer, ConstitutiveLaw)
+        KRATOS_SERIALIZE_LOAD_BASE_CLASS(rSerializer, BaseType)
         rSerializer.load("FatigueReductionFactor", mFatigueReductionFactor);
         rSerializer.load("PreviousStresses", mPreviousStresses);
         rSerializer.load("MaxStress", mMaxStress);

applications/ConstitutiveLawsApplication/custom_processes/advance_in_time_high_cycle_fatigue_process.h

@@ -52,8 +52,6 @@ class KRATOS_API(CONSTITUTIVE_LAWS_APPLICATION)AdvanceInTimeHighCycleFatigueProc
     ///@name  Enum's
     ///@{
 
-protected:
-
 
 public:
     static constexpr double tolerance = std::numeric_limits<double>::epsilon();
@@ -98,10 +96,26 @@ class KRATOS_API(CONSTITUTIVE_LAWS_APPLICATION)AdvanceInTimeHighCycleFatigueProc
      */
     void TimeAndCyclesUpdate(const double Increment);
 
-protected:
+private:
     // Member Variables
-    ModelPart& mrModelPart;                     // The model part to compute
-    Parameters mThisParameters;
+    ModelPart& mrModelPart;      // The model part to compute
+    Parameters mThisParameters;  // The project parameters
+
+    friend class Serializer;
+
+    void save(Serializer &rSerializer) const override
+    {
+        KRATOS_SERIALIZE_SAVE_BASE_CLASS(rSerializer, Process)
+        rSerializer.save("ModelPart", mrModelPart);
+        rSerializer.save("ThisParameters", mThisParameters);
+    }
+
+    void load(Serializer &rSerializer) override
+    {
+        KRATOS_SERIALIZE_LOAD_BASE_CLASS(rSerializer, Process)
+        rSerializer.load("ModelPart", mrModelPart);
+        rSerializer.load("ThisParameters", mThisParameters);
+    }
 
 }; // Class AdvanceInTimeHighCycleFatigueProcess
 

applications/GeoMechanicsApplication/custom_conditions/general_U_Pw_diff_order_condition.hpp

@@ -42,7 +42,7 @@ class KRATOS_API(GEO_MECHANICS_APPLICATION) GeneralUPwDiffOrderCondition : publi
 
     KRATOS_CLASS_INTRUSIVE_POINTER_DEFINITION(GeneralUPwDiffOrderCondition);
 
-    GeneralUPwDiffOrderCondition() : GeneralUPwDiffOrderCondition(0, nullptr, nullptr){};
+    GeneralUPwDiffOrderCondition() : GeneralUPwDiffOrderCondition(0, nullptr, nullptr) {};
 
     GeneralUPwDiffOrderCondition(IndexType NewId, GeometryType::Pointer pGeometry)
         : GeneralUPwDiffOrderCondition(NewId, pGeometry, nullptr)

applications/GeoMechanicsApplication/custom_elements/steady_state_Pw_element.hpp

@@ -121,8 +121,7 @@ class KRATOS_API(GEO_MECHANICS_APPLICATION) SteadyStatePwElement : public Transi
     void load(Serializer& rSerializer) override{KRATOS_SERIALIZE_LOAD_BASE_CLASS(rSerializer, Element)}
 
     // Assignment operator.
-    SteadyStatePwElement&
-    operator=(SteadyStatePwElement const& rOther);
+    SteadyStatePwElement& operator=(SteadyStatePwElement const& rOther);
 
     // Copy constructor.
     SteadyStatePwElement(SteadyStatePwElement const& rOther);

applications/GeoMechanicsApplication/custom_elements/transient_Pw_element.hpp

@@ -166,8 +166,7 @@ class KRATOS_API(GEO_MECHANICS_APPLICATION) TransientPwElement : public UPwSmall
     void load(Serializer& rSerializer) override{KRATOS_SERIALIZE_LOAD_BASE_CLASS(rSerializer, Element)}
 
     // Assignment operator.
-    TransientPwElement&
-    operator=(TransientPwElement const& rOther);
+    TransientPwElement& operator=(TransientPwElement const& rOther);
 
     // Copy constructor.
     TransientPwElement(TransientPwElement const& rOther);

applications/GeoMechanicsApplication/custom_processes/README.md

@@ -89,11 +89,19 @@ When the overconsolidation ratio ("OCR") and optionally the unloading-reloading
 
 $$K_0 = OCR.K_0^{nc} +  \frac{\nu_{ur}}{1 - \nu_{ur}} ( OCR - 1 )$$
 
-![Initial effective stress tensor](initial_effective_stress_tensor.png)
+```math
+\sigma^{'}_{initial} = \begin{bmatrix} {K_0 \sigma^{'}_{zz}} & 0 & 0 \\
+                                        0 & {K_0 \sigma^{'}_{zz}} & 0 \\
+                                        0 & 0 & {\sigma^{'}_{zz}} \end{bmatrix}
+```
 
 Alternatively, when the pre-overburden pressure "POP" is specified, the initial stress tensor becomes:
 
-![Initial effective stress tensor with POP](initial_effective_stress_tensor_with_POP.png)
+```math
+\sigma^{'}_{initial} = \begin{bmatrix} {K_0^{nc} (\sigma^{'}_{zz} + POP )} - \frac{\nu_{ur}}{1 - \nu_{ur}} POP & 0 & 0 \\
+                                        0 & {K_0^{nc} (\sigma^{'}_{zz} + POP)} - \frac{\nu_{ur}}{1 - \nu_{ur}} POP & 0 \\
+                                        0 & 0 & {\sigma^{'}_{zz}} \end{bmatrix}
+```
 
 When the optional unloading-reloading Poisson's ratio is omitted, a default value $\nu_{ur} = 0$ is used such that the correction term drops to 0.
 

applications/GeoMechanicsApplication/custom_processes/initial_effective_stress_tensor.png

@@ -110,18 +110,18 @@ void AddCustomStrategiesToPython(pybind11::module& m)
 
     py::class_<GeoMechanicsNewtonRaphsonStrategyType, typename GeoMechanicsNewtonRaphsonStrategyType::Pointer, BaseSolvingStrategyType>(
         m, "GeoMechanicsNewtonRaphsonStrategy")
-        .def(py::init<ModelPart&, BaseSchemeType::Pointer, LinearSolverType::Pointer, ConvergenceCriteriaType::Pointer,
+        .def(py::init<ModelPart&, BaseSchemeType::Pointer, ConvergenceCriteriaType::Pointer,
                       BuilderAndSolverType::Pointer, Parameters&, int, bool, bool, bool>());
 
     py::class_<GeoMechanicsNewtonRaphsonErosionProcessStrategyType,
                typename GeoMechanicsNewtonRaphsonErosionProcessStrategyType::Pointer, BaseSolvingStrategyType>(
         m, "GeoMechanicsNewtonRaphsonErosionProcessStrategy")
-        .def(py::init<ModelPart&, BaseSchemeType::Pointer, LinearSolverType::Pointer, ConvergenceCriteriaType::Pointer,
+        .def(py::init<ModelPart&, BaseSchemeType::Pointer, ConvergenceCriteriaType::Pointer,
                       BuilderAndSolverType::Pointer, Parameters&, int, bool, bool, bool>());
 
     py::class_<GeoMechanicsRammArcLengthStrategyType, typename GeoMechanicsRammArcLengthStrategyType::Pointer, BaseSolvingStrategyType>(
         m, "GeoMechanicsRammArcLengthStrategy")
-        .def(py::init<ModelPart&, BaseSchemeType::Pointer, LinearSolverType::Pointer, ConvergenceCriteriaType::Pointer,
+        .def(py::init<ModelPart&, BaseSchemeType::Pointer, ConvergenceCriteriaType::Pointer,
                       BuilderAndSolverType::Pointer, Parameters&, int, bool, bool, bool>())
         .def("UpdateLoads", &GeoMechanicsRammArcLengthStrategyType::UpdateLoads);
 

applications/GeoMechanicsApplication/custom_processes/initial_effective_stress_tensor_with_POP.png

@@ -54,7 +54,6 @@ class GeoMechanicsNewtonRaphsonErosionProcessStrategy
 
     GeoMechanicsNewtonRaphsonErosionProcessStrategy(ModelPart&                    model_part,
                                                     typename TSchemeType::Pointer pScheme,
-                                                    typename TLinearSolver::Pointer pNewLinearSolver,
                                                     typename TConvergenceCriteriaType::Pointer pNewConvergenceCriteria,
                                                     typename TBuilderAndSolverType::Pointer pNewBuilderAndSolver,
                                                     Parameters& rParameters,
@@ -63,16 +62,7 @@ class GeoMechanicsNewtonRaphsonErosionProcessStrategy
                                                     bool        ReformDofSetAtEachStep = false,
                                                     bool        MoveMeshFlag           = false)
         : GeoMechanicsNewtonRaphsonStrategy<TSparseSpace, TDenseSpace, TLinearSolver>(
-              model_part,
-              pScheme,
-              pNewLinearSolver,
-              pNewConvergenceCriteria,
-              pNewBuilderAndSolver,
-              rParameters,
-              MaxIterations,
-              CalculateReactions,
-              ReformDofSetAtEachStep,
-              MoveMeshFlag)
+              model_part, pScheme, pNewConvergenceCriteria, pNewBuilderAndSolver, rParameters, MaxIterations, CalculateReactions, ReformDofSetAtEachStep, MoveMeshFlag)
     {
         rank              = model_part.GetCommunicator().MyPID();
         mPipingIterations = rParameters["max_piping_iterations"].GetInt();