Offset should be a long

ax3l · ax3l · commit 43883bb4ae32 · 2024-02-01T09:10:33.000-08:00
Overflow risk is very high for pure `int`.
Also, counter is `unsigned`, so `unsigned long` for now.
diff --git a/Source/Diagnostics/Diagnostics.H b/Source/Diagnostics/Diagnostics.H
@@ -313,7 +313,7 @@ protected:
      *  The first vector is for total number of snapshots and second vector loops
      *  over the total number of species selected for diagnostics.
      */
-    amrex::Vector< amrex::Vector <int> > m_totalParticles_flushed_already;
+    amrex::Vector< amrex::Vector <unsigned long> > m_totalParticles_flushed_already;
     /** Vector of total number of particles in the buffer, per species, per snapshot.
      *  The first vector is for total number of snapshots and second vector loops
      *  over the total number of species selected for diagnostics.
diff --git a/Source/Diagnostics/FlushFormats/FlushFormat.H b/Source/Diagnostics/FlushFormats/FlushFormat.H
@@ -16,7 +16,7 @@ public:
         const amrex::Vector<amrex::MultiFab>& mf,
         amrex::Vector<amrex::Geometry>& geom,
         amrex::Vector<int> iteration, double time,
-        amrex::Vector<int>& totalParticlesFlushedAlready,
+        amrex::Vector<unsigned long>& totalParticlesFlushedAlready,
         const amrex::Vector<ParticleDiag>& particle_diags, int nlev,
         std::string prefix, int file_min_digits,
         bool plot_raw_fields,
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatAscent.H b/Source/Diagnostics/FlushFormats/FlushFormatAscent.H
@@ -33,7 +33,7 @@ public:
         const amrex::Vector<amrex::MultiFab>& mf,
         amrex::Vector<amrex::Geometry>& geom,
         amrex::Vector<int> iteration, double time,
-        amrex::Vector<int>& totalParticlesFlushedAlready,
+        amrex::Vector<unsigned long>& totalParticlesFlushedAlready,
         const amrex::Vector<ParticleDiag>& particle_diags, int nlev,
         std::string prefix, int file_min_digits,
         bool plot_raw_fields,
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatAscent.cpp b/Source/Diagnostics/FlushFormats/FlushFormatAscent.cpp
@@ -15,7 +15,7 @@ FlushFormatAscent::WriteToFile (
     const amrex::Vector<amrex::MultiFab>& mf,
     amrex::Vector<amrex::Geometry>& geom,
     const amrex::Vector<int> iteration, const double time,
-    amrex::Vector<int>& /* totalParticlesFlushedAlready*/,
+    amrex::Vector<unsigned long>& /* totalParticlesFlushedAlready*/,
     const amrex::Vector<ParticleDiag>& particle_diags, int nlev,
     const std::string prefix, int file_min_digits, bool plot_raw_fields,
     bool plot_raw_fields_guards,
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.H b/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.H
@@ -20,7 +20,7 @@ class FlushFormatCheckpoint final : public FlushFormatPlotfile
         const amrex::Vector<amrex::MultiFab>& mf,
         amrex::Vector<amrex::Geometry>& geom,
         amrex::Vector<int> iteration, double time,
-        amrex::Vector<int>& totalParticlesFlushedAlready,
+        amrex::Vector<unsigned long>& totalParticlesFlushedAlready,
         const amrex::Vector<ParticleDiag>& particle_diags, int nlev,
         std::string prefix, int file_min_digits,
         bool plot_raw_fields,
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.cpp b/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.cpp
@@ -31,7 +31,7 @@ FlushFormatCheckpoint::WriteToFile (
         const amrex::Vector<amrex::MultiFab>& /*mf*/,
         amrex::Vector<amrex::Geometry>& geom,
         const amrex::Vector<int> iteration, const double /*time*/,
-        amrex::Vector<int>& /* totalParticlesFlushedAlready*/,
+        amrex::Vector<unsigned long>& /* totalParticlesFlushedAlready*/,
         const amrex::Vector<ParticleDiag>& particle_diags, int nlev,
         const std::string prefix, int file_min_digits,
         bool /*plot_raw_fields*/,
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.H b/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.H
@@ -32,7 +32,7 @@ public:
         const amrex::Vector<amrex::MultiFab>& mf,
         amrex::Vector<amrex::Geometry>& geom,
         amrex::Vector<int> iteration, double time,
-        amrex::Vector<int>& totalParticlesFlushedAlready,
+        amrex::Vector<unsigned long>& totalParticlesFlushedAlready,
         const amrex::Vector<ParticleDiag>& particle_diags, int output_levels,
         std::string prefix, int file_min_digits,
         bool plot_raw_fields,
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.cpp b/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.cpp
@@ -120,7 +120,7 @@ FlushFormatOpenPMD::WriteToFile (
     const amrex::Vector<amrex::MultiFab>& mf,
     amrex::Vector<amrex::Geometry>& geom,
     const amrex::Vector<int> iteration, const double time,
-    amrex::Vector<int>& totalParticlesFlushedAlready,
+    amrex::Vector<unsigned long>& totalParticlesFlushedAlready,
     const amrex::Vector<ParticleDiag>& particle_diags, int output_levels,
     const std::string prefix, int file_min_digits, bool plot_raw_fields,
     bool plot_raw_fields_guards,
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.H b/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.H
@@ -27,7 +27,7 @@ public:
         const amrex::Vector<amrex::MultiFab>& mf,
         amrex::Vector<amrex::Geometry>& geom,
         amrex::Vector<int> iteration, double time,
-        amrex::Vector<int>& totalParticlesFlushedAlready,
+        amrex::Vector<unsigned long>& totalParticlesFlushedAlready,
         const amrex::Vector<ParticleDiag>& particle_diags, int nlev,
         std::string prefix, int file_min_digits,
         bool plot_raw_fields,
@@ -55,7 +55,7 @@ public:
     void WriteParticles(const std::string& dir,
                         const amrex::Vector<ParticleDiag>& particle_diags,
                         amrex::Real time,
-                        amrex::Vector<int>& totalParticlesFlushedAlready,
+                        amrex::Vector<unsigned long>& totalParticlesFlushedAlready,
                         bool isBTD = false) const;
 
     FlushFormatPlotfile () = default;
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.cpp b/Source/Diagnostics/FlushFormats/FlushFormatPlotfile.cpp
@@ -59,7 +59,7 @@ FlushFormatPlotfile::WriteToFile (
     const amrex::Vector<amrex::MultiFab>& mf,
     amrex::Vector<amrex::Geometry>& geom,
     const amrex::Vector<int> iteration, const double time,
-    amrex::Vector<int>& totalParticlesFlushedAlready,
+    amrex::Vector<unsigned long>& totalParticlesFlushedAlready,
     const amrex::Vector<ParticleDiag>& particle_diags, int nlev,
     const std::string prefix, int file_min_digits, bool plot_raw_fields,
     bool plot_raw_fields_guards,
@@ -342,7 +342,7 @@ void
 FlushFormatPlotfile::WriteParticles(const std::string& dir,
                                     const amrex::Vector<ParticleDiag>& particle_diags,
                                     const amrex::Real time,
-                                    amrex::Vector<int>& totalParticlesFlushedAlready,
+                                    amrex::Vector<unsigned long>& totalParticlesFlushedAlready,
                                     bool isBTD) const
 {
     int i = 0;
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatSensei.H b/Source/Diagnostics/FlushFormats/FlushFormatSensei.H
@@ -53,7 +53,7 @@ public:
         const amrex::Vector<amrex::MultiFab>& mf,
         amrex::Vector<amrex::Geometry>& geom,
         amrex::Vector<int> iteration, double time,
-        amrex::Vector<int>& totalParticlesFlushedAlready,
+        amrex::Vector<unsigned long>& totalParticlesFlushedAlready,
         const amrex::Vector<ParticleDiag>& particle_diags, int nlev,
         std::string prefix, int file_min_digits,
         bool plot_raw_fields,
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatSensei.cpp b/Source/Diagnostics/FlushFormats/FlushFormatSensei.cpp
@@ -48,7 +48,7 @@ FlushFormatSensei::WriteToFile (
     const amrex::Vector<amrex::MultiFab>& mf,
     amrex::Vector<amrex::Geometry>& geom,
     const amrex::Vector<int> iteration, const double time,
-    amrex::Vector<int>& totalParticlesFlushedAlready,
+    amrex::Vector<unsigned long>& totalParticlesFlushedAlready,
     const amrex::Vector<ParticleDiag>& particle_diags,
     int nlev, const std::string prefix, int file_min_digits,
     bool plot_raw_fields, bool plot_raw_fields_guards,
diff --git a/Source/Diagnostics/WarpXOpenPMD.H b/Source/Diagnostics/WarpXOpenPMD.H
@@ -123,7 +123,7 @@ public:
   void WriteOpenPMDParticles (
               const amrex::Vector<ParticleDiag>& particle_diags,
               amrex::Real time,
-              amrex::Vector<int>& totalParticlesFlushedAlready,
+              amrex::Vector<unsigned long>& totalParticlesFlushedAlready,
               bool use_pinned_pc = false,
               bool isBTD = false,
               bool isLastBTDFlush = false);
@@ -303,7 +303,7 @@ private:
             const amrex::Vector<std::string>&  int_comp_names,
             amrex::ParticleReal charge,
             amrex::ParticleReal mass,
-            int & ParticleFlushOffset,
+            unsigned long & DumpToFile,
             bool isBTD = false,
             bool isLastBTDFlush = false);
 
diff --git a/Source/Diagnostics/WarpXOpenPMD.cpp b/Source/Diagnostics/WarpXOpenPMD.cpp
@@ -520,7 +520,7 @@ WarpXOpenPMDPlot::Init (openPMD::Access access, bool isBTD)
 void
 WarpXOpenPMDPlot::WriteOpenPMDParticles (const amrex::Vector<ParticleDiag>& particle_diags,
                   const amrex::Real time,
-                  amrex::Vector<int>& totalParticlesFlushedAlready,
+                  amrex::Vector<unsigned long>& totalParticlesFlushedAlready,
                   const bool use_pinned_pc,
                   const bool isBTD,
                   const bool isLastBTDFlush
@@ -644,7 +644,7 @@ WarpXOpenPMDPlot::DumpToFile (ParticleContainer* pc,
                     const amrex::Vector<std::string>&  int_comp_names,
                     amrex::ParticleReal const charge,
                     amrex::ParticleReal const mass,
-                    int & ParticleFlushOffset,
+                    unsigned long & ParticleFlushOffset,
                     const bool isBTD,
                     const bool isLastBTDFlush
 )
