[MatL] Ehlers; Rename material state class.

For unknown reasons MSVC-15 and 17 refuse to compile the original code.

MaterialLib/SolidModels/Ehlers-impl.h

@@ -670,11 +670,11 @@ SolidEhlers<DisplacementDim>::integrateStress(
     typename MechanicsBase<DisplacementDim>::MaterialStateVariables const&
         material_state_variables)
 {
-    assert(dynamic_cast<MaterialStateVariables<DisplacementDim> const*>(
+    assert(dynamic_cast<StateVariables<DisplacementDim> const*>(
                &material_state_variables) != nullptr);
 
-    MaterialStateVariables<DisplacementDim> state =
-        static_cast<MaterialStateVariables<DisplacementDim> const&>(
+    StateVariables<DisplacementDim> state =
+        static_cast<StateVariables<DisplacementDim> const&>(
             material_state_variables);
     state.setInitialConditions();
 
@@ -759,14 +759,14 @@ SolidEhlers<DisplacementDim>::integrateStress(
         return std::make_tuple(mp.G * sigma * (1 - state.damage.value()),
                 std::unique_ptr<typename MechanicsBase<
                     DisplacementDim>::MaterialStateVariables>{
-                    new MaterialStateVariables<DisplacementDim>{state}},
+                    new StateVariables<DisplacementDim>{state}},
                 tangentStiffness);
 
     return {
         mp.G * sigma,
         std::unique_ptr<
             typename MechanicsBase<DisplacementDim>::MaterialStateVariables>{
-            new MaterialStateVariables<DisplacementDim>{state}},
+            new StateVariables<DisplacementDim>{state}},
         tangentStiffness};
 }
 

MaterialLib/SolidModels/Ehlers.h

@@ -133,16 +133,16 @@ private:
 };
 
 template <int DisplacementDim>
-struct MaterialStateVariables
+struct StateVariables
     : public MechanicsBase<DisplacementDim>::MaterialStateVariables
 {
-    MaterialStateVariables& operator=(MaterialStateVariables const&) = default;
+    StateVariables& operator=(StateVariables const&) = default;
     typename MechanicsBase<DisplacementDim>::MaterialStateVariables& operator=(
         typename MechanicsBase<DisplacementDim>::MaterialStateVariables const&
             state) noexcept override
     {
-        assert(dynamic_cast<MaterialStateVariables const*>(&state) != nullptr);
-        return operator=(static_cast<MaterialStateVariables const&>(state));
+        assert(dynamic_cast<StateVariables const*>(&state) != nullptr);
+        return operator=(static_cast<StateVariables const&>(state));
     }
 
     void setInitialConditions()
@@ -168,7 +168,7 @@ struct MaterialStateVariables
 
 #ifndef NDEBUG
     friend std::ostream& operator<<(
-        std::ostream& os, MaterialStateVariables<DisplacementDim> const& m)
+        std::ostream& os, StateVariables<DisplacementDim> const& m)
     {
         os << "State:\n"
            << "eps_p_D: " << m.eps_p.D << "\n"
@@ -205,8 +205,8 @@ public:
         typename MechanicsBase<DisplacementDim>::MaterialStateVariables>
     createMaterialStateVariables() override
     {
-        return std::unique_ptr<MaterialStateVariables<DisplacementDim>>{
-            new MaterialStateVariables<DisplacementDim>};
+        return std::unique_ptr<StateVariables<DisplacementDim>>{
+            new StateVariables<DisplacementDim>};
     }
 
 public: