Merge branch 'AMReX-Codes:development' into development

ruohai0925 · May 18, 2024 · c943626 · c943626
2 parents a6e3c40 + 5d02c64
commit c943626
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/Src/Particle/AMReX_ParticleIO.H b/Src/Particle/AMReX_ParticleIO.H
@@ -775,7 +775,7 @@ ParticleContainer_impl<ParticleType, NArrayReal, NArrayInt, Allocator, CellAssig
 
     if (have_pheaders)
     {
-        for (int lev = 0; lev <= finest_level_in_file; lev++)
+        for (int lev = 0; lev <= finestLevel(); lev++)
         {
             old_dms[lev] = ParticleDistributionMap(lev);
             old_bas[lev] = ParticleBoxArray(lev);
@@ -791,12 +791,6 @@ ParticleContainer_impl<ParticleType, NArrayReal, NArrayInt, Allocator, CellAssig
             std::string phdr_string(phdr_chars.dataPtr());
             std::istringstream phdr_file(phdr_string, std::istringstream::in);
 
-            if (lev > finestLevel())
-            {
-                dual_grid = true;
-                break;
-            }
-
             particle_box_arrays[lev].readFrom(phdr_file);
             if (! particle_box_arrays[lev].CellEqual(ParticleBoxArray(lev))) { dual_grid = true; }
         }
@@ -927,7 +921,7 @@ ParticleContainer_impl<ParticleType, NArrayReal, NArrayInt, Allocator, CellAssig
     }
 
     if (dual_grid) {
-        for (int lev = 0; lev <= finest_level_in_file; lev++) {
+        for (int lev = 0; lev <= finestLevel(); lev++) {
             SetParticleBoxArray(lev, old_bas[lev]);
             SetParticleDistributionMap(lev, old_dms[lev]);
         }

diff --git a/Src/Particle/AMReX_ParticleTile.H b/Src/Particle/AMReX_ParticleTile.H
@@ -720,6 +720,16 @@ struct ParticleTile
 
     ParticleTile () = default;
 
+#ifndef _WIN32  // workaround windows compiler bug
+    ~ParticleTile () = default;
+
+    ParticleTile (ParticleTile const&) = delete;
+    ParticleTile (ParticleTile &&) noexcept = default;
+
+    ParticleTile& operator= (ParticleTile const&) = delete;
+    ParticleTile& operator= (ParticleTile &&) noexcept = default;
+#endif
+
     void define (int a_num_runtime_real, int a_num_runtime_int)
     {
         m_defined = true;