From 829c60aa31a4326c39d830db2b41f341c5843508 Mon Sep 17 00:00:00 2001 From: Luc Maisonobe Date: Mon, 24 Jun 2024 20:41:28 +0200 Subject: [PATCH 1/2] Fixed API incompatible change introduced in 12.1. --- src/changes/changes.xml | 7 + .../ModifiedSaastamoinenModel.java | 135 +++++++++++++++++- .../earth/troposphere/SaastamoinenModel.java | 30 +--- .../measurements/BistaticRangeRateTest.java | 7 +- .../measurements/BistaticRangeTest.java | 7 +- .../estimation/measurements/Range2Test.java | 7 +- .../measurements/RangeAnalyticTest.java | 7 +- .../measurements/RangeRateTest.java | 7 +- .../estimation/measurements/RangeTest.java | 7 +- .../estimation/measurements/TDOATest.java | 5 +- .../TurnAroundRangeAnalyticTest.java | 6 +- .../measurements/TurnAroundRangeTest.java | 6 +- .../modifiers/TropoModifierTest.java | 19 ++- 13 files changed, 199 insertions(+), 51 deletions(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 80368fd93e..edcaf6d30d 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -20,6 +20,13 @@ Orekit Changes + + + Fixed API incompatible change introduced in 12.1. + + 0.5) + * @param deltaR δR correction term function + * @since 7.1 + * @deprecated as of 12.1.1, replaced by {@link #ModifiedSaastamoinenModel(PressureTemperatureHumidityProvider, BilinearInterpolatingFunction)} + */ + @Deprecated + private ModifiedSaastamoinenModel(final double t0, final double p0, final double r0, + final BilinearInterpolatingFunction deltaR) { + this(new ConstantPressureTemperatureHumidityProvider( + new PressureTemperatureHumidity(0, + TroposphericModelUtils.HECTO_PASCAL.toSI(p0), + t0, + WATER.waterVaporPressure(TroposphericModelUtils.HECTO_PASCAL.toSI(p0), t0, r0), + Double.NaN, + Double.NaN)), + deltaR); + } + /** * Create a new Saastamoinen model for the troposphere using the given environmental * conditions and table from the reference book. @@ -221,6 +307,51 @@ public PressureTemperatureHumidityProvider getPth0Provider() { return pth0Provider; } + /** {@inheritDoc} + *

+ * The Saastamoinen model is not defined for altitudes below 0.0. for continuity + * reasons, we use the value for h = 0 when altitude is negative. + *

+ *

+ * There are also numerical issues for elevation angles close to zero. For continuity reasons, + * elevations lower than a threshold will use the value obtained + * for the threshold itself. + *

+ * @see #getLowElevationThreshold() + * @see #setLowElevationThreshold(double) + */ + @Override + public double pathDelay(final double elevation, final GeodeticPoint point, + final double[] parameters, final AbsoluteDate date) { + return pathDelay(new TrackingCoordinates(0.0, elevation, 0.0), point, + pth0Provider.getWeatherParamerers(point, date), + parameters, date). + getDelay(); + } + + /** {@inheritDoc} + *

+ * The Saastamoinen model is not defined for altitudes below 0.0. for continuity + * reasons, we use the value for h = 0 when altitude is negative. + *

+ *

+ * There are also numerical issues for elevation angles close to zero. For continuity reasons, + * elevations lower than a threshold will use the value obtained + * for the threshold itself. + *

+ * @see #getLowElevationThreshold() + * @see #setLowElevationThreshold(double) + */ + @Override + public > T pathDelay(final T elevation, final FieldGeodeticPoint point, + final T[] parameters, final FieldAbsoluteDate date) { + return pathDelay(new FieldTrackingCoordinates<>(date.getField().getZero(), elevation, date.getField().getZero()), + point, + pth0Provider.getWeatherParamerers(point, date), + parameters, date). + getDelay(); + } + /** {@inheritDoc} *

* The Saastamoinen model is not defined for altitudes below 0.0. for continuity diff --git a/src/main/java/org/orekit/models/earth/troposphere/SaastamoinenModel.java b/src/main/java/org/orekit/models/earth/troposphere/SaastamoinenModel.java index 18e61e236d..396fa2837a 100644 --- a/src/main/java/org/orekit/models/earth/troposphere/SaastamoinenModel.java +++ b/src/main/java/org/orekit/models/earth/troposphere/SaastamoinenModel.java @@ -22,21 +22,16 @@ import org.orekit.bodies.GeodeticPoint; import org.orekit.data.DataContext; import org.orekit.data.DataProvidersManager; -import org.orekit.models.earth.weather.ConstantPressureTemperatureHumidityProvider; -import org.orekit.models.earth.weather.PressureTemperatureHumidity; import org.orekit.models.earth.weather.PressureTemperatureHumidityProvider; -import org.orekit.models.earth.weather.water.Wang1988; import org.orekit.time.AbsoluteDate; import org.orekit.time.FieldAbsoluteDate; -import org.orekit.utils.FieldTrackingCoordinates; -import org.orekit.utils.TrackingCoordinates; /** The modified Saastamoinen model. * @author Luc Maisonobe * @deprecated as of 12.1, replaced by {@link ModifiedSaastamoinenModel} */ @Deprecated -public class SaastamoinenModel extends ModifiedSaastamoinenModel implements DiscreteTroposphericModel { +public class SaastamoinenModel extends ModifiedSaastamoinenModel { /** Default file name for δR correction term table. */ public static final String DELTA_R_FILE_NAME = ModifiedSaastamoinenModel.DELTA_R_FILE_NAME; @@ -56,7 +51,7 @@ public class SaastamoinenModel extends ModifiedSaastamoinenModel implements Disc */ @DefaultDataContext public SaastamoinenModel(final double t0, final double p0, final double r0) { - this(t0, p0, r0, DELTA_R_FILE_NAME); + super(t0, p0, r0); } /** Create a new Saastamoinen model for the troposphere using the given @@ -75,7 +70,7 @@ public SaastamoinenModel(final double t0, final double p0, final double r0) { @DefaultDataContext public SaastamoinenModel(final double t0, final double p0, final double r0, final String deltaRFileName) { - this(t0, p0, r0, deltaRFileName, DataContext.getDefault().getDataProvidersManager()); + super(t0, p0, r0, deltaRFileName); } /** Create a new Saastamoinen model for the troposphere using the given @@ -96,16 +91,7 @@ public SaastamoinenModel(final double t0, final double r0, final String deltaRFileName, final DataProvidersManager dataProvidersManager) { - super(new ConstantPressureTemperatureHumidityProvider(new PressureTemperatureHumidity(0.0, - TroposphericModelUtils.HECTO_PASCAL.toSI(p0), - t0, - new Wang1988(). - waterVaporPressure(TroposphericModelUtils.HECTO_PASCAL.toSI(p0), - t0, - r0), - Double.NaN, - Double.NaN)), - deltaRFileName, dataProvidersManager); + super(t0, p0, r0, deltaRFileName, dataProvidersManager); } /** Create a new Saastamoinen model using a standard atmosphere model. @@ -129,8 +115,7 @@ public static SaastamoinenModel getStandardModel() { @Deprecated public double pathDelay(final double elevation, final GeodeticPoint point, final double[] parameters, final AbsoluteDate date) { - return pathDelay(new TrackingCoordinates(0.0, elevation, 0.0), point, - getPth0Provider().getWeatherParamerers(point, date), parameters, date).getDelay(); + return super.pathDelay(elevation, point, parameters, date); } /** {@inheritDoc} */ @@ -140,10 +125,7 @@ public > T pathDelay(final T elevation, final FieldGeodeticPoint point, final T[] parameters, final FieldAbsoluteDate date) { - return pathDelay(new FieldTrackingCoordinates<>(date.getField().getZero(), elevation, date.getField().getZero()), - point, - getPth0Provider().getWeatherParamerers(point, date), - parameters, date).getDelay(); + return super.pathDelay(elevation, point, parameters, date); } } diff --git a/src/test/java/org/orekit/estimation/measurements/BistaticRangeRateTest.java b/src/test/java/org/orekit/estimation/measurements/BistaticRangeRateTest.java index 2e9bef435e..56ce83c78c 100644 --- a/src/test/java/org/orekit/estimation/measurements/BistaticRangeRateTest.java +++ b/src/test/java/org/orekit/estimation/measurements/BistaticRangeRateTest.java @@ -27,6 +27,7 @@ import org.orekit.estimation.EstimationTestUtils; import org.orekit.estimation.measurements.modifiers.BistaticRangeRateTroposphericDelayModifier; import org.orekit.models.earth.troposphere.ModifiedSaastamoinenModel; +import org.orekit.models.earth.troposphere.TroposphericModel; import org.orekit.orbits.OrbitType; import org.orekit.orbits.PositionAngleType; import org.orekit.propagation.Propagator; @@ -168,7 +169,8 @@ public void testStateDerivativesWithModifier() { 1.0, 3.0, 300.0); propagator.clearStepHandlers(); - final BistaticRangeRateTroposphericDelayModifier modifier = new BistaticRangeRateTroposphericDelayModifier(ModifiedSaastamoinenModel.getStandardModel()); + final BistaticRangeRateTroposphericDelayModifier modifier = + new BistaticRangeRateTroposphericDelayModifier((TroposphericModel) ModifiedSaastamoinenModel.getStandardModel()); double maxRelativeError = 0; for (final ObservedMeasurement measurement : measurements) { @@ -324,7 +326,8 @@ public void testParameterDerivativesWithModifier() { 1.0, 3.0, 300.0); propagator.clearStepHandlers(); - final BistaticRangeRateTroposphericDelayModifier modifier = new BistaticRangeRateTroposphericDelayModifier(ModifiedSaastamoinenModel.getStandardModel()); + final BistaticRangeRateTroposphericDelayModifier modifier = + new BistaticRangeRateTroposphericDelayModifier((TroposphericModel) ModifiedSaastamoinenModel.getStandardModel()); double maxRelativeError = 0; for (final ObservedMeasurement measurement : measurements) { diff --git a/src/test/java/org/orekit/estimation/measurements/BistaticRangeTest.java b/src/test/java/org/orekit/estimation/measurements/BistaticRangeTest.java index 84799eaf6c..6c28b8793c 100644 --- a/src/test/java/org/orekit/estimation/measurements/BistaticRangeTest.java +++ b/src/test/java/org/orekit/estimation/measurements/BistaticRangeTest.java @@ -27,6 +27,7 @@ import org.orekit.estimation.EstimationTestUtils; import org.orekit.estimation.measurements.modifiers.BistaticRangeTroposphericDelayModifier; import org.orekit.models.earth.troposphere.ModifiedSaastamoinenModel; +import org.orekit.models.earth.troposphere.TroposphericModel; import org.orekit.orbits.OrbitType; import org.orekit.orbits.PositionAngleType; import org.orekit.propagation.Propagator; @@ -169,7 +170,8 @@ public void testStateDerivativesWithModifier() { 1.0, 3.0, 300.0); propagator.clearStepHandlers(); - final BistaticRangeTroposphericDelayModifier modifier = new BistaticRangeTroposphericDelayModifier(ModifiedSaastamoinenModel.getStandardModel()); + final BistaticRangeTroposphericDelayModifier modifier = + new BistaticRangeTroposphericDelayModifier((TroposphericModel) ModifiedSaastamoinenModel.getStandardModel()); double maxRelativeError = 0; for (final ObservedMeasurement measurement : measurements) { @@ -325,7 +327,8 @@ public void testParameterDerivativesWithModifier() { 1.0, 3.0, 300.0); propagator.clearStepHandlers(); - final BistaticRangeTroposphericDelayModifier modifier = new BistaticRangeTroposphericDelayModifier(ModifiedSaastamoinenModel.getStandardModel()); + final BistaticRangeTroposphericDelayModifier modifier = + new BistaticRangeTroposphericDelayModifier((TroposphericModel) ModifiedSaastamoinenModel.getStandardModel()); double maxRelativeError = 0; for (final ObservedMeasurement measurement : measurements) { diff --git a/src/test/java/org/orekit/estimation/measurements/Range2Test.java b/src/test/java/org/orekit/estimation/measurements/Range2Test.java index 466b505d9f..3b66c46a17 100644 --- a/src/test/java/org/orekit/estimation/measurements/Range2Test.java +++ b/src/test/java/org/orekit/estimation/measurements/Range2Test.java @@ -29,6 +29,7 @@ import org.orekit.estimation.EstimationTestUtils; import org.orekit.estimation.measurements.modifiers.RangeTroposphericDelayModifier; import org.orekit.models.earth.troposphere.ModifiedSaastamoinenModel; +import org.orekit.models.earth.troposphere.TroposphericModel; import org.orekit.orbits.OrbitType; import org.orekit.orbits.PositionAngleType; import org.orekit.propagation.Propagator; @@ -329,7 +330,8 @@ void genericTestStateDerivatives(final boolean isModifier, final boolean printRe ) { // Add modifiers if test implies it - final RangeTroposphericDelayModifier modifier = new RangeTroposphericDelayModifier(ModifiedSaastamoinenModel.getStandardModel()); + final RangeTroposphericDelayModifier modifier = + new RangeTroposphericDelayModifier((TroposphericModel) ModifiedSaastamoinenModel.getStandardModel()); if (isModifier) { ((Range) measurement).addModifier(modifier); } @@ -480,7 +482,8 @@ void genericTestParameterDerivatives(final boolean isModifier, final boolean pri ) { // Add modifiers if test implies it - final RangeTroposphericDelayModifier modifier = new RangeTroposphericDelayModifier(ModifiedSaastamoinenModel.getStandardModel()); + final RangeTroposphericDelayModifier modifier = + new RangeTroposphericDelayModifier((TroposphericModel) ModifiedSaastamoinenModel.getStandardModel()); if (isModifier) { ((Range) measurement).addModifier(modifier); } diff --git a/src/test/java/org/orekit/estimation/measurements/RangeAnalyticTest.java b/src/test/java/org/orekit/estimation/measurements/RangeAnalyticTest.java index f42ab2941e..44a131254e 100644 --- a/src/test/java/org/orekit/estimation/measurements/RangeAnalyticTest.java +++ b/src/test/java/org/orekit/estimation/measurements/RangeAnalyticTest.java @@ -32,6 +32,7 @@ import org.orekit.estimation.EstimationTestUtils; import org.orekit.estimation.measurements.modifiers.RangeTroposphericDelayModifier; import org.orekit.models.earth.troposphere.ModifiedSaastamoinenModel; +import org.orekit.models.earth.troposphere.TroposphericModel; import org.orekit.orbits.OrbitType; import org.orekit.orbits.PositionAngleType; import org.orekit.propagation.Propagator; @@ -361,7 +362,8 @@ void genericTestStateDerivatives(final boolean isModifier, final boolean isFinit ) { // Add modifiers if test implies it - final RangeTroposphericDelayModifier modifier = new RangeTroposphericDelayModifier(ModifiedSaastamoinenModel.getStandardModel()); + final RangeTroposphericDelayModifier modifier = + new RangeTroposphericDelayModifier((TroposphericModel) ModifiedSaastamoinenModel.getStandardModel()); if (isModifier) { ((Range) measurement).addModifier(modifier); } @@ -536,7 +538,8 @@ void genericTestParameterDerivatives(final boolean isModifier, final boolean isF ) { // Add modifiers if test implies it - final RangeTroposphericDelayModifier modifier = new RangeTroposphericDelayModifier(ModifiedSaastamoinenModel.getStandardModel()); + final RangeTroposphericDelayModifier modifier = + new RangeTroposphericDelayModifier((TroposphericModel) ModifiedSaastamoinenModel.getStandardModel()); if (isModifier) { ((Range) measurement).addModifier(modifier); } diff --git a/src/test/java/org/orekit/estimation/measurements/RangeRateTest.java b/src/test/java/org/orekit/estimation/measurements/RangeRateTest.java index 8451fd83a8..5a53aecac7 100644 --- a/src/test/java/org/orekit/estimation/measurements/RangeRateTest.java +++ b/src/test/java/org/orekit/estimation/measurements/RangeRateTest.java @@ -28,6 +28,7 @@ import org.orekit.models.earth.troposphere.EstimatedModel; import org.orekit.models.earth.troposphere.GlobalMappingFunctionModel; import org.orekit.models.earth.troposphere.ModifiedSaastamoinenModel; +import org.orekit.models.earth.troposphere.TroposphericModel; import org.orekit.orbits.OrbitType; import org.orekit.orbits.PositionAngleType; import org.orekit.propagation.Propagator; @@ -463,7 +464,8 @@ public void testStateDerivativesWithModifier() { double maxRelativeError = 0; for (final ObservedMeasurement measurement : measurements) { - final RangeRateTroposphericDelayModifier modifier = new RangeRateTroposphericDelayModifier(ModifiedSaastamoinenModel.getStandardModel(), true); + final RangeRateTroposphericDelayModifier modifier = + new RangeRateTroposphericDelayModifier((TroposphericModel) ModifiedSaastamoinenModel.getStandardModel(), true); ((RangeRate) measurement).addModifier(modifier); // @@ -610,7 +612,8 @@ public void testParameterDerivativesWithModifier() { double maxRelativeError = 0; for (final ObservedMeasurement measurement : measurements) { - final RangeRateTroposphericDelayModifier modifier = new RangeRateTroposphericDelayModifier(ModifiedSaastamoinenModel.getStandardModel(), true); + final RangeRateTroposphericDelayModifier modifier = + new RangeRateTroposphericDelayModifier((TroposphericModel) ModifiedSaastamoinenModel.getStandardModel(), true); ((RangeRate) measurement).addModifier(modifier); // parameter corresponding to station position offset diff --git a/src/test/java/org/orekit/estimation/measurements/RangeTest.java b/src/test/java/org/orekit/estimation/measurements/RangeTest.java index b518da30e5..84a6b71435 100644 --- a/src/test/java/org/orekit/estimation/measurements/RangeTest.java +++ b/src/test/java/org/orekit/estimation/measurements/RangeTest.java @@ -34,6 +34,7 @@ import org.orekit.models.earth.troposphere.EstimatedModel; import org.orekit.models.earth.troposphere.ModifiedSaastamoinenModel; import org.orekit.models.earth.troposphere.NiellMappingFunctionModel; +import org.orekit.models.earth.troposphere.TroposphericModel; import org.orekit.orbits.OrbitType; import org.orekit.orbits.PositionAngleType; import org.orekit.propagation.Propagator; @@ -361,7 +362,8 @@ void genericTestStateDerivatives(final boolean isModifier, final boolean printRe ) { // Add modifiers if test implies it - final RangeTroposphericDelayModifier modifier = new RangeTroposphericDelayModifier(ModifiedSaastamoinenModel.getStandardModel()); + final RangeTroposphericDelayModifier modifier = + new RangeTroposphericDelayModifier((TroposphericModel) ModifiedSaastamoinenModel.getStandardModel()); if (isModifier) { ((Range) measurement).addModifier(modifier); } @@ -512,7 +514,8 @@ void genericTestParameterDerivatives(final boolean isModifier, final boolean pri ) { // Add modifiers if test implies it - final RangeTroposphericDelayModifier modifier = new RangeTroposphericDelayModifier(ModifiedSaastamoinenModel.getStandardModel()); + final RangeTroposphericDelayModifier modifier = + new RangeTroposphericDelayModifier((TroposphericModel) ModifiedSaastamoinenModel.getStandardModel()); if (isModifier) { ((Range) measurement).addModifier(modifier); } diff --git a/src/test/java/org/orekit/estimation/measurements/TDOATest.java b/src/test/java/org/orekit/estimation/measurements/TDOATest.java index 1d76c73adc..5755c22a6c 100644 --- a/src/test/java/org/orekit/estimation/measurements/TDOATest.java +++ b/src/test/java/org/orekit/estimation/measurements/TDOATest.java @@ -27,6 +27,7 @@ import org.orekit.estimation.EstimationTestUtils; import org.orekit.estimation.measurements.modifiers.TDOATroposphericDelayModifier; import org.orekit.models.earth.troposphere.ModifiedSaastamoinenModel; +import org.orekit.models.earth.troposphere.TroposphericModel; import org.orekit.orbits.OrbitType; import org.orekit.orbits.PositionAngleType; import org.orekit.propagation.Propagator; @@ -170,7 +171,7 @@ public void testStateDerivativesWithModifier() { // create a modifier final TDOATroposphericDelayModifier modifier = - new TDOATroposphericDelayModifier(ModifiedSaastamoinenModel.getStandardModel()); + new TDOATroposphericDelayModifier((TroposphericModel) ModifiedSaastamoinenModel.getStandardModel()); double maxRelativeError = 0; for (final ObservedMeasurement measurement : measurements) { @@ -328,7 +329,7 @@ public void testParameterDerivativesWithModifier() { // create a modifier final TDOATroposphericDelayModifier modifier = - new TDOATroposphericDelayModifier(ModifiedSaastamoinenModel.getStandardModel()); + new TDOATroposphericDelayModifier((TroposphericModel) ModifiedSaastamoinenModel.getStandardModel()); double maxRelativeError = 0; for (final ObservedMeasurement measurement : measurements) { diff --git a/src/test/java/org/orekit/estimation/measurements/TurnAroundRangeAnalyticTest.java b/src/test/java/org/orekit/estimation/measurements/TurnAroundRangeAnalyticTest.java index a6ef7767fd..30195d6048 100644 --- a/src/test/java/org/orekit/estimation/measurements/TurnAroundRangeAnalyticTest.java +++ b/src/test/java/org/orekit/estimation/measurements/TurnAroundRangeAnalyticTest.java @@ -32,6 +32,7 @@ import org.orekit.estimation.EstimationTestUtils; import org.orekit.estimation.measurements.modifiers.TurnAroundRangeTroposphericDelayModifier; import org.orekit.models.earth.troposphere.ModifiedSaastamoinenModel; +import org.orekit.models.earth.troposphere.TroposphericModel; import org.orekit.orbits.OrbitType; import org.orekit.orbits.PositionAngleType; import org.orekit.propagation.Propagator; @@ -365,7 +366,7 @@ void genericTestStateDerivatives(final boolean isModifier, final boolean isFinit // Add modifiers if test implies it final TurnAroundRangeTroposphericDelayModifier modifier = - new TurnAroundRangeTroposphericDelayModifier(ModifiedSaastamoinenModel.getStandardModel()); + new TurnAroundRangeTroposphericDelayModifier((TroposphericModel) ModifiedSaastamoinenModel.getStandardModel()); if (isModifier) { ((TurnAroundRange) measurement).addModifier(modifier); } @@ -537,7 +538,8 @@ void genericTestParameterDerivatives(final boolean isModifier, final boolean isF for (final ObservedMeasurement measurement : measurements) { // Add modifiers if test implies it - final TurnAroundRangeTroposphericDelayModifier modifier = new TurnAroundRangeTroposphericDelayModifier(ModifiedSaastamoinenModel.getStandardModel()); + final TurnAroundRangeTroposphericDelayModifier modifier = + new TurnAroundRangeTroposphericDelayModifier((TroposphericModel) ModifiedSaastamoinenModel.getStandardModel()); if (isModifier) { ((TurnAroundRange) measurement).addModifier(modifier); } diff --git a/src/test/java/org/orekit/estimation/measurements/TurnAroundRangeTest.java b/src/test/java/org/orekit/estimation/measurements/TurnAroundRangeTest.java index fce108676d..a1c7555fc6 100644 --- a/src/test/java/org/orekit/estimation/measurements/TurnAroundRangeTest.java +++ b/src/test/java/org/orekit/estimation/measurements/TurnAroundRangeTest.java @@ -32,6 +32,7 @@ import org.orekit.estimation.EstimationTestUtils; import org.orekit.estimation.measurements.modifiers.TurnAroundRangeTroposphericDelayModifier; import org.orekit.models.earth.troposphere.ModifiedSaastamoinenModel; +import org.orekit.models.earth.troposphere.TroposphericModel; import org.orekit.orbits.OrbitType; import org.orekit.orbits.PositionAngleType; import org.orekit.propagation.Propagator; @@ -309,7 +310,7 @@ void genericTestStateDerivatives(final boolean isModifier, final boolean printRe // Add modifiers if test implies it final TurnAroundRangeTroposphericDelayModifier modifier = - new TurnAroundRangeTroposphericDelayModifier(ModifiedSaastamoinenModel.getStandardModel()); + new TurnAroundRangeTroposphericDelayModifier((TroposphericModel) ModifiedSaastamoinenModel.getStandardModel()); if (isModifier) { ((TurnAroundRange) measurement).addModifier(modifier); } @@ -456,7 +457,8 @@ void genericTestParameterDerivatives(final boolean isModifier, final boolean pri for (final ObservedMeasurement measurement : measurements) { // Add modifiers if test implies it - final TurnAroundRangeTroposphericDelayModifier modifier = new TurnAroundRangeTroposphericDelayModifier(ModifiedSaastamoinenModel.getStandardModel()); + final TurnAroundRangeTroposphericDelayModifier modifier = + new TurnAroundRangeTroposphericDelayModifier((TroposphericModel) ModifiedSaastamoinenModel.getStandardModel()); if (isModifier) { ((TurnAroundRange) measurement).addModifier(modifier); } diff --git a/src/test/java/org/orekit/estimation/measurements/modifiers/TropoModifierTest.java b/src/test/java/org/orekit/estimation/measurements/modifiers/TropoModifierTest.java index 1faf7a49c8..cdb7dbb428 100644 --- a/src/test/java/org/orekit/estimation/measurements/modifiers/TropoModifierTest.java +++ b/src/test/java/org/orekit/estimation/measurements/modifiers/TropoModifierTest.java @@ -48,6 +48,7 @@ import org.orekit.models.earth.troposphere.EstimatedModel; import org.orekit.models.earth.troposphere.ModifiedSaastamoinenModel; import org.orekit.models.earth.troposphere.NiellMappingFunctionModel; +import org.orekit.models.earth.troposphere.TroposphericModel; import org.orekit.orbits.OrbitType; import org.orekit.orbits.PositionAngleType; import org.orekit.propagation.Propagator; @@ -85,7 +86,8 @@ public void testRangeTropoModifier() { 1.0, 3.0, 300.0); propagator.clearStepHandlers(); - final RangeTroposphericDelayModifier modifier = new RangeTroposphericDelayModifier(ModifiedSaastamoinenModel.getStandardModel()); + final RangeTroposphericDelayModifier modifier = + new RangeTroposphericDelayModifier((TroposphericModel) ModifiedSaastamoinenModel.getStandardModel()); for (final ObservedMeasurement measurement : measurements) { final AbsoluteDate date = measurement.getDate(); @@ -193,7 +195,8 @@ public void testPhaseTropoModifier() { 1.0, 3.0, 300.0); propagator.clearStepHandlers(); - final PhaseTroposphericDelayModifier modifier = new PhaseTroposphericDelayModifier(ModifiedSaastamoinenModel.getStandardModel()); + final PhaseTroposphericDelayModifier modifier = + new PhaseTroposphericDelayModifier((TroposphericModel) ModifiedSaastamoinenModel.getStandardModel()); for (final ObservedMeasurement measurement : measurements) { final AbsoluteDate date = measurement.getDate(); @@ -302,7 +305,8 @@ public void testTurnAroundRangeTropoModifier() { 1.0, 3.0, 300.0); propagator.clearStepHandlers(); - final TurnAroundRangeTroposphericDelayModifier modifier = new TurnAroundRangeTroposphericDelayModifier(ModifiedSaastamoinenModel.getStandardModel()); + final TurnAroundRangeTroposphericDelayModifier modifier = + new TurnAroundRangeTroposphericDelayModifier((TroposphericModel) ModifiedSaastamoinenModel.getStandardModel()); for (final ObservedMeasurement measurement : measurements) { final AbsoluteDate date = measurement.getDate(); @@ -353,7 +357,7 @@ public void testBistaticRangeTropoModifier() { propagator.clearStepHandlers(); final BistaticRangeTroposphericDelayModifier modifier = - new BistaticRangeTroposphericDelayModifier(ModifiedSaastamoinenModel.getStandardModel()); + new BistaticRangeTroposphericDelayModifier((TroposphericModel) ModifiedSaastamoinenModel.getStandardModel()); for (final ObservedMeasurement measurement : measurements) { BistaticRange biRange = (BistaticRange) measurement; @@ -402,7 +406,7 @@ public void testBistaticRangeRateTropoModifier() { propagator.clearStepHandlers(); final BistaticRangeRateTroposphericDelayModifier modifier = - new BistaticRangeRateTroposphericDelayModifier(ModifiedSaastamoinenModel.getStandardModel()); + new BistaticRangeRateTroposphericDelayModifier((TroposphericModel) ModifiedSaastamoinenModel.getStandardModel()); for (final ObservedMeasurement measurement : measurements) { BistaticRangeRate biRangeRate = (BistaticRangeRate) measurement; @@ -510,7 +514,7 @@ public void testTDOATropoModifier() { propagator.clearStepHandlers(); final TDOATroposphericDelayModifier modifier = - new TDOATroposphericDelayModifier(ModifiedSaastamoinenModel.getStandardModel()); + new TDOATroposphericDelayModifier((TroposphericModel) ModifiedSaastamoinenModel.getStandardModel()); for (final ObservedMeasurement measurement : measurements) { TDOA tdoa = (TDOA) measurement; @@ -615,7 +619,8 @@ public void testRangeRateTropoModifier() { 1.0, 3.0, 300.0); propagator.clearStepHandlers(); - final RangeRateTroposphericDelayModifier modifier = new RangeRateTroposphericDelayModifier(ModifiedSaastamoinenModel.getStandardModel(), false); + final RangeRateTroposphericDelayModifier modifier = + new RangeRateTroposphericDelayModifier((TroposphericModel) ModifiedSaastamoinenModel.getStandardModel(), false); for (final ObservedMeasurement measurement : measurements) { final AbsoluteDate date = measurement.getDate(); From f7b06e6a93ca828f87b7c0e690f51b0c9b823b07 Mon Sep 17 00:00:00 2001 From: Luc Maisonobe Date: Mon, 24 Jun 2024 21:49:27 +0200 Subject: [PATCH 2/2] Updated support files for patch release. --- pom.xml | 2 +- src/changes/changes.xml | 2 +- src/site/markdown/downloads.md.vm | 2 +- src/site/markdown/faq.md | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 84c5403dc4..d660dd6093 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.orekit orekit jar - 12.1 + 12.1.1 OREKIT http://www.orekit.org/ diff --git a/src/changes/changes.xml b/src/changes/changes.xml index edcaf6d30d..103ecad21e 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -20,7 +20,7 @@ Orekit Changes - diff --git a/src/site/markdown/downloads.md.vm b/src/site/markdown/downloads.md.vm index 285f3f6867..b0066728df 100644 --- a/src/site/markdown/downloads.md.vm +++ b/src/site/markdown/downloads.md.vm @@ -45,7 +45,7 @@ with groupID org.orekit and artifactId orekit so maven internal mechanism will download automatically all artifacts and dependencies as required. -#set ( $versions = {"12.1": "2024-06-24", "12.0.2": "2024-03-15", "12.0.1": "2023-12-31", "12.0": "2023-11-08", "11.3.3": "2023-06-30", "11.3.2": "2023-02-17", "11.3.1": "2022-12-24", "11.3": "2022-10-25", "11.2.1": "2022-08-01", "11.2": "2022-06-20", "11.1.2": "2022-04-27", "11.1.1": "2022-03-17", "11.1": "2022-02-14", "11.0.2": "2021-11-24", "11.0.1": "2021-10-22", "11.0": "2021-09-20", "10.3.1": "2021-06-16", "10.3": "2020-12-21", "10.2": "2020-07-14", "10.1": "2020-02-19", "10.0": "2019-06-24", "9.3.1": "2019-03-16", "9.3": "2019-01-25", "9.2": "2018-05-26","9.1": "2017-11-26","9.0.1": "2017-11-03","9.0": "2017-07-26","8.0.1": "2017-11-03","8.0": "2016-06-30","7.2.1": "2017-11-03","7.2": "2016-04-05","7.1": "2016-02-07","7.0": "2015-01-11","6.1": "2013-12-13","6.0": "2013-04-23","5.0.3": "2011-07-13","5.0.2": "2011-07-11","5.0.1": "2011-04-18"} ) +#set ( $versions = {"12.1.1": "2024-06-25", "12.1": "2024-06-24", "12.0.2": "2024-03-15", "12.0.1": "2023-12-31", "12.0": "2023-11-08", "11.3.3": "2023-06-30", "11.3.2": "2023-02-17", "11.3.1": "2022-12-24", "11.3": "2022-10-25", "11.2.1": "2022-08-01", "11.2": "2022-06-20", "11.1.2": "2022-04-27", "11.1.1": "2022-03-17", "11.1": "2022-02-14", "11.0.2": "2021-11-24", "11.0.1": "2021-10-22", "11.0": "2021-09-20", "10.3.1": "2021-06-16", "10.3": "2020-12-21", "10.2": "2020-07-14", "10.1": "2020-02-19", "10.0": "2019-06-24", "9.3.1": "2019-03-16", "9.3": "2019-01-25", "9.2": "2018-05-26","9.1": "2017-11-26","9.0.1": "2017-11-03","9.0": "2017-07-26","8.0.1": "2017-11-03","8.0": "2016-06-30","7.2.1": "2017-11-03","7.2": "2016-04-05","7.1": "2016-02-07","7.0": "2015-01-11","6.1": "2013-12-13","6.0": "2013-04-23","5.0.3": "2011-07-13","5.0.2": "2011-07-11","5.0.1": "2011-04-18"} ) #foreach( $version in $versions.entrySet() ) | package | link | diff --git a/src/site/markdown/faq.md b/src/site/markdown/faq.md index 62a7b4ea18..4202e62a48 100644 --- a/src/site/markdown/faq.md +++ b/src/site/markdown/faq.md @@ -156,6 +156,7 @@ Math to Hipparchus Orekit 12.0.1 | Hipparchus 3.0 Orekit 12.0.2 | Hipparchus 3.0 Orekit 12.1 | Hipparchus 3.1 + Orekit 12.1.1 | Hipparchus 3.1 ### Maven failed to compile Orekit and complained about a missing artifact.