Merge branch 'AddUnits' of github.com:EXP-code/EXP into AddUnits

Author: Martin D. Weinberg

CMakeLists.txt

@@ -47,18 +47,41 @@ endif()
 # Build options
 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_PNG "Enable PNG graphics support" FALSE)
 option(ENABLE_CUDA "Enable CUDA" FALSE)
 option(ENABLE_SLURM "Enable SLURM checkpointing support" FALSE)
 option(ENABLE_XDR "Enable RPC/XDR support for Tipsy standard" FALSE)
 option(ENABLE_VTK "Configure VTK if available" FALSE)
 option(ENABLE_CUDA_SINGLE "Use real*4 instead of real*8 for CUDA" FALSE)
-option(ENABLE_USER "Enable basic user modules" ON)
+option(ENABLE_USER "Enable compilation of user modules" ON)
 option(ENABLE_SLCHECK "Enable *careful* Sturm-Liouville solutions" TRUE)
 option(ENABLE_TESTS "Enable build tests for EXP, pyEXP and helpers" ON)
+option(ENABLE_MINIMAL "Compile EXP support libraries only" OFF)
 option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
 option(BUILD_DOCS "Build documentation" OFF)
 
+# Metaflag for minimal build
+
+if(ENABLE_MINIMAL)
+  set(ENABLE_NBODY OFF)
+  set(ENABLE_PYEXP OFF)
+  set(ENABLE_USER  OFF)
+  set(ENABLE_UTILS OFF)
+  set(ENABLE_TESTS OFF)
+endif()
+  
+# Metaflag for pyEXP only
+
+if(ENABLE_PYEXP_ONLY)
+  set(ENABLE_NBODY OFF)
+  set(ENABLE_PYEXP ON)
+  set(ENABLE_USER  OFF)
+  set(ENABLE_UTILS OFF)
+  set(ENABLE_TESTS OFF)
+endif()
+  
 # Set mpirun launcher for CTest
 
 set(EXP_MPI_LAUNCH "mpirun" CACHE STRING "Command to run an MPI application (for unit tests only)")
@@ -253,12 +276,15 @@ add_subdirectory(expui)
 if (ENABLE_NBODY)
   add_subdirectory(src)
 endif()
-add_subdirectory(utils)
+if (ENABLE_UTILS)
+  add_subdirectory(utils)
+endif()
 if (ENABLE_PYEXP)
   add_subdirectory(pyEXP)
 endif()
-
-add_subdirectory(extern/user-modules)
+if (ENABLE_USER)
+  add_subdirectory(extern/user-modules)
+endif()
 
 # Build the tests; set ENABLE_TEST=OFF to disable
 if(ENABLE_TESTS)

expui/BiorthBasis.cc

@@ -1546,6 +1546,11 @@ namespace BasisClasses
 
 	if (dmodel.compare("MN")==0) // Miyamoto-Nagai
 	  model = std::make_shared<MNdisk>(1.0, H);
+	else if (DTYPE == DiskType::python) {
+	  model = std::make_shared<AxiSymPyModel>(pyname, acyl);
+	  std::cout << "Using AxiSymPyModel for deprojection from Python function <"
+		    << pyname << ">" << std::endl;
+	}
 	else			// Default to exponential
 	  model = std::make_shared<Exponential>(1.0, H);
 

expui/CMakeLists.txt

@@ -48,17 +48,20 @@ install(TARGETS expui DESTINATION lib)
 
 # Configure and build the test routines
 #
-add_executable(nativetoh5 coefstoh5.cc)
-add_executable(h5compare  h5compare.cc)
-add_executable(viewcoefs  viewcoefs.cc)
-add_executable(h5power    h5power.cc)
-add_executable(makecoefs  makecoefs.cc)
-add_executable(testread   testread.cc)
-add_executable(testunits  testunits.cc)
+if(ENABLE_UTILS)
+  add_executable(nativetoh5 coefstoh5.cc)
+  add_executable(h5compare  h5compare.cc)
+  add_executable(viewcoefs  viewcoefs.cc)
+  add_executable(h5power    h5power.cc)
+  add_executable(makecoefs  makecoefs.cc)
+  add_executable(testread   testread.cc)
+  add_executable(testunits  testunits.cc)
 
-foreach(program ${bin_PROGRAMS})
-  target_link_libraries(${program} expui exputil ${common_LINKLIB})
-  target_include_directories(${program} PUBLIC ${common_INCLUDE})
-  target_compile_options(${program} PUBLIC ${OpenMP_CXX_FLAGS})
-  install(TARGETS ${program} DESTINATION bin)
-endforeach()
+  foreach(program ${bin_PROGRAMS})
+    target_link_libraries(${program} expui exputil ${common_LINKLIB})
+    target_include_directories(${program} PUBLIC ${common_INCLUDE})
+    target_compile_options(${program} PUBLIC ${OpenMP_CXX_FLAGS})
+    install(TARGETS ${program} DESTINATION bin)
+  endforeach()
+
+endif()

expui/UnitValidator.H

@@ -3,7 +3,7 @@
 #include <map>
 
 /** Class to validate unit types and names The allowed types and units
-    can be extended as needed by adding new names and aliasess to
+    can be extended as needed by adding new names and aliases to
     UnitValidator::createAllowedUnitTypes() and
     UnitValidator::createAllowedUnitNames() in UnitValidator.cc
 */

include/DiskModels.H

@@ -277,4 +277,27 @@ public:
 
 };
 
+//! Enforce an axisymmetric model by using the x-axis only from a
+//! user-defined Python model
+class AxiSymPyModel : public EmpCylSL::AxiDisk
+{
+private:
+
+  std::shared_ptr<DiskDensityFunc> pyDens;
+  double scale;
+
+public:
+
+  AxiSymPyModel(const std::string& pyname, double a) : scale(a)
+  {
+    pyDens = std::make_shared<DiskDensityFunc>(pyname);
+  }
+
+  double operator()(double R, double z, double phi=0.)
+  {
+    return (*pyDens)(R*scale, z*scale, 0.0);
+  }
+
+};
+
 #endif