Commit 1a337321 authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#820 Very minor changes (typos, unused template keyword, spaces...).

parent 89f88409
......@@ -78,7 +78,7 @@ namespace HappyHeart
void ComputeDynamicTimeSchemeResidualContribution(const VectorsAndMatrices<HyperelasticityNS::TimeScheme::midpoint>& vm,
GlobalVector& system_rhs)
GlobalVector& system_rhs)
{
Wrappers::Petsc::AXPY(1.,
vm.GetVectorNewStiffness(),
......@@ -92,8 +92,6 @@ namespace HappyHeart
static_cast<void>(vm);
}
} // namespace Private
......
......@@ -93,7 +93,7 @@ namespace HappyHeart
const double sqrt_I3 = std::sqrt(I3);
const double fluid_mass = GetFluidMass().GetValue(quadrature_point, geom_elt);
const double fluid_density = GetFluidDensity().GetValue(quadrature_point, geom_elt);
const double initial_porosity = GetInitialPorosity();//.GetValue(quadrature_point, geom_elt);
const double initial_porosity = GetInitialPorosity();
assert(!NumericNS::AreEqual(initial_porosity, 1.));
assert(!NumericNS::IsZero(fluid_density));
......@@ -106,10 +106,7 @@ namespace HappyHeart
); // \todo #820 See question about absolute value...
return ret;
}
double StVenantKirchhoff::SecondDerivativeWThirdInvariant(const InvariantHolder& invariant_holder,
const QuadraturePoint& quadrature_point,
......@@ -150,7 +147,7 @@ namespace HappyHeart
const double fluid_mass = GetFluidMass().GetValue(quadrature_point, geom_elt);
const double fluid_density = GetFluidDensity().GetValue(quadrature_point, geom_elt);
const double initial_porosity = GetInitialPorosity();//.GetValue(quadrature_point, geom_elt);
const double initial_porosity = GetInitialPorosity();
assert(!NumericNS::AreEqual(initial_porosity, 1.));
assert(!NumericNS::IsZero(fluid_density));
......@@ -191,8 +188,8 @@ namespace HappyHeart
double ret = bulk_solid / NumericNS::Square(fluid_density * (sqrt_I3 - fluid_mass_over_density));
assert(!NumericNS::IsZero(fluid_mass));
ret += GetPenalizationPorosity().GetValue(quadrature_point, geom_elt) / NumericNS::Square(fluid_mass);
// assert(!NumericNS::IsZero(fluid_mass));
// ret += GetPenalizationPorosity().GetValue(quadrature_point, geom_elt) / NumericNS::Square(fluid_mass);
return ret;
}
......@@ -207,7 +204,7 @@ namespace HappyHeart
const double fluid_mass = GetFluidMass().GetValue(quadrature_point, geom_elt);
const double fluid_density = GetFluidDensity().GetValue(quadrature_point, geom_elt);
const double initial_porosity = GetInitialPorosity();//.GetValue(quadrature_point, geom_elt);
const double initial_porosity = GetInitialPorosity();
assert(!NumericNS::AreEqual(initial_porosity, 1.));
assert(!NumericNS::IsZero(fluid_density));
......
......@@ -275,6 +275,10 @@ namespace HappyHeart
auto& dynamic_contribution_to_rhs = this->GetNonCstHelperGlobalVector<1>();
variable_holder.template DevPrint<DevPhase::solid_newton>(dynamic_contribution_to_rhs,
"dynamic_contribution_to_rhs");
Wrappers::Petsc::MatMult(vectors_and_matrices.GetMassPerSquareTime(),
helper_vector,
dynamic_contribution_to_rhs, __FILE__, __LINE__);
......
......@@ -24,8 +24,6 @@ using namespace HappyHeart;
int main(int argc, char ** argv)
{
using InputParameterList = PoromechanicsNS::InputParameterList;
using hyperelastic_law_type = PoromechanicsNS::HyperelasticLawNS::StVenantKirchhoff;
......@@ -36,8 +34,7 @@ int main(int argc, char ** argv)
hyperelastic_law_type,
HyperelasticityNS::TimeScheme::midpoint
>;
try
{
InitHappyHeart<InputParameterList> happy_heart(argc, argv);
......
......@@ -30,8 +30,6 @@ namespace HappyHeart
const QuadraturePoint& quad_pt,
const GeometricElt& geom_elt) const noexcept
{
static_cast<void>(geom_elt);
static_cast<void>(quad_pt);
static_cast<void>(invariant_holder);
return GetBulk().GetValue(quad_pt, geom_elt);
......
......@@ -61,7 +61,7 @@ namespace HappyHeart
// static_cast<void>(pressure); // See #7.
auto& invariant_holder = this->GetNonCstInvariantHolder();
invariant_holder.template Update(cauchy_green_tensor);
invariant_holder.Update(cauchy_green_tensor);
const auto& law = GetHyperelasticLaw();
......
Markdown is supported
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