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 96471e94 authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#959 Reorganize InitParameter, add comments and rename it to make its purpose...

#959 Reorganize InitParameter, add comments and rename it to make its purpose clearer. ENrich comment of module Parameter to make it clear there are actually two categories of parameters to handle.
parent 3c74b110
......@@ -951,8 +951,6 @@
BE6128891CCE54A600318BB6 /* PerShapeFunctionOrder.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE6128871CCE54A600318BB6 /* PerShapeFunctionOrder.hxx */; };
BE616F4E1B8775D4007FFC00 /* InputParameter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE616F4C1B8775D4007FFC00 /* InputParameter.hpp */; };
BE616F4F1B8775D4007FFC00 /* InputParameter.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE616F4D1B8775D4007FFC00 /* InputParameter.hxx */; };
BE6199291B0F2D4300906290 /* InitParameter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE6199261B0F2D4300906290 /* InitParameter.hpp */; };
BE61992A1B0F2D4300906290 /* InitParameter.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE6199271B0F2D4300906290 /* InitParameter.hxx */; };
BE6199751B0F648900906290 /* libParameters.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE6199501B0F643300906290 /* libParameters.a */; };
BE6199761B0F648C00906290 /* libParameters.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE6199501B0F643300906290 /* libParameters.a */; };
BE61997B1B0F649500906290 /* libParameters.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE6199501B0F643300906290 /* libParameters.a */; };
......@@ -1167,6 +1165,10 @@
BE8553AC1BBD77BF00DB109E /* None.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE8553A61BBD77BF00DB109E /* None.cpp */; };
BE8553AD1BBD77BF00DB109E /* None.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE8553A71BBD77BF00DB109E /* None.hpp */; };
BE8553AE1BBD77BF00DB109E /* None.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE8553A81BBD77BF00DB109E /* None.hxx */; };
BE8594201DAE558A00DC23D8 /* InitParameterFromInputData.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE85941E1DAE558A00DC23D8 /* InitParameterFromInputData.hpp */; };
BE8594211DAE558A00DC23D8 /* InitParameterFromInputData.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE85941F1DAE558A00DC23D8 /* InitParameterFromInputData.hxx */; };
BE8594241DAE55A800DC23D8 /* InitParameterFromInputData.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE8594221DAE55A800DC23D8 /* InitParameterFromInputData.hpp */; };
BE8594251DAE55A800DC23D8 /* InitParameterFromInputData.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE8594231DAE55A800DC23D8 /* InitParameterFromInputData.hxx */; };
BE86A9EE1A385C9B003B211D /* SegmentP2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE86A9EC1A385C9B003B211D /* SegmentP2.cpp */; };
BE86A9EF1A385C9B003B211D /* SegmentP2.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE86A9ED1A385C9B003B211D /* SegmentP2.hpp */; };
BE86B21D1AE90F6B00406F5B /* GlobalVectorStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE86B21A1AE90F6B00406F5B /* GlobalVectorStorage.cpp */; };
......@@ -1548,8 +1550,6 @@
BEB291A31CA02EB400A74738 /* libOps.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE43AD351AFB9ADB0082AF43 /* libOps.a */; };
BEB291A41CA02EB400A74738 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC37E0617DDC0210021BFB7 /* Accelerate.framework */; };
BEB291AA1CA02EDE00A74738 /* main_interpolator_P1_P1b.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEB291831CA02E5600A74738 /* main_interpolator_P1_P1b.cpp */; };
BEB309291DACE63C006C8A00 /* InitParameter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BEB309231DACE63C006C8A00 /* InitParameter.hpp */; };
BEB3092A1DACE63C006C8A00 /* InitParameter.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BEB309241DACE63C006C8A00 /* InitParameter.hxx */; };
BEB3092B1DACE63C006C8A00 /* ParameterInstance.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BEB309251DACE63C006C8A00 /* ParameterInstance.hpp */; };
BEB3092C1DACE63C006C8A00 /* ParameterInstance.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BEB309261DACE63C006C8A00 /* ParameterInstance.hxx */; };
BEB3092D1DACE63C006C8A00 /* TimeDependency.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BEB309271DACE63C006C8A00 /* TimeDependency.hpp */; };
......@@ -6359,8 +6359,6 @@
BE616F4C1B8775D4007FFC00 /* InputParameter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = InputParameter.hpp; path = Crtp/InputParameter.hpp; sourceTree = "<group>"; };
BE616F4D1B8775D4007FFC00 /* InputParameter.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = InputParameter.hxx; path = Crtp/InputParameter.hxx; sourceTree = "<group>"; };
BE617B51196C2ED70060B609 /* Hyperelasticity.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = Hyperelasticity.hpp; sourceTree = "<group>"; };
BE6199261B0F2D4300906290 /* InitParameter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = InitParameter.hpp; sourceTree = "<group>"; };
BE6199271B0F2D4300906290 /* InitParameter.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = InitParameter.hxx; sourceTree = "<group>"; };
BE6199501B0F643300906290 /* libParameters.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libParameters.a; sourceTree = BUILT_PRODUCTS_DIR; };
BE625B261BCBB0D200FB316D /* FiberList.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = FiberList.hpp; sourceTree = "<group>"; };
BE625B271BCBB0D200FB316D /* FiberList.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = FiberList.hxx; sourceTree = "<group>"; };
......@@ -6564,6 +6562,10 @@
BE8553A61BBD77BF00DB109E /* None.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = None.cpp; sourceTree = "<group>"; };
BE8553A71BBD77BF00DB109E /* None.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = None.hpp; sourceTree = "<group>"; };
BE8553A81BBD77BF00DB109E /* None.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = None.hxx; sourceTree = "<group>"; };
BE85941E1DAE558A00DC23D8 /* InitParameterFromInputData.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = InitParameterFromInputData.hpp; sourceTree = "<group>"; };
BE85941F1DAE558A00DC23D8 /* InitParameterFromInputData.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = InitParameterFromInputData.hxx; sourceTree = "<group>"; };
BE8594221DAE55A800DC23D8 /* InitParameterFromInputData.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = InitParameterFromInputData.hpp; sourceTree = "<group>"; };
BE8594231DAE55A800DC23D8 /* InitParameterFromInputData.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = InitParameterFromInputData.hxx; sourceTree = "<group>"; };
BE86A9EC1A385C9B003B211D /* SegmentP2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentP2.cpp; sourceTree = "<group>"; };
BE86A9ED1A385C9B003B211D /* SegmentP2.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = SegmentP2.hpp; sourceTree = "<group>"; };
BE86B21A1AE90F6B00406F5B /* GlobalVectorStorage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GlobalVectorStorage.cpp; path = Internal/Storage/GlobalVectorStorage.cpp; sourceTree = "<group>"; };
......@@ -6815,8 +6817,6 @@
BEB291811CA02D3700A74738 /* demo_input_test_P1_to_P1b.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = demo_input_test_P1_to_P1b.lua; path = Data/Lua/demo_input_test_P1_to_P1b.lua; sourceTree = SOURCE_ROOT; };
BEB291831CA02E5600A74738 /* main_interpolator_P1_P1b.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main_interpolator_P1_P1b.cpp; sourceTree = "<group>"; };
BEB291A91CA02EB400A74738 /* TestInterpolatorP1_to_P1b */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = TestInterpolatorP1_to_P1b; sourceTree = BUILT_PRODUCTS_DIR; };
BEB309231DACE63C006C8A00 /* InitParameter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = InitParameter.hpp; sourceTree = "<group>"; };
BEB309241DACE63C006C8A00 /* InitParameter.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = InitParameter.hxx; sourceTree = "<group>"; };
BEB309251DACE63C006C8A00 /* ParameterInstance.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ParameterInstance.hpp; sourceTree = "<group>"; };
BEB309261DACE63C006C8A00 /* ParameterInstance.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ParameterInstance.hxx; sourceTree = "<group>"; };
BEB309271DACE63C006C8A00 /* TimeDependency.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = TimeDependency.hpp; sourceTree = "<group>"; };
......@@ -10589,8 +10589,6 @@
BECA4DA61B17598300DC7265 /* SConscript */,
BEEA60181DAE414F0029F329 /* ParameterType.hpp */,
BEEA60191DAE414F0029F329 /* ParameterType.hxx */,
BE6199261B0F2D4300906290 /* InitParameter.hpp */,
BE6199271B0F2D4300906290 /* InitParameter.hxx */,
BE6B01F81CAD60DF0061AB93 /* Parameter.hpp */,
BE6B1AF31B0A343D00CC2135 /* Parameter.hxx */,
BE9EA61A1C89F50900836E0E /* ParameterAtDof.hpp */,
......@@ -10598,6 +10596,7 @@
1332BBB91CD3842C003E1039 /* ScalarParameterFromFile.cpp */,
1332BBB21CD34502003E1039 /* ScalarParameterFromFile.hpp */,
1332BBB31CD34502003E1039 /* ScalarParameterFromFile.hxx */,
BE85941C1DAE558A00DC23D8 /* InitParameterFromInputData */,
BE44E3AA1CAA7727006DDE6F /* TimeDependency */,
BEED7BB51C7C9647002C4C15 /* Compound */,
BEB309631DAD49ED006C8A00 /* Policy */,
......@@ -10884,6 +10883,25 @@
path = DofSourcePolicy;
sourceTree = "<group>";
};
BE85941C1DAE558A00DC23D8 /* InitParameterFromInputData */ = {
isa = PBXGroup;
children = (
BE8594221DAE55A800DC23D8 /* InitParameterFromInputData.hpp */,
BE8594231DAE55A800DC23D8 /* InitParameterFromInputData.hxx */,
BE85941D1DAE558A00DC23D8 /* Internal */,
);
path = InitParameterFromInputData;
sourceTree = "<group>";
};
BE85941D1DAE558A00DC23D8 /* Internal */ = {
isa = PBXGroup;
children = (
BE85941E1DAE558A00DC23D8 /* InitParameterFromInputData.hpp */,
BE85941F1DAE558A00DC23D8 /* InitParameterFromInputData.hxx */,
);
path = Internal;
sourceTree = "<group>";
};
BE8B67331CC0E9B100312399 /* NumberingSubset */ = {
isa = PBXGroup;
children = (
......@@ -11580,8 +11598,6 @@
isa = PBXGroup;
children = (
BEB309321DACE948006C8A00 /* Alias.hpp */,
BEB309231DACE63C006C8A00 /* InitParameter.hpp */,
BEB309241DACE63C006C8A00 /* InitParameter.hxx */,
BEB309251DACE63C006C8A00 /* ParameterInstance.hpp */,
BEB309261DACE63C006C8A00 /* ParameterInstance.hxx */,
BEB3092F1DACE65C006C8A00 /* ParameterAtDof.hpp */,
......@@ -13227,9 +13243,7 @@
BE2E0CD81ABB094200B543E8 /* Mesh.hpp in Headers */,
BE5B6F841C3C16BF004A0284 /* InterpolationFile.hxx in Headers */,
BE2E0CC81ABAFBA800B543E8 /* Domain.hpp in Headers */,
BE61992A1B0F2D4300906290 /* InitParameter.hxx in Headers */,
BE8B67391CC0EA3800312399 /* NumberingSubset.hxx in Headers */,
BE6199291B0F2D4300906290 /* InitParameter.hpp in Headers */,
BEB7B0F91BB3F4FD005E5D18 /* DirichletBoundaryCondition.hxx in Headers */,
BE87A4EF1A6FEFF100E92902 /* InitHappyHeart.hxx in Headers */,
BE6FB5E01B4EC0CF00F0F6A3 /* ParameterUsualDescription.hxx in Headers */,
......@@ -13317,6 +13331,8 @@
BEEA60031DAE269D0029F329 /* FiberListManager.hxx in Headers */,
BEEA600A1DAE269D0029F329 /* Traits.hxx in Headers */,
BEB3094F1DACEE99006C8A00 /* GradientBasedElasticityTensor.hxx in Headers */,
BE8594241DAE55A800DC23D8 /* InitParameterFromInputData.hpp in Headers */,
BE8594201DAE558A00DC23D8 /* InitParameterFromInputData.hpp in Headers */,
BEB309861DAD49ED006C8A00 /* PiecewiseConstantByDomain.hxx in Headers */,
BEEA60021DAE269D0029F329 /* FiberListManager.hpp in Headers */,
BEB3092B1DACE63C006C8A00 /* ParameterInstance.hpp in Headers */,
......@@ -13339,7 +13355,6 @@
BEB3095A1DACEE99006C8A00 /* LameLambda.hpp in Headers */,
BEB309841DAD49ED006C8A00 /* OpsFunction.hxx in Headers */,
BEB309351DACE948006C8A00 /* Alias.hpp in Headers */,
BEB3092A1DACE63C006C8A00 /* InitParameter.hxx in Headers */,
BE44E3AF1CAA7748006DDE6F /* None.hpp in Headers */,
BEB309541DACEE99006C8A00 /* Configuration.hpp in Headers */,
BEB3094E1DACEE99006C8A00 /* GradientBasedElasticityTensor.hpp in Headers */,
......@@ -13355,6 +13370,8 @@
BEEA60071DAE269D0029F329 /* ReadFiberFile.hxx in Headers */,
BEB309511DACEE99006C8A00 /* ComputeGradientBasedElasticityTensor.hpp in Headers */,
BEB3095B1DACEE99006C8A00 /* LameLambda.hxx in Headers */,
BE8594251DAE55A800DC23D8 /* InitParameterFromInputData.hxx in Headers */,
BE8594211DAE558A00DC23D8 /* InitParameterFromInputData.hxx in Headers */,
BEEA60141DAE2CE60029F329 /* ApplyTimeFactor.hxx in Headers */,
BEB3092E1DACE63C006C8A00 /* TimeDependency.hxx in Headers */,
BEB3097A1DAD49ED006C8A00 /* AtDof.hxx in Headers */,
......@@ -13366,7 +13383,6 @@
BEB309521DACEE99006C8A00 /* ComputeGradientBasedElasticityTensor.hxx in Headers */,
BEEA60061DAE269D0029F329 /* ReadFiberFile.hpp in Headers */,
BEB309831DAD49ED006C8A00 /* OpsFunction.hpp in Headers */,
BEB309291DACE63C006C8A00 /* InitParameter.hpp in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -18,7 +18,7 @@
# include "FiniteElement/FiniteElementSpace/GodOfDof.hpp"
# include "Parameters/InitParameter.hpp"
# include "Parameters/InitParameterFromInputData/InitParameterFromInputData.hpp"
# include "Operators/GlobalVariationalOperatorInstances/LinearForm/TransientSource.hpp"
......
......@@ -51,7 +51,7 @@ namespace HappyHeart
using parameter_type = InputParameter::TransientSource<index>;
parameter_ptr = InitThreeDimensionalParameter<parameter_type, TimeDependencyT>(std::forward<T>(name),
parameter_ptr = InitThreeDimensionalParameterFromInputData<parameter_type, TimeDependencyT>(std::forward<T>(name),
geometric_mesh_region,
input_parameter_data);
......
......@@ -8,7 +8,7 @@
// Copyright © 2016 Inria. All rights reserved.
//
# include "Parameters/InitParameter.hpp"
# include "Parameters/InitParameterFromInputData/InitParameterFromInputData.hpp"
#include "Parameters/Internal/ParameterInstance.hpp"
#include "Parameters/TimeDependency/TimeDependency.hpp"
#include "ModelInstances/AcousticWave/VariationalFormulation.hpp"
......@@ -68,11 +68,11 @@ namespace HappyHeart
const GeometricMeshRegion& mesh = god_of_dof.GetGeometricMeshRegion();
diffusion_tensor_ =
InitScalarParameter<Diffusion::Tensor<EnumUnderlyingType(TensorIndex::diffusion_tensor)>>("Diffusion tensor",
InitScalarParameterFromInputData<Diffusion::Tensor<EnumUnderlyingType(TensorIndex::diffusion_tensor)>>("Diffusion tensor",
mesh,
input_parameter_data);
density_ = InitScalarParameter<Diffusion::Density>("Density",
density_ = InitScalarParameterFromInputData<Diffusion::Density>("Density",
mesh,
input_parameter_data);
......@@ -133,7 +133,7 @@ namespace HappyHeart
using parameter_type = InputParameter::TransientSource<EnumUnderlyingType(SourceIndex::volumic_source)>;
volumic_source_parameter_ =
InitThreeDimensionalParameter<parameter_type>("Volumic source",
InitThreeDimensionalParameterFromInputData<parameter_type>("Volumic source",
mesh,
input_parameter_data);
......@@ -146,7 +146,7 @@ namespace HappyHeart
using parameter_type_2 = InputParameter::TransientSource<EnumUnderlyingType(SourceIndex::time_dependent_source)>;
time_dependent_source_parameter_ =
InitThreeDimensionalParameter
InitThreeDimensionalParameterFromInputData
<
parameter_type_2,
ParameterNS::TimeDependencyFunctor
......
......@@ -67,23 +67,23 @@ namespace HappyHeart
intracellular_trans_diffusion_tensor_ =
InitScalarParameter<Diffusion::Tensor<EnumUnderlyingType(TensorIndex::intracellular_trans_diffusion_tensor)>>("Intracellular Trans Diffusion tensor",
InitScalarParameterFromInputData<Diffusion::Tensor<EnumUnderlyingType(TensorIndex::intracellular_trans_diffusion_tensor)>>("Intracellular Trans Diffusion tensor",
mesh,
input_parameter_data);
extracellular_trans_diffusion_tensor_ =
InitScalarParameter<Diffusion::Tensor<EnumUnderlyingType(TensorIndex::extracellular_trans_diffusion_tensor)>>("Extracellular Trans Diffusion tensor",
InitScalarParameterFromInputData<Diffusion::Tensor<EnumUnderlyingType(TensorIndex::extracellular_trans_diffusion_tensor)>>("Extracellular Trans Diffusion tensor",
mesh,
input_parameter_data);
intracellular_fiber_diffusion_tensor_ =
InitScalarParameter<Diffusion::Tensor<EnumUnderlyingType(TensorIndex::intracellular_fiber_diffusion_tensor)>>("Intracellular Fiber Diffusion tensor",
InitScalarParameterFromInputData<Diffusion::Tensor<EnumUnderlyingType(TensorIndex::intracellular_fiber_diffusion_tensor)>>("Intracellular Fiber Diffusion tensor",
mesh,
input_parameter_data);
extracellular_fiber_diffusion_tensor_ =
InitScalarParameter<Diffusion::Tensor<EnumUnderlyingType(TensorIndex::extracellular_fiber_diffusion_tensor)>>("Extracellular Fiber Diffusion tensor",
InitScalarParameterFromInputData<Diffusion::Tensor<EnumUnderlyingType(TensorIndex::extracellular_fiber_diffusion_tensor)>>("Extracellular Fiber Diffusion tensor",
mesh,
input_parameter_data);
transcellular_density_ =
InitScalarParameter<Diffusion::Density>("Transcellular Density",
InitScalarParameterFromInputData<Diffusion::Density>("Transcellular Density",
mesh,
input_parameter_data);
......@@ -174,7 +174,7 @@ namespace HappyHeart
using parameter_type_on_square = InputParameter::TransientSource<EnumUnderlyingType(ForceIndexList::transcellular_current_applied_on_square)>;
transcellular_current_applied_on_square_parameter_ =
InitThreeDimensionalParameter<parameter_type_on_square>("Current Applied On Square",
InitThreeDimensionalParameterFromInputData<parameter_type_on_square>("Current Applied On Square",
mesh,
input_parameter_data);
......
......@@ -64,11 +64,11 @@ namespace HappyHeart
const auto& mesh = god_of_dof.GetGeometricMeshRegion();
using Diffusion = InputParameter::Diffusion;
intracellular_trans_diffusion_tensor_ = InitScalarParameter<Diffusion::Tensor<EnumUnderlyingType(TensorIndex::intracellular_trans_diffusion_tensor)>>("Intracellular Trans Diffusion tensor", mesh, input_parameter_data);
extracellular_trans_diffusion_tensor_ = InitScalarParameter<Diffusion::Tensor<EnumUnderlyingType(TensorIndex::extracellular_trans_diffusion_tensor)>>("Extracellular Trans Diffusion tensor", mesh, input_parameter_data);
intracellular_fiber_diffusion_tensor_ = InitScalarParameter<Diffusion::Tensor<EnumUnderlyingType(TensorIndex::intracellular_fiber_diffusion_tensor)>>("Intracellular Fiber Diffusion tensor", mesh, input_parameter_data);
extracellular_fiber_diffusion_tensor_ = InitScalarParameter<Diffusion::Tensor<EnumUnderlyingType(TensorIndex::extracellular_fiber_diffusion_tensor)>>("Extracellular Fiber Diffusion tensor", mesh, input_parameter_data);
transcellular_density_ = InitScalarParameter<Diffusion::Density>("Transcellular Density", mesh, input_parameter_data);
intracellular_trans_diffusion_tensor_ = InitScalarParameterFromInputData<Diffusion::Tensor<EnumUnderlyingType(TensorIndex::intracellular_trans_diffusion_tensor)>>("Intracellular Trans Diffusion tensor", mesh, input_parameter_data);
extracellular_trans_diffusion_tensor_ = InitScalarParameterFromInputData<Diffusion::Tensor<EnumUnderlyingType(TensorIndex::extracellular_trans_diffusion_tensor)>>("Extracellular Trans Diffusion tensor", mesh, input_parameter_data);
intracellular_fiber_diffusion_tensor_ = InitScalarParameterFromInputData<Diffusion::Tensor<EnumUnderlyingType(TensorIndex::intracellular_fiber_diffusion_tensor)>>("Intracellular Fiber Diffusion tensor", mesh, input_parameter_data);
extracellular_fiber_diffusion_tensor_ = InitScalarParameterFromInputData<Diffusion::Tensor<EnumUnderlyingType(TensorIndex::extracellular_fiber_diffusion_tensor)>>("Extracellular Fiber Diffusion tensor", mesh, input_parameter_data);
transcellular_density_ = InitScalarParameterFromInputData<Diffusion::Density>("Transcellular Density", mesh, input_parameter_data);
if (!GetTranscellularDiffusionDensity().IsConstant())
throw Exception("Current Bidomain model is restricted to a constant diffusion density.",
......@@ -187,7 +187,7 @@ namespace HappyHeart
using parameter_type_on_left_ventricle = InputParameter::TransientSource<EnumUnderlyingType(ForceIndexList::transcellular_current_applied_on_left_ventricle)>;
transcellular_current_applied_on_left_ventricle_parameter_ =
InitThreeDimensionalParameter<parameter_type_on_left_ventricle>("Current Applied On Left Ventricle",
InitThreeDimensionalParameterFromInputData<parameter_type_on_left_ventricle>("Current Applied On Left Ventricle",
mesh,
input_parameter_data);
......@@ -203,7 +203,7 @@ namespace HappyHeart
using parameter_type_on_right_ventricle =
InputParameter::TransientSource<EnumUnderlyingType(ForceIndexList::transcellular_current_applied_on_right_ventricle)>;
transcellular_current_applied_on_right_ventricle_parameter_ =
InitThreeDimensionalParameter<parameter_type_on_right_ventricle>("Current Applied On Right Ventricle",
InitThreeDimensionalParameterFromInputData<parameter_type_on_right_ventricle>("Current Applied On Right Ventricle",
mesh,
input_parameter_data);
......
......@@ -53,7 +53,7 @@ namespace HappyHeart
geometric_mesh_region,
felt_space_highest_dimension.GetQuadratureRulePerTopology());
static_pressure_ = InitScalarParameter<InputParameter::Source::StaticPressure>("StaticPressure",
static_pressure_ = InitScalarParameterFromInputData<InputParameter::Source::StaticPressure>("StaticPressure",
geometric_mesh_region,
input_parameter_data);
......
......@@ -25,18 +25,18 @@ namespace HappyHeart
const auto& god_of_dof = this->GetGodOfDof();
const auto& mesh = god_of_dof.GetGeometricMeshRegion();
volumic_mass_ = InitScalarParameter<InputParameter::Solid::VolumicMass>("Volumic mass",
volumic_mass_ = InitScalarParameterFromInputData<InputParameter::Solid::VolumicMass>("Volumic mass",
mesh,
input_parameter_data);
if (!GetVolumicMass().IsConstant())
throw Exception("Current elastic model is restricted to a constant volumic mass!", __FILE__, __LINE__);
young_modulus_ = InitScalarParameter<InputParameter::Solid::YoungModulus>("Young modulus",
young_modulus_ = InitScalarParameterFromInputData<InputParameter::Solid::YoungModulus>("Young modulus",
mesh,
input_parameter_data);
poisson_ratio_ = InitScalarParameter<InputParameter::Solid::PoissonRatio>("Poisson ratio",
poisson_ratio_ = InitScalarParameterFromInputData<InputParameter::Solid::PoissonRatio>("Poisson ratio",
mesh,
input_parameter_data);
......
......@@ -10,7 +10,7 @@
#include "FiniteElement/BoundaryConditions/DirichletBoundaryConditionManager.hpp"
#include "Parameters/InitParameter.hpp"
#include "Parameters/InitParameterFromInputData/InitParameterFromInputData.hpp"
#include "ModelInstances/FSI_EI/AleElasticVariationalFormulation.hpp"
......@@ -59,18 +59,18 @@ namespace HappyHeart
const auto& god_of_dof = this->GetGodOfDof();
const auto& mesh = god_of_dof.GetGeometricMeshRegion();
volumic_mass_ = InitScalarParameter<InputParameter::Solid::VolumicMass>("Volumic mass",
volumic_mass_ = InitScalarParameterFromInputData<InputParameter::Solid::VolumicMass>("Volumic mass",
mesh,
input_parameter_data);
if (!GetVolumicMass().IsConstant())
throw Exception("Current elastic model is restricted to a constant volumic mass!", __FILE__, __LINE__);
young_modulus_ = InitScalarParameter<InputParameter::Solid::YoungModulus>("Young modulus",
young_modulus_ = InitScalarParameterFromInputData<InputParameter::Solid::YoungModulus>("Young modulus",
mesh,
input_parameter_data);
poisson_ratio_ = InitScalarParameter<InputParameter::Solid::PoissonRatio>("Poisson ratio",
poisson_ratio_ = InitScalarParameterFromInputData<InputParameter::Solid::PoissonRatio>("Poisson ratio",
mesh,
input_parameter_data);
......
......@@ -8,7 +8,7 @@
// Copyright (c) 2015 Inria. All rights reserved.
//
#include "Parameters/InitParameter.hpp"
#include "Parameters/InitParameterFromInputData/InitParameterFromInputData.hpp"
#include "Parameters/Instances/GradientBasedElasticityTensor/Internal/Configuration.hpp"
......@@ -84,11 +84,11 @@ namespace HappyHeart
const auto& god_of_dof = this->GetGodOfDof();
const auto& mesh = god_of_dof.GetGeometricMeshRegion();
fluid_density_ = InitScalarParameter<InputParameter::Fluid::Density>("Fluid density",
fluid_density_ = InitScalarParameterFromInputData<InputParameter::Fluid::Density>("Fluid density",
mesh,
input_parameter_data);
fluid_viscosity_ = InitScalarParameter<InputParameter::Fluid::Viscosity>("Fluid viscosity",
fluid_viscosity_ = InitScalarParameterFromInputData<InputParameter::Fluid::Viscosity>("Fluid viscosity",
mesh,
input_parameter_data);
......
......@@ -8,7 +8,7 @@
// Copyright (c) 2015 Inria. All rights reserved.
//
#include "Parameters/InitParameter.hpp"
#include "Parameters/InitParameterFromInputData/InitParameterFromInputData.hpp"
#include "ModelInstances/FSI_EI/ImplicitStepFluidVariationalFormulation.hpp"
#include "ModelInstances/FSI_EI/ExplicitStepVariationalFormulation.hpp"
......@@ -100,7 +100,7 @@ namespace HappyHeart
{
using parameter_type = InputParameter::TransientSource<EnumUnderlyingType(SourceIndex::inlet_pressure)>;
inlet_pressure_ =
InitThreeDimensionalParameter<parameter_type>("inlet_pressure",
InitThreeDimensionalParameterFromInputData<parameter_type>("inlet_pressure",
mesh,
input_parameter_data);
......
......@@ -8,7 +8,7 @@
// Copyright © 2015 Inria. All rights reserved.
//
#include "Parameters/InitParameter.hpp"
#include "Parameters/InitParameterFromInputData/InitParameterFromInputData.hpp"
#include "ModelInstances/FSI_EI/SolidVariationalFormulationPolicy/Elasticity/VariationalFormulation.hpp"
#include "ModelInstances/FSI_EI/InputParameterList.hpp"
......@@ -52,18 +52,18 @@ namespace HappyHeart
const auto& god_of_dof = this->GetGodOfDof();
const auto& mesh = god_of_dof.GetGeometricMeshRegion();
volumic_mass_ = InitScalarParameter<InputParameter::Solid::VolumicMass>("Volumic mass",
volumic_mass_ = InitScalarParameterFromInputData<InputParameter::Solid::VolumicMass>("Volumic mass",
mesh,
input_parameter_data);
if (!GetVolumicMass().IsConstant())
throw Exception("Current elastic model is restricted to a constant volumic mass!", __FILE__, __LINE__);
young_modulus_ = InitScalarParameter<InputParameter::Solid::YoungModulus>("Young modulus",
young_modulus_ = InitScalarParameterFromInputData<InputParameter::Solid::YoungModulus>("Young modulus",
mesh,
input_parameter_data);
poisson_ratio_ = InitScalarParameter<InputParameter::Solid::PoissonRatio>("Poisson ratio",
poisson_ratio_ = InitScalarParameterFromInputData<InputParameter::Solid::PoissonRatio>("Poisson ratio",
mesh,
input_parameter_data);
......
......@@ -10,7 +10,7 @@
// # include "Geometry/GeometricElt/Advanced/FreeFunctions.hpp"
# include "Parameters/InitParameter.hpp"
# include "Parameters/InitParameterFromInputData/InitParameterFromInputData.hpp"
# include "ModelInstances/Heat/HeatVariationalFormulation.hpp"
......@@ -43,13 +43,13 @@ namespace HappyHeart
const GodOfDof& god_of_dof = GetGodOfDof();
const GeometricMeshRegion& mesh = god_of_dof.GetGeometricMeshRegion();
diffusion_tensor_ = InitScalarParameter<Diffusion::Tensor<EnumUnderlyingType(TensorIndex::diffusion_tensor)>>("Diffusion tensor",
diffusion_tensor_ = InitScalarParameterFromInputData<Diffusion::Tensor<EnumUnderlyingType(TensorIndex::diffusion_tensor)>>("Diffusion tensor",
mesh,
input_parameter_data);
transfert_coefficient_ = InitScalarParameter<Diffusion::TransfertCoefficient>("Transfert coefficient",
transfert_coefficient_ = InitScalarParameterFromInputData<Diffusion::TransfertCoefficient>("Transfert coefficient",
mesh,
input_parameter_data);
density_ = InitScalarParameter<Diffusion::Density>("Density",
density_ = InitScalarParameterFromInputData<Diffusion::Density>("Density",
mesh,
input_parameter_data);
......@@ -104,7 +104,7 @@ namespace HappyHeart
using parameter_type = InputParameter::TransientSource<EnumUnderlyingType(ForceIndexList::volumic_source)>;
volumic_source_parameter_ =
InitThreeDimensionalParameter<parameter_type>("Volumic source",
InitThreeDimensionalParameterFromInputData<parameter_type>("Volumic source",
mesh,
input_parameter_data);
......@@ -128,7 +128,7 @@ namespace HappyHeart
using parameter_type = InputParameter::TransientSource<EnumUnderlyingType(ForceIndexList::neumann_boundary_condition)>;
neumann_parameter_ =
InitThreeDimensionalParameter<parameter_type>("Neumann boundary condition",
InitThreeDimensionalParameterFromInputData<parameter_type>("Neumann boundary condition",
mesh,
input_parameter_data);
......@@ -148,7 +148,7 @@ namespace HappyHeart
using parameter_type = InputParameter::TransientSource<EnumUnderlyingType(ForceIndexList::robin_boundary_condition)>;
robin_parameter_ =
InitThreeDimensionalParameter<parameter_type>("Robin boundary condition",
InitThreeDimensionalParameterFromInputData<parameter_type>("Robin boundary condition",
mesh,
input_parameter_data);
......
......@@ -8,7 +8,7 @@
// Copyright (c) 2015 Inria. All rights reserved.
//
#include "Parameters/InitParameter.hpp"
#include "Parameters/InitParameterFromInputData/InitParameterFromInputData.hpp"
#include "Parameters/Instances/GradientBasedElasticityTensor/Internal/Configuration.hpp"
......@@ -62,11 +62,11 @@ namespace HappyHeart
const auto& god_of_dof = this->GetGodOfDof();
const auto& mesh = god_of_dof.GetGeometricMeshRegion();
fluid_density_ = InitScalarParameter<InputParameter::Fluid::Density>("Fluid density",
fluid_density_ = InitScalarParameterFromInputData<InputParameter::Fluid::Density>("Fluid density",
mesh,
input_parameter_data);
fluid_viscosity_ = InitScalarParameter<InputParameter::Fluid::Viscosity>("Fluid viscosity",
fluid_viscosity_ = InitScalarParameterFromInputData<InputParameter::Fluid::Viscosity>("Fluid viscosity",
mesh,
input_parameter_data);
......
......@@ -8,7 +8,7 @@
// Copyright (c) 2015 Inria. All rights reserved.
//
#include "Parameters/InitParameter.hpp"
#include "Parameters/InitParameterFromInputData/InitParameterFromInputData.hpp"
#include "ModelInstances/FSI_EI/ImplicitStepFluidVariationalFormulation.hpp"
#include "ModelInstances/FSI_EI/ExplicitStepVariationalFormulation.hpp"
......@@ -109,7 +109,7 @@ namespace HappyHeart
{
using parameter_type = InputParameter::TransientSource<EnumUnderlyingType(SourceIndex::inlet_pressure)>;
inlet_pressure_ =
InitThreeDimensionalParameter<parameter_type>("inlet_pressure",
InitThreeDimensionalParameterFromInputData<parameter_type>("inlet_pressure",
mesh,
input_parameter_data);
......
......@@ -8,7 +8,7 @@
// Copyright © 2015 Inria. All rights reserved.
//
#include "Parameters/InitParameter.hpp"
#include "Parameters/InitParameterFromInputData/InitParameterFromInputData.hpp"
#include "ModelInstances/FSI_EI/SolidVariationalFormulationPolicy/Elasticity/VariationalFormulation.hpp"
#include "ModelInstances/FSI_EI/InputParameterList.hpp"
......@@ -52,18 +52,18 @@ namespace HappyHeart
const auto& god_of_dof = this->GetGodOfDof();
const auto& mesh = god_of_dof.GetGeometricMeshRegion();
volumic_mass_ = InitScalarParameter<InputParameter::Solid::VolumicMass>("Volumic mass",
volumic_mass_ = InitScalarParameterFromInputData<InputParameter::Solid::VolumicMass>("Volumic mass",
mesh,
input_parameter_data);
if (!GetVolumicMass().IsConstant())
throw Exception("Current elastic model is restricted to a constant volumic mass!", __FILE__, __LINE__);
young_modulus_ = InitScalarParameter<InputParameter::Solid::YoungModulus>("Young modulus",
young_modulus_ = InitScalarParameterFromInputData<InputParameter::Solid::YoungModulus>("Young modulus",
mesh,
input_parameter_data);
poisson_ratio_ = InitScalarParameter<InputParameter::Solid::PoissonRatio>("Poisson ratio",
poisson_ratio_ = InitScalarParameterFromInputData<InputParameter::Solid::PoissonRatio>("Poisson ratio",
mesh,
input_parameter_data);
......
......@@ -63,7 +63,7 @@ namespace HappyHeart
{
const auto& geometric_mesh_region = this->GetGodOfDof().GetGeometricMeshRegion();
volumic_mass_ = InitScalarParameter<InputParameter::Solid::VolumicMass>("Volumic mass",
volumic_mass_ = InitScalarParameterFromInputData<InputParameter::Solid::VolumicMass>("Volumic mass",
geometric_mesh_region,
input_parameter_data);
......@@ -71,23 +71,23 @@ namespace HappyHeart
throw Exception("Current hyperelastic model is restricted to a constant volumic mass!",
__FILE__, __LINE__);
young_modulus_ = InitScalarParameter<InputParameter::Solid::YoungModulus>("Young modulus",
young_modulus_ = InitScalarParameterFromInputData<InputParameter::Solid::YoungModulus>("Young modulus",
geometric_mesh_region,
input_parameter_data);
poisson_ratio_ = InitScalarParameter<InputParameter::Solid::PoissonRatio>("Poisson ratio",
poisson_ratio_ = InitScalarParameterFromInputData<InputParameter::Solid::PoissonRatio>("Poisson ratio",
geometric_mesh_region,
input_parameter_data);
kappa1_ = InitScalarParameter<InputParameter::Solid::Kappa1>("Kappa1",
kappa1_ = InitScalarParameterFromInputData<InputParameter::Solid::Kappa1>("Kappa1",
geometric_mesh_region,
input_parameter_data);
kappa2_ = InitScalarParameter<InputParameter::Solid::Kappa2>("Kappa2",
kappa2_ = InitScalarParameterFromInputData<InputParameter::Solid::Kappa2>("Kappa2",
geometric_mesh_region,
input_parameter_data);
bulk_ = InitScalarParameter<InputParameter::Solid::HyperelasticBulk>("HyperelasticBulk",