Merged

tudat-team · Jan 29, 2024 · 18c0442 · 18c0442
2 parents f295180 + 55c00e8
commit 18c0442
Show file tree

Hide file tree

Showing 43 changed files with 3,337 additions and 351 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.13.0.dev2
+current_version = 2.13.0.dev4
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?

diff --git a/cmake_modules/compiler.cmake b/cmake_modules/compiler.cmake
@@ -275,7 +275,7 @@
      # problem: https://dev.azure.com/tudat-team/feedstock-builds/_build/results?buildId=95&view=logs&j=00f5923e-fdef-5026-5091-0d5a0b3d5a2c&t=3cc4a9ed-60e1-5810-6eb3-5f9cd4a26dba
      # solution: https://stackoverflow.com/questions/1091662/vc-internal-compiler-error
      #     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /Ox /W3 /FC -D_SCL_SECURE_NO_WARNINGS")
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /W3 /FC /Ox -D_SCL_SECURE_NO_WARNINGS")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /W3 /FC -D_SCL_SECURE_NO_WARNINGS")
      if (TUDAT_FORCE_DYNAMIC_RUNTIME)
          # This is needed for conda builds, as the prebuilt libraries are MD.
          set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MD")
@@ -371,7 +371,8 @@ endif ()
 
 
 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")
+
 
 string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_UPPER)
 message(STATUS "Building with flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UPPER}}.")

diff --git a/include/tudat/astro/basic_astro/accelerationModelTypes.h b/include/tudat/astro/basic_astro/accelerationModelTypes.h
@@ -23,6 +23,7 @@
 #include "tudat/astro/propulsion/thrustAccelerationModel.h"
 #include "tudat/astro/propulsion/massRateFromThrust.h"
 #include "tudat/astro/relativity/relativisticAccelerationCorrection.h"
+#include "tudat/astro/relativity/einsteinInfeldHoffmannAcceleration.h"
 #include "tudat/astro/basic_astro/empiricalAcceleration.h"
 #include "tudat/astro/propulsion/massRateFromThrust.h"
 #include "tudat/astro/electromagnetism/radiationPressureAcceleration.h"
@@ -64,6 +65,7 @@ enum AvailableAcceleration
     radiation_pressure,
     momentum_wheel_desaturation_acceleration,
     custom_acceleration,
+    einstein_infeld_hoffmann_acceleration,
     yarkovsky_acceleration
 };
 
@@ -120,6 +122,8 @@ std::vector< std::shared_ptr< AccelerationModel3d > > getAccelerationModelsOfTyp
         const std::vector< std::shared_ptr< AccelerationModel3d > >& fullList,
         const AvailableAcceleration modelType );
 
+
+
 // Function to check whether an acceleration type is a direct gravitational acceleration
 /*
  * Function to check whether an acceleration type is a direct gravitational acceleration, e.g. a gravitational

diff --git a/include/tudat/astro/ephemerides/compositeEphemeris.h b/include/tudat/astro/ephemerides/compositeEphemeris.h
@@ -395,7 +395,7 @@ std::shared_ptr< Ephemeris > createReferencePointEphemeris(
                 referencePointEphemerisVector, referencePointRotationVector, "SSB", "ECLIPJ2000" );
 }
 
-extern template class CompositeEphemeris< double, double >;
+//extern template class CompositeEphemeris< double, double >;
 
 } // namespace ephemerides
 

diff --git a/...tudat/astro/orbit_determination/acceleration_partials/centralGravityAccelerationPartial.h b/...tudat/astro/orbit_determination/acceleration_partials/centralGravityAccelerationPartial.h
@@ -21,6 +21,10 @@ namespace tudat
 namespace acceleration_partials
 {
 
+Eigen::Matrix3d calculatePartialOfPointMassGravityWrtPositionOfAcceleratedBody(
+    const Eigen::Vector3d& relativePosition,
+    const double gravitationalParameter );
+
 //! Calculates partial derivative of point mass gravitational acceleration wrt the position of body undergoing acceleration.
 /*!
  *  Calculates partial derivative of point mass gravitational acceleration wrt the position of body undergoing acceleration.