Fix particles (#1422)

* fix how we locate particles with terrain * fix particle issue that caused crash with CUDA + DEBUG
erf-model · Feb 2, 2024 · 8559185 · 8559185
1 parent 8d42c92
commit 8559185
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/Source/ERF.H b/Source/ERF.H
@@ -682,7 +682,7 @@ private:
 
 #ifdef ERF_USE_PARTICLES
     // Particle container with all particle species
-    static ParticleData particleData;
+    ParticleData particleData;
 
     // variables and functions for tracers particles
     bool  m_use_tracer_particles; /*!< tracer particles that advect with flow */

diff --git a/Source/ERF.cpp b/Source/ERF.cpp
@@ -28,10 +28,6 @@ Vector<AMRErrorTag> ERF::ref_tags;
 
 SolverChoice ERF::solverChoice;
 
-#ifdef ERF_USE_PARTICLES
-ParticleData ERF::particleData;
-#endif
-
 // Time step control
 amrex::Real ERF::cfl           =  0.8;
 amrex::Real ERF::fixed_dt      = -1.0;

diff --git a/Source/Particles/ParticleData.H b/Source/Particles/ParticleData.H
@@ -50,12 +50,12 @@ class ParticleData
         }
 
         /*! Write checkpoint files */
-        void Checkpoint ( const std::string& a_fname )
+        void Checkpoint ( const std::string& a_fname ) const
         {
             BL_PROFILE("ParticleData::Checkpoint()");
             for (ParticlesNamesVector::size_type i = 0; i < m_namelist.size(); i++) {
                 auto name( m_namelist[i] );
-                auto particles( m_particle_species[name] );
+                auto particles( m_particle_species.at(name) );
                 particles->Checkpoint( a_fname, name, true, particles->varNames() );
             }
         }