change ifdef directive name

Exawind · Oct 15, 2024 · e54f067 · e54f067
1 parent bcfc2e5
commit e54f067
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -129,8 +129,8 @@ endif()
 
 include(set_compile_flags)
 
-if(ERF_ENABLE_MULTIBLOCK)
-    target_compile_definitions(${amr_wind_lib_name} PUBLIC ERF_USE_MULTIBLOCK)
+if(ERF_AW_MULTIBLOCK)
+    target_compile_definitions(${amr_wind_lib_name} PUBLIC ERF_AW_MULTIBLOCK)
 endif()
 
 if (AMR_WIND_ENABLE_W2A)

diff --git a/amr-wind/CFDSim.H b/amr-wind/CFDSim.H
@@ -9,7 +9,7 @@
 #include "amr-wind/core/MeshMap.H"
 #include "amr-wind/helics.H"
 
-#ifdef ERF_USE_MULTIBLOCK
+#ifdef ERF_AW_MULTIBLOCK
 #include "amr-wind/wind_energy/ABLReadERFFcn.H"
 class MultiBlockContainer;
 #endif
@@ -63,7 +63,7 @@ public:
     SimTime& time() { return m_time; }
     const SimTime& time() const { return m_time; }
 
-#ifdef ERF_USE_MULTIBLOCK
+#ifdef ERF_AW_MULTIBLOCK
     void set_mbc(MultiBlockContainer* mbc) { m_mbc = mbc; }
     MultiBlockContainer** mbc() { return &m_mbc; }
 
@@ -159,7 +159,7 @@ private:
 
     bool m_mesh_mapping{false};
 
-#ifdef ERF_USE_MULTIBLOCK
+#ifdef ERF_AW_MULTIBLOCK
     MultiBlockContainer* m_mbc = nullptr;
     ReadERFFcn m_read_erf {nullptr};
 #endif

diff --git a/amr-wind/incflo.H b/amr-wind/incflo.H
@@ -13,7 +13,7 @@
 #include "amr-wind/core/FieldRepo.H"
 #include "amr-wind/overset/OversetOps.H"
 
-#ifdef ERF_USE_MULTIBLOCK
+#ifdef ERF_AW_MULTIBLOCK
 #include "amr-wind/wind_energy/ABLReadERFFcn.H"
 class MultiBlockContainer;
 #endif
@@ -62,7 +62,7 @@ public:
     // Evolve solution to final time through repeated calls to Advance()
     void Evolve();
 
-#ifdef ERF_USE_MULTIBLOCK
+#ifdef ERF_AW_MULTIBLOCK
     // Evolve solution in a multiblock framework by desired number of steps
     void Evolve_MB(int MBstep, int max_block_step);
 #endif
@@ -159,7 +159,7 @@ public:
 
     void ReadCheckpointFile();
 
-#ifdef ERF_USE_MULTIBLOCK
+#ifdef ERF_AW_MULTIBLOCK
     void SetMultiBlockPointer(MultiBlockContainer *mbc) { m_sim.set_mbc(mbc); }
     void set_read_erf(ReadERFFcn fcn) {m_sim.set_read_erf(fcn);}
 #endif

diff --git a/amr-wind/incflo.cpp b/amr-wind/incflo.cpp
@@ -23,7 +23,7 @@ incflo::incflo()
     // constructor. No valid BoxArray and DistributionMapping have been defined.
     // But the arrays for them have been resized.
 
-#ifdef ERF_USE_MULTIBLOCK
+#ifdef ERF_AW_MULTIBLOCK
     amrex::Print() << std::endl << "AMR-Wind is initializing.. "<< std::endl << std::endl;
 #endif
 

diff --git a/amr-wind/wind_energy/ABLBoundaryPlane.H b/amr-wind/wind_energy/ABLBoundaryPlane.H
@@ -7,7 +7,7 @@
 #include "amr-wind/utilities/ncutils/nc_interface.H"
 #include <AMReX_BndryRegister.H>
 
-#ifdef ERF_USE_MULTIBLOCK
+#ifdef ERF_AW_MULTIBLOCK
 #include "amr-wind/wind_energy/ABLReadERFFcn.H"
 class MultiBlockContainer;
 #endif
@@ -163,7 +163,7 @@ public:
 
     io_mode mode() const { return m_io_mode; }
 
-#ifdef ERF_USE_MULTIBLOCK
+#ifdef ERF_AW_MULTIBLOCK
     MultiBlockContainer* mbc() {return *m_mbc;}
 #endif
 
@@ -172,7 +172,7 @@ private:
     const FieldRepo& m_repo;
     const amrex::AmrCore& m_mesh;
 
-#ifdef ERF_USE_MULTIBLOCK
+#ifdef ERF_AW_MULTIBLOCK
     // pointer to pointer : when ABL boundary plane gets intiialized, amr-wind
     // CFDsim does not yet have the up to date pointer to the mbc or the read_erf function
     // be careful: if this is used before amr-wind gets the mbc pointer set

diff --git a/amr-wind/wind_energy/ABLBoundaryPlane.cpp b/amr-wind/wind_energy/ABLBoundaryPlane.cpp
@@ -254,7 +254,7 @@ bool InletData::is_populated(amrex::Orientation ori) const
 
 ABLBoundaryPlane::ABLBoundaryPlane(CFDSim& sim)
     : m_time(sim.time()), m_repo(sim.repo()), m_mesh(sim.mesh())
-#ifdef ERF_USE_MULTIBLOCK
+#ifdef ERF_AW_MULTIBLOCK
     , m_mbc(sim.mbc()), m_read_erf(sim.get_read_erf())
 #endif
 {