Merge pull request #83 from seahorce-scidac/update_particles

update particle component names
seahorce-scidac · Dec 14, 2023 · b2ea063 · b2ea063
2 parents 4392090 + 3b5807e
commit b2ea063
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/Source/Particles/ParticleData.H b/Source/Particles/ParticleData.H
@@ -87,6 +87,6 @@ struct ParticleData {
 
     int use_tracer_particles;
     std::unique_ptr<TracerPC> tracer_particles;
-    amrex::Vector<std::string> tracer_particle_varnames = {AMREX_D_DECL("xvel", "yvel", "zvel")};
+    amrex::Vector<std::string> tracer_particle_varnames = {AMREX_D_DECL("old_x", "old_y", "old_z")};
 };
 #endif
diff --git a/Source/Particles/TracerPC.H b/Source/Particles/TracerPC.H
@@ -6,8 +6,9 @@
 struct TracerRealIdx
 {
     enum {
-        vx = 0,
-        vy, vz,
+        old_x = 0,
+        old_y,
+        old_z,
         ncomps
     };
 };

diff --git a/Source/Particles/TracerPC.cpp b/Source/Particles/TracerPC.cpp
@@ -34,9 +34,9 @@ InitParticles ()
                 p.pos(1) = y;
                 p.pos(2) = z;
 
-                p.rdata(TracerRealIdx::vx) = v[0];
-                p.rdata(TracerRealIdx::vy) = v[1];
-                p.rdata(TracerRealIdx::vz) = v[2];
+                p.rdata(TracerRealIdx::old_x) = p.pos(0);
+                p.rdata(TracerRealIdx::old_y) = p.pos(1);
+                p.rdata(TracerRealIdx::old_z) = p.pos(2);
 
                 p.idata(TracerIntIdx::k) = iv[2];  // particles carry their z-index
 
@@ -102,9 +102,9 @@ InitParticles (const MultiFab& a_z_height)
                 p.pos(1) = y;
                 p.pos(2) = z;
 
-                p.rdata(TracerRealIdx::vx) = v[0];
-                p.rdata(TracerRealIdx::vy) = v[1];
-                p.rdata(TracerRealIdx::vz) = v[2];
+                p.rdata(TracerRealIdx::old_x) = p.pos(0);
+                p.rdata(TracerRealIdx::old_y) = p.pos(1);
+                p.rdata(TracerRealIdx::old_z) = p.pos(2);
 
                 p.idata(TracerIntIdx::k) = iv[2];  // particles carry their z-index
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,8 +6,9 @@ @@
     struct TracerRealIdx
     {
         enum {
-            vx = 0,
-            vy, vz,
+            old_x = 0,
+            old_y,
+            old_z,
             ncomps
         };
     };
@@ Expand Down @@