fix gmake compilation and clean up particle stuff (#1515)

erf-model · Mar 20, 2024 · 8b67153 · 8b67153
1 parent 24e4a9a
commit 8b67153
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/Source/Initialization/Make.package b/Source/Initialization/Make.package
@@ -2,11 +2,14 @@ CEXE_sources += ERF_init_uniform.cpp
 CEXE_sources += ERF_init_from_hse.cpp
 CEXE_sources += ERF_init_custom.cpp
 CEXE_sources += ERF_init_from_input_sounding.cpp
+CEXE_sources += ERF_init_bcs.cpp
+CEXE_sources += ERF_init1d.cpp
+
+ifeq ($(USE_WINDFARM),TRUE)
 CEXE_sources += ERF_init_windfarm.cpp
+endif
 
 CEXE_headers += InputSoundingData.H
-CEXE_sources += ERF_init_bcs.cpp
-CEXE_sources += ERF_init1d.cpp
 
 ifeq ($(USE_NETCDF),TRUE)
 CEXE_headers += Metgrid_utils.H

diff --git a/Source/Particles/ERFPC.H b/Source/Particles/ERFPC.H
@@ -224,7 +224,7 @@ class ERFPC : public amrex::ParticleContainer<  ERFParticlesRealIdxAoS::ncomps,
         bool m_advect_w_flow;               /*!< advect with flow velocity */
         bool m_advect_w_gravity;            /*!< advect under gravitational force */
 
-        amrex::RealBox particle_box;
+        amrex::RealBox m_particle_box;
         bool place_randomly_in_cells;
 
         std::string m_name;                 /*!< name of this particle species */

diff --git a/Source/Particles/ERFPCInitializations.cpp b/Source/Particles/ERFPCInitializations.cpp
@@ -31,8 +31,8 @@ void ERFPC::readInputs ()
         pp.queryAdd("particle_box_hi", particle_box_hi, AMREX_SPACEDIM);
         AMREX_ASSERT(particle_box_hi.size() == AMREX_SPACEDIM);
 
-        particle_box.setLo(particle_box_lo);
-        particle_box.setHi(particle_box_hi);
+        m_particle_box.setLo(particle_box_lo);
+        m_particle_box.setHi(particle_box_hi);
 
         // We default to placing the particles randomly within each cell,
         // but can override this for regression testing
@@ -60,7 +60,7 @@ void ERFPC::InitializeParticles (const std::unique_ptr<MultiFab>& a_height_ptr)
     if (m_initialization_type == ERFParticleInitializations::init_default) {
         initializeParticlesDefault( a_height_ptr );
     } else if (m_initialization_type == ERFParticleInitializations::init_box) {
-        initializeParticlesUniformDistributionInBox( a_height_ptr , particle_box );
+        initializeParticlesUniformDistributionInBox( a_height_ptr , m_particle_box );
     } else if (m_initialization_type == ERFParticleInitializations::init_uniform) {
         initializeParticlesUniformDistribution( a_height_ptr );
     } else {