Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream-orekit-gitlab/release-12.0' in…
Browse files Browse the repository at this point in the history 
…to develop
  • Loading branch information
@petrushy
petrushy committed Nov 3, 2023
2 parents 33bfd8f + 4aee10d commit 2935481
Show file tree
Hide file tree
Showing 12 changed files with 199 additions and 138 deletions.
14 changes: 13 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,9 @@
<contributor>
<name>Daniel Aguilar Taboada</name>
</contributor>
<contributor>
<name>Julien Asquier</name>
</contributor>
<contributor>
<name>Louis Aucouturier</name>
</contributor>
Expand Down Expand Up @@ -286,6 +289,9 @@
<contributor>
<name>Andrea Fiorentino</name>
</contributor>
<contributor>
<name>Brad Hards</name>
</contributor>
<contributor>
<name>Romaric Her</name>
</contributor>
Expand Down Expand Up @@ -316,6 +322,9 @@
<contributor>
<name>Vincent Mouraux</name>
</contributor>
<contributor>
<name>Theo Nguyen</name>
</contributor>
<contributor>
<name>Lars N&#230;sbye Christensen</name>
</contributor>
Expand Down Expand Up @@ -343,6 +352,9 @@
<contributor>
<name>Mathieu Rom&#233;ro</name>
</contributor>
<contributor>
<name>Li Rongwang</name>
</contributor>
<contributor>
<name>Chiara Rusconi</name>
</contributor>
Expand Down Expand Up @@ -1101,7 +1113,7 @@
<configuration>
<!-- Orekit is mostly a computational library. -->
<!-- As there is not a lot of I/O it is better to not overide the number of CPU. -->
<forkCount>1C</forkCount>
<forkCount>0.5C</forkCount>
<argLine>@{argLine} -Xmx2048m</argLine>
</configuration>
</plugin>
Expand Down
8 changes: 7 additions & 1 deletion src/changes/changes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<title>Orekit Changes</title>
</properties>
<body>
<release version="12.0" date="2023-11-05"
<release version="12.0" date="2023-11-08"
description="Orekit 12.0 is a major new release.
It includes both new features and bug fixes. The main new features
introduced in 12.0 are: the Zeis model for DSST J2-squared terms, RTCM orbit
Expand All @@ -39,6 +39,12 @@
formats: EOP C04, STK ephemeris files, Rinex 3.05 and 4.0, Rinex 2 navigation
messages, CCSDS ADM v2, and Sinex Differential Code Bias (DCB).
See the list below for a full description of the changes.">
<action dev="lirw1984" type="update" issue="938">
Enhanced parsing of CRD files.
</action>
<action dev="luc" type="update" issue="1256">
Limit use of synchronization in LazyLoadedTimeScales.
</action>
<action dev="serrof" type="update" issue="1242">
Removed unused static variables in DTM2000.
</action>
Expand Down
6 changes: 3 additions & 3 deletions src/design/data-filtering-class-diagram.puml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@
DataFilter <|-- GzipFilter
DataFilter <|-- UnixFilter

UnixFilter --> DataSource.Opener : creates
GzipFilter --> DataSource.Opener : creates
UnixFilter --> Opener : creates
GzipFilter --> Opener : creates

}

package files.rinex #DDEBD8 {
class HatanakaCompressFilter
DataFilter <|-- HatanakaCompressFilter
DataSource.Opener <-left- HatanakaCompressFilter : creates
Opener <-left- HatanakaCompressFilter : creates
}

}
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/orekit/gnss/metric/ntrip/NtripClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,7 @@ public void stopStreaming(final int time) {

try {
// wait for proper ending
executorService.shutdown();
executorService.awaitTermination(time, TimeUnit.MILLISECONDS);
} catch (InterruptedException ie) {
// Restore interrupted state...
Expand Down
38 changes: 19 additions & 19 deletions src/main/java/org/orekit/propagation/FieldSpacecraftState.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -720,14 +720,14 @@ public FieldOrbit<T> getOrbit() throws OrekitIllegalStateException {
/** {@inheritDoc} */
@Override
public FieldAbsoluteDate<T> getDate() {
return (isOrbitDefined()) ? orbit.getDate() : absPva.getDate();
return isOrbitDefined() ? orbit.getDate() : absPva.getDate();
}

/** Get the defining frame.
* @return the frame in which state is defined
*/
public Frame getFrame() {
return (isOrbitDefined()) ? orbit.getFrame() : absPva.getFrame();
return isOrbitDefined() ? orbit.getFrame() : absPva.getFrame();
}


Expand Down Expand Up @@ -892,7 +892,7 @@ public FieldStaticTransform<T> toStaticTransform() {
* state contains an absolute position-velocity-acceleration rather than an orbit
*/
public T getMu() {
return (isOrbitDefined()) ? orbit.getMu() : absPva.getDate().getField().getZero().add(Double.NaN);
return isOrbitDefined() ? orbit.getMu() : absPva.getDate().getField().getZero().add(Double.NaN);
}

/** Get the Keplerian period.
Expand All @@ -903,7 +903,7 @@ public T getMu() {
* than an orbit
*/
public T getKeplerianPeriod() {
return (isOrbitDefined()) ? orbit.getKeplerianPeriod() : absPva.getDate().getField().getZero().add(Double.NaN);
return isOrbitDefined() ? orbit.getKeplerianPeriod() : absPva.getDate().getField().getZero().add(Double.NaN);
}

/** Get the Keplerian mean motion.
Expand All @@ -914,7 +914,7 @@ public T getKeplerianPeriod() {
* than an orbit
*/
public T getKeplerianMeanMotion() {
return (isOrbitDefined()) ? orbit.getKeplerianMeanMotion() : absPva.getDate().getField().getZero().add(Double.NaN);
return isOrbitDefined() ? orbit.getKeplerianMeanMotion() : absPva.getDate().getField().getZero().add(Double.NaN);
}

/** Get the semi-major axis.
Expand All @@ -923,7 +923,7 @@ public T getKeplerianMeanMotion() {
* than an orbit
*/
public T getA() {
return (isOrbitDefined()) ? orbit.getA() : absPva.getDate().getField().getZero().add(Double.NaN);
return isOrbitDefined() ? orbit.getA() : absPva.getDate().getField().getZero().add(Double.NaN);
}

/** Get the first component of the eccentricity vector (as per equinoctial parameters).
Expand All @@ -933,7 +933,7 @@ public T getA() {
* @see #getE()
*/
public T getEquinoctialEx() {
return (isOrbitDefined()) ? orbit.getEquinoctialEx() : absPva.getDate().getField().getZero().add(Double.NaN);
return isOrbitDefined() ? orbit.getEquinoctialEx() : absPva.getDate().getField().getZero().add(Double.NaN);
}

/** Get the second component of the eccentricity vector (as per equinoctial parameters).
Expand All @@ -943,7 +943,7 @@ public T getEquinoctialEx() {
* @see #getE()
*/
public T getEquinoctialEy() {
return (isOrbitDefined()) ? orbit.getEquinoctialEy() : absPva.getDate().getField().getZero().add(Double.NaN);
return isOrbitDefined() ? orbit.getEquinoctialEy() : absPva.getDate().getField().getZero().add(Double.NaN);
}

/** Get the first component of the inclination vector (as per equinoctial parameters).
Expand All @@ -953,7 +953,7 @@ public T getEquinoctialEy() {
* @see #getI()
*/
public T getHx() {
return (isOrbitDefined()) ? orbit.getHx() : absPva.getDate().getField().getZero().add(Double.NaN);
return isOrbitDefined() ? orbit.getHx() : absPva.getDate().getField().getZero().add(Double.NaN);
}

/** Get the second component of the inclination vector (as per equinoctial parameters).
Expand All @@ -963,7 +963,7 @@ public T getHx() {
* @see #getI()
*/
public T getHy() {
return (isOrbitDefined()) ? orbit.getHy() : absPva.getDate().getField().getZero().add(Double.NaN);
return isOrbitDefined() ? orbit.getHy() : absPva.getDate().getField().getZero().add(Double.NaN);
}

/** Get the true latitude argument (as per equinoctial parameters).
Expand All @@ -974,7 +974,7 @@ public T getHy() {
* @see #getLM()
*/
public T getLv() {
return (isOrbitDefined()) ? orbit.getLv() : absPva.getDate().getField().getZero().add(Double.NaN);
return isOrbitDefined() ? orbit.getLv() : absPva.getDate().getField().getZero().add(Double.NaN);
}

/** Get the eccentric latitude argument (as per equinoctial parameters).
Expand All @@ -985,7 +985,7 @@ public T getLv() {
* @see #getLM()
*/
public T getLE() {
return (isOrbitDefined()) ? orbit.getLE() : absPva.getDate().getField().getZero().add(Double.NaN);
return isOrbitDefined() ? orbit.getLE() : absPva.getDate().getField().getZero().add(Double.NaN);
}

/** Get the mean longitude argument (as per equinoctial parameters).
Expand All @@ -996,7 +996,7 @@ public T getLE() {
* @see #getLE()
*/
public T getLM() {
return (isOrbitDefined()) ? orbit.getLM() : absPva.getDate().getField().getZero().add(Double.NaN);
return isOrbitDefined() ? orbit.getLM() : absPva.getDate().getField().getZero().add(Double.NaN);
}

// Additional orbital elements
Expand All @@ -1009,7 +1009,7 @@ public T getLM() {
* @see #getEquinoctialEy()
*/
public T getE() {
return (isOrbitDefined()) ? orbit.getE() : absPva.getDate().getField().getZero().add(Double.NaN);
return isOrbitDefined() ? orbit.getE() : absPva.getDate().getField().getZero().add(Double.NaN);
}

/** Get the inclination.
Expand All @@ -1018,15 +1018,15 @@ public T getE() {
* @see #getHy()
*/
public T getI() {
return (isOrbitDefined()) ? orbit.getI() : absPva.getDate().getField().getZero().add(Double.NaN);
return isOrbitDefined() ? orbit.getI() : absPva.getDate().getField().getZero().add(Double.NaN);
}

/** Get the position in orbit definition frame.
* @return position in orbit definition frame
* @since 12.0
*/
public FieldVector3D<T> getPosition() {
return (isOrbitDefined()) ? orbit.getPosition() : absPva.getPosition();
return isOrbitDefined() ? orbit.getPosition() : absPva.getPosition();
}

/** Get the {@link TimeStampedFieldPVCoordinates} in orbit definition frame.
Expand All @@ -1040,7 +1040,7 @@ public FieldVector3D<T> getPosition() {
* @return pvCoordinates in orbit definition frame
*/
public TimeStampedFieldPVCoordinates<T> getPVCoordinates() {
return (isOrbitDefined()) ? orbit.getPVCoordinates() : absPva.getPVCoordinates();
return isOrbitDefined() ? orbit.getPVCoordinates() : absPva.getPVCoordinates();
}

/** Get the position in given output frame.
Expand All @@ -1050,7 +1050,7 @@ public TimeStampedFieldPVCoordinates<T> getPVCoordinates() {
* @see #getPVCoordinates(Frame)
*/
public FieldVector3D<T> getPosition(final Frame outputFrame) {
return (isOrbitDefined()) ? orbit.getPosition(outputFrame) : absPva.getPosition(outputFrame);
return isOrbitDefined() ? orbit.getPosition(outputFrame) : absPva.getPosition(outputFrame);
}

/** Get the {@link TimeStampedFieldPVCoordinates} in given output frame.
Expand All @@ -1065,7 +1065,7 @@ public FieldVector3D<T> getPosition(final Frame outputFrame) {
* @return pvCoordinates in orbit definition frame
*/
public TimeStampedFieldPVCoordinates<T> getPVCoordinates(final Frame outputFrame) {
return (isOrbitDefined()) ? orbit.getPVCoordinates(outputFrame) : absPva.getPVCoordinates(outputFrame);
return isOrbitDefined() ? orbit.getPVCoordinates(outputFrame) : absPva.getPVCoordinates(outputFrame);
}

/** Get the attitude.
Expand Down
Loading

0 comments on commit 2935481

Please sign in to comment.