Commit 79b1dd9d authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#873 Parameters: I changed my mind and put the setting of time functor in a...

#873 Parameters: I changed my mind and put the setting of time functor in a dedicated method: it was way too cumbersome to give an additional parameter to every Paramneter constructor when this parameter was most of the time an empty struct.
parent 2ca98b78
......@@ -735,6 +735,21 @@
BE8D2D471AE8EFC200F1EC63 /* GlobalMatrixStorage.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE8D2D441AE8EFC200F1EC63 /* GlobalMatrixStorage.hxx */; };
BE8F0E671A81260600D81C9F /* ___FILEBASENAME___.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE8F0E631A81260600D81C9F /* ___FILEBASENAME___.hpp */; };
BE8F0E681A81260600D81C9F /* ___FILEBASENAME___.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE8F0E641A81260600D81C9F /* ___FILEBASENAME___.hxx */; };
BE9063281CABF01200E69200 /* libSeldon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEE79A1F1C995B5F00F05519 /* libSeldon.a */; };
BE9063291CABF01200E69200 /* libOperators.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BECA4B941B1756DE00DC7265 /* libOperators.a */; };
BE90632A1CABF01200E69200 /* libParameters.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE6199501B0F643300906290 /* libParameters.a */; };
BE90632B1CABF01200E69200 /* libUtilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEA8A379177AD4FE009436C9 /* libUtilities.a */; };
BE90632C1CABF01200E69200 /* libOps.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE43AD351AFB9ADB0082AF43 /* libOps.a */; };
BE90632D1CABF01200E69200 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC37E0617DDC0210021BFB7 /* Accelerate.framework */; };
BE90632E1CABF01200E69200 /* libCore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE05B52916D238FE000E248D /* libCore.a */; };
BE90632F1CABF01200E69200 /* libFiniteElement.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE9C4D121807F5DC005B94BC /* libFiniteElement.a */; };
BE9063301CABF01200E69200 /* libFormulationSolver.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEABCEBD1AE65A9A00817D37 /* libFormulationSolver.a */; };
BE9063311CABF01200E69200 /* libGeometry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE05B4DD16D23573000E248D /* libGeometry.a */; };
BE90633E1CABF05200E69200 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE90633A1CABF05200E69200 /* main.cpp */; };
BE90633F1CABF05200E69200 /* Model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE90633B1CABF05200E69200 /* Model.cpp */; };
BE9063411CABF4DC00E69200 /* libOps.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE43AD351AFB9ADB0082AF43 /* libOps.a */; };
BE9063421CABF4DC00E69200 /* libSeldon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEE79A1F1C995B5F00F05519 /* libSeldon.a */; };
BE9063431CABF56200E69200 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC37E0617DDC0210021BFB7 /* Accelerate.framework */; };
BE90DECF1A24903700CCAFDE /* HappyHeart.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE5BC2F516C0133300232749 /* HappyHeart.hpp */; };
BE90DEE11A24903700CCAFDE /* Result.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE7A19EC183E4789002767FD /* Result.hpp */; };
BE90DFA31A24915500CCAFDE /* GeometricMeshRegion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE5BC2B916C00A0600232749 /* GeometricMeshRegion.cpp */; };
......@@ -2879,6 +2894,69 @@
remoteGlobalIDString = A90F59BF1AFB5FD8009228A0;
remoteInfo = Ops;
};
BE9063131CABF01200E69200 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = BE781C001B0B582500DBE49F /* Seldon.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = BE9CBB4F1B0B339100FA0F1B;
remoteInfo = Seldon;
};
BE9063151CABF01200E69200 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = BE5BC27016C008CF00232749 /* Project object */;
proxyType = 1;
remoteGlobalIDString = BEA8A378177AD4FE009436C9;
remoteInfo = Utilities;
};
BE9063171CABF01200E69200 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = BE5BC27016C008CF00232749 /* Project object */;
proxyType = 1;
remoteGlobalIDString = BE05B52816D238FE000E248D;
remoteInfo = Core;
};
BE9063191CABF01200E69200 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = BE5BC27016C008CF00232749 /* Project object */;
proxyType = 1;
remoteGlobalIDString = BE05B4DC16D23573000E248D;
remoteInfo = Geometry;
};
BE90631B1CABF01200E69200 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = BE5BC27016C008CF00232749 /* Project object */;
proxyType = 1;
remoteGlobalIDString = BE9C4D111807F5DC005B94BC;
remoteInfo = FiniteElement;
};
BE90631D1CABF01200E69200 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = BE5BC27016C008CF00232749 /* Project object */;
proxyType = 1;
remoteGlobalIDString = BE61994F1B0F643300906290;
remoteInfo = Parameters;
};
BE90631F1CABF01200E69200 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = BE5BC27016C008CF00232749 /* Project object */;
proxyType = 1;
remoteGlobalIDString = BECA4B931B1756DE00DC7265;
remoteInfo = Operators;
};
BE9063211CABF01200E69200 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = BE5BC27016C008CF00232749 /* Project object */;
proxyType = 1;
remoteGlobalIDString = BEABCEBC1AE65A9A00817D37;
remoteInfo = FormulationSolver;
};
BE9063231CABF01200E69200 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = BE43AD301AFB9ADB0082AF43 /* Ops.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = A90F59BF1AFB5FD8009228A0;
remoteInfo = Ops;
};
BE9365931C8F25710011D8E3 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = BE43AD301AFB9ADB0082AF43 /* Ops.xcodeproj */;
......@@ -3782,6 +3860,15 @@
);
runOnlyForDeploymentPostprocessing = 1;
};
BE9063321CABF01200E69200 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = /usr/share/man/man1/;
dstSubfolderSpec = 0;
files = (
);
runOnlyForDeploymentPostprocessing = 1;
};
BEA263A61A28D092001802B6 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
......@@ -4808,6 +4895,13 @@
BE8F0E631A81260600D81C9F /* ___FILEBASENAME___.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = "___FILEBASENAME___.hpp"; sourceTree = "<group>"; };
BE8F0E641A81260600D81C9F /* ___FILEBASENAME___.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = "___FILEBASENAME___.hxx"; sourceTree = "<group>"; };
BE8F0E651A81260600D81C9F /* TemplateInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = TemplateInfo.plist; sourceTree = "<group>"; };
BE9063361CABF01300E69200 /* TestParameterTimeDependency */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = TestParameterTimeDependency; sourceTree = BUILT_PRODUCTS_DIR; };
BE9063391CABF05200E69200 /* InputParameterList.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = InputParameterList.hpp; sourceTree = "<group>"; };
BE90633A1CABF05200E69200 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
BE90633B1CABF05200E69200 /* Model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Model.cpp; sourceTree = "<group>"; };
BE90633C1CABF05200E69200 /* Model.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Model.hpp; sourceTree = "<group>"; };
BE90633D1CABF05200E69200 /* Model.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Model.hxx; sourceTree = "<group>"; };
BE9063401CABF10000E69200 /* demo_input_test_parameter_time_dependency.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = demo_input_test_parameter_time_dependency.lua; path = Data/Lua/demo_input_test_parameter_time_dependency.lua; sourceTree = SOURCE_ROOT; };
BE915A051AAF2E7000B4C474 /* LocalMatrixStorage.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = LocalMatrixStorage.hpp; sourceTree = "<group>"; };
BE915A061AAF2E7000B4C474 /* LocalMatrixStorage.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = LocalMatrixStorage.hxx; sourceTree = "<group>"; };
BE915A071AAF2E7000B4C474 /* LocalVectorStorage.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = LocalVectorStorage.hpp; sourceTree = "<group>"; };
......@@ -5846,6 +5940,23 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
BE9063271CABF01200E69200 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
BE9063281CABF01200E69200 /* libSeldon.a in Frameworks */,
BE9063291CABF01200E69200 /* libOperators.a in Frameworks */,
BE90632A1CABF01200E69200 /* libParameters.a in Frameworks */,
BE90632B1CABF01200E69200 /* libUtilities.a in Frameworks */,
BE90632C1CABF01200E69200 /* libOps.a in Frameworks */,
BE90632D1CABF01200E69200 /* Accelerate.framework in Frameworks */,
BE90632E1CABF01200E69200 /* libCore.a in Frameworks */,
BE90632F1CABF01200E69200 /* libFiniteElement.a in Frameworks */,
BE9063301CABF01200E69200 /* libFormulationSolver.a in Frameworks */,
BE9063311CABF01200E69200 /* libGeometry.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
BE9C4D0F1807F5DC005B94BC /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
......@@ -6000,6 +6111,9 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
BE9063431CABF56200E69200 /* Accelerate.framework in Frameworks */,
BE9063411CABF4DC00E69200 /* libOps.a in Frameworks */,
BE9063421CABF4DC00E69200 /* libSeldon.a in Frameworks */,
132EFAC01C52575000478643 /* libUtilities.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -7259,6 +7373,7 @@
0A5E0FDB1C8EE27400D1FF63 /* AcousticWave */,
BEE8A2881C9048F300CD25F0 /* CardiacMechanics */,
BEB291A91CA02EB400A74738 /* TestInterpolatorP1_to_P1b */,
BE9063361CABF01300E69200 /* TestParameterTimeDependency */,
);
name = Products;
sourceTree = "<group>";
......@@ -7758,6 +7873,7 @@
BE6A983D1BC66CDC004184F2 /* Parameter */ = {
isa = PBXGroup;
children = (
BE9063381CABF05200E69200 /* TimeDependency */,
BE6A98461BC66E0A004184F2 /* AtDof */,
);
path = Parameter;
......@@ -8044,6 +8160,19 @@
path = LocalVariationalOperator.xctemplate;
sourceTree = "<group>";
};
BE9063381CABF05200E69200 /* TimeDependency */ = {
isa = PBXGroup;
children = (
BE9063401CABF10000E69200 /* demo_input_test_parameter_time_dependency.lua */,
BE9063391CABF05200E69200 /* InputParameterList.hpp */,
BE90633A1CABF05200E69200 /* main.cpp */,
BE90633B1CABF05200E69200 /* Model.cpp */,
BE90633C1CABF05200E69200 /* Model.hpp */,
BE90633D1CABF05200E69200 /* Model.hxx */,
);
path = TimeDependency;
sourceTree = "<group>";
};
BE915A021AAF2DE200B4C474 /* LocalLinearAlgebraStorage */ = {
isa = PBXGroup;
children = (
......@@ -11330,6 +11459,32 @@
productReference = BE6FB5851B4E749600F0F6A3 /* TestXCodeTemplate */;
productType = "com.apple.product-type.tool";
};
BE9063111CABF01200E69200 /* TestParameterTimeDependency */ = {
isa = PBXNativeTarget;
buildConfigurationList = BE9063331CABF01200E69200 /* Build configuration list for PBXNativeTarget "TestParameterTimeDependency" */;
buildPhases = (
BE9063241CABF01200E69200 /* Sources */,
BE9063271CABF01200E69200 /* Frameworks */,
BE9063321CABF01200E69200 /* CopyFiles */,
);
buildRules = (
);
dependencies = (
BE9063121CABF01200E69200 /* PBXTargetDependency */,
BE9063141CABF01200E69200 /* PBXTargetDependency */,
BE9063161CABF01200E69200 /* PBXTargetDependency */,
BE9063181CABF01200E69200 /* PBXTargetDependency */,
BE90631A1CABF01200E69200 /* PBXTargetDependency */,
BE90631C1CABF01200E69200 /* PBXTargetDependency */,
BE90631E1CABF01200E69200 /* PBXTargetDependency */,
BE9063201CABF01200E69200 /* PBXTargetDependency */,
BE9063221CABF01200E69200 /* PBXTargetDependency */,
);
name = TestParameterTimeDependency;
productName = TestAtDofParameter;
productReference = BE9063361CABF01300E69200 /* TestParameterTimeDependency */;
productType = "com.apple.product-type.tool";
};
BE9C4D111807F5DC005B94BC /* FiniteElement */ = {
isa = PBXNativeTarget;
buildConfigurationList = BE9C4D131807F5DC005B94BC /* Build configuration list for PBXNativeTarget "FiniteElement" */;
......@@ -11788,6 +11943,7 @@
BE1ABAB61B9DC6FC00A7DBD8 /* TestInterpolatorP1_to_P2 */,
BEB291851CA02EB400A74738 /* TestInterpolatorP1_to_P1b */,
BE6A98351BC66CBB004184F2 /* TestAtDofParameter */,
BE9063111CABF01200E69200 /* TestParameterTimeDependency */,
13E8D7A31C0DF6A6009073DA /* RivlinCube */,
BE5B6F161C3C12AF004A0284 /* FSI_EI */,
13A7FD1C1C3FF71400257E99 /* ReactionDiffusion_FHN */,
......@@ -12228,6 +12384,15 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
BE9063241CABF01200E69200 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
BE90633E1CABF05200E69200 /* main.cpp in Sources */,
BE90633F1CABF05200E69200 /* Model.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
BE9C4D0E1807F5DC005B94BC /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
......@@ -13544,6 +13709,51 @@
name = Ops;
targetProxy = BE70219F1B0CC28A0068B840 /* PBXContainerItemProxy */;
};
BE9063121CABF01200E69200 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = Seldon;
targetProxy = BE9063131CABF01200E69200 /* PBXContainerItemProxy */;
};
BE9063141CABF01200E69200 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = BEA8A378177AD4FE009436C9 /* Utilities */;
targetProxy = BE9063151CABF01200E69200 /* PBXContainerItemProxy */;
};
BE9063161CABF01200E69200 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = BE05B52816D238FE000E248D /* Core */;
targetProxy = BE9063171CABF01200E69200 /* PBXContainerItemProxy */;
};
BE9063181CABF01200E69200 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = BE05B4DC16D23573000E248D /* Geometry */;
targetProxy = BE9063191CABF01200E69200 /* PBXContainerItemProxy */;
};
BE90631A1CABF01200E69200 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = BE9C4D111807F5DC005B94BC /* FiniteElement */;
targetProxy = BE90631B1CABF01200E69200 /* PBXContainerItemProxy */;
};
BE90631C1CABF01200E69200 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = BE61994F1B0F643300906290 /* Parameters */;
targetProxy = BE90631D1CABF01200E69200 /* PBXContainerItemProxy */;
};
BE90631E1CABF01200E69200 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = BECA4B931B1756DE00DC7265 /* Operators */;
targetProxy = BE90631F1CABF01200E69200 /* PBXContainerItemProxy */;
};
BE9063201CABF01200E69200 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = BEABCEBC1AE65A9A00817D37 /* FormulationSolver */;
targetProxy = BE9063211CABF01200E69200 /* PBXContainerItemProxy */;
};
BE9063221CABF01200E69200 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = Ops;
targetProxy = BE9063231CABF01200E69200 /* PBXContainerItemProxy */;
};
BE9365941C8F25710011D8E3 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = Ops;
......@@ -14923,7 +15133,6 @@
"-llua",
"-lyuni-static-core",
"-lmpi",
"-lmpi_cxx",
"-lpetsc",
);
PRESERVE_DEAD_CODE_INITS_AND_TERMS = NO;
......@@ -15034,7 +15243,6 @@
"-llua",
"-lyuni-static-core",
"-lmpi",
"-lmpi_cxx",
"-lpetsc",
);
PRESERVE_DEAD_CODE_INITS_AND_TERMS = NO;
......@@ -15357,6 +15565,58 @@
};
name = Release;
};
BE9063341CABF01200E69200 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_ENABLE_MODULES = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
MTL_ENABLE_DEBUG_INFO = YES;
OTHER_LDFLAGS = (
"-llua",
"-lyuni-static-core",
"-lmpi",
"-lpetsc",
);
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
BE9063351CABF01200E69200 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_ENABLE_MODULES = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
COPY_PHASE_STRIP = NO;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_NO_COMMON_BLOCKS = YES;
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_LDFLAGS = (
"-llua",
"-lyuni-static-core",
"-lmpi",
"-lpetsc",
);
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
BE9C4D141807F5DC005B94BC /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
......@@ -15849,11 +16109,13 @@
);
GCC_VERSION = "";
HEADER_SEARCH_PATHS = /Users/Shared/Library/Yuni/src;
LIBRARY_SEARCH_PATHS = /Users/Shared/Library/Yuni/src/build/debug/lib;
LIBRARY_SEARCH_PATHS = $inherited;
OTHER_LDFLAGS = (
"-llua",
"-lyuni-static-core",
"-lmpi",
"-lpetsc",
"-lmpi_cxx",
);
PRODUCT_NAME = "$(TARGET_NAME)";
};
......@@ -15865,11 +16127,13 @@
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
GCC_VERSION = "";
HEADER_SEARCH_PATHS = /Users/Shared/Library/Yuni/src;
LIBRARY_SEARCH_PATHS = /Users/Shared/Library/Yuni/src/build/release/lib;
LIBRARY_SEARCH_PATHS = $inherited;
OTHER_LDFLAGS = (
"-llua",
"-lyuni-static-core",
"-lmpi",
"-lpetsc",
"-lmpi_cxx",
);
PRODUCT_NAME = "$(TARGET_NAME)";
};
......@@ -16180,6 +16444,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
BE9063331CABF01200E69200 /* Build configuration list for PBXNativeTarget "TestParameterTimeDependency" */ = {
isa = XCConfigurationList;
buildConfigurations = (
BE9063341CABF01200E69200 /* Debug */,
BE9063351CABF01200E69200 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
BE9C4D131807F5DC005B94BC /* Build configuration list for PBXNativeTarget "FiniteElement" */ = {
isa = XCConfigurationList;
buildConfigurations = (
......@@ -42,7 +42,7 @@
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Release"
buildConfiguration = "Debug"
selectedDebuggerIdentifier = ""
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
launchStyle = "0"
......
......@@ -99,7 +99,6 @@ namespace HappyHeart
const Unknown& unknown,
unsigned int geom_mesh_region_dimension,
const quadrature_rule_per_topology_type& quadrature_rule_set,
TimeDependencyT&& time_dependency,
DoComputeProcessorWiseLocal2Global do_compute_processor_wise_local2global);
......
......@@ -35,7 +35,6 @@ namespace HappyHeart
const Unknown& unknown,
const unsigned int geom_mesh_region_dimension,
const quadrature_rule_per_topology_type& quadrature_rule_set,
TimeDependencyT&& time_dependency,
DoComputeProcessorWiseLocal2Global do_compute_processor_wise_local2global)
{
namespace GVO = GlobalVariationalOperatorNS;
......@@ -54,10 +53,9 @@ namespace HappyHeart
using parameter_type = InputParameter::TransientSource<index>;
parameter_ptr = InitThreeDimensionalParameter<parameter_type>(std::forward<T>(name),
geometric_mesh_region,
input_parameter_data,
std::move(time_dependency));
parameter_ptr = InitThreeDimensionalParameter<parameter_type, TimeDependencyT>(std::forward<T>(name),
geometric_mesh_region,
input_parameter_data);
if (parameter_ptr == nullptr)
return;
......
......@@ -148,9 +148,9 @@ namespace HappyHeart
mesh,
input_parameter_data);
const Parameter<ParameterNS::Type::vector>& volumic_source_parameter = GetVolumicSourceParameter();
const Parameter<ParameterNS::Type::vector, ParameterNS::TimeDependencyNS::None>& volumic_source_parameter = GetVolumicSourceParameter();
volumic_source_operator_ = std::make_unique<GVO::TransientSource>(felt_space_highest_dimension,
volumic_source_operator_ = std::make_unique<GVO::TransientSource<>>(felt_space_highest_dimension,
velocity,
mesh_dimension,
default_quadrature_rule_set,
......@@ -232,7 +232,7 @@ namespace HappyHeart
if (time > GetInitialTimeVolumicSource() && time < GetFinalTimeVolumicSource())
{
const GlobalVariationalOperatorNS::TransientSource& volumic_source_operator = GetVolumicSourceOperator();
const GlobalVariationalOperatorNS::TransientSource<>& volumic_source_operator = GetVolumicSourceOperator();
GlobalVectorWithCoefficient vector(vector_current_volumic_source, 1.);
volumic_source_operator.Assemble(std::make_tuple(std::ref(vector)), time);
......
......@@ -170,12 +170,12 @@ namespace HappyHeart
GlobalVariationalOperatorNS::GradPhiGradPhi::const_unique_ptr stiffness_operator_ = nullptr;
//! Volumic source operator.
GlobalVariationalOperatorNS::TransientSource::const_unique_ptr volumic_source_operator_ = nullptr;
GlobalVariationalOperatorNS::TransientSource<>::const_unique_ptr volumic_source_operator_ = nullptr;
///@}
//! Get the volumic source operator.
const GlobalVariationalOperatorNS::TransientSource& GetVolumicSourceOperator() const noexcept;
const GlobalVariationalOperatorNS::TransientSource<>& GetVolumicSourceOperator() const noexcept;
//! Get the stiffness operator.
const GlobalVariationalOperatorNS::GradPhiGradPhi& GetStiffnessOperator() const noexcept;
......@@ -248,18 +248,18 @@ namespace HappyHeart
///@{
//! Diffusion tensor.
ScalarParameter::unique_ptr diffusion_tensor_ = nullptr;
ScalarParameter<>::unique_ptr diffusion_tensor_ = nullptr;
//! Diffusion Density.
ScalarParameter::unique_ptr density_ = nullptr;
ScalarParameter<>::unique_ptr density_ = nullptr;
///@}
//! Diffusion density,
const ScalarParameter& GetDensity() const;
const ScalarParameter<>& GetDensity() const;
//! Diffusion tensor.
const ScalarParameter& GetDiffusionTensor() const;
const ScalarParameter<>& GetDiffusionTensor() const;
private:
......@@ -268,11 +268,11 @@ namespace HappyHeart
///@{
//! Volumic source parameter.
Parameter<ParameterNS::Type::vector>::unique_ptr volumic_source_parameter_ = nullptr;
Parameter<ParameterNS::Type::vector, ParameterNS::TimeDependencyNS::None>::unique_ptr volumic_source_parameter_ = nullptr;
///@}
//! Constant access to the volumic source parameter.
const Parameter<ParameterNS::Type::vector>& GetVolumicSourceParameter() const;
const Parameter<ParameterNS::Type::vector, ParameterNS::TimeDependencyNS::None>& GetVolumicSourceParameter() const;
private:
......
......@@ -44,7 +44,7 @@ namespace HappyHeart
}
inline const GlobalVariationalOperatorNS::TransientSource&
inline const GlobalVariationalOperatorNS::TransientSource<>&
VariationalFormulation::GetVolumicSourceOperator() const noexcept
{
assert(!(!volumic_source_operator_));
......@@ -107,21 +107,21 @@ namespace HappyHeart
}
inline const ScalarParameter& VariationalFormulation::GetDensity() const
inline const ScalarParameter<>& VariationalFormulation::GetDensity() const
{
assert(!(!density_));
return *density_;
}
inline const ScalarParameter& VariationalFormulation::GetDiffusionTensor() const
inline const ScalarParameter<>& VariationalFormulation::GetDiffusionTensor() const
{
assert(!(!diffusion_tensor_));
return *diffusion_tensor_;
}
inline const Parameter<ParameterNS::Type::vector>& VariationalFormulation::GetVolumicSourceParameter() const
inline const Parameter<ParameterNS::Type::vector, ParameterNS::TimeDependencyNS::None>& VariationalFormulation::GetVolumicSourceParameter() const
{
assert(!(!volumic_source_parameter_));
return *volumic_source_parameter_;
......
......@@ -65,33 +65,27 @@ namespace HappyHeart
using Diffusion = InputParameter::Diffusion;
using no_time_dep = ParameterNS::TimeDependencyNS::None;
intracellular_trans_diffusion_tensor_ =
InitScalarParameter<Diffusion::Tensor<EnumUnderlyingType(TensorIndex::intracellular_trans_diffusion_tensor)>>("Intracellular Trans Diffusion tensor",
mesh,
input_parameter_data,
no_time_dep());
input_parameter_data);
extracellular_trans_diffusion_tensor_ =
InitScalarParameter<Diffusion::Tensor<EnumUnderlyingType(TensorIndex::extracellular_trans_diffusion_tensor)>>("Extracellular Trans Diffusion tensor",
mesh,
input_parameter_data,
no_time_dep());
input_parameter_data);
intracellular_fiber_diffusion_tensor_ =
InitScalarParameter<Diffusion::Tensor<EnumUnderlyingType(TensorIndex::intracellular_fiber_diffusion_tensor)>>("Intracellular Fiber Diffusion tensor",
mesh,
input_parameter_data,
no_time_dep());
input_parameter_data);
extracellular_fiber_diffusion_tensor_ =
InitScalarParameter<Diffusion::Tensor<EnumUnderlyingType(TensorIndex::extracellular_fiber_diffusion_tensor)>>("Extracellular Fiber Diffusion tensor",
mesh,
input_parameter_data,
no_time_dep());
input_parameter_data);
transcellular_density_ =
InitScalarParameter<Diffusion::Density>("Transcellular Density",
mesh,
input_parameter_data,
no_time_dep());
input_parameter_data);
if (!GetTranscellularDiffusionDensity().IsConstant())
throw Exception("Current Bidomain model is restricted to a constant diffusion density.",
......@@ -196,16 +190,16 @@ namespace HappyHeart
default_quadrature_rule_set,
GetNonCstReactionLaw());
using no_time_dep = ParameterNS::TimeDependencyNS::None;
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",
mesh,
input_parameter_data,
no_time_dep());
input_parameter_data);