Fix particle_initrandom_mass_total scaling to use whole domain

AMReX-Astro · Sep 10, 2021 · 2a4721b · 2a4721b
1 parent 0aa9b2a
commit 2a4721b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/Source/Particle/NyxParticles.cpp b/Source/Particle/NyxParticles.cpp
@@ -417,13 +417,17 @@ Nyx::init_particles ()
         Real tol = 1e-12;
 #endif
 
+        Real number_of_cells = Geom().ProbLength(0)/Geom().CellSize(0) *
+                               Geom().ProbLength(1)/Geom().CellSize(1) *
+                               Geom().ProbLength(2)/Geom().CellSize(2);
         if(particle_initrandom_mass <= 0) {
-            particle_initrandom_mass = particle_initrandom_mass_total / amrex::Real(grids[level].numPts());
+            particle_initrandom_mass = particle_initrandom_mass_total / number_of_cells;
             if(verbose)
-              amrex::Print()<<"... setting particle_initrandom_mass to "<<particle_initrandom_mass<<std::endl;
+              amrex::Print()<<"... setting particle_initrandom_mass to "<<particle_initrandom_mass<<
+                " by dividing "<<particle_initrandom_mass_total<<" by "<< number_of_cells<<std::endl;
         }
 
-        if(particle_initrandom_mass_total / amrex::Real(grids[level].numPts()) - particle_initrandom_mass > tol
+        if(particle_initrandom_mass_total / number_of_cells - particle_initrandom_mass > tol
                                                                && (particle_init_type == "Random" ||
                                                                    particle_init_type == "RandomPerBox" ||
                                                                    particle_init_type == "RandomPerCell"  ))

diff --git a/Source/TimeStep/Nyx_advance.cpp b/Source/TimeStep/Nyx_advance.cpp
@@ -26,6 +26,8 @@ Nyx::advance (Real time,
 
 {
 
+  const std::string region_name = nStep() > 1 ? "R::Nyx::advance" : "R::Nyx::advance::STEP1";
+  BL_PROFILE_REGION(region_name);
   MultiFab::RegionTag amrlevel_tag("AmrLevel_Level_" + std::to_string(level));
 
 #ifdef NO_HYDRO