Merge pull request Tudat#45 from tudat-team/develop

Develop
DominicDirkx · Jan 20, 2022 · dbbd353 · dbbd353
2 parents fa30c49 + ca17a04
commit dbbd353
Show file tree

Hide file tree

Showing 724 changed files with 29,676 additions and 21,009 deletions.
diff --git a/.authors.yml b/.authors.yml
@@ -0,0 +1,58 @@
+- name: Geoffrey H. Garrett
+  email: g.h.garrett13@gmail.com
+  aliases:
+  - Geoffrey Hyde Garrett
+  - Geoffrey Garrett
+  - ggarrett13
+- name: Emil Heeren
+  email:
+- name: FlyOHolic
+  email: m.a.griffioen@student.tudelft.nl
+- name: Reneh107
+  email: r.hoogendoorn@student.tudelft.nl
+- name: Kartik Kumar
+  email: me@kartikkumar.com
+- name: Elmar Puts
+  email: elmarputs@gmail.com
+- name: Dominic Dirkx
+  email: D.Dirkx@tudelft.nl
+  aliases:
+  - DominicDirkx
+  alternate_emails:
+  - hidden@hidden.com
+- name: mfacchinelli
+  email: michele.facchinelli@yahoo.it
+- name: Frank Hogervorst
+  email: f.c.hogervorst@student.tudelft.nl
+  aliases:
+  - FrankHogervorst
+- name: Aleix Pinardell
+  email: J.A.PinardellPons@student.tudelft.nl
+- name: Jeroen Melman
+  email: None
+  alternate_emails:
+  - hidden@hidden.com
+- name: Michele Facchinelli
+  email: m.facchinelli@student.tudelft.nl
+- name: mchambe
+  email: m.s.chambe@student.tudelft.nl
+- name: mvandenbroeck
+  email: m.m.h.vandenbroeck@student.tudelft.nl
+- name: Jacco Geul
+  email: jacco@geul.net
+- name: ifodde
+  email: I.Fodde@student.tudelft.nl
+  alternate_emails:
+  - iostofodde@gmail.com
+- name: René
+  email: R.Hoogendoorn@student.tudelft.nl
+- name: DominicDirkx
+  email: d.dirkx@tudelft.nl
+- name: Rody Oldenhuis
+  email: rody@dawnaerospace.com
+- name: Rene107
+  email: renehoogendoorn107@hotmail.com
+- name: Alejandro Gonzalez Puerta
+  email: a.gonzalezpuerta@student.tudelft.nl
+- name: Valerio Filice
+  email: filicevalerio@gmail.com
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,6 @@ CMakeCache.txt
 CMakeLists.txt.user
 CMakeFiles
 CMakeScripts
-Makefile
 cmake_install.cmake
 install_manifest.txt
 
@@ -46,8 +45,9 @@ install_manifest.txt
 # Build and doxygen related
 #
 Documentation/
-doc/doxygen/html/
-doc/doxygen/latex/
+docs/doxygen/html/
+docs/doxygen/latex/
+docs/doxygen/xml/
 build*/
 bin/
 lib/
@@ -72,3 +72,6 @@ Tudat/interface/spice/Kernels/
 /cmake-build-debug/*
 /cmake-build*
 
+
+# Rever
+rever/
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,7 +21,8 @@ endif ()
 cmake_policy(SET CMP0069 NEW)
 
 # Get version from file.
-file(READ "version" Tudat_VERSION)
+file(READ "version" Tudat_VERSION_LABEL)
+string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" Tudat_VERSION "${Tudat_VERSION_LABEL}")
 
 # Specific project name.
 project(Tudat VERSION ${Tudat_VERSION} LANGUAGES C CXX)
@@ -71,7 +72,10 @@ option(TUDAT_BUILD_WITH_FILTERS "Build Tudat with preliminary Kalman Filter func
 option(TUDAT_BUILD_WITH_SOFA_INTERFACE "Build Tudat with sofa interface." ON)
 
 # Build json interface.
-option(TUDAT_BUILD_WITH_JSON_INTERFACE "Build Tudat with json interface." ON)
+option(TUDAT_BUILD_WITH_JSON_INTERFACE "Build Tudat with json interface." OFF)
+
+# Build with nrlmsise-00 atmosphere model.
+option(TUDAT_BUILD_WITH_NRLMSISE00 "Build with nrlmsise-00 atmosphere model." OFF)
 
 # Build pagmo-dependent code
 option(TUDAT_BUILD_WITH_PAGMO "Build Tudat with pagmo." OFF)
@@ -88,10 +92,12 @@ message(STATUS "TUDAT_BUILD_STATIC_LIBRARY                            ${TUDAT_BU
 message(STATUS "TUDAT_BUILD_WITH_FILTERS                              ${TUDAT_BUILD_WITH_FILTERS}")
 message(STATUS "TUDAT_BUILD_WITH_SOFA_INTERFACE                       ${TUDAT_BUILD_WITH_SOFA_INTERFACE}")
 message(STATUS "TUDAT_BUILD_WITH_JSON_INTERFACE                       ${TUDAT_BUILD_WITH_JSON_INTERFACE}")
+message(STATUS "TUDAT_BUILD_WITH_NRLMSISE00                           ${TUDAT_BUILD_WITH_NRLMSISE00}")
 message(STATUS "TUDAT_BUILD_WITH_EXTENDED_PRECISION_PROPAGATION_TOOLS ${TUDAT_BUILD_WITH_EXTENDED_PRECISION_PROPAGATION_TOOLS}")
 message(STATUS "TUDAT_DOWNLOAD_AND_BUILD_BOOST                        ${TUDAT_DOWNLOAD_AND_BUILD_BOOST}")
 
 set(Tudat_DEFINITIONS "${Tudat_DEFINITIONS} -DTUDAT_BUILD_WITH_FILTERS=${TUDAT_BUILD_WITH_FILTERS}")
+set(Tudat_DEFINITIONS "${Tudat_DEFINITIONS} -DTUDAT_BUILD_WITH_NRLMSISE00=${TUDAT_BUILD_WITH_NRLMSISE00}")
 set(Tudat_DEFINITIONS "${Tudat_DEFINITIONS} -DTUDAT_BUILD_WITH_SOFA_INTERFACE=${TUDAT_BUILD_WITH_SOFA_INTERFACE}")
 set(Tudat_DEFINITIONS "${Tudat_DEFINITIONS} -DTUDAT_BUILD_WITH_JSON_INTERFACE=${TUDAT_BUILD_WITH_JSON_INTERFACE}")
 set(Tudat_DEFINITIONS "${Tudat_DEFINITIONS} -DTUDAT_BUILD_WITH_EXTENDED_PRECISION_PROPAGATION_TOOLS=${TUDAT_BUILD_WITH_EXTENDED_PRECISION_PROPAGATION_TOOLS}")
@@ -141,7 +147,7 @@ endif ()
 
 # Set required boost components.
 set(_TUDAT_REQUIRED_BOOST_LIBS filesystem system regex date_time thread
-        serialization chrono atomic)
+        chrono atomic)
 
 if (TUDAT_BUILD_TESTS)
     # Add the unit test framework, if needed.
@@ -206,9 +212,9 @@ if (DEFINED _GLIBCXX_USE_CXX11_ABI)
             set(Tudat_DEFINITIONS "${Tudat_DEFINITIONS} -D_GLIBCXX_USE_CXX11_ABI=0")
             message(STATUS "-D_GLIBCXX_USE_CXX11_ABI=0 added to CMAKE_CXX_FLAGS!")
         elseif ((${Boost_VERSION_MAJOR} GREATER_EQUAL "1") AND (${Boost_VERSION_MINOR} GREATER_EQUAL "70") AND ${TUDAT_BUILD_GNU})
-#            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
-#            set(Tudat_DEFINITIONS "${Tudat_DEFINITIONS} -D_GLIBCXX_USE_CXX11_ABI=0")
-#            message(STATUS "-D_GLIBCXX_USE_CXX11_ABI=0 added to CMAKE_CXX_FLAGS!")
+            #            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
+            #            set(Tudat_DEFINITIONS "${Tudat_DEFINITIONS} -D_GLIBCXX_USE_CXX11_ABI=0")
+            #            message(STATUS "-D_GLIBCXX_USE_CXX11_ABI=0 added to CMAKE_CXX_FLAGS!")
         elseif (${TUDAT_BUILD_MSVC})
             set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
             set(Tudat_DEFINITIONS "${Tudat_DEFINITIONS} -D_GLIBCXX_USE_CXX11_ABI=0")
@@ -282,23 +288,18 @@ endif ()
 # CSpice dependency
 find_package(CSpice REQUIRED 1.0.0)
 
-# Sofa dependency if in build settings.
 if (TUDAT_BUILD_WITH_SOFA_INTERFACE)
-    #
+    find_package(Sofa REQUIRED 1.0.0)
     add_definitions(-DTUDAT_BUILD_WITH_SOFA_INTERFACE=1)
-    if (${CMAKE_PROJECT_NAME} STREQUAL ${PROJECT_NAME})
-        find_package(Sofa REQUIRED 1.0.0)
-    elseif (NOT ${TUDAT_BUNDLE_BUILD})
-        find_package(Sofa REQUIRED 1.0.0)
-    else ()
-        set(Sofa_INCLUDE_DIRS ${Sofa_BUILD_INCLUDE_DIRS})
-    endif ()
-else ()
-    add_definitions(-DTUDAT_BUILD_WITH_SOFA_INTERFACE=0)
 endif ()
 
-# TODO: add NRLMSISE back in
-add_definitions(-DTUDAT_BUILD_WITH_NRLMSISE=0)
+if (TUDAT_BUILD_WITH_NRLMSISE00)
+    find_package(nrlmsise00 REQUIRED 0.1)
+    message(STATUS ${NRLMSISE00_LIBRARIES})
+    add_definitions(-DTUDAT_BUILD_WITH_NRLMSISE=1)
+else( )
+    add_definitions(-DTUDAT_BUILD_WITH_NRLMSISE=0)
+endif ()
 
 # JSON
 if (TUDAT_BUILD_WITH_JSON_INTERFACE)

diff --git a/cmake_modules/FindNRLMSISE00.cmake b/cmake_modules/FindNRLMSISE00.cmake
diff --git a/cmake_modules/TudatFindBoost.cmake b/cmake_modules/TudatFindBoost.cmake
@@ -1,10 +1,10 @@
 
 # Run a first pass for finding the headers only,
 # and establishing the Boost version.
-set(_TUDAT_BOOST_MINIMUM_VERSION 1.64.0)
-set(Boost_USE_STATIC_LIBS ON)
+set(_TUDAT_BOOST_MINIMUM_VERSION 1.72.0)
+set(Boost_USE_STATIC_LIBS OFF)
 set(Boost_USE_MULTITHREADED ON)
-set(Boost_USE_STATIC_RUNTIME ON)
+set(Boost_USE_STATIC_RUNTIME OFF)
 find_package(Boost ${_TUDAT_BOOST_MINIMUM_VERSION} QUIET REQUIRED)
 
 if(_TUDAT_FIND_BOOST_PYTHON)

diff --git a/cmake_modules/TudatLinkLibraries.cmake b/cmake_modules/TudatLinkLibraries.cmake
@@ -23,6 +23,10 @@ if (TUDAT_BUILD_WITH_SOFA_INTERFACE)
     list(APPEND TUDAT_ITRS_LIBRARIES Tudat::tudat_earth_orientation)
 endif ()
 
+if (TUDAT_BUILD_WITH_NRLMSISE00)
+    list(APPEND TUDAT_EXTERNAL_INTERFACE_LIBRARIES ${NRLMSISE00_LIBRARIES})
+endif ()
+
 
 if (TUDAT_BUILD_WITH_JSON_INTERFACE)
     list(APPEND TUDAT_EXTERNAL_LIBRARIES ${nlohmann_json_LIBRARIES})
@@ -45,11 +49,9 @@ endif ()
 
 
 list(APPEND Tudat_PROPAGATION_LIBRARIES
+        Tudat::tudat_propagation_setup
         Tudat::tudat_shape_based_methods
         Tudat::tudat_low_thrust_trajectories
-        Tudat::tudat_numerical_quadrature
-        Tudat::tudat_propagation_setup
-        Tudat::tudat_trajectory_design
         Tudat::tudat_environment_setup
         Tudat::tudat_ground_stations
         Tudat::tudat_aerodynamics
@@ -67,7 +69,8 @@ list(APPEND Tudat_PROPAGATION_LIBRARIES
         Tudat::tudat_statistics
         Tudat::tudat_propagators
         ${TUDAT_EXTERNAL_INTERFACE_LIBRARIES}
-        Tudat::tudat_basic_astrodynamics
+        Tudat::tudat_basic_astrodynamics        
+        Tudat::tudat_numerical_quadrature
         Tudat::tudat_interpolators
         Tudat::tudat_root_finders
         Tudat::tudat_basic_mathematics
@@ -81,7 +84,6 @@ if (TUDAT_BUILD_WITH_ESTIMATION_TOOLS)
     list(APPEND Tudat_ESTIMATION_LIBRARIES
             Tudat::tudat_estimation_setup
             Tudat::tudat_propagation_setup
-            Tudat::tudat_trajectory_design
             Tudat::tudat_environment_setup
             Tudat::tudat_observation_models
             Tudat::tudat_ground_stations
@@ -111,7 +113,6 @@ if (TUDAT_BUILD_WITH_ESTIMATION_TOOLS)
             Tudat::tudat_basic_mathematics
             Tudat::tudat_input_output
             Tudat::tudat_basics
-#            ${TUDAT_EXTERNAL_LIBRARIES}
             )
 
 else ()

diff --git a/cmake_modules/compiler.cmake b/cmake_modules/compiler.cmake
@@ -16,6 +16,7 @@
  ####################
  # Debug information
  ####################
+
  message("")
  message("*** COMPILER CONFIGURATION ***")
  message("")
@@ -100,7 +101,7 @@
          # standard apple clang compiler flags
          set(CMAKE_CXX_FLAGS
                  "${CMAKE_CXX_FLAGS}"
-                 " -std=c++11"
+                 " -std=c++1z"
                  " -stdlib=libc++"
                  " -Wall "
                  " -Wextra"
@@ -119,12 +120,13 @@
          # standard linux clang compiler flags
          set(CMAKE_CXX_FLAGS
                  "${CMAKE_CXX_FLAGS}"
-                 " -std=c++11"
+                 " -std=c++1z"
                  " -stdlib=libstdc++"
                  " -Wall"
                  " -Wextra"
                  " -Wno-unused-parameter"
-                 " -Wno-unused-variable")
+                 " -Wno-unused-variable"
+                 )
          string(CONCAT CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
 
      elseif (WIN32)
@@ -134,7 +136,7 @@
          # standard windows clang c++ compiler flags
          set(CMAKE_CXX_FLAGS
                  "${CMAKE_CXX_FLAGS}"
-                 " -std=c++11"
+                 " -std=c++1z"
                  " -Wall"
                  " -Wextra"
                  " -Wno-unused-parameter"
@@ -202,7 +204,6 @@
                              " -Wno-unused-macros"
                              " -Wno-vla"
                              " -Wno-unreachable-code-break"
-                             " -Wno-implicit-fallthrough"
                              " -Wno-conditional-uninitialized"
                              " -Wno-exit-time-destructors"
                              " -Wno-undefined-func-template"
@@ -211,7 +212,7 @@
                              " -Wno-c++98-compat-pedantic"
                              " -Wno-used-but-marked-unused" # : boost unit tests. should be reinabled and sorted out.
                              " -Wno-newline-eof" # : end of line newline. should be reinabled and so.
-                             " -Wno-return-std-move-in-c++11" # :
+                             " -Wno-return-std-move-in-c++1z" # :
                              )
                      string(CONCAT CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
                  endif ()
@@ -227,9 +228,9 @@
      add_compile_definitions(TUDAT_BUILD_GNU)
      message(STATUS "Using gnucxx compiler.")
      include(CheckCXXCompilerFlag)
-     check_cxx_compiler_flag("-std=c++11" CXX_SUPPORTS_CXX11)
-     if (CXX_SUPPORTS_CXX11)
-         set(CMAKE_CXX_FLAGS "-Wall -std=c++11")
+     check_cxx_compiler_flag("-std=c++1z" CXX_SUPPORTS_CXX1Z)
+     if (CXX_SUPPORTS_CXX1Z)
+         set(CMAKE_CXX_FLAGS "-Wall -std=c++1z")
      else ()
          check_cxx_compiler_flag("-std=c++0x" CXX_SUPPORTS_CXX0x)
          if (CXX_SUPPORTS_CXX0x)
@@ -241,7 +242,7 @@
      set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
      set(CMAKE_CXX_FLAGS_DEBUG "-Og -g")
 
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra -Wno-unused-parameter -Wno-unused-variable -Woverloaded-virtual -Wold-style-cast -Wnon-virtual-dtor")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra -Wno-unused-parameter -Wno-unused-variable -Woverloaded-virtual -Wold-style-cast -Wnon-virtual-dtor -Wunused-but-set-variable -Wsign-compare")
 
      # MinGW fixes
      if (MINGW AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
@@ -345,7 +346,7 @@
                  "C1786" # Deprecated functions
                  "C2545" # Empty else statement
                  "C2557" # Comparing signed to unsigned
-                 "C2722" # List init syntax is c++11 feature
+                 "C2722" # List init syntax is c++1z feature
                  "C3280" # Declaration hides variable
                  )
      endif ()