Attention une mise à jour du service Gitlab va être effectuée le mardi 18 janvier (et non lundi 17 comme annoncé précédemment) entre 18h00 et 18h30. Cette mise à jour va générer une interruption du service dont nous ne maîtrisons pas complètement la durée mais qui ne devrait pas excéder quelques minutes.

Commit 0fc1d92f authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#841 Solid: as it is not truly a Parameter instance, move it into a brand new...

#841 Solid: as it is not truly a Parameter instance, move it into a brand new group Parameters/Compound. Remove also the encompassing ParameterNS.
parent 7560465f
......@@ -256,9 +256,6 @@
BE2E0CD81ABB094200B543E8 /* Mesh.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE2E0CD51ABB094200B543E8 /* Mesh.hpp */; };
BE2E47161C7B47D400AC3DDD /* LameLambda.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE2E47151C7B47D400AC3DDD /* LameLambda.cpp */; };
BE2E47181C7B480100AC3DDD /* LameMu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE2E47171C7B480100AC3DDD /* LameMu.cpp */; };
BE2E471D1C7B4B8A00AC3DDD /* Solid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE2E471A1C7B4B8A00AC3DDD /* Solid.cpp */; };
BE2E471E1C7B4B8A00AC3DDD /* Solid.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE2E471B1C7B4B8A00AC3DDD /* Solid.hpp */; };
BE2E471F1C7B4B8A00AC3DDD /* Solid.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE2E471C1C7B4B8A00AC3DDD /* Solid.hxx */; };
BE2E47231C7B715E00AC3DDD /* DetermineDefaultQuadratureRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE2E47201C7B715E00AC3DDD /* DetermineDefaultQuadratureRule.cpp */; };
BE2E47241C7B715E00AC3DDD /* DetermineDefaultQuadratureRule.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE2E47211C7B715E00AC3DDD /* DetermineDefaultQuadratureRule.hpp */; };
BE2E47251C7B715E00AC3DDD /* DetermineDefaultQuadratureRule.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE2E47221C7B715E00AC3DDD /* DetermineDefaultQuadratureRule.hxx */; };
......@@ -1311,6 +1308,9 @@
BEEABA631A49CB5A00A875C6 /* CommandLineOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEEABA601A49CB5A00A875C6 /* CommandLineOptions.cpp */; };
BEEABA641A49CB5A00A875C6 /* CommandLineOptions.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BEEABA611A49CB5A00A875C6 /* CommandLineOptions.hpp */; };
BEEABA651A49CB5A00A875C6 /* CommandLineOptions.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BEEABA621A49CB5A00A875C6 /* CommandLineOptions.hxx */; };
BEED7BBA1C7C9670002C4C15 /* Solid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEED7BB71C7C9670002C4C15 /* Solid.cpp */; };
BEED7BBB1C7C9670002C4C15 /* Solid.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BEED7BB81C7C9670002C4C15 /* Solid.hpp */; };
BEED7BBC1C7C9670002C4C15 /* Solid.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BEED7BB91C7C9670002C4C15 /* Solid.hxx */; };
BEF1942A1BAAF44C0081602C /* SubsetOrSuperset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEF194271BAAF44C0081602C /* SubsetOrSuperset.cpp */; };
BEF1942B1BAAF44C0081602C /* SubsetOrSuperset.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BEF194281BAAF44C0081602C /* SubsetOrSuperset.hpp */; };
BEF1942C1BAAF44C0081602C /* SubsetOrSuperset.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BEF194291BAAF44C0081602C /* SubsetOrSuperset.hxx */; };
......@@ -3803,9 +3803,6 @@
BE2E0CD51ABB094200B543E8 /* Mesh.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Mesh.hpp; sourceTree = "<group>"; };
BE2E47151C7B47D400AC3DDD /* LameLambda.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LameLambda.cpp; path = Parameter/Solid/LameLambda.cpp; sourceTree = "<group>"; };
BE2E47171C7B480100AC3DDD /* LameMu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LameMu.cpp; path = Parameter/Solid/LameMu.cpp; sourceTree = "<group>"; };
BE2E471A1C7B4B8A00AC3DDD /* Solid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Solid.cpp; path = Solid/Solid.cpp; sourceTree = "<group>"; };
BE2E471B1C7B4B8A00AC3DDD /* Solid.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Solid.hpp; path = Solid/Solid.hpp; sourceTree = "<group>"; };
BE2E471C1C7B4B8A00AC3DDD /* Solid.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Solid.hxx; path = Solid/Solid.hxx; sourceTree = "<group>"; };
BE2E47201C7B715E00AC3DDD /* DetermineDefaultQuadratureRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DetermineDefaultQuadratureRule.cpp; sourceTree = "<group>"; };
BE2E47211C7B715E00AC3DDD /* DetermineDefaultQuadratureRule.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = DetermineDefaultQuadratureRule.hpp; sourceTree = "<group>"; };
BE2E47221C7B715E00AC3DDD /* DetermineDefaultQuadratureRule.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = DetermineDefaultQuadratureRule.hxx; sourceTree = "<group>"; };
......@@ -4821,6 +4818,9 @@
BEEABA601A49CB5A00A875C6 /* CommandLineOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CommandLineOptions.cpp; sourceTree = "<group>"; };
BEEABA611A49CB5A00A875C6 /* CommandLineOptions.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CommandLineOptions.hpp; sourceTree = "<group>"; };
BEEABA621A49CB5A00A875C6 /* CommandLineOptions.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CommandLineOptions.hxx; sourceTree = "<group>"; };
BEED7BB71C7C9670002C4C15 /* Solid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Solid.cpp; sourceTree = "<group>"; };
BEED7BB81C7C9670002C4C15 /* Solid.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Solid.hpp; sourceTree = "<group>"; };
BEED7BB91C7C9670002C4C15 /* Solid.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Solid.hxx; sourceTree = "<group>"; };
BEEFEF72196ECCC000C80FF1 /* Matrix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Matrix.cpp; sourceTree = "<group>"; };
BEEFEF73196ECCC000C80FF1 /* Matrix.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Matrix.hpp; sourceTree = "<group>"; };
BEEFEF74196ECCC000C80FF1 /* Matrix.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Matrix.hxx; sourceTree = "<group>"; };
......@@ -5972,16 +5972,6 @@
path = Private;
sourceTree = "<group>";
};
BE2E47191C7B4B5E00AC3DDD /* Solid */ = {
isa = PBXGroup;
children = (
BE2E471A1C7B4B8A00AC3DDD /* Solid.cpp */,
BE2E471B1C7B4B8A00AC3DDD /* Solid.hpp */,
BE2E471C1C7B4B8A00AC3DDD /* Solid.hxx */,
);
name = Solid;
sourceTree = "<group>";
};
BE3221851B4686B100F27D6C /* Private */ = {
isa = PBXGroup;
children = (
......@@ -6602,7 +6592,6 @@
BE6A109B1B18923100F19349 /* LameMu.cpp */,
BE6A109C1B18923100F19349 /* LameMu.hpp */,
BE6A109D1B18923100F19349 /* LameMu.hxx */,
BE2E47191C7B4B5E00AC3DDD /* Solid */,
BE625B251BCBB0D200FB316D /* Fiber */,
BE61994B1B0F641D00906290 /* Private */,
);
......@@ -6908,8 +6897,9 @@
BE6199271B0F2D4300906290 /* InitParameter.hxx */,
BE6B1AF21B0A343D00CC2135 /* Parameter.hpp */,
BE6B1AF31B0A343D00CC2135 /* Parameter.hxx */,
BE6B1AF61B0A343D00CC2135 /* Policy */,
BE6199471B0F61C400906290 /* Instances */,
BEED7BB51C7C9647002C4C15 /* Compound */,
BE6B1AF61B0A343D00CC2135 /* Policy */,
BE61992E1B0F536100906290 /* Private */,
);
name = Parameters;
......@@ -8707,6 +8697,24 @@
path = CommandLineOptions;
sourceTree = "<group>";
};
BEED7BB51C7C9647002C4C15 /* Compound */ = {
isa = PBXGroup;
children = (
BEED7BB61C7C9670002C4C15 /* Solid */,
);
path = Compound;
sourceTree = "<group>";
};
BEED7BB61C7C9670002C4C15 /* Solid */ = {
isa = PBXGroup;
children = (
BEED7BB71C7C9670002C4C15 /* Solid.cpp */,
BEED7BB81C7C9670002C4C15 /* Solid.hpp */,
BEED7BB91C7C9670002C4C15 /* Solid.hxx */,
);
path = Solid;
sourceTree = "<group>";
};
BEEFEF71196ECCC000C80FF1 /* Matrix */ = {
isa = PBXGroup;
children = (
......@@ -9065,12 +9073,12 @@
BEF567C91B1735B000AAA2AA /* ThreeDimensionalParameter.hpp in Headers */,
BE646CD91B32FD77008BD37C /* AtQuadraturePoint.hpp in Headers */,
BE6A10A01B18923100F19349 /* LameMu.hxx in Headers */,
BE2E471F1C7B4B8A00AC3DDD /* Solid.hxx in Headers */,
BEED7BBC1C7C9670002C4C15 /* Solid.hxx in Headers */,
BE6A11BA1BBE7EAF00107942 /* AtDof.hpp in Headers */,
BE625B301BCBB0D200FB316D /* FiberList.hpp in Headers */,
BE17F3391B149A2A00EAAACE /* Configuration.hxx in Headers */,
BE01FA341BC677350080AD73 /* AtDof.hxx in Headers */,
BE2E471E1C7B4B8A00AC3DDD /* Solid.hpp in Headers */,
BEED7BBB1C7C9670002C4C15 /* Solid.hpp in Headers */,
BE625B311BCBB0D200FB316D /* FiberList.hxx in Headers */,
BE3C40991B0F7DD900396F68 /* ComputeGradientBasedElasticityTensor.hpp in Headers */,
BE625B351BCBB0D200FB316D /* ReadFiberFile.hxx in Headers */,
......@@ -10998,7 +11006,7 @@
BE3C40981B0F7DD900396F68 /* ComputeGradientBasedElasticityTensor.cpp in Sources */,
BE6322FC1B188BF500F787CC /* LameLambda.cpp in Sources */,
13A3989E1BD63DD100913E2C /* RectangularSourceTimeParameter.cpp in Sources */,
BE2E471D1C7B4B8A00AC3DDD /* Solid.cpp in Sources */,
BEED7BBA1C7C9670002C4C15 /* Solid.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......
......@@ -6,8 +6,8 @@
// Copyright (c) 2015 Inria. All rights reserved.
//
#ifndef HAPPY_HEART_x_OPERATORS_x_GLOBAL_VARIATIONAL_OPERATOR_x_DETERMINE_DEFAULT_QUADRATURE_RULE_HPP_
# define HAPPY_HEART_x_OPERATORS_x_GLOBAL_VARIATIONAL_OPERATOR_x_DETERMINE_DEFAULT_QUADRATURE_RULE_HPP_
#ifndef HAPPY_HEART_x_FINITE_ELEMENT_x_QUADRATURE_RULES_x_DETERMINE_DEFAULT_QUADRATURE_RULE_HPP_
# define HAPPY_HEART_x_FINITE_ELEMENT_x_QUADRATURE_RULES_x_DETERMINE_DEFAULT_QUADRATURE_RULE_HPP_
# include <map>
......@@ -34,4 +34,4 @@ namespace HappyHeart
# include "FiniteElement/QuadratureRules/DetermineDefaultQuadratureRule.hxx"
#endif // HAPPY_HEART_x_OPERATORS_x_GLOBAL_VARIATIONAL_OPERATOR_x_DETERMINE_DEFAULT_QUADRATURE_RULE_HPP_
#endif // HAPPY_HEART_x_FINITE_ELEMENT_x_QUADRATURE_RULES_x_DETERMINE_DEFAULT_QUADRATURE_RULE_HPP_
......@@ -6,8 +6,8 @@
// Copyright (c) 2015 Inria. All rights reserved.
//
#ifndef HAPPY_HEART_x_OPERATORS_x_GLOBAL_VARIATIONAL_OPERATOR_x_DETERMINE_DEFAULT_QUADRATURE_RULE_HXX_
# define HAPPY_HEART_x_OPERATORS_x_GLOBAL_VARIATIONAL_OPERATOR_x_DETERMINE_DEFAULT_QUADRATURE_RULE_HXX_
#ifndef HAPPY_HEART_x_FINITE_ELEMENT_x_QUADRATURE_RULES_x_DETERMINE_DEFAULT_QUADRATURE_RULE_HXX_
# define HAPPY_HEART_x_FINITE_ELEMENT_x_QUADRATURE_RULES_x_DETERMINE_DEFAULT_QUADRATURE_RULE_HXX_
namespace HappyHeart
......@@ -18,4 +18,4 @@ namespace HappyHeart
} // namespace HappyHeart
#endif // HAPPY_HEART_x_OPERATORS_x_GLOBAL_VARIATIONAL_OPERATOR_x_DETERMINE_DEFAULT_QUADRATURE_RULE_HXX_
#endif // HAPPY_HEART_x_FINITE_ELEMENT_x_QUADRATURE_RULES_x_DETERMINE_DEFAULT_QUADRATURE_RULE_HXX_
......@@ -296,7 +296,7 @@ namespace HappyHeart
//! Access to the solid object which encompasses all relevant material parameters.
const ParameterNS::Solid& GetSolid() const noexcept;
const Solid& GetSolid() const noexcept;
//! Access to volumic mass.
const ScalarParameter& GetVolumicMass() const noexcept;
......@@ -342,7 +342,7 @@ namespace HappyHeart
const NumberingSubset& numbering_subset_;
//! Material parameters related to the solid.
ParameterNS::Solid::unique_ptr solid_ = nullptr;
Solid::unique_ptr solid_ = nullptr;
};
......
......@@ -61,10 +61,10 @@ namespace HappyHeart
{
const auto& geometric_mesh_region = this->GetGodOfDof().GetGeometricMeshRegion();
solid_ = std::make_unique<ParameterNS::Solid>(input_parameter_data,
solid_ = std::make_unique<Solid>(input_parameter_data,
geometric_mesh_region);
if (!GetSolid().template GetParameter<ParameterNS::Solid::param::volumic_mass>().IsConstant())
if (!GetSolid().template GetParameter<Solid::param::volumic_mass>().IsConstant())
throw Exception("Current hyperelastic model is restricted to a constant volumic mass!",
__FILE__, __LINE__);
......@@ -410,7 +410,7 @@ namespace HappyHeart
inline const ScalarParameter& VariationalFormulationHyperElasticity<LawPolicyT, TimeSchemeT>
::GetVolumicMass() const noexcept
{
return GetSolid().template GetParameter<ParameterNS::Solid::param::volumic_mass>();
return GetSolid().template GetParameter<Solid::param::volumic_mass>();
}
......@@ -419,7 +419,7 @@ namespace HappyHeart
class LawPolicyT,
HyperelasticityNS::TimeScheme TimeSchemeT
>
inline const ParameterNS::Solid& VariationalFormulationHyperElasticity<LawPolicyT, TimeSchemeT>
inline const Solid& VariationalFormulationHyperElasticity<LawPolicyT, TimeSchemeT>
::GetSolid() const noexcept
{
assert(!(!solid_));
......
......@@ -8,7 +8,7 @@
# include "Core/TimeManager/Policy/ConstantTimeStep.hpp"
# include "Core/InputParameter/Parameter/Solid/Solid.hpp"
# include "Parameters/Instances/Solid/Solid.hpp"
# include "Parameters/Compound/Solid/Solid.hpp"
# include "Operators/LocalVariationalOperatorInstances/NonlinearForm/SecondPiolaKirchhoffStressTensor/HyperelasticityPolicy/Private/InvariantManager.hpp"
# include "Operators/LocalVariationalOperatorInstances/NonlinearForm/SecondPiolaKirchhoffStressTensor/Private/Helper.hpp"
......@@ -327,7 +327,7 @@ namespace HappyHeart
GlobalVector& GetNonCstHelperGlobalVector();
//! Access to the solid object which encompasses all relevant material parameters.
const ParameterNS::Solid& GetSolid() const noexcept;
const Solid& GetSolid() const noexcept;
//! Volumic mass.
const ScalarParameter& GetVolumicMass() const noexcept;
......@@ -383,7 +383,7 @@ namespace HappyHeart
//! \name Material parameters.
///@{
ParameterNS::Solid::const_unique_ptr solid_ = nullptr;
Solid::const_unique_ptr solid_ = nullptr;
///@}
......
......@@ -157,10 +157,10 @@ namespace HappyHeart
const auto& geometric_mesh_region = this->GetGodOfDof().GetGeometricMeshRegion();
solid_ = std::make_unique<ParameterNS::Solid>(input_parameter_data,
solid_ = std::make_unique<Solid>(input_parameter_data,
geometric_mesh_region);
if (!GetSolid().template GetParameter<ParameterNS::Solid::param::volumic_mass>().IsConstant())
if (!GetSolid().template GetParameter<Solid::param::volumic_mass>().IsConstant())
throw Exception("Current hyperelastic model is restricted to a constant volumic mass!",
__FILE__, __LINE__);
......@@ -621,7 +621,7 @@ namespace HappyHeart
class LawPolicyT,
HyperelasticityNS::TimeScheme TimeSchemeT
>
inline const ParameterNS::Solid& VariationalFormulationHyperElasticity<LawPolicyT, TimeSchemeT>
inline const Solid& VariationalFormulationHyperElasticity<LawPolicyT, TimeSchemeT>
::GetSolid() const noexcept
{
assert(!(!solid_));
......@@ -638,7 +638,7 @@ namespace HappyHeart
VariationalFormulationHyperElasticity<LawPolicyT, TimeSchemeT>
::GetVolumicMass() const noexcept
{
return GetSolid().template GetParameter<ParameterNS::Solid::param::volumic_mass>();
return GetSolid().template GetParameter<Solid::param::volumic_mass>();
}
......
......@@ -9,7 +9,7 @@
#include "ThirdParty/Wrappers/Petsc/Vector/AccessVectorContent.hpp"
#include "Parameters/Instances/Solid/Solid.hpp"
#include "Parameters/Compound/Solid/Solid.hpp"
#include "FormulationSolver/Private/InitialCondition/InitThreeDimensionalInitialCondition.hpp"
......@@ -42,7 +42,7 @@ namespace HappyHeart
const auto& god_of_dof = GetGodOfDof();
const auto& geometric_mesh_region = god_of_dof.GetGeometricMeshRegion();
solid_ = std::make_unique<ParameterNS::Solid>(input_parameter_data,
solid_ = std::make_unique<Solid>(input_parameter_data,
geometric_mesh_region);
applied_pressure_ = InitScalarParameter<InputParameter::Source::AppliedPressure>("AppliedPressure",
......
......@@ -40,15 +40,8 @@ namespace HappyHeart
// Forward declarations.
// ============================
namespace ParameterMS
{
class Solid;
} // namespace ParameterNS
class Solid;
// ============================
......@@ -295,7 +288,7 @@ namespace HappyHeart
const ScalarParameter& GetAppliedPressure() const noexcept;
//! Access to the solid.
const ParameterNS::Solid& GetSolid() const noexcept;
const Solid& GetSolid() const noexcept;
private:
......@@ -351,7 +344,7 @@ namespace HappyHeart
private:
//! Material parameters of the solid.
ParameterNS::Solid::unique_ptr solid_ = nullptr;
Solid::unique_ptr solid_ = nullptr;
//! Applied pressure.
ScalarParameter::unique_ptr applied_pressure_ = nullptr;
......
......@@ -129,7 +129,7 @@ namespace HappyHeart
}
inline const ParameterNS::Solid& VariationalFormulation::GetSolid() const noexcept
inline const Solid& VariationalFormulation::GetSolid() const noexcept
{
assert(!(!solid_));
return *solid_;
......
......@@ -88,7 +88,7 @@ namespace HappyHeart
const Unknown& vectorial_unknown,
unsigned int geom_mesh_region_dimension,
const quadrature_rule_per_topology_type& quadrature_rule_per_topology,
const ParameterNS::Solid& solid);
const Solid& solid);
//! Destructor.
~SecondPiolaKirchhoffStressTensor() = default;
......
......@@ -24,7 +24,7 @@ namespace HappyHeart
const Unknown& vectorial_unknown,
unsigned int geom_mesh_region_dimension,
const quadrature_rule_per_topology_type& quadrature_rule_per_topology,
const ParameterNS::Solid& solid)
const Solid& solid)
: parent(felt_space,
vectorial_unknown,
geom_mesh_region_dimension,
......
......@@ -23,7 +23,7 @@
# include "Parameters/InitParameter.hpp"
# include "Parameters/Instances/Solid/Solid.hpp"
# include "Parameters/Compound/Solid/Solid.hpp"
# include "Operators/LocalVariationalOperator/ElementaryData.hpp"
# include "Operators/LocalVariationalOperator/NonlinearLocalVariationalOperator.hpp"
......@@ -125,7 +125,7 @@ namespace HappyHeart
*/
explicit SecondPiolaKirchhoffStressTensor(const ExtendedUnknown::vector_const_shared_ptr& unknown_list,
elementary_data_type&& elementary_data,
const ParameterNS::Solid& solid);
const Solid& solid);
//! Destructor.
virtual ~SecondPiolaKirchhoffStressTensor();
......
......@@ -35,7 +35,7 @@ namespace HappyHeart
SecondPiolaKirchhoffStressTensor<HyperelasticityPolicyT, ViscoelasticityPolicyT, ActiveStressPolicyT>
::SecondPiolaKirchhoffStressTensor(const ExtendedUnknown::vector_const_shared_ptr& unknown_list,
elementary_data_type&& a_elementary_data,
const ParameterNS::Solid& solid)
const Solid& solid)
: HyperelasticityPolicyT(a_elementary_data.GetGeomMeshRegionDimension(), solid),
ViscoelasticityPolicyT(),
ActiveStressPolicyT(),
......
......@@ -13,7 +13,7 @@
#include "Utilities/Numeric/Numeric.hpp"
#include "Utilities/Containers/EnumClass.hpp"
#include "Parameters/Instances/Solid/Solid.hpp"
#include "Parameters/Compound/Solid/Solid.hpp"
#include "Operators/LocalVariationalOperatorInstances/NonlinearForm/SecondPiolaKirchhoffStressTensor/HyperelasticityPolicy/HyperelasticLaws/CiarletGeymonat.hpp"
......@@ -46,10 +46,10 @@ namespace HappyHeart
}
CiarletGeymonat::CiarletGeymonat(const ParameterNS::Solid& solid)
: kappa1_(solid.template GetParameter<ParameterNS::Solid::param::kappa_1>()),
kappa2_(solid.GetParameter<ParameterNS::Solid::param::kappa_2>()),
bulk_(solid.GetParameter<ParameterNS::Solid::param::hyperelastic_bulk>())
CiarletGeymonat::CiarletGeymonat(const Solid& solid)
: kappa1_(solid.template GetParameter<Solid::param::kappa_1>()),
kappa2_(solid.GetParameter<Solid::param::kappa_2>()),
bulk_(solid.GetParameter<Solid::param::hyperelastic_bulk>())
{ }
......
......@@ -25,16 +25,7 @@ namespace HappyHeart
class QuadraturePoint;
namespace ParameterNS
{
class Solid;
} // namespace ParameterNS
class Solid;
// ============================
......@@ -82,7 +73,7 @@ namespace HappyHeart
*
* \param[in] solid Object which provides the required material parameters for the solid.
*/
explicit CiarletGeymonat(const ParameterNS::Solid& solid);
explicit CiarletGeymonat(const Solid& solid);
protected:
......
......@@ -11,7 +11,7 @@
#include "Utilities/Numeric/Numeric.hpp"
#include "Utilities/Containers/EnumClass.hpp"
#include "Parameters/Instances/Solid/Solid.hpp"
#include "Parameters/Compound/Solid/Solid.hpp"
#include "Operators/LocalVariationalOperatorInstances/NonlinearForm/SecondPiolaKirchhoffStressTensor/HyperelasticityPolicy/HyperelasticLaws/MooneyRivlin.hpp"
......@@ -45,10 +45,10 @@ namespace HappyHeart
}
MooneyRivlin::MooneyRivlin(const ParameterNS::Solid& solid)
: kappa1_(solid.GetParameter<ParameterNS::Solid::param::kappa_1>()),
kappa2_(solid.GetParameter<ParameterNS::Solid::param::kappa_2>()),
bulk_(solid.GetParameter<ParameterNS::Solid::param::hyperelastic_bulk>())
MooneyRivlin::MooneyRivlin(const Solid& solid)
: kappa1_(solid.GetParameter<Solid::param::kappa_1>()),
kappa2_(solid.GetParameter<Solid::param::kappa_2>()),
bulk_(solid.GetParameter<Solid::param::hyperelastic_bulk>())
{ }
......
......@@ -32,16 +32,7 @@ namespace HappyHeart
class QuadraturePoint;
namespace ParameterNS
{
class Solid;
} // namespace ParameterNS
class Solid;
// ============================
......@@ -89,7 +80,7 @@ namespace HappyHeart
*
* \param[in] solid Object which provides the required material parameters for the solid.
*/
explicit MooneyRivlin(const ParameterNS::Solid& solid);
explicit MooneyRivlin(const Solid& solid);
protected:
......
......@@ -11,7 +11,7 @@
# include "Utilities/Containers/EnumClass.hpp"
# include "Parameters/Instances/Solid/Solid.hpp"
# include "Parameters/Compound/Solid/Solid.hpp"
# include "Operators/LocalVariationalOperatorInstances/NonlinearForm/SecondPiolaKirchhoffStressTensor/HyperelasticityPolicy/HyperelasticLaws/StVenantKirchhoff.hpp"
......@@ -43,10 +43,10 @@ namespace HappyHeart
}
StVenantKirchhoff::StVenantKirchhoff(const ParameterNS::Solid& solid)
: lame_lambda_(solid.GetParameter<ParameterNS::Solid::param::lame_lambda>()),
lame_mu_(solid.GetParameter<ParameterNS::Solid::param::lame_mu>()),
bulk_(solid.GetParameter<ParameterNS::Solid::param::hyperelastic_bulk>())
StVenantKirchhoff::StVenantKirchhoff(const Solid& solid)
: lame_lambda_(solid.GetParameter<Solid::param::lame_lambda>()),
lame_mu_(solid.GetParameter<Solid::param::lame_mu>()),
bulk_(solid.GetParameter<Solid::param::hyperelastic_bulk>())
{ }
......
......@@ -28,16 +28,7 @@ namespace HappyHeart
class QuadraturePoint;
namespace ParameterNS
{
class Solid;
} // namespace ParameterNS
class Solid;
// ============================
......@@ -92,7 +83,7 @@ namespace HappyHeart
*
* \param[in] solid Object which provides the required material parameters for the solid.
*/
explicit StVenantKirchhoff(const ParameterNS::Solid& solid);
explicit StVenantKirchhoff(const Solid& solid);
protected:
......
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