Commit 4634a3fe authored by GILLES Sebastien's avatar GILLES Sebastien

#1192 Replace all 'happy_heart' occurrences in the code and SConscripts by 'Morefem'.

parent 329d3349
/// \namespace MoReFEM
/// \brief Main HappyHeart namespace.
/// \brief Main MoReeFEM namespace.
/*!
* \class doxygen_hide_matrix_numbering_subset_arg
......
......@@ -64,6 +64,6 @@ core_src = Split('''
./TimeManager/TimeManagerInstance.cpp
''')
core_lib = custom.HappyHeartLibrary(env, 'happy_heart_core', core_src)
core_lib = custom.HappyHeartLibrary(env, 'morefem_core', core_src)
Return('core_lib')
......@@ -29,19 +29,19 @@ namespace MoReFEM
const auto& matrix_pattern = god_of_dof.GetMatrixPattern(row_numbering_subset, col_numbering_subset);
const auto& mpi_happy_heart = god_of_dof.GetMpi();
const auto& mpi_morefem = god_of_dof.GetMpi();
const unsigned int Nrow_processor_wise_dof = god_of_dof.NprocessorWiseDof(row_numbering_subset);
const unsigned int Ncolumn_processor_wise_dof = god_of_dof.NprocessorWiseDof(col_numbering_subset);
namespace Petsc = Wrappers::Petsc;
const unsigned int Nproc = mpi_happy_heart.template Nprocessor<unsigned int>();
const unsigned int Nproc = mpi_morefem.template Nprocessor<unsigned int>();
if (Nproc == 1)
{
matrix.InitSequentialMatrix(Nrow_processor_wise_dof, Ncolumn_processor_wise_dof,
matrix_pattern, mpi_happy_heart,
matrix_pattern, mpi_morefem,
__FILE__, __LINE__);
}
else
......@@ -52,7 +52,7 @@ namespace MoReFEM
matrix.InitParallelMatrix(Nrow_processor_wise_dof, Ncolumn_processor_wise_dof,
Nrow_program_wise_dof, Ncolumn_program_wise_dof,
matrix_pattern,
mpi_happy_heart,
mpi_morefem,
__FILE__, __LINE__);
}
......@@ -95,16 +95,16 @@ namespace MoReFEM
// Now fill the structure of the matrix as in AllocateGlobalMatrix().
// ===================================================
const auto& mpi_happy_heart = god_of_dof.GetMpi();
const auto& mpi_morefem = god_of_dof.GetMpi();
namespace Petsc = Wrappers::Petsc;
const unsigned int Nproc = mpi_happy_heart.template Nprocessor<unsigned int>();
const unsigned int Nproc = mpi_morefem.template Nprocessor<unsigned int>();
if (Nproc == 1)
{
matrix.InitSequentialMatrix(Nrow_proc_wise, Nrow_proc_wise,
diagonal_pattern, mpi_happy_heart,
diagonal_pattern, mpi_morefem,
__FILE__, __LINE__);
}
else
......@@ -114,7 +114,7 @@ namespace MoReFEM
matrix.InitParallelMatrix(Nrow_proc_wise, Nrow_proc_wise,
Nrow_program_wise, Nrow_program_wise,
diagonal_pattern,
mpi_happy_heart,
mpi_morefem,
__FILE__, __LINE__);
}
......@@ -126,7 +126,7 @@ namespace MoReFEM
void AllocateGlobalVector(const GodOfDof& god_of_dof,
GlobalVector& vector)
{
const auto& mpi_happy_heart = god_of_dof.GetMpi();
const auto& mpi_morefem = god_of_dof.GetMpi();
const auto& numbering_subset = vector.GetNumberingSubset();
......@@ -134,10 +134,10 @@ namespace MoReFEM
namespace Petsc = Wrappers::Petsc;
const unsigned int Nproc = mpi_happy_heart.template Nprocessor<unsigned int>();
const unsigned int Nproc = mpi_morefem.template Nprocessor<unsigned int>();
if (Nproc == 1)
vector.InitSequentialVector(Nprocessor_wise_dof, mpi_happy_heart, __FILE__, __LINE__);
vector.InitSequentialVector(Nprocessor_wise_dof, mpi_morefem, __FILE__, __LINE__);
else
{
std::vector<PetscInt> ghosted_dof_index_list;
......@@ -163,7 +163,7 @@ namespace MoReFEM
vector.InitMpiVectorWithGhost(Nprocessor_wise_dof,
Nprogram_wise_dof,
ghosted_dof_index_list,
mpi_happy_heart,
mpi_morefem,
__FILE__, __LINE__);
}
......
......@@ -94,6 +94,6 @@ felt_src = Split('''
./Unknown/UnknownManager.cpp
''')
felt_lib = custom.HappyHeartLibrary(env, 'happy_heart_felt', felt_src)
felt_lib = custom.HappyHeartLibrary(env, 'morefem_felt', felt_src)
Return('felt_lib')
......@@ -15,6 +15,6 @@ local_src = Split('''
./Internal/Storage/GlobalVectorStorage.cpp
''')
local_lib = custom.HappyHeartLibrary(env, 'happy_heart_formulation_solver', local_src)
local_lib = custom.HappyHeartLibrary(env, 'morefem_formulation_solver', local_src)
Return('local_lib')
......@@ -112,7 +112,7 @@ geometry_src = Split('''
./RefGeometricElt/RefGeomElt.cpp
''')
geometry_lib = custom.HappyHeartLibrary(env, 'happy_heart_geometry', geometry_src)
geometry_lib = custom.HappyHeartLibrary(env, 'morefem_geometry', geometry_src)
Return('geometry_lib')
......@@ -13,7 +13,7 @@ elasticity_src = Split('''
''')
elasticity_lib = custom.HappyHeartLibrary(env, 'happy_heart_elasticity', elasticity_src)
elasticity_lib = custom.HappyHeartLibrary(env, 'morefem_elasticity', elasticity_src)
main_elasticity_src = Split('''
......
......@@ -25,10 +25,10 @@ int main(int argc, char** argv)
try
{
InitMoReFEM<InputParameterList> happy_heart(argc, argv);
InitMoReFEM<InputParameterList> morefem(argc, argv);
const auto& input_parameter_data = happy_heart.GetInputParameterList();
const auto& mpi = happy_heart.GetMpi();
const auto& input_parameter_data = morefem.GetInputParameterList();
const auto& mpi = morefem.GetMpi();
try
{
......
......@@ -31,10 +31,10 @@ int main(int argc, char** argv)
{
using InputParameterList = ElasticityNS::InputParameterList;
InitMoReFEM<InputParameterList, Utilities::InputParameterListNS::DoTrackUnusedFields::no> happy_heart(argc, argv);
InitMoReFEM<InputParameterList, Utilities::InputParameterListNS::DoTrackUnusedFields::no> morefem(argc, argv);
const auto& input_parameter_data = happy_heart.GetInputParameterList();
const auto& mpi = happy_heart.GetMpi();
const auto& input_parameter_data = morefem.GetInputParameterList();
const auto& mpi = morefem.GetMpi();
try
{
......
......@@ -14,7 +14,7 @@ heat_src = Split('''
''')
heat_lib = custom.HappyHeartLibrary(env, 'happy_heart_heat', heat_src)
heat_lib = custom.HappyHeartLibrary(env, 'morefem_heat', heat_src)
main_heat_src = Split('''
......
......@@ -25,10 +25,10 @@ int main(int argc, char** argv)
try
{
InitMoReFEM<InputParameterList> happy_heart(argc, argv);
InitMoReFEM<InputParameterList> morefem(argc, argv);
const auto& input_parameter_data = happy_heart.GetInputParameterList();
const auto& mpi = happy_heart.GetMpi();
const auto& input_parameter_data = morefem.GetInputParameterList();
const auto& mpi = morefem.GetMpi();
try
{
......
......@@ -31,10 +31,10 @@ int main(int argc, char** argv)
{
using InputParameterList = HeatNS::InputParameterList;
InitMoReFEM<InputParameterList, Utilities::InputParameterListNS::DoTrackUnusedFields::no> happy_heart(argc, argv);
InitMoReFEM<InputParameterList, Utilities::InputParameterListNS::DoTrackUnusedFields::no> morefem(argc, argv);
const auto& input_parameter_data = happy_heart.GetInputParameterList();
const auto& mpi = happy_heart.GetMpi();
const auto& input_parameter_data = morefem.GetInputParameterList();
const auto& mpi = morefem.GetMpi();
try
{
......
......@@ -14,7 +14,7 @@ midpoint_hyperelasticity_src = Split('''
''')
midpoint_hyperelasticity_lib = custom.HappyHeartLibrary(env, 'happy_heart_midpoint_hyperelasticity', midpoint_hyperelasticity_src)
midpoint_hyperelasticity_lib = custom.HappyHeartLibrary(env, 'morefem_midpoint_hyperelasticity', midpoint_hyperelasticity_src)
main_midpoint_hyperelasticity_src = Split('''
......
......@@ -23,10 +23,10 @@ int main(int argc, char** argv)
try
{
InitMoReFEM<InputParameterList> happy_heart(argc, argv);
InitMoReFEM<InputParameterList> morefem(argc, argv);
const auto& input_parameter_data = happy_heart.GetInputParameterList();
const auto& mpi = happy_heart.GetMpi();
const auto& input_parameter_data = morefem.GetInputParameterList();
const auto& mpi = morefem.GetMpi();
try
{
......
......@@ -31,10 +31,10 @@ int main(int argc, char** argv)
{
using InputParameterList = MidpointHyperelasticityNS::InputParameterList;
InitMoReFEM<InputParameterList, Utilities::InputParameterListNS::DoTrackUnusedFields::no> happy_heart(argc, argv);
InitMoReFEM<InputParameterList, Utilities::InputParameterListNS::DoTrackUnusedFields::no> morefem(argc, argv);
const auto& input_parameter_data = happy_heart.GetInputParameterList();
const auto& mpi = happy_heart.GetMpi();
const auto& input_parameter_data = morefem.GetInputParameterList();
const auto& mpi = morefem.GetMpi();
try
{
......
......@@ -14,7 +14,7 @@ laplacian_src = Split('''
''')
laplacian_lib = custom.HappyHeartLibrary(env, 'happy_heart_laplacian', laplacian_src)
laplacian_lib = custom.HappyHeartLibrary(env, 'morefem_laplacian', laplacian_src)
main_laplacian_src = Split('''
......
......@@ -25,10 +25,10 @@ int main(int argc, char** argv)
try
{
InitMoReFEM<InputParameterList> happy_heart(argc, argv);
InitMoReFEM<InputParameterList> morefem(argc, argv);
const auto& input_parameter_data = happy_heart.GetInputParameterList();
const auto& mpi = happy_heart.GetMpi();
const auto& input_parameter_data = morefem.GetInputParameterList();
const auto& mpi = morefem.GetMpi();
try
{
......
......@@ -31,10 +31,10 @@ int main(int argc, char** argv)
{
using InputParameterList = LaplacianNS::InputParameterList;
InitMoReFEM<InputParameterList, Utilities::InputParameterListNS::DoTrackUnusedFields::no> happy_heart(argc, argv);
InitMoReFEM<InputParameterList, Utilities::InputParameterListNS::DoTrackUnusedFields::no> morefem(argc, argv);
const auto& input_parameter_data = happy_heart.GetInputParameterList();
const auto& mpi = happy_heart.GetMpi();
const auto& input_parameter_data = morefem.GetInputParameterList();
const auto& mpi = morefem.GetMpi();
try
{
......
......@@ -13,7 +13,7 @@ rivlin_src = Split('''
''')
rivlin_lib = custom.HappyHeartLibrary(env, 'happy_heart_rivlin', rivlin_src)
rivlin_lib = custom.HappyHeartLibrary(env, 'morefem_rivlin', rivlin_src)
main_rivlin_src = Split('''
......
......@@ -25,10 +25,10 @@ int main(int argc, char** argv)
try
{
InitMoReFEM<InputParameterList> happy_heart(argc, argv);
InitMoReFEM<InputParameterList> morefem(argc, argv);
const auto& input_parameter_data = happy_heart.GetInputParameterList();
const auto& mpi = happy_heart.GetMpi();
const auto& input_parameter_data = morefem.GetInputParameterList();
const auto& mpi = morefem.GetMpi();
try
{
......
......@@ -31,10 +31,10 @@ int main(int argc, char** argv)
{
using InputParameterList = RivlinCubeNS::InputParameterList;
InitMoReFEM<InputParameterList, Utilities::InputParameterListNS::DoTrackUnusedFields::no> happy_heart(argc, argv);
InitMoReFEM<InputParameterList, Utilities::InputParameterListNS::DoTrackUnusedFields::no> morefem(argc, argv);
const auto& input_parameter_data = happy_heart.GetInputParameterList();
const auto& mpi = happy_heart.GetMpi();
const auto& input_parameter_data = morefem.GetInputParameterList();
const auto& mpi = morefem.GetMpi();
try
{
......
......@@ -12,7 +12,7 @@ stokes_src = Split('''
VariationalFormulation.cpp
''')
stokes_lib = custom.HappyHeartLibrary(env, 'happy_heart_stokes', stokes_src)
stokes_lib = custom.HappyHeartLibrary(env, 'morefem_stokes', stokes_src)
main_stokes_src = Split('''
main.cpp
......@@ -35,7 +35,7 @@ env_2_op = env.Clone()
env_2_op.Append(CPPDEFINES='HAPPY_HEART_STOKES_MODEL_WITH_TWO_OPERATORS')
stokes_2_op_lib = custom.HappyHeartLibrary(env_2_op, 'happy_heart_stokes_2_op', stokes_2_op_src)
stokes_2_op_lib = custom.HappyHeartLibrary(env_2_op, 'morefem_stokes_2_op', stokes_2_op_src)
stokes_2_op = custom.HappyHeartProgram(env_2_op, 'stokes_2_op', main_stokes_2_op_src, [stokes_2_op_lib])
......
......@@ -25,10 +25,10 @@ int main(int argc, char** argv)
try
{
InitMoReFEM<InputParameterList> happy_heart(argc, argv);
InitMoReFEM<InputParameterList> morefem(argc, argv);
const auto& input_parameter_data = happy_heart.GetInputParameterList();
const auto& mpi = happy_heart.GetMpi();
const auto& input_parameter_data = morefem.GetInputParameterList();
const auto& mpi = morefem.GetMpi();
try
{
......
......@@ -31,10 +31,10 @@ int main(int argc, char** argv)
{
using InputParameterList = StokesNS::InputParameterList;
InitMoReFEM<InputParameterList, Utilities::InputParameterListNS::DoTrackUnusedFields::no> happy_heart(argc, argv);
InitMoReFEM<InputParameterList, Utilities::InputParameterListNS::DoTrackUnusedFields::no> morefem(argc, argv);
const auto& input_parameter_data = happy_heart.GetInputParameterList();
const auto& mpi = happy_heart.GetMpi();
const auto& input_parameter_data = morefem.GetInputParameterList();
const auto& mpi = morefem.GetMpi();
try
{
......
......@@ -55,6 +55,6 @@ src = Split('''
./VariationalOperator/NonlinearForm/Local/SecondPiolaKirchhoffStressTensor/ViscoelasticityPolicy/None.cpp
''')
lib = custom.HappyHeartLibrary(env, 'happy_heart_operator_instances', src)
lib = custom.HappyHeartLibrary(env, 'morefem_operator_instances', src)
Return('lib')
......@@ -25,6 +25,6 @@ src = Split('''
./Miscellaneous/MatchDofInNumberingSubset.cpp
''')
lib = custom.HappyHeartLibrary(env, 'happy_heart_operators', src)
lib = custom.HappyHeartLibrary(env, 'morefem_operators', src)
Return('lib')
......@@ -17,7 +17,7 @@ src = Split('''
./ScalarParameterFromFile/ScalarParameterFromFile.cpp
''')
lib = custom.HappyHeartLibrary(env, 'happy_heart_parameter_instances', src)
lib = custom.HappyHeartLibrary(env, 'morefem_parameter_instances', src)
Return('lib')
......@@ -13,7 +13,7 @@ src = Split('''
./TimeDependency/Policy/FromFile.cpp
''')
lib = custom.HappyHeartLibrary(env, 'happy_heart_parameter', src)
lib = custom.HappyHeartLibrary(env, 'morefem_parameter', src)
Return('lib')
......@@ -196,26 +196,26 @@ namespace MoReFEM
assert(!(!geom_elt_ptr));
decltype(auto) geom_elt = *geom_elt_ptr;
auto&& happy_heart_ordering = ComputeHappyHeartOrdering(data,
auto&& morefem_ordering = ComputeHappyHeartOrdering(data,
numbering_subset,
geom_elt,
unknown_in_matrix_list);
decltype(auto) freefem_ordering = GetFreefemDofList(current_geom_elt_index);
assert(happy_heart_ordering.size() == freefem_ordering.size()
assert(morefem_ordering.size() == freefem_ordering.size()
&& "Check the Freefem ordering file you gave in input is valid!");
const auto size = happy_heart_ordering.size();
const auto size = morefem_ordering.size();
for (auto i = 0ul; i < size; ++i)
{
const auto happy_heart_dof_index = happy_heart_ordering[i];
assert(happy_heart_dof_index < Ndof);
const auto morefem_dof_index = morefem_ordering[i];
assert(morefem_dof_index < Ndof);
const auto freefem_dof_index = freefem_ordering[i];
auto& current_dof_in_mapping = mapping[happy_heart_dof_index];
auto& current_dof_in_mapping = mapping[morefem_dof_index];
if (current_dof_in_mapping == unused)
current_dof_in_mapping = freefem_dof_index;
......
......@@ -25,7 +25,7 @@ post_processing_src = Split('''
./OutputDeformedMesh/OutputDeformedMesh.cpp
''')
post_processing_lib = custom.HappyHeartLibrary(env, 'happy_heart_post_processing', post_processing_src)
post_processing_lib = custom.HappyHeartLibrary(env, 'morefem_post_processing', post_processing_src)
......
......@@ -49,10 +49,10 @@ int main(int argc, char** argv)
using InputParameterList = InputParameterList<InputParameterTuple>;
InitMoReFEM<InputParameterList, Utilities::InputParameterListNS::DoTrackUnusedFields::no> happy_heart(argc, argv);
InitMoReFEM<InputParameterList, Utilities::InputParameterListNS::DoTrackUnusedFields::no> morefem(argc, argv);
const auto& input_parameter_data = happy_heart.GetInputParameterList();
const auto& mpi = happy_heart.GetMpi();
const auto& input_parameter_data = morefem.GetInputParameterList();
const auto& mpi = morefem.GetMpi();
// Path to the matrix to convert, hardcoded at the moment.
const std::string matrix_path =
......
......@@ -62,10 +62,10 @@ int main(int argc, char** argv)
using InputParameterList = InputParameterList<InputParameterTuple>;
InitMoReFEM<InputParameterList, Utilities::InputParameterListNS::DoTrackUnusedFields::no> happy_heart(argc, argv);
InitMoReFEM<InputParameterList, Utilities::InputParameterListNS::DoTrackUnusedFields::no> morefem(argc, argv);
const auto& input_parameter_data = happy_heart.GetInputParameterList();
const auto& mpi = happy_heart.GetMpi();
const auto& input_parameter_data = morefem.GetInputParameterList();
const auto& mpi = morefem.GetMpi();
try
{
......
......@@ -77,8 +77,8 @@ libraries = (\
'OperatorInstances', \
'FormulationSolver')
# List of all libraries, as strings without path. For instance ['libhappy_heart_utilities.dylib', 'libhappy_heart_core.dylib'].
happy_heart_libs = []
# List of all libraries, as strings without path. For instance ['libmorefem_utilities.dylib', 'libmorefem_core.dylib'].
morefem_libs = []
env["LINK_LIBRARIES_LIST"] = copy.copy(env['THIRD_PARTY_LIBRARIES'])
......@@ -108,18 +108,18 @@ for library in libraries:
libs_for_alias.append(full_path_target)
# Update the list of known libraries so far.
happy_heart_libs.append(libname)
morefem_libs.append(libname)
env["LINK_LIBRARIES_LIST"].insert(0, libname)
env.Alias('libraries', libs_for_alias)
aggregated_happy_heart = os.path.join(env["TARGET_VARIANT_DIR"], "libHappyHeart.a")
env.Alias('aggregated_happy_heart', aggregated_happy_heart)
aggregated_morefem = os.path.join(env["TARGET_VARIANT_DIR"], "libHappyHeart.a")
env.Alias('aggregated_morefem', aggregated_morefem)
## Aggregate all the basic libraries into a single one, easier to link with in other projects.
env.Command(aggregated_happy_heart, libs_for_alias, custom.AggregateLibraries)
env.Command(aggregated_morefem, libs_for_alias, custom.AggregateLibraries)
executable_list = []
exec_library_list = []
......
......@@ -25,10 +25,10 @@ int main(int argc, char** argv)
try
{
InitMoReFEM<InputParameterList> happy_heart(argc, argv);
InitMoReFEM<InputParameterList> morefem(argc, argv);
const auto& input_parameter_data = happy_heart.GetInputParameterList();
const auto& mpi = happy_heart.GetMpi();
const auto& input_parameter_data = morefem.GetInputParameterList();
const auto& mpi = morefem.GetMpi();
try
{
......
......@@ -30,10 +30,10 @@ int main(int argc, char** argv)
try
{
InitMoReFEM<InputParameterList> happy_heart(argc, argv);
InitMoReFEM<InputParameterList> morefem(argc, argv);
const auto& input_parameter_data = happy_heart.GetInputParameterList();
const auto& mpi = happy_heart.GetMpi();
const auto& input_parameter_data = morefem.GetInputParameterList();
const auto& mpi = morefem.GetMpi();
try
......
......@@ -24,10 +24,10 @@ int main(int argc, char** argv)
try
{
InitMoReFEM<InputParameterList> happy_heart(argc, argv);
InitMoReFEM<InputParameterList> morefem(argc, argv);
const auto& input_parameter_data = happy_heart.GetInputParameterList();
const auto& mpi = happy_heart.GetMpi();
const auto& input_parameter_data = morefem.GetInputParameterList();
const auto& mpi = morefem.GetMpi();
try
{
......
......@@ -27,10 +27,10 @@ int main(int argc, char** argv)
try
{
InitMoReFEM<InputParameterList> happy_heart(argc, argv);
InitMoReFEM<InputParameterList> morefem(argc, argv);
const auto& input_parameter_data = happy_heart.GetInputParameterList();
const auto& mpi = happy_heart.GetMpi();
const auto& input_parameter_data = morefem.GetInputParameterList();
const auto& mpi = morefem.GetMpi();
try
{
......
......@@ -27,10 +27,10 @@ int main(int argc, char** argv)
try
{
InitMoReFEM<InputParameterList> happy_heart(argc, argv);
InitMoReFEM<InputParameterList> morefem(argc, argv);
const auto& input_parameter_data = happy_heart.GetInputParameterList();
const auto& mpi = happy_heart.GetMpi();
const auto& input_parameter_data = morefem.GetInputParameterList();
const auto& mpi = morefem.GetMpi();
try
{
......
......@@ -23,10 +23,10 @@ int main(int argc, char** argv)
try
{
InitMoReFEM<InputParameterList> happy_heart(argc, argv);
InitMoReFEM<InputParameterList> morefem(argc, argv);
const auto& input_parameter_data = happy_heart.GetInputParameterList();
const auto& mpi = happy_heart.GetMpi();
const auto& input_parameter_data = morefem.GetInputParameterList();
const auto& mpi = morefem.GetMpi();
try
{
......
......@@ -12,7 +12,7 @@ test_Ncoord_in_domain_src = Split('''
''')
test_Ncoord_in_domain_lib = custom.HappyHeartLibrary(env, 'happy_heart_test_Ncoord_in_domain', test_Ncoord_in_domain_src)
test_Ncoord_in_domain_lib = custom.HappyHeartLibrary(env, 'morefem_test_Ncoord_in_domain', test_Ncoord_in_domain_src)
main_test_Ncoord_in_domain_src = Split('''
......
......@@ -25,10 +25,10 @@ int main(int argc, char** argv)
try
{
InitMoReFEM<InputParameterList> happy_heart(argc, argv);
InitMoReFEM<InputParameterList> morefem(argc, argv);
const auto& input_parameter_data = happy_heart.GetInputParameterList();
const auto& mpi = happy_heart.GetMpi();
const auto& input_parameter_data = morefem.GetInputParameterList();
const auto& mpi = morefem.GetMpi();
try
{
......
......@@ -13,7 +13,7 @@ ondomatic_src = Split('''
''')
ondomatic_lib = custom.HappyHeartLibrary(env, 'happy_heart_ondomatic', ondomatic_src)
ondomatic_lib = custom.HappyHeartLibrary(env, 'morefem_ondomatic', ondomatic_src)
main_ondomatic_src = Split('''
......@@ -27,4 +27,4 @@ ondomatic = custom.HappyHeartProgram(env, 'Ondomatic', main_ondomatic_src, [ondo
list_exec = (ondomatic, )
list_lib = (ondomatic_lib, )
Return('list_exec', 'list_lib')
\ No newline at end of file
Return('list_exec', 'list_lib')
......@@ -25,10 +25,10 @@ int main(int argc, char** argv)
try
{
InitMoReFEM<InputParameterList> happy_heart(argc, argv);
InitMoReFEM<InputParameterList> morefem(argc, argv);
const auto& input_parameter_data = happy_heart.GetInputParameterList();
const auto& mpi = happy_heart.GetMpi();
const auto& input_parameter_data = morefem.GetInputParameterList();
const auto& mpi = morefem.GetMpi();
try
{
......
......@@ -30,10 +30,10 @@ int main(int argc, char * argv[])
try
{
InitMoReFEM<InputParameterList> happy_heart(argc, argv);
InitMoReFEM<InputParameterList> morefem(argc, argv);
const auto& input_parameter_data = happy_heart.GetInputParameterList();
const auto& mpi = happy_heart.GetMpi();