Merge branch 'develop' into porkchop_and_hybrid_modules

tudat-team · Oct 23, 2023 · 34b8f4a · 34b8f4a
2 parents 1d3b148 + d866cb6
commit 34b8f4a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.7.3.dev21
+current_version = 0.7.3.dev23
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?

diff --git a/examples b/examples
diff --git a/tudatpy/CMakeLists.txt b/tudatpy/CMakeLists.txt
@@ -172,7 +172,7 @@ INSTALL_PURE_PYTHON_MODULE_DIR(plotting)
 INSTALL_PURE_PYTHON_MODULE_DIR(util)
 INSTALL_PURE_PYTHON_MODULE_DIR(io)
 
-# Install the Python components of kernel modules
+# Create hybrid C++/Python modules
 macro(CREATE_HYBRID_CPP_PYTHON_MODULE module_dir_name)
     install(DIRECTORY kernel_hybrid/${module_dir_name}/ DESTINATION "${TUDATPY_INSTALL_PATH}/${module_dir_name}")
     file(COPY kernel_hybrid/${module_dir_name}/ DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${module_dir_name}/)

diff --git a/tudatpy/kernel/expose_numerical_simulation/expose_environment.cpp b/tudatpy/kernel/expose_numerical_simulation/expose_environment.cpp
@@ -8,6 +8,7 @@
  *    http://tudat.tudelft.nl/LICENSE.
  */
 
+#include "tudatpy/scalarTypes.h"
 #include "expose_environment.h"
 #include <tudat/basics/deprecationWarnings.h>
 
@@ -676,7 +677,7 @@ void expose_environment(py::module &m) {
             .def("get_body", &tss::SystemOfBodies::getBody,
                  py::arg("body_name"),
                  get_docstring("SystemOfBodies.get_body").c_str())
-            .def("create_empty_body", &tss::SystemOfBodies::createEmptyBody,
+            .def("create_empty_body", &tss::SystemOfBodies::createEmptyBody< double, TIME_TYPE >,
                  py::arg("body_name"),
                  py::arg("process_body") = 1,
                  get_docstring("SystemOfBodies.create_empty_body").c_str())
@@ -687,7 +688,7 @@ void expose_environment(py::module &m) {
                  get_docstring("SystemOfBodies.list_of_bodies").c_str())
 //            .def("get_body_dict", &tss::SystemOfBodies::getMap,
 //                 get_docstring("SystemOfBodies.get_body_dict").c_str())
-            .def("add_body", &tss::SystemOfBodies::addBody,
+            .def("add_body", &tss::SystemOfBodies::addBody< double, TIME_TYPE >,
                  py::arg("body_to_add"),
                  py::arg("body_name"),
                  py::arg("process_body") = 1,

diff --git a/version b/version
@@ -1 +1 @@
-0.7.3.dev21
+0.7.3.dev23