Commit 577c8921 authored by GILLES Sebastien's avatar GILLES Sebastien

#386 Rename Problems ModelInstances.

parent 431beab2
......@@ -2303,7 +2303,7 @@
BE5BC3B416C0156E00232749 /* Model */,
BE4529231A4189F3006A1577 /* PostProcessing */,
BE372DCD18C47F0500127212 /* Test */,
BEA0753A186052FB00E83E71 /* Problems */,
BEA0753A186052FB00E83E71 /* ModelInstances */,
BE7027F91A5FC55700E11393 /* XCodeTemplates */,
BE5BC2D416C011CA00232749 /* Frameworks */,
BE5BC27916C008CF00232749 /* Products */,
......@@ -2779,7 +2779,7 @@
path = Exceptions;
sourceTree = "<group>";
};
BEA0753A186052FB00E83E71 /* Problems */ = {
BEA0753A186052FB00E83E71 /* ModelInstances */ = {
isa = PBXGroup;
children = (
BE5BE50A19336DF6006BE2BF /* SConscript */,
......@@ -2787,8 +2787,8 @@
BEA0754A1860549B00E83E71 /* Hyperelasticity */,
BE63B4911A31C20E003A6523 /* Elasticity */,
);
name = Problems;
path = src/Problems;
name = ModelInstances;
path = src/ModelInstances;
sourceTree = "<group>";
};
BEA0754A1860549B00E83E71 /* Hyperelasticity */ = {
......
......@@ -16,30 +16,30 @@
<string>___FILEBASENAME___.cpp</string>
<key>SortOrder</key>
<string>2</string>
<key>Options</key>
<array>
<dict>
<key>Identifier</key>
<string>groupName</string>
<key>Name</key>
<string>GroupName</string>
<key>Description</key>
<string>Name of the folder (and group in XCode) in which the problem is handled. Folder should be
in src/Problems.</string>
<key>Type</key>
<string>text</string>
</dict>
<dict>
<key>Identifier</key>
<string>problemName</string>
<key>Name</key>
<string>ProblemName</string>
<key>Description</key>
<string>The name of the problem considered (without spaces).</string>
<key>Type</key>
<string>text</string>
</dict>
</array>
<key>Options</key>
<array>
<dict>
<key>Identifier</key>
<string>groupName</string>
<key>Name</key>
<string>GroupName</string>
<key>Description</key>
<string>Name of the folder (and group in XCode) in which the problem is handled. Folder should be
in src/ModelInstances.</string>
<key>Type</key>
<string>text</string>
</dict>
<dict>
<key>Identifier</key>
<string>problemName</string>
<key>Name</key>
<string>ProblemName</string>
<key>Description</key>
<string>The name of the problem considered (without spaces).</string>
<key>Type</key>
<string>text</string>
</dict>
</array>
<key>Summary</key>
<string>Typical main of a new HappyHeart problem.</string>
</dict>
......
......@@ -13,8 +13,8 @@
#include "Core/InitTimeKeepLog.hpp"
#include "Problems/___VARIABLE_groupName:identifier___/InputParameterList.hpp"
#include "Problems/___VARIABLE_groupName:identifier___/Model.hpp"
#include "ModelInstances/___VARIABLE_groupName:identifier___/InputParameterList.hpp"
#include "ModelInstances/___VARIABLE_groupName:identifier___/Model.hpp"
using namespace HappyHeart;
......
......@@ -16,30 +16,30 @@
<string>___FILEBASENAME___.cpp</string>
<key>SortOrder</key>
<string>2</string>
<key>Options</key>
<array>
<dict>
<key>Identifier</key>
<string>groupName</string>
<key>Name</key>
<string>GroupName</string>
<key>Description</key>
<string>Name of the folder (and group in XCode) in which the problem is handled. Folder should be
in src/Problems.</string>
<key>Type</key>
<string>text</string>
</dict>
<dict>
<key>Identifier</key>
<string>problemName</string>
<key>Name</key>
<string>ProblemName</string>
<key>Description</key>
<string>The name of the problem considered (without spaces).</string>
<key>Type</key>
<string>text</string>
</dict>
</array>
<key>Options</key>
<array>
<dict>
<key>Identifier</key>
<string>groupName</string>
<key>Name</key>
<string>GroupName</string>
<key>Description</key>
<string>Name of the folder (and group in XCode) in which the problem is handled. Folder should be
in src/ModelInstances.</string>
<key>Type</key>
<string>text</string>
</dict>
<dict>
<key>Identifier</key>
<string>problemName</string>
<key>Name</key>
<string>ProblemName</string>
<key>Description</key>
<string>The name of the problem considered (without spaces).</string>
<key>Type</key>
<string>text</string>
</dict>
</array>
<key>Summary</key>
<string>Model minimal interface..</string>
</dict>
......
......@@ -6,7 +6,7 @@
//___COPYRIGHT___
//
#include "Problems/___VARIABLE_groupName:identifier___/___FILEBASENAME___.hpp"
#include "ModelInstances/___VARIABLE_groupName:identifier___/___FILEBASENAME___.hpp"
namespace HappyHeart
......
......@@ -14,7 +14,7 @@
# include "Model/Model.hpp"
# include "Problems/___VARIABLE_groupName:identifier___/InputParameterList.hpp"
# include "ModelInstances/___VARIABLE_groupName:identifier___/InputParameterList.hpp"
namespace HappyHeart
......@@ -130,7 +130,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "Problems/___VARIABLE_groupName:identifier___/___FILEBASENAME___.hxx"
# include "ModelInstances/___VARIABLE_groupName:identifier___/___FILEBASENAME___.hxx"
#endif /* defined(_____PROJECTNAMEASIDENTIFIER________FILEBASENAMEASIDENTIFIER_____HPP) */
......@@ -16,30 +16,30 @@
<string>___FILEBASENAME___.cpp</string>
<key>SortOrder</key>
<string>2</string>
<key>Options</key>
<array>
<dict>
<key>Identifier</key>
<string>groupName</string>
<key>Name</key>
<string>GroupName</string>
<key>Description</key>
<string>Name of the folder (and group in XCode) in which the problem is handled. Folder should be
in src/Problems.</string>
<key>Type</key>
<string>text</string>
</dict>
<dict>
<key>Identifier</key>
<string>problemName</string>
<key>Name</key>
<string>ProblemName</string>
<key>Description</key>
<string>The name of the problem considered (without spaces).</string>
<key>Type</key>
<string>text</string>
</dict>
</array>
<key>Options</key>
<array>
<dict>
<key>Identifier</key>
<string>groupName</string>
<key>Name</key>
<string>GroupName</string>
<key>Description</key>
<string>Name of the folder (and group in XCode) in which the problem is handled. Folder should be
in src/ModelInstances.</string>
<key>Type</key>
<string>text</string>
</dict>
<dict>
<key>Identifier</key>
<string>problemName</string>
<key>Name</key>
<string>ProblemName</string>
<key>Description</key>
<string>The name of the problem considered (without spaces).</string>
<key>Type</key>
<string>text</string>
</dict>
</array>
<key>Summary</key>
<string>VariationalFormulation minimal interface.</string>
</dict>
......
......@@ -6,7 +6,7 @@
//___COPYRIGHT___
//
#include "Problems/___VARIABLE_groupName:identifier___/___FILEBASENAME___.hpp"
#include "ModelInstances/___VARIABLE_groupName:identifier___/___FILEBASENAME___.hpp"
namespace HappyHeart
......
......@@ -18,7 +18,7 @@
# include "Solver/VariationalFormulation.hpp"
# include "Problems/___VARIABLE_groupName:identifier___/InputParameterList.hpp"
# include "ModelInstances/___VARIABLE_groupName:identifier___/InputParameterList.hpp"
namespace HappyHeart
......@@ -144,7 +144,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "Problems/___VARIABLE_groupName:identifier___/___FILEBASENAME___.hxx"
# include "ModelInstances/___VARIABLE_groupName:identifier___/___FILEBASENAME___.hxx"
#endif /* defined(_____PROJECTNAMEASIDENTIFIER________FILEBASENAMEASIDENTIFIER_____HPP) */
......@@ -9,7 +9,7 @@
#include "Core/InputParameterList.hpp"
#include "Problems/Demo/InputParameterList.hpp"
#include "ModelInstances/Demo/InputParameterList.hpp"
int main()
......
......@@ -6,7 +6,7 @@
// Copyright (c) 2014 Inria. All rights reserved.
//
#include "Problems/Elasticity/ElasticityModel.hpp"
#include "ModelInstances/Elasticity/ElasticityModel.hpp"
namespace HappyHeart
......
......@@ -14,8 +14,8 @@
# include "Model/Model.hpp"
# include "Problems/Elasticity/VariationalFormulationElasticity.hpp"
# include "Problems/Elasticity/InputParameterList.hpp"
# include "ModelInstances/Elasticity/VariationalFormulationElasticity.hpp"
# include "ModelInstances/Elasticity/InputParameterList.hpp"
namespace HappyHeart
......@@ -141,7 +141,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "Problems/Elasticity/ElasticityModel.hxx"
# include "ModelInstances/Elasticity/ElasticityModel.hxx"
#endif // _HAPPY_HEART__PROBLEMS__ELASTICITY__ELASTICITY_MODEL_HPP_
......@@ -6,7 +6,7 @@
// Copyright (c) 2014 Inria. All rights reserved.
//
#include "Problems/Elasticity/VariationalFormulationElasticity.hpp"
#include "ModelInstances/Elasticity/VariationalFormulationElasticity.hpp"
namespace HappyHeart
......
......@@ -20,7 +20,7 @@
# include "FiniteElement/Operators/GlobalVariationalOperators/Vector/Force.hpp"
# include "FiniteElement/Operators/GlobalVariationalOperators/Matrix/GradOnGradientBasedElasticityTensor.hpp"
# include "Problems/Elasticity/InputParameterList.hpp"
# include "ModelInstances/Elasticity/InputParameterList.hpp"
# include "Solver/VariationalFormulation.hpp"
......@@ -279,7 +279,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "Problems/Elasticity/VariationalFormulationElasticity.hxx"
# include "ModelInstances/Elasticity/VariationalFormulationElasticity.hxx"
#endif // _HAPPY_HEART__PROBLEMS__ELASTICITY__VARIATIONAL_FORMULATION_ELASTICITY_HPP_
......@@ -5,8 +5,8 @@
#include "Core/InitTimeKeepLog.hpp"
#include "Problems/Elasticity/InputParameterList.hpp"
#include "Problems/Elasticity/ElasticityModel.hpp"
#include "ModelInstances/Elasticity/InputParameterList.hpp"
#include "ModelInstances/Elasticity/ElasticityModel.hpp"
using namespace HappyHeart;
......
......@@ -10,7 +10,7 @@
# include "FiniteElement/Operators/LocalVariationalOperators/MatrixAndVector/Hyperelasticity/HyperelasticLaws/CiarletGeymonat.hpp"
# include "FiniteElement/Operators/LocalVariationalOperators/MatrixAndVector/Hyperelasticity/HyperelasticLaws/StVenantKirchhoff.hpp"
# include "Problems/Hyperelasticity/VariationalFormulationHyperElasticity.hpp"
# include "ModelInstances/Hyperelasticity/VariationalFormulationHyperElasticity.hpp"
......@@ -133,7 +133,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "Problems/Hyperelasticity/HyperElasticityModel.hxx"
# include "ModelInstances/Hyperelasticity/HyperElasticityModel.hxx"
#endif // _HAPPY_HEART__PROBLEMS__HYPERELASTICITY__HYPER_ELASTICITY_MODEL_HPP_
......@@ -15,7 +15,7 @@
# include "FiniteElement/Operators/GlobalVariationalOperators/Vector/Force.hpp"
# include "FiniteElement/Operators/GlobalVariationalOperators/MatrixAndVector/GradOnGradientBasedHyperelasticityTensor.hpp"
# include "Problems/Hyperelasticity/InputParameterList.hpp"
# include "ModelInstances/Hyperelasticity/InputParameterList.hpp"
#endif // _HAPPY_HEART__PROBLEMS__HYPERELASTICITY__HYPERELASTICITY_HPP_
......@@ -92,7 +92,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "Problems/Hyperelasticity/Impl/SnesFunctions.hxx"
# include "ModelInstances/Hyperelasticity/Impl/SnesFunctions.hxx"
#endif // _HAPPY_HEART__PROBLEMS__HYPERELASTICITY__IMPL__SNES_FUNCTIONS_HPP_
......@@ -149,7 +149,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "Problems/Hyperelasticity/Private//VectorsAndMatricesCrtp.hxx"
# include "ModelInstances/Hyperelasticity/Private//VectorsAndMatricesCrtp.hxx"
#endif // _HAPPY_HEART__PROBLEMS__HYPERELASTICITY__PRIVATE__VECTORS_AND_MATRICES_CRTP_HPP_
......@@ -6,7 +6,7 @@
// Copyright (c) 2014 Inria. All rights reserved.
//
#include "Problems/Hyperelasticity/TimeSchemes/HalfSum/HalfSum.hpp"
#include "ModelInstances/Hyperelasticity/TimeSchemes/HalfSum/HalfSum.hpp"
namespace HappyHeart
......
......@@ -11,10 +11,10 @@
# include "FiniteElement/FiniteElementSpace/FiniteEltSpace.hpp"
# include "Problems/Hyperelasticity/TimeSchemes/TimeScheme.hpp"
# include "Problems/Hyperelasticity/Hyperelasticity.hpp"
# include "Problems/Hyperelasticity/Private/VectorsAndMatricesCrtp.hpp"
# include "Problems/Hyperelasticity/TimeSchemes/HalfSum/VectorsAndMatrices.hpp"
# include "ModelInstances/Hyperelasticity/TimeSchemes/TimeScheme.hpp"
# include "ModelInstances/Hyperelasticity/Hyperelasticity.hpp"
# include "ModelInstances/Hyperelasticity/Private/VectorsAndMatricesCrtp.hpp"
# include "ModelInstances/Hyperelasticity/TimeSchemes/HalfSum/VectorsAndMatrices.hpp"
namespace HappyHeart
......@@ -130,7 +130,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "Problems/Hyperelasticity/TimeSchemes/HalfSum/HalfSum.hxx"
# include "ModelInstances/Hyperelasticity/TimeSchemes/HalfSum/HalfSum.hxx"
#endif // _HAPPY_HEART__PROBLEMS__HYPERELASTICITY__TIME_SCHEMES__HALF_SUM__HALF_SUM_HPP_
......@@ -6,7 +6,7 @@
// Copyright (c) 2014 Inria. All rights reserved.
//
#include "Problems/Hyperelasticity/TimeSchemes/HalfSum/VectorsAndMatrices.hpp"
#include "ModelInstances/Hyperelasticity/TimeSchemes/HalfSum/VectorsAndMatrices.hpp"
namespace HappyHeart
......
......@@ -9,8 +9,8 @@
#ifndef _HAPPY_HEART__PROBLEMS__HYPERELASTICITY__TIME_SCHEMES__HALF_SUM__VECTORS_AND_MATRICES_HPP_
# define _HAPPY_HEART__PROBLEMS__HYPERELASTICITY__TIME_SCHEMES__HALF_SUM__VECTORS_AND_MATRICES_HPP_
# include "Problems/Hyperelasticity/Private/VectorsAndMatricesCrtp.hpp"
# include "Problems/Hyperelasticity/TimeSchemes/TimeScheme.hpp"
# include "ModelInstances/Hyperelasticity/Private/VectorsAndMatricesCrtp.hpp"
# include "ModelInstances/Hyperelasticity/TimeSchemes/TimeScheme.hpp"
namespace HappyHeart
......@@ -94,7 +94,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "Problems/Hyperelasticity/TimeSchemes/HalfSum/VectorsAndMatrices.hxx"
# include "ModelInstances/Hyperelasticity/TimeSchemes/HalfSum/VectorsAndMatrices.hxx"
#endif // _HAPPY_HEART__PROBLEMS__HYPERELASTICITY__TIME_SCHEMES__HALF_SUM__VECTORS_AND_MATRICES_HPP_
......@@ -6,7 +6,7 @@
// Copyright (c) 2014 Inria. All rights reserved.
//
#include "Problems/Hyperelasticity/TimeSchemes/Midpoint/Midpoint.hpp"
#include "ModelInstances/Hyperelasticity/TimeSchemes/Midpoint/Midpoint.hpp"
namespace HappyHeart
......
......@@ -11,10 +11,10 @@
# include "FiniteElement/FiniteElementSpace/FiniteEltSpace.hpp"
# include "Problems/Hyperelasticity/TimeSchemes/TimeScheme.hpp"
# include "Problems/Hyperelasticity/Hyperelasticity.hpp"
# include "Problems/Hyperelasticity/Private/VectorsAndMatricesCrtp.hpp"
# include "Problems/Hyperelasticity/TimeSchemes/Midpoint/VectorsAndMatrices.hpp"
# include "ModelInstances/Hyperelasticity/TimeSchemes/TimeScheme.hpp"
# include "ModelInstances/Hyperelasticity/Hyperelasticity.hpp"
# include "ModelInstances/Hyperelasticity/Private/VectorsAndMatricesCrtp.hpp"
# include "ModelInstances/Hyperelasticity/TimeSchemes/Midpoint/VectorsAndMatrices.hpp"
namespace HappyHeart
......@@ -133,7 +133,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "Problems/Hyperelasticity/TimeSchemes/Midpoint/Midpoint.hxx"
# include "ModelInstances/Hyperelasticity/TimeSchemes/Midpoint/Midpoint.hxx"
#endif // _HAPPY_HEART__PROBLEMS__HYPERELASTICITY__TIME_SCHEMES__MIDPOINT__MIDPOINT_HPP_
......@@ -6,7 +6,7 @@
// Copyright (c) 2014 Inria. All rights reserved.
//
#include "Problems/Hyperelasticity/TimeSchemes/Midpoint/VectorsAndMatrices.hpp"
#include "ModelInstances/Hyperelasticity/TimeSchemes/Midpoint/VectorsAndMatrices.hpp"
namespace HappyHeart
......
......@@ -9,8 +9,8 @@
#ifndef _HAPPY_HEART__PROBLEMS__HYPERELASTICITY__TIME_SCHEMES__MIDPOINT__VECTORS_AND_MATRICES_HPP_
# define _HAPPY_HEART__PROBLEMS__HYPERELASTICITY__TIME_SCHEMES__MIDPOINT__VECTORS_AND_MATRICES_HPP_
# include "Problems/Hyperelasticity/Private/VectorsAndMatricesCrtp.hpp"
# include "Problems/Hyperelasticity/TimeSchemes/TimeScheme.hpp"
# include "ModelInstances/Hyperelasticity/Private/VectorsAndMatricesCrtp.hpp"
# include "ModelInstances/Hyperelasticity/TimeSchemes/TimeScheme.hpp"
namespace HappyHeart
......@@ -86,7 +86,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "Problems/Hyperelasticity/TimeSchemes/Midpoint/VectorsAndMatrices.hxx"
# include "ModelInstances/Hyperelasticity/TimeSchemes/Midpoint/VectorsAndMatrices.hxx"
#endif // _HAPPY_HEART__PROBLEMS__HYPERELASTICITY__TIME_SCHEMES__MIDPOINT__VECTORS_AND_MATRICES_HPP_
......@@ -13,12 +13,12 @@
# include "FiniteElement/Operators/GlobalVariationalOperators/Vector/Force.hpp"
# include "FiniteElement/Operators/GlobalVariationalOperators/MatrixAndVector/GradOnGradientBasedHyperelasticityTensor.hpp"
# include "Problems/Hyperelasticity/Hyperelasticity.hpp"
# include "Problems/Hyperelasticity/Impl/SnesFunctions.hpp"
# include "Problems/Hyperelasticity/InputParameterList.hpp"
# include "ModelInstances/Hyperelasticity/Hyperelasticity.hpp"
# include "ModelInstances/Hyperelasticity/Impl/SnesFunctions.hpp"
# include "ModelInstances/Hyperelasticity/InputParameterList.hpp"
# include "Problems/Hyperelasticity/TimeSchemes/HalfSum/HalfSum.hpp"
# include "Problems/Hyperelasticity/TimeSchemes/Midpoint/Midpoint.hpp"
# include "ModelInstances/Hyperelasticity/TimeSchemes/HalfSum/HalfSum.hpp"
# include "ModelInstances/Hyperelasticity/TimeSchemes/Midpoint/Midpoint.hpp"
namespace HappyHeart
......@@ -248,7 +248,7 @@ namespace HappyHeart
}
# include "Problems/Hyperelasticity/VariationalFormulationHyperElasticity.hxx"
# include "ModelInstances/Hyperelasticity/VariationalFormulationHyperElasticity.hxx"
#endif // _HAPPY_HEART__PROBLEMS__HYPERELASTICITY__VARIATIONAL_FORMULATION_HYPER_ELASTICITY_HPP_
......@@ -7,8 +7,8 @@
#include "Core/InitTimeKeepLog.hpp"
#include "Problems/Hyperelasticity/HyperElasticityModel.hpp"
#include "Problems/Hyperelasticity/InputParameterList.hpp"
#include "ModelInstances/Hyperelasticity/HyperElasticityModel.hpp"
#include "ModelInstances/Hyperelasticity/InputParameterList.hpp"
using namespace HappyHeart;
......
......@@ -5,7 +5,7 @@
// Copyright (c) 2014 Inria. All rights reserved.
//
#include "Problems/PseudoStokes/PseudoStokesModel.hpp"
#include "ModelInstances/PseudoStokes/PseudoStokesModel.hpp"
namespace HappyHeart
......
......@@ -14,8 +14,8 @@
# include "Model/Model.hpp"
# include "Problems/PseudoStokes/VariationalFormulationPseudoStokes.hpp"
# include "Problems/PseudoStokes/InputParameterList.hpp"
# include "ModelInstances/PseudoStokes/VariationalFormulationPseudoStokes.hpp"
# include "ModelInstances/PseudoStokes/InputParameterList.hpp"
namespace HappyHeart
......@@ -140,7 +140,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "Problems/PseudoStokes/PseudoStokesModel.hxx"
# include "ModelInstances/PseudoStokes/PseudoStokesModel.hxx"
#endif // _HAPPY_HEART__PROBLEMS__PSEUDO_STOKES__PSEUDO_STOKES_MODEL_HPP_
......@@ -7,7 +7,7 @@
//
#include <numeric>
#include "Problems/PseudoStokes/VariationalFormulationPseudoStokes.hpp"
#include "ModelInstances/PseudoStokes/VariationalFormulationPseudoStokes.hpp"
namespace HappyHeart
......
......@@ -19,7 +19,7 @@
# include "FiniteElement/Operators/GlobalVariationalOperators/Matrix/GradPhiGradPhi.hpp"
# include "FiniteElement/Operators/GlobalVariationalOperators/Matrix/PseudoStokesPsiDiv.hpp"
# include "Problems/PseudoStokes/InputParameterList.hpp"
# include "ModelInstances/PseudoStokes/InputParameterList.hpp"
# include "Solver/VariationalFormulation.hpp"
......@@ -195,7 +195,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "Problems/PseudoStokes/VariationalFormulationPseudoStokes.hxx"
# include "ModelInstances/PseudoStokes/VariationalFormulationPseudoStokes.hxx"
#endif // _HAPPY_HEART__PROBLEMS__PSEUDO_STOKES__VARIATIONAL_FORMULATION_PSEUDO_STOKES_HPP_
......@@ -5,8 +5,8 @@
#include "Core/InitTimeKeepLog.hpp"
#include "Problems/PseudoStokes/InputParameterList.hpp"
#include "Problems/PseudoStokes/PseudoStokesModel.hpp"
#include "ModelInstances/PseudoStokes/InputParameterList.hpp"
#include "ModelInstances/PseudoStokes/PseudoStokesModel.hpp"
using namespace HappyHeart;
......
......@@ -288,8 +288,8 @@ for path in env['LIBPATH']:
env.Alias('install', target_variant_directory)
# List of libraries to build; a folder with the same name is expected to exist.
# 'Problems' and 'ThirdParty' are left out on purpose:
# - Problems is dedicated to build executables, and is managed later. It will probably move somewhere else in the near future.
# 'ModelInstances' and 'ThirdParty' are left out on purpose:
# - ModelInstances is dedicated to build executables, and is managed later. It will probably move somewhere else in the near future.
# - ThirdParty is in fact compiled within Utilities: both are entangled and it would be tricky to separate them.
# Beware: ordering is important: a library below depends on all the ones on its left.
libraries = ('Utilities', 'Core', 'Geometry', 'FiniteElement') # No source file in 'Solver' library...
......@@ -323,9 +323,9 @@ for library in libraries:
# Now create the executables for all the problems.
list_exec = SConscript('Problems/SConscript',
list_exec = SConscript('ModelInstances/SConscript',
exports=(['env', 'all_libs']),
variant_dir=os.path.join(intermediate_variant_directory, 'Problems'),
variant_dir=os.path.join(intermediate_variant_directory, 'ModelInstances'),
duplicate=0)
list_test_exec = SConscript('Test/SConscript',
......
......@@ -6,7 +6,7 @@ Import(['env', 'all_libs'])
list_exec = []
# For the time being only main_test in Tests folder is considered... Later on should be as Problems.
# For the time being only main_test in Tests folder is considered... Later on should be as ModelInstances.
#for problem in problems:
# list_exec.append(SConscript(os.path.join(problem, 'SConscript'), ['env', 'all_libs'], duplicate=0))
......
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