Updated Bonsai reader variant to v2

Author: Martin D. Weinberg

exputil/ParticleReader.cc

@@ -1896,7 +1896,7 @@ namespace PR {
 
   std::vector<std::string> ParticleReader::readerTypes
     {"PSPout", "PSPspl", "GadgetNative", "GadgetHDF5", "PSPhdf5",
-     "TipsyNative", "TipsyXDR", "Bonsai"};
+     "TipsyNative", "TipsyXDR", "ChaNGa", "Bonsai"};
 
 
   std::vector<std::vector<std::string>>
@@ -2031,7 +2031,8 @@ namespace PR {
       exit(1);
     }
 #endif
-
+    else if (reader.find("ChaNGa") == 0)
+      ret = std::make_shared<Tipsy>(file, Tipsy::TipsyType::changa, verbose);
     else if (reader.find("Bonsai") == 0)
       ret = std::make_shared<Tipsy>(file, Tipsy::TipsyType::bonsai, verbose);
     else {
@@ -2184,8 +2185,7 @@ namespace PR {
 	P.pos[k] = ps->gas_particles[pcount].pos[k];
 	P.vel[k] = ps->gas_particles[pcount].vel[k];
       }
-      if (ttype == TipsyType::bonsai) P.indx = ps->gas_particles[pcount].ID();
-      else P.indx = ps->getIndexOffset(TipsyReader::Ptype::gas) + pcount + 1;
+      P.indx = ps->getIndexOffset(TipsyReader::Ptype::gas) + pcount + 1;
 
       pcount++;
       return;
@@ -2198,8 +2198,12 @@ namespace PR {
 	P.pos[k] = ps->dark_particles[pcount].pos[k];
 	P.vel[k] = ps->dark_particles[pcount].vel[k];
       }
-      if (ttype == TipsyType::bonsai) P.indx = ps->dark_particles[pcount].ID();
-      else P.indx = ps->getIndexOffset(TipsyReader::Ptype::dark) + pcount + 1;
+      if (ttype == TipsyType::bonsai)
+	P.indx = ps->dark_particles[pcount].ID2();
+      else if (ttype == TipsyType::changa)
+	P.indx = ps->dark_particles[pcount].ID();
+      else
+	P.indx = ps->getIndexOffset(TipsyReader::Ptype::dark) + pcount + 1;
 
       pcount++;
       return;
@@ -2212,8 +2216,12 @@ namespace PR {
 	P.pos[k] = ps->star_particles[pcount].pos[k];
 	P.vel[k] = ps->star_particles[pcount].vel[k];
       }
-      if (ttype == TipsyType::bonsai) P.indx = ps->star_particles[pcount].ID();
-      else P.indx = ps->getIndexOffset(TipsyReader::Ptype::star) + pcount + 1;
+      if (ttype == TipsyType::bonsai)
+	P.indx = ps->star_particles[pcount].ID2();
+      else if (ttype == TipsyType::changa)
+	P.indx = ps->star_particles[pcount].ID();
+      else
+	P.indx = ps->getIndexOffset(TipsyReader::Ptype::star) + pcount + 1;
 
       pcount++;
       return;

include/ParticleReader.H

@@ -573,7 +573,7 @@ namespace PR
 
   public:
 
-    enum class TipsyType { native, xdr, bonsai };
+    enum class TipsyType { native, xdr, changa, bonsai };
 
   private:
     //! List of files

include/tipsy.H

@@ -40,12 +40,6 @@ namespace TipsyReader
     Real metals ;
     Real phi    ;
     //@}
-
-    //! Convert phi to index for Bonsai
-    int ID() const {
-      union id {Real v; int i;} u;
-      u.v = phi; return u.i;
-    }
   } ;
 
   struct dark_particle
@@ -59,11 +53,18 @@ namespace TipsyReader
     Real phi    ;
     //@}
 
-    //! Convert phi to index for Bonsai
+    //! Convert phi to 32-bit index for ChaNGa
     int ID() const {
       union id {Real v; int i;} u;
       u.v = phi; return u.i;
     }
+
+    //! Convert phi to 64-bit index for Bonsai
+    unsigned long ID2() const {
+      union id {Real v[2]; uint64_t i;} u;
+      u.v[0] = eps; u.v[1] = phi; return u.i;
+    }
+
   } ;
 
   struct star_particle
@@ -79,11 +80,17 @@ namespace TipsyReader
     Real phi    ;
     //@}
 
-    //! Convert phi to index for Bonsai
+    //! Convert phi to 32-bit index for ChaNGa
     int ID() const {
       union id {Real v; int i;} u;
       u.v = phi; return u.i;
     }
+
+    //! Convert exp, phi to 64bit index for Bonsai
+    unsigned long ID2() const {
+      union id {Real v[2]; uint64_t i;} u;
+      u.v[0] = eps; u.v[1] = phi; return u.i;
+    }
   } ;
 
   struct Header