[Commits] [svn:einsteintoolkit] incoming/PITTNullCode/SphericalHarmonicReconGen/src/ (Rev. 100)

[reisswig at tapir.caltech.edu]

User: reisswig
Date: 2013/10/24 04:49 PM

Modified:
 /PITTNullCode/SphericalHarmonicReconGen/src/
  sph_database.cc, sph_database.hh, startup.cc

Log:
 PITTNullCode/SphericalHarmonicReconGen: dat-v2 format.

File Changes:

Directory: /PITTNullCode/SphericalHarmonicReconGen/src/
=======================================================

File [modified]: sph_database.cc
Delta lines: +5 -4
===================================================================
--- PITTNullCode/SphericalHarmonicReconGen/src/sph_database.cc	2013-10-24 21:33:14 UTC (rev 99)
+++ PITTNullCode/SphericalHarmonicReconGen/src/sph_database.cc	2013-10-24 21:49:59 UTC (rev 100)
@@ -479,10 +479,11 @@
 		       const int col_radius_,
 		       const int col_lmax_,
 		       const int col_n_variables_,
-		       const int col_data_) 
+		       const int col_data_,
+		       const bool inverse_m_) 
 	       : SPH_database(cached_timesteps, verbose_), _fname(fname_),
 		 _col_time(col_time_), _col_iteration(col_iteration_), _col_radius(col_radius_), _col_lmax(col_lmax_),
-		 _col_n_variables(col_n_variables_), _col_data(col_data_), columns_assigned(0)
+		 _col_n_variables(col_n_variables_), _col_data(col_data_), columns_assigned(0), inverse_m(inverse_m_)
 { 
    _lmax = lmax_;
    _n_spheres = 1;
@@ -658,10 +659,10 @@
 	       }*/
 	       
 	       if (this_line_num_columns == column)  // real part
-		  cache[t][v][sphere][l][m] = (CCTK_REAL) val;
+		  cache[t][v][sphere][l][inverse_m ? 2*l-m : m] = (CCTK_REAL) val;
 	       
 	       if (this_line_num_columns == column+1)  { // imaginary-part
-		  cache[t][v+1][sphere][l][m] = (CCTK_REAL) val;
+		  cache[t][v+1][sphere][l][inverse_m ? 2*l-m : m] = (CCTK_REAL) val;
 		  
 	          column += 2; // next lm-mode
 	          m++;

File [modified]: sph_database.hh
Delta lines: +4 -1
===================================================================
--- PITTNullCode/SphericalHarmonicReconGen/src/sph_database.hh	2013-10-24 21:33:14 UTC (rev 99)
+++ PITTNullCode/SphericalHarmonicReconGen/src/sph_database.hh	2013-10-24 21:49:59 UTC (rev 100)
@@ -213,7 +213,8 @@
 		       const int col_radius_,
 		       const int col_lmax_,
 		       const int col_n_variables_,
-		       const int col_data_);
+		       const int col_data_,
+		       const bool inverse_m_);
             
 	    virtual ~SPH_db_DAT();
             
@@ -259,6 +260,8 @@
             int num_columns;
             int columns_assigned;
             
+            bool inverse_m;
+            
             void scan_dat_file();
             
             

File [modified]: startup.cc
Delta lines: +3 -1
===================================================================
--- PITTNullCode/SphericalHarmonicReconGen/src/startup.cc	2013-10-24 21:33:14 UTC (rev 99)
+++ PITTNullCode/SphericalHarmonicReconGen/src/startup.cc	2013-10-24 21:49:59 UTC (rev 100)
@@ -121,7 +121,9 @@
          if (CCTK_EQUALS(format, "ASCII"))
             SHR::db[i] = new SHR::SPH_db_ASCII(pathname+fnames[i], verbose, cached_timesteps+1, column_time, column_iteration, column_radius);
          if (CCTK_EQUALS(format, "DAT"))
-            SHR::db[i] = new SHR::SPH_db_DAT(pathname+fnames[i], verbose, cached_timesteps+1, lmaxInFile, column_time, column_iteration, column_radius, column_lmax, column_n_variables, column_data);
+            SHR::db[i] = new SHR::SPH_db_DAT(pathname+fnames[i], verbose, cached_timesteps+1, lmaxInFile, column_time, column_iteration, column_radius, column_lmax, column_n_variables, column_data, false);
+         if (CCTK_EQUALS(format, "DAT-v2"))
+            SHR::db[i] = new SHR::SPH_db_DAT(pathname+fnames[i], verbose, cached_timesteps+1, lmaxInFile, column_time, column_iteration, column_radius, column_lmax, column_n_variables, column_data, true);
          if (CCTK_EQUALS(format, "SpEC-H5"))
             SHR::db[i] = new SHR::SPH_db_SpEC_H5(pathname+fnames[i], verbose, cached_timesteps+1);
          if (CCTK_EQUALS(format, "SpEC-H5-v2"))