From 64bfe9115d5da98b7ed979fe917d86b8aa130c80 Mon Sep 17 00:00:00 2001 From: Dominic Dirkx Date: Thu, 30 May 2024 09:33:05 +0200 Subject: [PATCH] Modifications for extended time compatibility --- include/tudat/astro/basic_astro/dateTime.h | 2 +- include/tudat/simulation/estimation_setup/fitOrbitToEphemeris.h | 2 +- .../tudat/simulation/estimation_setup/processTrackingTxtFile.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/tudat/astro/basic_astro/dateTime.h b/include/tudat/astro/basic_astro/dateTime.h index 253259092f..dec2c371fc 100644 --- a/include/tudat/astro/basic_astro/dateTime.h +++ b/include/tudat/astro/basic_astro/dateTime.h @@ -266,7 +266,7 @@ DateTime addSecondsToDateTime( const DateTime& dateTime, const TimeType timeToAd template< typename TimeType > DateTime addDaysToDateTime( const DateTime& dateTime, const TimeType daysToAdd ) { - return getCalendarDateFromTime< Time >( dateTime.epoch< Time >( ) + daysToAdd * mathematical_constants::getFloatingInteger< TimeType >( 86400 ) ); + return getCalendarDateFromTime< Time >( dateTime.epoch< Time >( ) + daysToAdd * mathematical_constants::getFloatingInteger< long double >( 86400 ) ); } diff --git a/include/tudat/simulation/estimation_setup/fitOrbitToEphemeris.h b/include/tudat/simulation/estimation_setup/fitOrbitToEphemeris.h index 729a5ba8ee..37ea5ab5bb 100644 --- a/include/tudat/simulation/estimation_setup/fitOrbitToEphemeris.h +++ b/include/tudat/simulation/estimation_setup/fitOrbitToEphemeris.h @@ -52,7 +52,7 @@ std::shared_ptr< observation_models::ObservationCollection< StateScalarType, Tim while( currentTime < finalTime ) { observationTimes.push_back( currentTime ); - currentTime += dataPointInterval; + currentTime += static_cast< double >( dataPointInterval ); } diff --git a/include/tudat/simulation/estimation_setup/processTrackingTxtFile.h b/include/tudat/simulation/estimation_setup/processTrackingTxtFile.h index 4ed0440bb8..bb0fe18f2d 100644 --- a/include/tudat/simulation/estimation_setup/processTrackingTxtFile.h +++ b/include/tudat/simulation/estimation_setup/processTrackingTxtFile.h @@ -268,7 +268,7 @@ createTrackingTxtFileObservationCollection( std::map >>> observablesMap; // Get vectors of times, observations, and ancillary settings for the current observable type and link ends - std::vector allObservationTimes = processedTrackingTxtFileContents->getObservationTimes(); + std::vector allObservationTimes = utilities::staticCastVector< TimeType, double >( processedTrackingTxtFileContents->getObservationTimes() ); std::vector linkEndsVector = processedTrackingTxtFileContents->getLinkEndsVector(); std::set linkEndsSet = processedTrackingTxtFileContents->getLinkEndsSet();