fixed merge conflicts.

.bumpversion.cfg

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

.github/workflows/build_and_test.yml

@@ -98,7 +98,7 @@ jobs:
     - name: Create conda environment from environment.yml
       # Update the tudat conda environment created using the environment.yml file if the cache is not restored
       run: mamba env update -n tudat -f environment.yml
-      if: steps.cache.outputs.cache-hit != 'true'
+      #(commenting line for test) if: steps.cache.outputs.cache-hit != 'true'
 
 
     - name: Download tudat resources data files for Linux and MacOS
@@ -110,12 +110,12 @@ jobs:
       # be downloaded manually when the cache is hit.
       # This step downloads the data files in the tudat-resources package by running
       # the post-link scripts in https://github.com/tudat-team/tudat-resources-feedstock/blob/master/recipe/
-      if: (runner.os == 'Linux' || runner.os == 'MacOS') && steps.cache.outputs.cache-hit == 'true'
+      if: (runner.os == 'Linux' || runner.os == 'MacOS') #(commenting line for test) && steps.cache.outputs.cache-hit == 'true'
       run: bash -c "$(curl -fsSL https://raw.githubusercontent.com/tudat-team/tudat-resources-feedstock/master/recipe/post-link.sh)"
 
 
     - name: Download tudat-resources data files for Windows
-      if: runner.os == 'Windows' && steps.cache.outputs.cache-hit == 'true'
+      if: runner.os == 'Windows' #(commenting line for test) && steps.cache.outputs.cache-hit == 'true'
       run: cmd /c "curl -fsSL https://raw.githubusercontent.com/tudat-team/tudat-resources-feedstock/master/recipe/post-link.bat | cmd"
 
 
@@ -151,4 +151,4 @@ jobs:
       working-directory: "${{ github.workspace }}/build"
       # Execute tests defined by the CMake configuration. Note that --build-config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
       # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-      run: ctest --build-config ${{ matrix.build_type }} --output-on-failure -j4
+      run: ctest --build-config ${{ matrix.build_type }} --output-on-failure -j4

CMakeLists.txt

@@ -74,9 +74,6 @@ 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." 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)
 if(CMAKE_CXX_SIMULATE_ID MATCHES "MSVC")
@@ -120,12 +117,10 @@ 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}")
@@ -134,13 +129,19 @@ set(Tudat_DEFINITIONS "${Tudat_DEFINITIONS} -DTUDAT_BUILD_WITH_EXTENDED_PRECISIO
 #  Offer the user the choice of overriding the installation directories.
 # +============================================================================
 # TODO: Consider if this can work with <tudat/paths.hpp> going forward.
-set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib/" CACHE PATH "Installation directory for libraries")
-set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin/" CACHE PATH "Installation directory for executables")
-set(INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include/" CACHE PATH "Installation directory for header files")
-set(INSTALL_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data/" CACHE PATH "Installation directory for data files")
-set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/" CACHE PATH "Installation directory for man documentation")
-#set(INSTALL_TESTS_DIR "${CMAKE_INSTALL_PREFIX}/tests/" CACHE PATH "Installation directory for tests (default=OFF)")
-set(INSTALL_CMAKE_DIR "${INSTALL_LIB_DIR}/cmake/${PROJECT_NAME_LOWER}" CACHE PATH "Installation directory for cmake config files")
+
+set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin")
+set(INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include")
+set(INSTALL_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data")
+set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}")
+#set(INSTALL_TESTS_DIR "${CMAKE_INSTALL_PREFIX}/tests")
+set(INSTALL_CMAKE_DIR "${INSTALL_LIB_DIR}/cmake/${PROJECT_NAME_LOWER}")
+
+message("")
+message(STATUS "INSTALLATION PREFIX: ${CMAKE_INSTALL_PREFIX}")
+message("")
+
 
 # Make relative paths absolute (needed later on)
 foreach (p LIB BIN INCLUDE DATA CMAKE)
@@ -321,13 +322,10 @@ if (TUDAT_BUILD_WITH_SOFA_INTERFACE)
     add_definitions(-DTUDAT_BUILD_WITH_SOFA_INTERFACE=1)
 endif ()
 
-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 ()
+find_package(nrlmsise00 REQUIRED 0.1)
+message(STATUS ${NRLMSISE00_LIBRARIES})
+add_definitions(-DTUDAT_BUILD_WITH_NRLMSISE=1)
+
 
 # JSON
 if (TUDAT_BUILD_WITH_JSON_INTERFACE)

cmake_modules/TudatLinkLibraries.cmake

@@ -23,9 +23,7 @@ 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 ()
+list(APPEND TUDAT_EXTERNAL_INTERFACE_LIBRARIES ${NRLMSISE00_LIBRARIES})
 
 
 if (TUDAT_BUILD_WITH_JSON_INTERFACE)

cmake_modules/compiler.cmake

@@ -367,7 +367,7 @@ if (MSVC)
   add_compile_options(/bigobj)
 else()
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-backtrace-limit=0")
+    #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-backtrace-limit=0")
 endif ()
 
 

include/tudat/astro/aerodynamics.h

@@ -26,8 +26,8 @@
 #include "aerodynamics/exponentialAtmosphere.h"
 #include "aerodynamics/flightConditions.h"
 #include "aerodynamics/hypersonicLocalInclinationAnalysis.h"
-//#include "aerodynamics/nrlmsise00Atmosphere.h"
-//#include "aerodynamics/nrlmsise00InputFunctions.h"
+#include "aerodynamics/nrlmsise00Atmosphere.h"
+#include "aerodynamics/nrlmsise00InputFunctions.h"
 #include "aerodynamics/standardAtmosphere.h"
 #include "aerodynamics/tabulatedAtmosphere.h"
 #include "aerodynamics/trimOrientation.h"

include/tudat/astro/aerodynamics/nrlmsise00Atmosphere.h

@@ -417,7 +417,20 @@ class NRLMSISE00Atmosphere : public AtmosphereModel
         return inputData_;
     }
 
- private:
+    NRLMSISE00InputFunction getNrlmsise00InputFunction( )
+    {
+        return nrlmsise00InputFunction_;
+    }
+
+    nrlmsise_input getNRLMSISE00InputStruct( )
+    {
+        return input_;
+    }
+
+    void setInputStruct( const double altitude, const double longitude,
+                         const double latitude, const double time );
+
+private:
 
     //! Shared pointer to solar activity function
     NRLMSISE00InputFunction nrlmsise00InputFunction_;
@@ -565,6 +578,7 @@ class NRLMSISE00Atmosphere : public AtmosphereModel
         return seed;
     }
 
+
     //! Compute the local atmospheric properties.
     /*!
      * Computes the local atmospheric density, pressure and temperature.
@@ -586,6 +600,11 @@ class NRLMSISE00Atmosphere : public AtmosphereModel
 
 };
 
+Eigen::VectorXd getNrlmsiseInputAsVector( const nrlmsise_input& input );
+
+
+
+
 }  // namespace aerodynamics
 }  // namespace tudat