Add subdirectory in Source/Matter and fix GNUmake files

GRTLCollaboration · Feb 13, 2025 · 66a8ab6 · 66a8ab6
1 parent 41083b0
commit 66a8ab6
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 38 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/ScalarFieldBH/MyMatterFunctions.hpp → Examples/ScalarFieldBH/MyMatterFunctions.cpp b/Examples/ScalarFieldBH/MyMatterFunctions.hpp → Examples/ScalarFieldBH/MyMatterFunctions.cpp
@@ -3,12 +3,7 @@
  * Please refer to LICENSE in GRTresna's root directory.
  */
 
-#if !defined(SCALARFIELD_HPP_)
-#error "This file should only be included through ScalarField.hpp"
-#endif
-
-#ifndef MYMATTERFUNCTIONS_HPP_
-#define MYMATTERFUNCTIONS_HPP_
+#include "ScalarField.hpp"
 
 Real ScalarField::my_potential_function(const Real &phi_here) const
 {
@@ -28,5 +23,3 @@ Real ScalarField::my_Pi_function(const RealVect &loc) const
     return m_matter_params.pi_0 +
            m_matter_params.dpi * exp(-rr / m_matter_params.dpi_length);
 }
-
-#endif /* MYMATTERFUNCTIONS_HPP_ */
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/...es/ScalarFieldCosmo/MyMatterFunctions.hpp → ...es/ScalarFieldCosmo/MyMatterFunctions.cpp b/...es/ScalarFieldCosmo/MyMatterFunctions.hpp → ...es/ScalarFieldCosmo/MyMatterFunctions.cpp
@@ -3,12 +3,7 @@
  * Please refer to LICENSE in GRTresna's root directory.
  */
 
-#if !defined(SCALARFIELD_HPP_)
-#error "This file should only be included through ScalarField.hpp"
-#endif
-
-#ifndef MYMATTERFUNCTIONS_HPP_
-#define MYMATTERFUNCTIONS_HPP_
+#include "ScalarField.hpp"
 
 Real ScalarField::my_potential_function(const Real &phi_here) const
 {
@@ -34,5 +29,3 @@ Real ScalarField::my_Pi_function(const RealVect &loc) const
                       sin(2 * M_PI * loc[2] / L));
     return m_matter_params.pi_0 + dpi_value;
 }
-
-#endif /* MYMATTERFUNCTIONS_HPP_ */
diff --git a/Source/Matter/ScalarField.impl.hpp → Source/Matter/ScalarField/ScalarField.cpp b/Source/Matter/ScalarField.impl.hpp → Source/Matter/ScalarField/ScalarField.cpp
@@ -3,16 +3,19 @@
  * Please refer to LICENSE in GRTresna's root directory.
  */
 
-#if !defined(SCALARFIELD_HPP_)
-#error "This file should only be included through ScalarField.hpp"
-#endif
-
-#ifndef SCALARFIELD_IMPL_HPP_
-#define SCALARFIELD_IMPL_HPP_
-
+#include "ScalarField.hpp"
 #include "DerivativeOperators.hpp"
+#include "EMTensor.hpp"
+#include "FArrayBox.H"
+#include "GRParmParse.hpp"
 #include "Grids.hpp"
+#include "IntVect.H"
+#include "LevelData.H"
 #include "MultigridVariables.hpp"
+#include "PsiAndAijFunctions.hpp"
+#include "REAL.H"
+#include "RealVect.H"
+#include "Tensor.hpp"
 
 void ScalarField::initialise_matter_vars(LevelData<FArrayBox> &a_multigrid_vars,
                                          const RealVect &a_dx) const
@@ -72,5 +75,3 @@ emtensor_t ScalarField::compute_emtensor(const IntVect a_iv,
 
     return out;
 }
-
-#endif /* SCALARFIELD_IMPL_HPP_ */
diff --git a/Source/Matter/ScalarField.hpp → Source/Matter/ScalarField/ScalarField.hpp b/Source/Matter/ScalarField.hpp → Source/Matter/ScalarField/ScalarField.hpp
@@ -63,7 +63,4 @@ class ScalarField
     RealVect domainLength;
 };
 
-#include "MyMatterFunctions.hpp"
-#include "ScalarField.impl.hpp"
-
 #endif /* 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 \

diff --git a/...odicScalarFieldTest/MyMatterFunctions.hpp → ...odicScalarFieldTest/MyMatterFunctions.cpp b/...odicScalarFieldTest/MyMatterFunctions.hpp → ...odicScalarFieldTest/MyMatterFunctions.cpp
@@ -3,12 +3,7 @@
  * Please refer to LICENSE in GRTresna's root directory.
  */
 
-#if !defined(SCALARFIELD_HPP_)
-#error "This file should only be included through ScalarField.hpp"
-#endif
-
-#ifndef MYMATTERFUNCTIONS_HPP_
-#define MYMATTERFUNCTIONS_HPP_
+#include "ScalarField.hpp"
 
 Real ScalarField::my_potential_function(const Real &phi_here) const
 {
@@ -34,5 +29,3 @@ Real ScalarField::my_Pi_function(const RealVect &loc) const
                       sin(2 * M_PI * loc[2] / L));
     return m_matter_params.pi_0 + dpi_value;
 }
-
-#endif /* MYMATTERFUNCTIONS_HPP_ */