Merge pull request #213 from tudat-team/develop

Develop

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.8.0
+current_version = 0.8.0.dev66
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?

.gitignore

@@ -1,4 +1,5 @@
 # Generated files
+examples
 lib/
 libs/
 CMakeFiles/

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "examples"]
 	path = examples
-	url = https://github.com/tudat-team/tudatpy-examples
+	url = https://github.com/tudat-team/tudatpy-examples.git

.readthedocs.yml

@@ -15,6 +15,21 @@ build:
   os: "ubuntu-20.04"
   tools:
     python: "mambaforge-4.10"
+  jobs:
+    pre_install:
+      - LATEST_TAG=$(git describe --tags --abbrev=0) ; echo Downloading $LATEST_TAG ;
+       wget https://github.com/tudat-team/tudatpy/archive/refs/tags/$LATEST_TAG.zip; unzip $LATEST_TAG.zip; rm -rf docs/; LT=$(echo $LATEST_TAG | cut -c 2-); mv tudatpy-$LT/docs/ .
+
+      # The pre-install step enables building the docs on the latest tag
+      # instead of the latest commit. Since Read the Docs uses the latest
+      # tudatpy dev conda package to find the binaries (see docs/source/conf.
+      # py) and extract docs form them, it must use the corresponding source
+      # code to build the docs to avoid any inconsistencies. The pre-install
+      # step overrides the default behavior of Read the Docs to build the docs
+      # on the latest commit. The pre-install step replaces the docs/
+      # directory with the docs/ directory of the latest tag.
 
 conda:
   environment: docs/environment_readthedocs.yaml
+
+

CMakeLists.txt

@@ -18,7 +18,9 @@ else()
 #    add_definitions(-DVERSION_INFO "${tudatpy_VERSION_LABEL}")
 endif()
 
-include_directories(include)
+option(TUDAT_BUILD_WITH_FFTW3 "Build Tudat with FFTW3." OFF)
+
+include_directories("tudatpy/kernel")
 # Add cmake modules
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
@@ -50,8 +52,9 @@ if (MSVC)
     # https://docs.microsoft.com/en-us/cpp/build/reference/bigobj-increase-number-of-sections-in-dot-obj-file?view=vs-2019
     # This is equivalent to the big-obj for MinGW, this should stop error C1128.
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
+else()
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
 endif ()
-
 message(STATUS "<< ${PROJECT_NAME} (${CMAKE_BUILD_TYPE} - ${BUILD_STYLE}) >>")
 
 set(Boost_USE_STATIC_LIBS OFF)
@@ -74,7 +77,6 @@ include_directories(SYSTEM AFTER "${EIGEN3_INCLUDE_DIR}")
 
 # TODO: Make Tudat export definitions to the config for inheritence to this project.
 add_definitions(-DTUDAT_BUILD_WITH_SPICE_INTERFACE=1)
-add_definitions(-DTUDAT_BUILD_WITH_ESTIMATION_TOOLS=1)
 
 #if (DEFINED _GLIBCXX_USE_CXX11_ABI)
 #    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=${_GLIBCXX_USE_CXX11_ABI}")
@@ -116,6 +118,30 @@ find_package(NRLMSISE00 0.1 REQUIRED)
 #    set(NRLMSISE00_INCLUDE_DIRS ${NRLMSISE00_BUILD_INCLUDE_DIRS})
 #endif ()
 
+
+if (TUDAT_BUILD_WITH_FFTW3)
+    if(NOT APPLE)
+        find_package(FFTW3)
+        message(STATUS "FFTW " ${FFTW3_LIBRARIES})
+        include_directories(SYSTEM AFTER "${FFTW3_INCLUDE_DIRS}")
+        if(WIN32)
+            set (FFTW3_LIBRARIES "${FFTW3_LIBRARY_DIRS}/fftw3.lib")
+        else()
+            set (FFTW3_LIBRARIES "${FFTW3_LIBRARY_DIRS}/libfftw3.so")
+        endif()
+        add_definitions(-DTUDAT_BUILD_WITH_FFTW3=1)
+    else( )
+        find_package(FFTW3)
+        message(STATUS ${FFTW3_LIBRARIES})
+        include_directories(SYSTEM AFTER "${FFTW3_INCLUDE_DIRS}")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem \"${FFTW3_INCLUDE_DIR}\"")
+        set (FFTW3_LIBRARIES "${FFTW3_LIBRARY_DIRS}/libfftw3.dylib")
+        add_definitions(-DTUDAT_BUILD_WITH_FFTW3=1)
+    endif( )
+else( )
+    add_definitions(-DTUDAT_BUILD_WITH_FFTW3=0)
+endif( )
+
 # Sofa dependency if in build settings.
 if (${CMAKE_PROJECT_NAME} STREQUAL ${PROJECT_NAME})
     find_package(Tudat REQUIRED)

README.md

@@ -1,11 +1,13 @@
-
 # tudatpy
 
-TU Delft Astrodynamics Toolbox in Python, or **tudatpy**, is a library that exposes the powerful set of C++ 
-libraries, [Tudat](https://github.com/tudat-team/tudat), and adds a limited set of Python-only functionality. 
+TU Delft Astrodynamics Toolbox in Python, or **tudatpy**, is a library that primarily exposes the powerful set of C++ 
+libraries, [Tudat](https://tudat.tudelft.nl/). TudatPy aims at accelerating the implementation of Tudat simulations,
+providing an interface between Tudat and popular machine learning frameworks and establishing a platform to provide 
+quality education in the field of astrodynamics. See the [documentation](https://tudat-space.readthedocs.io) for more.
 
+Installation
+===================
+=======
 * For more details, we refer to the [project website](https://docs.tudat.space/en/latest/) and our [project Github page](https://github.com/tudat-team)
 * For developers, this repository is best built as part of the [tudat-bundle](https://github.com/tudat-team/tudat-bundle)
-* Conda package for this repository are available on [anaconda](anaconda.org/tudat-team/tudatpy/), which is built through the [tudat-feedstock](https://github.com/tudat-team/tudatpy-feedstock) on [Azure](https://dev.azure.com/tudat-team/feedstock-builds/_build?definitionId=3)
-
-
+* Conda package for this repository are available on [anaconda](anaconda.org/tudat-team/tudatpy/), which is built through the [tudat-feedstock](https://github.com/tudat-team/tudatpy-feedstock) on [Azure](https://dev.azure.com/tudat-team/feedstock-builds/_build?definitionId=3)

docs/environment_readthedocs.yaml

@@ -1,18 +1,16 @@
 name: tudatpy-docs-readthedocs
 channels:
   - conda-forge
+  - tudat-team/label/dev
   - tudat-team
 dependencies:
   # All standard tudat-bundle deps are needed for sphinx-documentation for tudatpy.
-  - python=3.8
-  - numpy
-  - matplotlib # for tudat.plotting
+  # Skipping listing tudat and boost-cpp here because they will be installed as part of tudatpy installation
   - basemap # for tudat.plotting
   - basemap-data-hires # for tudat.plotting
   # Other doc related
   - jinja2
   - yaml
-  #- cmake
   - pydantic=1.10.9
   - numpydoc
   - tudatpy
@@ -24,4 +22,4 @@ dependencies:
      - sphinxcontrib-fulltoc
      - sphinxcontrib-bibtex
      - furo
-     - sphinx_copybutton 
+     - sphinx_copybutton