EXP 7.10

.gitmodules

@@ -8,3 +8,6 @@
 [submodule "extern/HighFive"]
 	path = extern/HighFive
 	url = https://github.com/BlueBrain/HighFive.git
+[submodule "extern/QuickDigest5"]
+	path = extern/QuickDigest5
+	url = https://github.com/nthnn/QuickDigest5.git

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25) # Needed for CUDA, MPI, and CTest features
 
 project(
   EXP
-  VERSION "7.9.3"
+  VERSION "7.10.0"
   HOMEPAGE_URL https://github.com/EXP-code/EXP
   LANGUAGES C CXX Fortran)
 
@@ -259,6 +259,7 @@ execute_process(
 
 include_directories(${PROJECT_SOURCE_DIR}/extern/yaml-cpp/include)
 include_directories(${PROJECT_SOURCE_DIR}/extern/pybind11/include)
+include_directories(${PROJECT_SOURCE_DIR}/extern/QuickDigest5/include)
 
 # Report to the user
 message("Configuring build for ${GIT_BRANCH}/${GIT_COMMIT} at ${COMPILE_TIME}")

doc/exp.cfg

@@ -48,7 +48,7 @@ PROJECT_NAME           = EXP
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 7.9.3
+PROJECT_NUMBER         = 7.10.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

doc/exp.cfg.breathe

@@ -48,7 +48,7 @@ PROJECT_NAME           = EXP
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 7.9.3
+PROJECT_NUMBER         = 7.10.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

expui/BasisFactory.H

@@ -196,15 +196,25 @@ namespace BasisClasses
     operator()(double x1, double x2, double x3,
 	       const Coord ctype=Coord::Spherical);
 
-    //! Evaluate fields at a point
+    //! Evaluate fields at a point in the expansion-origin frame
     virtual std::vector<double> getFields(double x, double y, double z);
+
+    //! Evaluate fields at a point in the coefficient-origin frame
+    virtual std::vector<double> getFieldsOrigin(double x, double y, double z);
 
-    //! Evaluate fields at a point for all coefficients sets
+    //! Evaluate fields at a point for all coefficients sets in the
+    //! expansion-origin frame
     virtual std::tuple<std::map<std::string, Eigen::VectorXd>,
 		       Eigen::VectorXd> getFieldsCoefs
     (double x, double y, double z, std::shared_ptr<CoefClasses::Coefs> coefs);
+
+    //! Evaluate fields at a point for all coefficients sets in the
+    //! coefficient-origin frame
+    virtual std::tuple<std::map<std::string, Eigen::VectorXd>,
+		       Eigen::VectorXd> getFieldsCoefsOrigin
+    (double x, double y, double z, std::shared_ptr<CoefClasses::Coefs> coefs);
 
-    //! Evaluate fields at a point, and provide field lables
+    //! Evaluate fields at a point, and provide field labels
     virtual std::tuple<std::vector<double>, std::vector<std::string>>
     evaluate(double x, double y, double z)
     { return {getFields(x, y, z), getFieldLabels(coordinates)}; }

expui/BasisFactory.cc

@@ -229,15 +229,20 @@ namespace BasisClasses
   }
 
   std::vector<double> Basis::getFields(double x, double y, double z)
+  { return crt_eval(x, y, z); }
+
+  std::vector<double> Basis::getFieldsOrigin(double x, double y, double z)
   {
-    return crt_eval(x, y, z);
+    Eigen::Vector3d p(x, y, z);
+    p = coefrot * (p - coefctr);
+    return crt_eval(p(0), p(1), p(2));
   }
 
   std::tuple<std::map<std::string, Eigen::VectorXd>, Eigen::VectorXd>
   Basis::getFieldsCoefs
   (double x, double y, double z, std::shared_ptr<CoefClasses::Coefs> coefs)
   {
-    // Python dictonary for return
+    // Python dictionary for return
     std::map<std::string, Eigen::VectorXd> ret;
 
     // Times for the coefficients
@@ -249,9 +254,46 @@ namespace BasisClasses
 
     // Make the return dictionary of arrays
     for (int i=0; i<times.size(); i++) {
+      // Load the coefficients for the current time
       set_coefs(coefs->getCoefStruct(times[i]));
+
       // The field evaluation
       auto v = crt_eval(x, y, z); 
+
+      // Pack the fields into the dictionary
+      for (int j=0; j<fields.size(); j++) ret[fields[j]][i] = v[j];
+    }
+
+    // An attempt at an efficient return type for the time array
+    Eigen::VectorXd T =
+      Eigen::Map<Eigen::VectorXd, Eigen::Unaligned>(times.data(), times.size());
+
+    // Return the dictionary and the time array
+    return {ret, T};
+  }
+
+  std::tuple<std::map<std::string, Eigen::VectorXd>, Eigen::VectorXd>
+  Basis::getFieldsCoefsOrigin
+  (double x, double y, double z, std::shared_ptr<CoefClasses::Coefs> coefs)
+  {
+    // Python dictionary for return
+    std::map<std::string, Eigen::VectorXd> ret;
+
+    // Times for the coefficients
+    auto times  = coefs->Times();
+
+    // Initialize the dictionary/map
+    auto fields = getFieldLabels(coordinates);
+    for (auto s : fields) ret[s].resize(times.size());
+
+    // Make the return dictionary of arrays
+    for (int i=0; i<times.size(); i++) {
+      // Load the coefficients for the current time
+      set_coefs(coefs->getCoefStruct(times[i]));
+
+      // The field evaluation
+      auto v = getFieldsOrigin(x, y, z);
+
       // Pack the fields into the dictionary
       for (int j=0; j<fields.size(); j++) ret[fields[j]][i] = v[j];
     }

expui/BiorthBasis.H

@@ -1009,11 +1009,12 @@ namespace BasisClasses
     //! Basis construction parameters
     double aratio, hratio, dweight, rwidth, ashift, rfactor, rtrunc, ppow, Mfac, HERNA;
     bool Ignore, deproject;
-    std::string pyname;
+    std::string pyname, pyproj;
 
     //! DiskType support
-    //
-    enum DiskType { constant, gaussian, mn, exponential, doubleexpon, diskbulge, python };
+    //!
+    enum class DiskType
+      { constant, gaussian, mn, exponential, doubleexpon, diskbulge, python };
     DiskType DTYPE;
     std::string mtype, dtype, dmodel;
 
@@ -1022,6 +1023,20 @@ namespace BasisClasses
     double dcond(double R, double z, double phi, int M);
     std::shared_ptr<DiskDensityFunc> pyDens;
 
+    //@{
+    //! DeprojType support
+
+    //! Disk models used for deprojection
+    enum class DeprojType
+      { mn, toomre, python, exponential};
+
+    //! Current model
+    DeprojType PTYPE;
+
+    //! Look up by string
+    static const std::map<std::string, DeprojType> dplookup;
+    //@}
+
   protected:
 
     //! Evaluate basis in spherical coordinates