Merge branch 'devel' into AddUnits

Author: Martin D. Weinberg

CMakeLists.txt

@@ -7,6 +7,7 @@ project(
   LANGUAGES C CXX Fortran)
 
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
+set(CMAKE_C_STANDARD 17)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
@@ -268,7 +269,13 @@ endif()
 # try to find pybind11 and build wrapper python module
 find_package(Python3 COMPONENTS Interpreter Development)
 message(STATUS "python3 include dirs: ${Python3_INCLUDE_DIRS}")
-
+if(Python3_FOUND)
+  set(HAVE_PYTHON3 TRUE)
+else()
+  if(ENABLE_PYEXP)
+    message(FATAL_ERROR "You asked for pyEXP but I cannot find a Python3 environment. Please make Python3 available or disable pyEXP. CMake will exit." )
+  endif()
+endif()
 
 # Force installation of the yaml-cpp libraries
 install(TARGETS yaml-cpp DESTINATION lib)

config_cmake.h_in

@@ -19,6 +19,9 @@
 /* Defined if you have HDF5 support */
 #cmakedefine HAVE_HDF5 @HAVE_HDF5@
 
+/* Defined if Python3 runtime exists */
+#cmakedefine HAVE_PYTHON3 1
+
 /* Define to 1 if you have the `cuda' library. */
 #cmakedefine HAVE_LIBCUDA 1
 

doc/exp.cfg

@@ -964,6 +964,8 @@ INPUT                  = ./intro.doc \
                          ../include \
                          ../src \
                          ../src/user \
+			 ../exputil \
+			 ../expui \
                          ../utils/ICs \
                          ../utils/Analysis \
                          ../utils/PhaseSpace
@@ -1788,7 +1790,7 @@ FORMULA_MACROFILE      =
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-USE_MATHJAX            = NO
+USE_MATHJAX            = YES
 
 # With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
 # Note that the different versions of MathJax have different requirements with
@@ -1948,7 +1950,7 @@ EXTRA_SEARCH_MAPPINGS  =
 # If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
 # The default value is: YES.
 
-GENERATE_LATEX         = NO
+GENERATE_LATEX         = YES
 
 # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of