Merge pull request #169 from EXP-code/covariance

A preliminary implementation of partition covariance [WIP]

Author: The9Cat

CMakeLists.txt

@@ -49,7 +49,7 @@ endif()
 option(ENABLE_NBODY "Enable EXP n-body" ON)
 option(ENABLE_PYEXP "Enable the Python bindings" ON)
 option(ENABLE_PYEXP_ONLY "Python bindings and support libraries only" OFF)
-option(ENABLE_UTILS "Enable build of the EXP standalone utilities" OFF)
+option(ENABLE_UTILS "Enable build of the EXP standalone utilities" ON)
 option(ENABLE_PNG "Enable PNG graphics support" FALSE)
 option(ENABLE_CUDA "Enable CUDA" FALSE)
 option(ENABLE_SLURM "Enable SLURM checkpointing support" FALSE)

expui/BasisFactory.H

@@ -184,13 +184,13 @@ namespace BasisClasses
     { return coefret; }
 
     //! Accumulate new coefficients from full phase space
-    virtual void accumulate(double mass,
-			    double x, double y, double z,
-			    double u, double v, double w) = 0;
+    virtual void accumulate(double x, double y, double z,
+			    double u, double v, double w,
+			    double mass, unsigned long int indx) = 0;
 
     //! Accumulate new coefficients from coordinates only
     virtual void accumulate(double x, double y, double z,
-			    double mass) = 0;
+			    double mass, unsigned long int indx) = 0;
 
     //! Get mass on grid
     double getMass(void) { return totalMass; }