Add subdirectory in Source/Matter and add to GNUmake files

GRTLCollaboration · Feb 13, 2025 · f0232c0 · f0232c0
1 parent d47f305
commit f0232c0
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 2 deletions.
diff --git a/Examples/ScalarFieldBH/GNUmakefile b/Examples/ScalarFieldBH/GNUmakefile
@@ -14,6 +14,9 @@ makefiles += releasedExamples_AMRPoisson_execVariableCoefficient
 # cxxcppflags = -DUSE_CTTK
 cxxcppflags = -DUSE_CTTKHybrid
 
+# Choose directory of matter type
+MatterType = ScalarField
+
 # the base name(s) of the application(s) in this directory
 ebase = Main_ScalarFieldBH
 
@@ -27,11 +30,12 @@ INPUT = params.txt
 src_dirs := ../../Source \
             ../../Source/Core \
             ../../Source/Matter \
+            ../../Source/Matter/${MatterType} \
             ../../Source/Methods \
             ../../Source/Tools \
             ../../Source/Variables \
             ../../Source/TaggingCriteria \
-	          ../../Source/Operator \
+	        ../../Source/Operator \
             ../../Source/Operator/SolverOperator 
 
 # shared code for building example programs

diff --git a/Examples/ScalarFieldCosmo/GNUmakefile b/Examples/ScalarFieldCosmo/GNUmakefile
@@ -14,6 +14,9 @@ makefiles += releasedExamples_AMRPoisson_execVariableCoefficient
 cxxcppflags = -DUSE_CTTK
 # cxxcppflags = -DUSE_CTTKHybrid
 
+# Choose directory of matter type
+MatterType = ScalarField
+
 # the base name(s) of the application(s) in this directory
 ebase = Main_ScalarFieldCosmo
 
@@ -27,11 +30,12 @@ INPUT = params.txt
 src_dirs := ../../Source \
             ../../Source/Core \
             ../../Source/Matter \
+            ../../Source/Matter/${MatterType} \
             ../../Source/Methods \
             ../../Source/Tools \
             ../../Source/Variables \
             ../../Source/TaggingCriteria \
-	          ../../Source/Operator \
+	        ../../Source/Operator \
             ../../Source/Operator/SolverOperator 
 
 # shared code for building example programs

diff --git a/Source/Matter/ScalarField.cpp → Source/Matter/ScalarField/ScalarField.cpp b/Source/Matter/ScalarField.cpp → Source/Matter/ScalarField/ScalarField.cpp
diff --git a/Source/Matter/ScalarField.hpp → Source/Matter/ScalarField/ScalarField.hpp b/Source/Matter/ScalarField.hpp → Source/Matter/ScalarField/ScalarField.hpp
diff --git a/Source/Matter/ScalarFieldVariables.hpp → ...tter/ScalarField/ScalarFieldVariables.hpp b/Source/Matter/ScalarFieldVariables.hpp → ...tter/ScalarField/ScalarFieldVariables.hpp
diff --git a/Tests/PeriodicScalarFieldTest/GNUmakefile b/Tests/PeriodicScalarFieldTest/GNUmakefile
@@ -8,6 +8,9 @@ endif
 # trace the chain of included makefiles
 makefiles += releasedExamples_AMRPoisson_execVariableCoefficient
 
+# Choose directory of matter type
+MatterType = ScalarField
+
 # the base name(s) of the application(s) in this directory
 ebase = PeriodicScalarTest
 
@@ -21,6 +24,7 @@ INPUT = params.txt
 src_dirs := ../../Source \
             ../../Source/Core \
             ../../Source/Matter \
+            ../../Source/Matter/${MatterType} \
             ../../Source/Methods \
             ../../Source/Tools \
             ../../Source/Variables \