From 96e5c7f11775b55d2811bd4b0323524b1f21b84a Mon Sep 17 00:00:00 2001 From: Christoph Lehmann <christoph.lehmann@ufz.de> Date: Tue, 16 Aug 2016 17:07:54 +0200 Subject: [PATCH] [PL] moved parameter related files to subdirectory --- ProcessLib/CMakeLists.txt | 3 +++ ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h | 2 +- ProcessLib/InitialCondition.h | 2 +- ProcessLib/Parameter/CMakeLists.txt | 0 ProcessLib/{ => Parameter}/ConstantParameter.cpp | 0 ProcessLib/{ => Parameter}/ConstantParameter.h | 0 ProcessLib/{ => Parameter}/MeshElementParameter.cpp | 0 ProcessLib/{ => Parameter}/MeshElementParameter.h | 0 ProcessLib/{ => Parameter}/MeshNodeParameter.cpp | 0 ProcessLib/{ => Parameter}/MeshNodeParameter.h | 0 ProcessLib/{ => Parameter}/Parameter.cpp | 0 ProcessLib/{ => Parameter}/Parameter.h | 0 ProcessLib/{ => Parameter}/SpatialPosition.h | 0 ProcessLib/Process.h | 2 +- ProcessLib/Utils/ProcessUtils.h | 2 +- 15 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 ProcessLib/Parameter/CMakeLists.txt rename ProcessLib/{ => Parameter}/ConstantParameter.cpp (100%) rename ProcessLib/{ => Parameter}/ConstantParameter.h (100%) rename ProcessLib/{ => Parameter}/MeshElementParameter.cpp (100%) rename ProcessLib/{ => Parameter}/MeshElementParameter.h (100%) rename ProcessLib/{ => Parameter}/MeshNodeParameter.cpp (100%) rename ProcessLib/{ => Parameter}/MeshNodeParameter.h (100%) rename ProcessLib/{ => Parameter}/Parameter.cpp (100%) rename ProcessLib/{ => Parameter}/Parameter.h (100%) rename ProcessLib/{ => Parameter}/SpatialPosition.h (100%) diff --git a/ProcessLib/CMakeLists.txt b/ProcessLib/CMakeLists.txt index d3529016c73..d3883b0d778 100644 --- a/ProcessLib/CMakeLists.txt +++ b/ProcessLib/CMakeLists.txt @@ -6,6 +6,9 @@ APPEND_SOURCE_FILES(SOURCES) add_subdirectory(BoundaryCondition) APPEND_SOURCE_FILES(SOURCES BoundaryCondition) +add_subdirectory(Parameter) +APPEND_SOURCE_FILES(SOURCES Parameter) + add_subdirectory(GroundwaterFlow) APPEND_SOURCE_FILES(SOURCES GroundwaterFlow) diff --git a/ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h b/ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h index ad3e99e587a..5adda111bec 100644 --- a/ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h +++ b/ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h @@ -17,7 +17,7 @@ #include "NumLib/Fem/ShapeMatrixPolicy.h" #include "ProcessLib/LocalAssemblerInterface.h" #include "ProcessLib/LocalAssemblerTraits.h" -#include "ProcessLib/Parameter.h" +#include "ProcessLib/Parameter/Parameter.h" #include "ProcessLib/Utils/InitShapeMatrices.h" #include "GroundwaterFlowProcessData.h" diff --git a/ProcessLib/InitialCondition.h b/ProcessLib/InitialCondition.h index 60a89bfcca9..ccdd80833f4 100644 --- a/ProcessLib/InitialCondition.h +++ b/ProcessLib/InitialCondition.h @@ -10,7 +10,7 @@ #ifndef PROCESS_LIB_INITIAL_CONDITION_H_ #define PROCESS_LIB_INITIAL_CONDITION_H_ -#include "Parameter.h" +#include "ProcessLib/Parameter/Parameter.h" namespace ProcessLib { diff --git a/ProcessLib/Parameter/CMakeLists.txt b/ProcessLib/Parameter/CMakeLists.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/ProcessLib/ConstantParameter.cpp b/ProcessLib/Parameter/ConstantParameter.cpp similarity index 100% rename from ProcessLib/ConstantParameter.cpp rename to ProcessLib/Parameter/ConstantParameter.cpp diff --git a/ProcessLib/ConstantParameter.h b/ProcessLib/Parameter/ConstantParameter.h similarity index 100% rename from ProcessLib/ConstantParameter.h rename to ProcessLib/Parameter/ConstantParameter.h diff --git a/ProcessLib/MeshElementParameter.cpp b/ProcessLib/Parameter/MeshElementParameter.cpp similarity index 100% rename from ProcessLib/MeshElementParameter.cpp rename to ProcessLib/Parameter/MeshElementParameter.cpp diff --git a/ProcessLib/MeshElementParameter.h b/ProcessLib/Parameter/MeshElementParameter.h similarity index 100% rename from ProcessLib/MeshElementParameter.h rename to ProcessLib/Parameter/MeshElementParameter.h diff --git a/ProcessLib/MeshNodeParameter.cpp b/ProcessLib/Parameter/MeshNodeParameter.cpp similarity index 100% rename from ProcessLib/MeshNodeParameter.cpp rename to ProcessLib/Parameter/MeshNodeParameter.cpp diff --git a/ProcessLib/MeshNodeParameter.h b/ProcessLib/Parameter/MeshNodeParameter.h similarity index 100% rename from ProcessLib/MeshNodeParameter.h rename to ProcessLib/Parameter/MeshNodeParameter.h diff --git a/ProcessLib/Parameter.cpp b/ProcessLib/Parameter/Parameter.cpp similarity index 100% rename from ProcessLib/Parameter.cpp rename to ProcessLib/Parameter/Parameter.cpp diff --git a/ProcessLib/Parameter.h b/ProcessLib/Parameter/Parameter.h similarity index 100% rename from ProcessLib/Parameter.h rename to ProcessLib/Parameter/Parameter.h diff --git a/ProcessLib/SpatialPosition.h b/ProcessLib/Parameter/SpatialPosition.h similarity index 100% rename from ProcessLib/SpatialPosition.h rename to ProcessLib/Parameter/SpatialPosition.h diff --git a/ProcessLib/Process.h b/ProcessLib/Process.h index b94198a31af..1f04c0707da 100644 --- a/ProcessLib/Process.h +++ b/ProcessLib/Process.h @@ -15,9 +15,9 @@ #include "NumLib/ODESolver/TimeDiscretization.h" #include "NumLib/NamedFunctionCaller.h" #include "ProcessLib/BoundaryCondition/BoundaryConditionCollection.h" +#include "ProcessLib/Parameter/Parameter.h" #include "ExtrapolatorData.h" -#include "Parameter.h" #include "ProcessOutput.h" #include "SecondaryVariable.h" #include "CachedSecondaryVariable.h" diff --git a/ProcessLib/Utils/ProcessUtils.h b/ProcessLib/Utils/ProcessUtils.h index 57062c652fa..b8ac0096e47 100644 --- a/ProcessLib/Utils/ProcessUtils.h +++ b/ProcessLib/Utils/ProcessUtils.h @@ -13,7 +13,7 @@ #include <vector> #include "BaseLib/ConfigTree.h" #include "BaseLib/Error.h" -#include "ProcessLib/Parameter.h" +#include "ProcessLib/Parameter/Parameter.h" namespace ProcessLib { -- GitLab