Changeset 5d57155 for GenericIOBenchmarkRead.cxx

Timestamp:

09/25/17 16:15:39 (7 years ago)

Author:

Hal Finkel <hfinkel@…>

Branches:

master, pympi

Children:

b02d091

Parents:

fb69232

git-author:

Hal Finkel <hfinkel@…> (09/25/17 16:15:39)

git-committer:

Hal Finkel <hfinkel@…> (09/25/17 16:15:39)

Message:

Add support for float4 (and other homogeneous aggregates)

File:

• GenericIOBenchmarkRead.cxx (modified) (3 diffs)

GenericIOBenchmarkRead.cxx

@@ -54 +54 @@
 #define MASK_T uint16_t
 
+struct pos_t {
+  POSVEL_T x, y, z, w;
+};
+
 using namespace std;
 using namespace gio;
@@ -64 +68 @@
   MPI_Comm_size(MPI_COMM_WORLD, &commRanks);
 
+  bool UseAOS = false;
+  int a = 1;
+  if (argc > 1 && string(argv[a]) == "-a") {
+    UseAOS = true;
+    --argc;
+    ++a;
+  }
+
   if(argc != 2) {
-    fprintf(stderr,"USAGE: %s <mpiioName>\n", argv[0]);
+    fprintf(stderr,"USAGE: %s [-a] <mpiioName>\n", argv[0]);
     exit(-1);
   }
 
-  char *mpiioName = argv[1];
+  char *mpiioName = argv[a];
 
   vector<POSVEL_T> xx, yy, zz, vx, vy, vz, phi;
   vector<ID_T> id;
   vector<MASK_T> mask;
+
+  vector<pos_t> pos, vel;
 
   assert(sizeof(ID_T) == 8);
@@ -93 +107 @@
   Np = GIO.readNumElems();
 
-  xx.resize(Np + GIO.requestedExtraSpace()/sizeof(POSVEL_T));
-  yy.resize(Np + GIO.requestedExtraSpace()/sizeof(POSVEL_T));
-  zz.resize(Np + GIO.requestedExtraSpace()/sizeof(POSVEL_T));
-  vx.resize(Np + GIO.requestedExtraSpace()/sizeof(POSVEL_T));
-  vy.resize(Np + GIO.requestedExtraSpace()/sizeof(POSVEL_T));
-  vz.resize(Np + GIO.requestedExtraSpace()/sizeof(POSVEL_T));
-  phi.resize(Np + GIO.requestedExtraSpace()/sizeof(POSVEL_T));
+  if (UseAOS) {
+    pos.resize(Np + (GIO.requestedExtraSpace() + sizeof(pos_t) - 1)/sizeof(pos_t));
+    vel.resize(Np + (GIO.requestedExtraSpace() + sizeof(pos_t) - 1)/sizeof(pos_t));
+  } else {
+    xx.resize(Np + GIO.requestedExtraSpace()/sizeof(POSVEL_T));
+    yy.resize(Np + GIO.requestedExtraSpace()/sizeof(POSVEL_T));
+    zz.resize(Np + GIO.requestedExtraSpace()/sizeof(POSVEL_T));
+    vx.resize(Np + GIO.requestedExtraSpace()/sizeof(POSVEL_T));
+    vy.resize(Np + GIO.requestedExtraSpace()/sizeof(POSVEL_T));
+    vz.resize(Np + GIO.requestedExtraSpace()/sizeof(POSVEL_T));
+    phi.resize(Np + GIO.requestedExtraSpace()/sizeof(POSVEL_T));
+  }
   id.resize(Np + GIO.requestedExtraSpace()/sizeof(ID_T));
   mask.resize(Np + GIO.requestedExtraSpace()/sizeof(MASK_T));
 
-  GIO.addVariable("x", xx, true);
-  GIO.addVariable("y", yy, true);
-  GIO.addVariable("z", zz, true);
-  GIO.addVariable("vx", vx, true);
-  GIO.addVariable("vy", vy, true);
-  GIO.addVariable("vz", vz, true);
-  GIO.addVariable("phi", phi, true);
-  GIO.addVariable("id", id, true);
-  GIO.addVariable("mask", mask, true);
+  if (UseAOS) {
+    GIO.addVariable("pos", pos, GenericIO::VarHasExtraSpace);
+    GIO.addVariable("vel", vel, GenericIO::VarHasExtraSpace);
+  } else {
+    GIO.addVariable("x", xx, GenericIO::VarHasExtraSpace);
+    GIO.addVariable("y", yy, GenericIO::VarHasExtraSpace);
+    GIO.addVariable("z", zz, GenericIO::VarHasExtraSpace);
+    GIO.addVariable("vx", vx, GenericIO::VarHasExtraSpace);
+    GIO.addVariable("vy", vy, GenericIO::VarHasExtraSpace);
+    GIO.addVariable("vz", vz, GenericIO::VarHasExtraSpace);
+    GIO.addVariable("phi", phi, GenericIO::VarHasExtraSpace);
+  }
+  GIO.addVariable("id", id, GenericIO::VarHasExtraSpace);
+  GIO.addVariable("mask", mask, GenericIO::VarHasExtraSpace);
 
   GIO.readData();
   } // destroy GIO prior to calling MPI_Finalize
 
-  xx.resize(Np);
-  yy.resize(Np);
-  zz.resize(Np);
-  vx.resize(Np);
-  vy.resize(Np);
-  vz.resize(Np);
-  phi.resize(Np);
+  if (UseAOS) {
+    pos.resize(Np);
+    vel.resize(Np);
+  } else {
+    xx.resize(Np);
+    yy.resize(Np);
+    zz.resize(Np);
+    vx.resize(Np);
+    vy.resize(Np);
+    vz.resize(Np);
+    phi.resize(Np);
+  }
   id.resize(Np);
   mask.resize(Np);