Commit 84264dfa authored by Luc Maisonobe's avatar Luc Maisonobe
Browse files

Merge branch 'develop' of https://gitlab.orekit.org/orekit/orekit into develop

parents 85e30bee cde3ea88
Pipeline #1233 canceled with stages
......@@ -21,6 +21,9 @@
</properties>
<body>
<release version="11.0" date="TBD" description="TBD">
<action dev="bryan" type="fix" issue="795" due-to="guylaine">
Fixed output of NRLMSISE00 for altitude at 32.5 km.
</action>
<action dev="luc" type="add" issue="821">
Added support for CCSDS TDM V2.0.
</action>
......
......@@ -1835,7 +1835,7 @@ public class NRLMSISE00 implements Atmosphere {
// Calculates for lower stratosphere and troposphere (below ZN3[0])
// Temperature at nodes and gradients at end nodes
// Inverse temperature a linear function of spherical harmonics
if (alt < ZN3[0]) {
if (alt <= ZN3[0]) {
final double q = PMA[6][0] * PAVGM[6];
meso_tgn3[0] = meso_tgn2[1];
meso_tn3[1] = PMA[3][0] * PAVGM[3] / (1.0 - sw[22] * glob7s(PMA[3]));
......@@ -3241,7 +3241,7 @@ public class NRLMSISE00 implements Atmosphere {
// Calculates for lower stratosphere and troposphere (below ZN3[0])
// Temperature at nodes and gradients at end nodes
// Inverse temperature a linear function of spherical harmonics
if (alt.getReal() < ZN3[0]) {
if (alt.getReal() <= ZN3[0]) {
final double q = PMA[6][0] * PAVGM[6];
meso_tgn3[0] = meso_tgn2[1];
meso_tn3[1] = glob7s(PMA[3]).multiply(sw[22]).negate().add(1).reciprocal().multiply(PMA[3][0] * PAVGM[3]);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment