#1022 Rename more clearly a fluidmass method.

Sources/ModelInstances/UnderDevelopment/Poromechanics/Data/Fluidmass.cpp

@@ -32,7 +32,6 @@ namespace HappyHeart
                 static std::string ret("Fluidmass");
                 return ret;
             }
-
             
             
             Fluidmass::Fluidmass(const Monolithic& monolithic_data,
@@ -93,11 +92,11 @@ namespace HappyHeart
                                                                                    fluid_mass_unknown,
                                                                                    GetCurrent());
                     
-                    difference_as_param_ = std::make_unique<scalar_at_dof_type>("New - current fluid mass",
+                    difference_on_solid_as_param_ = std::make_unique<scalar_at_dof_type>("New - current fluid mass",
                                                                                 solid_mesh,
                                                                                 felt_space,
                                                                                 fluid_mass_unknown,
-                                                                                GetDifference());
+                                                                                GetDifferenceOnSolid());
 
 
                     
@@ -136,7 +135,7 @@ namespace HappyHeart
             
             
             
-            const GlobalVector& Fluidmass::GetDifference() const noexcept
+            const GlobalVector& Fluidmass::GetDifferenceOnSolid() const noexcept
             {
                 assert(!(!difference_on_solid_));
                 decltype(auto) new_value = GetNew();

Sources/ModelInstances/UnderDevelopment/Poromechanics/Data/Fluidmass.hpp

@@ -133,22 +133,21 @@ namespace HappyHeart
                  * 
                  * The vector is automatically updated if need be.
                  */
-                const GlobalVector& GetDifference() const noexcept;
+                const GlobalVector& GetDifferenceOnSolid() const noexcept;
                 
                 /*!
-                 * \brief Same as GetDifference() except no value returned.
+                 * \brief Same as GetDifferenceOnSolid() except no value returned.
                  */
-                void ReevaluateDifference() const noexcept;
+                void ReevaluateDifferenceOnSolid() const noexcept;
 
                 //! Access to new fluid mass parameter.
                 const ParameterAtDof<ParameterNS::Type::scalar>& GetNewAsParam() const noexcept;
                 
-                
                 //! Access to current fluid mass parameter.
                 const ParameterAtDof<ParameterNS::Type::scalar>& GetCurrentAsParam() const noexcept;
                 
                 //! Access to new minus current fluid mass parameter.
-                const ParameterAtDof<ParameterNS::Type::scalar>& GetDifferenceAsParam() const noexcept;
+                const ParameterAtDof<ParameterNS::Type::scalar>& GetDifferenceOnSolidAsParam() const noexcept;
 
                 /*!
                  * \brief Parameter that encapsulates current fluid_mass_vector on the inlet border.
@@ -264,7 +263,7 @@ namespace HappyHeart
                 ParameterAtDof<ParameterNS::Type::scalar>::unique_ptr current_value_as_param_ = nullptr;
                 
                 //! Parameter that encapsulates new minus current fluid_mass_vector, expressed on the fluid mesh.
-                ParameterAtDof<ParameterNS::Type::scalar>::unique_ptr difference_as_param_ = nullptr;
+                ParameterAtDof<ParameterNS::Type::scalar>::unique_ptr difference_on_solid_as_param_ = nullptr;
 
                 
                 //! Parameter that encapsulates current fluid_mass_vector, expressed on the solid mesh.

Sources/ModelInstances/UnderDevelopment/Poromechanics/Data/Fluidmass.hxx

@@ -68,15 +68,14 @@ namespace HappyHeart
             
             inline const ParameterAtDof<ParameterNS::Type::scalar, ParameterNS::TimeDependencyNS::None>&
             Fluidmass
-            ::GetDifferenceAsParam() const noexcept
+            ::GetDifferenceOnSolidAsParam() const noexcept
             {
-                ReevaluateDifference();
+                ReevaluateDifferenceOnSolid();
                 
-                assert(!(!difference_as_param_));
-                return *difference_as_param_;
+                assert(!(!difference_on_solid_as_param_));
+                return *difference_on_solid_as_param_;
             }
 
-
             
             inline const GlobalVector& Fluidmass::GetDeltaOnSolid() const noexcept
             {
@@ -104,7 +103,6 @@ namespace HappyHeart
                 assert(!(!current_value_on_fluid_));
                 return *current_value_on_fluid_;
             }
-    
             
             
             inline GlobalVector& Fluidmass::GetNonCstCurrentOnFluid() noexcept
@@ -113,9 +111,9 @@ namespace HappyHeart
             }
             
             
-            inline void Fluidmass::ReevaluateDifference() const noexcept
+            inline void Fluidmass::ReevaluateDifferenceOnSolid() const noexcept
             {
-                decltype(auto) new_value = GetDifference(); // lazy reevaluation may occur here.
+                decltype(auto) new_value = GetDifferenceOnSolid(); // lazy reevaluation may occur here.
                 static_cast<void>(new_value);
             }
 

Sources/ModelInstances/UnderDevelopment/Poromechanics/Data/SolidDisplacement.hpp

@@ -196,8 +196,7 @@ namespace HappyHeart
                 //! Tag used to check whether current_on_fluid_ is up-to-date with current_.
                 mutable unsigned int current_on_fluid_tag_ = 0u;
                 
-               
-                
+                               
                 ///@}
                 
                 //! Interpolation matrix that computes solid displacement on fluid mesh given a solid displacement on solid mesh.

Sources/ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/GlobalVariationalOperatorInstances/Darcy.hxx

@@ -88,7 +88,8 @@ namespace HappyHeart
                        ImplicitStepFluidNS::IsFullDarcy is_full_darcy,
                        const Domain& domain) const
             {
-               // GetNonCstUpdatePressureOperator().Update(GetCurrentSolidDisplacement());
+               //
+                // GetNonCstUpdatePressureOperator().Update(GetCurrentSolidDisplacement()); \todo #1022 Commented due to rebase; see if required (probably, ot at least make sure pressure operator is really updated at some point.
                 
                 return parent::AssembleImpl(std::move(global_vector_with_coeff_tuple),
                                             domain,

Sources/ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/LocalVariationalOperatorInstances/T21.hxx

@@ -83,9 +83,11 @@ namespace HappyHeart
 
                 decltype(auto) hyperelastic_law = GetHyperelasticLaw();
                 decltype(auto) fluid_mass_data = hyperelastic_law.GetFluidmassData();
-                decltype(auto) difference_fluidmass = fluid_mass_data.GetDifferenceAsParam();
+
+                //decltype(auto) difference_fluidmass = fluid_mass_data.GetDifferenceAsParam(); \todo #1022 See which one is correct: difference stems from rebase.
                 
                 decltype(auto) cauchy_green_tensor = this->GetCauchyGreenTensor();
+                decltype(auto) difference_fluidmass = fluid_mass_data.GetDifferenceOnSolidAsParam();
 
 
                 for (const auto& infos_at_quad_pt : infos_at_quad_pt_list)

Sources/ModelInstances/UnderDevelopment/Poromechanics/Parameter/Local/UpdatePressureAtQuadPt.hxx

@@ -71,7 +71,7 @@ namespace HappyHeart
             decltype(auto) hyperelastic_law = GetHyperelasticLaw();
             decltype(auto) fluid_mass_data = hyperelastic_law.GetFluidmassData();
             
-            decltype(auto) difference_fluidmass = fluid_mass_data.GetDifferenceAsParam();
+            decltype(auto) difference_fluidmass = fluid_mass_data.GetDifferenceOnSolidAsParam();
 
             for (const auto& infos_at_quad_pt : infos_at_quad_pt_list)
             {