diff --git a/CMakeLists.txt b/CMakeLists.txt index 42b393c38..414b9491e 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -289,7 +289,7 @@ ENDIF () ### Open Space Toolkit ▸ Physics -FIND_PACKAGE ("OpenSpaceToolkitPhysics" "2.0" REQUIRED) +FIND_PACKAGE ("OpenSpaceToolkitPhysics" "3.0" REQUIRED) IF (NOT OpenSpaceToolkitPhysics_FOUND) diff --git a/bindings/python/requirements.txt b/bindings/python/requirements.txt index f2fc3ce1e..6b588aca8 100644 --- a/bindings/python/requirements.txt +++ b/bindings/python/requirements.txt @@ -1,3 +1,3 @@ # Apache License 2.0 -open-space-toolkit-physics~=2.1.2 +open-space-toolkit-physics~=3.0.0 diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile index 7f5c5339f..2b3c91c3f 100644 --- a/docker/development/Dockerfile +++ b/docker/development/Dockerfile @@ -141,8 +141,8 @@ RUN mkdir -p /tmp/open-space-toolkit-mathematics \ ## Open Space Toolkit ▸ Physics -ARG OSTK_PHYSICS_MAJOR="2" -ARG OSTK_PHYSICS_MINOR="1" +ARG OSTK_PHYSICS_MAJOR="3" +ARG OSTK_PHYSICS_MINOR="0" ## Force an image rebuild when new Physics patch versions are detected ADD https://api.github.com/repos/open-space-collective/open-space-toolkit-physics/git/matching-refs/tags/${OSTK_PHYSICS_MAJOR}.${OSTK_PHYSICS_MINOR} /tmp/open-space-toolkit-physics/versions.json diff --git a/test/OpenSpaceToolkit/Astrodynamics/Trajectory/Propagator.test.cpp b/test/OpenSpaceToolkit/Astrodynamics/Trajectory/Propagator.test.cpp index a0059374a..ce8fd6c77 100644 --- a/test/OpenSpaceToolkit/Astrodynamics/Trajectory/Propagator.test.cpp +++ b/test/OpenSpaceToolkit/Astrodynamics/Trajectory/Propagator.test.cpp @@ -2244,6 +2244,10 @@ TEST_F( std::make_shared(EarthMagneticModel::Type::Undefined), std::make_shared( EarthAtmosphericModel::Type::NRLMSISE00, + EarthAtmosphericModel::InputDataType::CSSISpaceWeatherFile, + Real::Undefined(), + Real::Undefined(), + Real::Undefined(), Frame::ITRF(), EarthGravitationalModel::WGS84.equatorialRadius_, EarthGravitationalModel::WGS84.flattening_, @@ -2373,6 +2377,10 @@ TEST_F( std::make_shared(EarthMagneticModel::Type::Undefined), std::make_shared( EarthAtmosphericModel::Type::NRLMSISE00, + EarthAtmosphericModel::InputDataType::CSSISpaceWeatherFile, + Real::Undefined(), + Real::Undefined(), + Real::Undefined(), Frame::ITRF(), EarthGravitationalModel::WGS84.equatorialRadius_, EarthGravitationalModel::WGS84.flattening_,