From ae94de7fdde83a588dfbd07ad926577836eb3e38 Mon Sep 17 00:00:00 2001 From: Dominic Dirkx Date: Fri, 13 Oct 2023 18:28:42 +0200 Subject: [PATCH 1/5] Version bump --- .bumpversion.cfg | 2 +- version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 1e217c23..bb22e81d 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.7.3.dev21 +current_version = 0.7.3.dev22 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\.(?P[a-z]+)(?P\d+))? diff --git a/version b/version index 8bf29adc..5141be18 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.7.3.dev21 +0.7.3.dev22 From 26d09b2057c0cbc3507a79e1a5f9f8d97fcfb4af Mon Sep 17 00:00:00 2001 From: Dominic Dirkx Date: Sat, 14 Oct 2023 11:34:19 +0200 Subject: [PATCH 2/5] Updated examples --- examples | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples b/examples index 4ce9ef33..dd01c07d 160000 --- a/examples +++ b/examples @@ -1 +1 @@ -Subproject commit 4ce9ef33919d2a685ec708f310a0b6e23a6d4236 +Subproject commit dd01c07d4241ecedcfbd94de062d3d379057d3b3 From 8ac32f3befa6d6db9571f9d06a08214e89f0871c Mon Sep 17 00:00:00 2001 From: Dominic Dirkx Date: Sat, 14 Oct 2023 12:28:36 +0200 Subject: [PATCH 3/5] Corrected compile error for newly templated functions --- .../expose_numerical_simulation/expose_environment.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tudatpy/kernel/expose_numerical_simulation/expose_environment.cpp b/tudatpy/kernel/expose_numerical_simulation/expose_environment.cpp index 91c9c117..9de9f549 100644 --- 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 @@ -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, From c51a1b5490df82bec17c3a12108c3f304412a539 Mon Sep 17 00:00:00 2001 From: Dominic Dirkx Date: Mon, 16 Oct 2023 11:44:30 +0200 Subject: [PATCH 4/5] Bumping version number --- .bumpversion.cfg | 2 +- version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index bb22e81d..6cdbb453 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.7.3.dev22 +current_version = 0.7.3.dev23 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\.(?P[a-z]+)(?P\d+))? diff --git a/version b/version index 5141be18..589133b3 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.7.3.dev22 +0.7.3.dev23 From d866cb664a6124d511072eb8af5e62d439c6a0ec Mon Sep 17 00:00:00 2001 From: Dominic Dirkx Date: Wed, 18 Oct 2023 14:44:09 +0200 Subject: [PATCH 5/5] Commented out hybrid module stuff --- tudatpy/CMakeLists.txt | 80 +++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/tudatpy/CMakeLists.txt b/tudatpy/CMakeLists.txt index 07767a18..2fd05878 100644 --- a/tudatpy/CMakeLists.txt +++ b/tudatpy/CMakeLists.txt @@ -171,46 +171,46 @@ INSTALL_PURE_PYTHON_MODULE_DIR(bodies) 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 -macro(INSTALL_PYTHON_COMPONENTS_OF_HYBRID_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}/) -endmacro() -# INSTALL_PYTHON_COMPONENTS_OF_HYBRID_MODULE(utils) -#INSTALL_PYTHON_COMPONENTS_OF_HYBRID_MODULE(astro) -INSTALL_PYTHON_COMPONENTS_OF_HYBRID_MODULE(trajectory_design) -#INSTALL_PYTHON_COMPONENTS_OF_HYBRID_MODULE(constants) -#INSTALL_PYTHON_COMPONENTS_OF_HYBRID_MODULE(interface) -# INSTALL_PYTHON_COMPONENTS_OF_HYBRID_MODULE(io) -#INSTALL_PYTHON_COMPONENTS_OF_HYBRID_MODULE(math) -#INSTALL_PYTHON_COMPONENTS_OF_HYBRID_MODULE(numerical_simulation) - -# Expose hybrid C++/Python modules -file(COPY ${CMAKE_CURRENT_LIST_DIR}/setup_hybrid_modules.py DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../) -macro(EXPOSE_HYBRID_MODULES) - foreach(module ${ARGN}) - # Might be more robust to use a combination of - # - add_custom_command - # - add_custom_target - # - add_dependencies - # See: https://stackoverflow.com/a/44225986 - add_custom_command(TARGET kernel POST_BUILD - COMMAND ${PYTHON_EXECUTABLE} setup_hybrid_modules.py ${module} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../ - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/kernel.so) - endforeach() -endmacro() -EXPOSE_HYBRID_MODULES( - # utils - astro - trajectory_design - constants - interface - # io - math - numerical_simulation -) +# +## Install the Python components of kernel modules +#macro(INSTALL_PYTHON_COMPONENTS_OF_HYBRID_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}/) +#endmacro() +## INSTALL_PYTHON_COMPONENTS_OF_HYBRID_MODULE(utils) +##INSTALL_PYTHON_COMPONENTS_OF_HYBRID_MODULE(astro) +#INSTALL_PYTHON_COMPONENTS_OF_HYBRID_MODULE(trajectory_design) +##INSTALL_PYTHON_COMPONENTS_OF_HYBRID_MODULE(constants) +##INSTALL_PYTHON_COMPONENTS_OF_HYBRID_MODULE(interface) +## INSTALL_PYTHON_COMPONENTS_OF_HYBRID_MODULE(io) +##INSTALL_PYTHON_COMPONENTS_OF_HYBRID_MODULE(math) +##INSTALL_PYTHON_COMPONENTS_OF_HYBRID_MODULE(numerical_simulation) +# +## Expose hybrid C++/Python modules +#file(COPY ${CMAKE_CURRENT_LIST_DIR}/setup_hybrid_modules.py DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../) +#macro(EXPOSE_HYBRID_MODULES) +# foreach(module ${ARGN}) +# # Might be more robust to use a combination of +# # - add_custom_command +# # - add_custom_target +# # - add_dependencies +# # See: https://stackoverflow.com/a/44225986 +# add_custom_command(TARGET kernel POST_BUILD +# COMMAND ${PYTHON_EXECUTABLE} setup_hybrid_modules.py ${module} +# WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../ +# DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/kernel.so) +# endforeach() +#endmacro() +#EXPOSE_HYBRID_MODULES( +# # utils +# astro +# trajectory_design +# constants +# interface +# # io +# math +# numerical_simulation +#) #install(FILES test.py "${CMAKE_CURRENT_BINARY_DIR}/_version.py") file(COPY ../tests DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../)