Commit eea86157 authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#1022 Replace fluid pressure on solid mesh by expression derived from new NewFluidPressure class.

parent 80d75111
...@@ -541,6 +541,11 @@ namespace HappyHeart ...@@ -541,6 +541,11 @@ namespace HappyHeart
///@} ///@}
const ::HappyHeart::GlobalVariationalOperatorNS::TransientSource<ParameterNS::Type::scalar>&
GetFluidPressureSolidMeshOperator() const noexcept;
public: public:
/*! /*!
......
...@@ -371,7 +371,24 @@ namespace HappyHeart ...@@ -371,7 +371,24 @@ namespace HappyHeart
return const_cast<GlobalVector&>(GetDarcyVector()); return const_cast<GlobalVector&>(GetDarcyVector());
} }
template<class HyperelasticLawT>
inline const ::HappyHeart::GlobalVariationalOperatorNS::TransientSource<ParameterNS::Type::scalar>&
VariationalFormulation<HyperelasticLawT>
::GetFluidPressureSolidMeshOperator() const noexcept
{
decltype(auto) new_fluid_pressure_data = this->GetNonCstNewFluidPressureData();
decltype(auto) update_operator =
new_fluid_pressure_data.GetNonCstUpdatePressureParamOnSolidNew();
update_operator.Update();
assert(!(!fluid_pressure_solid_mesh_operator_));
return *fluid_pressure_solid_mesh_operator_;
}
} // namespace NewtonFixedPointNS } // namespace NewtonFixedPointNS
......
...@@ -334,7 +334,8 @@ namespace HappyHeart ...@@ -334,7 +334,8 @@ namespace HappyHeart
fluid_pressure_solid_mesh_operator_ = fluid_pressure_solid_mesh_operator_ =
std::make_unique<source_type>(felt_space, std::make_unique<source_type>(felt_space,
fluid_pressure, fluid_pressure,
fluid_pressure_data.GetNewOnSolidAsParam()); new_fluid_pressure_data.GetNonCstUpdatePressureParamOnSolidNew().GetPressureAtQuadPt());
// fluid_pressure_data.GetNewOnSolidAsParam());
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment