Skip to content
Snippets Groups Projects
Commit 86e679e2 authored by Luc Maisonobe's avatar Luc Maisonobe
Browse files

Merge branch 'issue-722' into develop

parents ea4af793 c0ae1674
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 208 additions and 75 deletions
src/changes/changes.xml
+ 5
− 0
View file @ 86e679e2
...@@ -21,6 +21,11 @@ ...@@ -21,6 +21,11 @@
</properties> </properties>
<body> <body>
<release version="11.1" date="TBD" description="TBD"> <release version="11.1" date="TBD" description="TBD">
<action dev="luc" type="fix" issue="722">
Prefer values from Bulletin B rather than Bulletin A if both are present
in rapid data column format. This handling of priority was already in
place for XML file, but not for column format.
</action>
<action dev="luc" type="fix" issue="448"> <action dev="luc" type="fix" issue="448">
Added support for ICGEM V2.0 format for piecewise gravity fields Added support for ICGEM V2.0 format for piecewise gravity fields
that contain discontinuities around major earthquakes, like that contain discontinuities around major earthquakes, like
......
src/main/java/org/orekit/frames/RapidDataAndPredictionColumnsLoader.java
+ 147
− 58
View file @ 86e679e2
...@@ -87,41 +87,70 @@ class RapidDataAndPredictionColumnsLoader extends AbstractEopLoader ...@@ -87,41 +87,70 @@ class RapidDataAndPredictionColumnsLoader extends AbstractEopLoader
/** Pattern to match the date part of the line (always present). */ /** Pattern to match the date part of the line (always present). */
private static final Pattern DATE_PATTERN = Pattern.compile(INTEGER2_FIELD + INTEGER2_FIELD + INTEGER2_FIELD + MJD_FIELD); private static final Pattern DATE_PATTERN = Pattern.compile(INTEGER2_FIELD + INTEGER2_FIELD + INTEGER2_FIELD + MJD_FIELD);
/** Start index of the pole part of the line. */ /** Start index of the pole part of the line (from bulletin A). */
private static int POLE_START = 16; private static int POLE_START_A = 16;
/** end index of the pole part of the line. */ /** end index of the pole part of the line (from bulletin A). */
private static int POLE_END = 55; private static int POLE_END_A = 55;
/** Pattern to match the pole part of the line. */ /** Pattern to match the pole part of the line (from bulletin A). */
private static final Pattern POLE_PATTERN = Pattern.compile(SEPARATOR + REAL_FIELD + REAL_FIELD + REAL_FIELD + REAL_FIELD); private static final Pattern POLE_PATTERN_A = Pattern.compile(SEPARATOR + REAL_FIELD + REAL_FIELD + REAL_FIELD + REAL_FIELD);
/** Start index of the UT1-UTC part of the line. */ /** Start index of the pole part of the line (from bulletin B). */
private static int UT1_UTC_START = 57; private static int POLE_START_B = 134;
/** end index of the UT1-UTC part of the line. */ /** end index of the pole part of the line (from bulletin B). */
private static int UT1_UTC_END = 78; private static int POLE_END_B = 154;
/** Pattern to match the UT1-UTC part of the line. */ /** Pattern to match the pole part of the line (from bulletin B). */
private static final Pattern UT1_UTC_PATTERN = Pattern.compile(SEPARATOR + REAL_FIELD + REAL_FIELD); private static final Pattern POLE_PATTERN_B = Pattern.compile(REAL_FIELD + REAL_FIELD);
/** Start index of the LOD part of the line. */ /** Start index of the UT1-UTC part of the line (from bulletin A). */
private static int LOD_START = 79; private static int UT1_UTC_START_A = 57;
/** end index of the LOD part of the line. */ /** end index of the UT1-UTC part of the line (from bulletin A). */
private static int LOD_END = 93; private static int UT1_UTC_END_A = 78;
/** Pattern to match the LOD part of the line. */ /** Pattern to match the UT1-UTC part of the line (from bulletin A). */
private static final Pattern LOD_PATTERN = Pattern.compile(REAL_FIELD + REAL_FIELD); private static final Pattern UT1_UTC_PATTERN_A = Pattern.compile(SEPARATOR + REAL_FIELD + REAL_FIELD);
/** Start index of the nutation part of the line. */ /** Start index of the UT1-UTC part of the line (from bulletin B). */
private static int NUTATION_START = 95; private static int UT1_UTC_START_B = 154;
/** end index of the nutation part of the line. */ /** end index of the UT1-UTC part of the line (from bulletin B). */
private static int NUTATION_END = 134; private static int UT1_UTC_END_B = 165;
/** Pattern to match the nutation part of the line. */ /** Pattern to match the UT1-UTC part of the line (from bulletin B). */
private static final Pattern NUTATION_PATTERN = Pattern.compile(SEPARATOR + REAL_FIELD + REAL_FIELD + REAL_FIELD + REAL_FIELD); private static final Pattern UT1_UTC_PATTERN_B = Pattern.compile(REAL_FIELD);
/** Start index of the LOD part of the line (from bulletin A). */
private static int LOD_START_A = 79;
/** end index of the LOD part of the line (from bulletin A). */
private static int LOD_END_A = 93;
/** Pattern to match the LOD part of the line (from bulletin A). */
private static final Pattern LOD_PATTERN_A = Pattern.compile(REAL_FIELD + REAL_FIELD);
// there are no LOD part from bulletin B
/** Start index of the nutation part of the line (from bulletin A). */
private static int NUTATION_START_A = 95;
/** end index of the nutation part of the line (from bulletin A). */
private static int NUTATION_END_A = 134;
/** Pattern to match the nutation part of the line (from bulletin A). */
private static final Pattern NUTATION_PATTERN_A = Pattern.compile(SEPARATOR + REAL_FIELD + REAL_FIELD + REAL_FIELD + REAL_FIELD);
/** Start index of the nutation part of the line (from bulletin B). */
private static int NUTATION_START_B = 165;
/** end index of the nutation part of the line (from bulletin B). */
private static int NUTATION_END_B = 185;
/** Pattern to match the nutation part of the line (from bulletin B). */
private static final Pattern NUTATION_PATTERN_B = Pattern.compile(REAL_FIELD + REAL_FIELD);
/** Type of nutation corrections. */ /** Type of nutation corrections. */
private final boolean isNonRotatingOrigin; private final boolean isNonRotatingOrigin;
...@@ -195,11 +224,14 @@ class RapidDataAndPredictionColumnsLoader extends AbstractEopLoader ...@@ -195,11 +224,14 @@ class RapidDataAndPredictionColumnsLoader extends AbstractEopLoader
lineNumber++; lineNumber++;
// split the lines in its various columns (some of them can be blank) // split the lines in its various columns (some of them can be blank)
final String datePart = (line.length() >= DATE_END) ? line.substring(DATE_START, DATE_END) : ""; final String datePart = getPart(line, DATE_START, DATE_END);
final String polePart = (line.length() >= POLE_END) ? line.substring(POLE_START, POLE_END) : ""; final String polePartA = getPart(line, POLE_START_A, POLE_END_A);
final String ut1utcPart = (line.length() >= UT1_UTC_END ) ? line.substring(UT1_UTC_START, UT1_UTC_END) : ""; final String ut1utcPartA = getPart(line, UT1_UTC_START_A, UT1_UTC_END_A);
final String lodPart = (line.length() >= LOD_END) ? line.substring(LOD_START, LOD_END) : ""; final String lodPartA = getPart(line, LOD_START_A, LOD_END_A);
final String nutationPart = (line.length() >= NUTATION_END) ? line.substring(NUTATION_START, NUTATION_END) : ""; final String nutationPartA = getPart(line, NUTATION_START_A, NUTATION_END_A);
final String polePartB = getPart(line, POLE_START_B, POLE_END_B);
final String ut1utcPartB = getPart(line, UT1_UTC_START_B, UT1_UTC_END_B);
final String nutationPartB = getPart(line, NUTATION_START_B, NUTATION_END_B);
// parse the date part // parse the date part
final Matcher dateMatcher = DATE_PATTERN.matcher(datePart); final Matcher dateMatcher = DATE_PATTERN.matcher(datePart);
...@@ -224,15 +256,27 @@ class RapidDataAndPredictionColumnsLoader extends AbstractEopLoader ...@@ -224,15 +256,27 @@ class RapidDataAndPredictionColumnsLoader extends AbstractEopLoader
// parse the pole part // parse the pole part
final double x; final double x;
final double y; final double y;
if (polePart.trim().length() == 0) { if (polePartB.trim().length() == 0) {
// pole part is blank // pole part from bulletin B is blank
x = 0; if (polePartA.trim().length() == 0) {
y = 0; // pole part from bulletin A is blank
x = 0;
y = 0;
} else {
final Matcher poleAMatcher = POLE_PATTERN_A.matcher(polePartA);
if (poleAMatcher.matches()) {
x = UnitsConverter.ARC_SECONDS_TO_RADIANS.convert(Double.parseDouble(poleAMatcher.group(1)));
y = UnitsConverter.ARC_SECONDS_TO_RADIANS.convert(Double.parseDouble(poleAMatcher.group(3)));
} else {
throw new OrekitException(OrekitMessages.UNABLE_TO_PARSE_LINE_IN_FILE,
lineNumber, name, line);
}
}
} else { } else {
final Matcher poleMatcher = POLE_PATTERN.matcher(polePart); final Matcher poleBMatcher = POLE_PATTERN_B.matcher(polePartB);
if (poleMatcher.matches()) { if (poleBMatcher.matches()) {
x = UnitsConverter.ARC_SECONDS_TO_RADIANS.convert(Double.parseDouble(poleMatcher.group(1))); x = UnitsConverter.ARC_SECONDS_TO_RADIANS.convert(Double.parseDouble(poleBMatcher.group(1)));
y = UnitsConverter.ARC_SECONDS_TO_RADIANS.convert(Double.parseDouble(poleMatcher.group(3))); y = UnitsConverter.ARC_SECONDS_TO_RADIANS.convert(Double.parseDouble(poleBMatcher.group(2)));
} else { } else {
throw new OrekitException(OrekitMessages.UNABLE_TO_PARSE_LINE_IN_FILE, throw new OrekitException(OrekitMessages.UNABLE_TO_PARSE_LINE_IN_FILE,
lineNumber, name, line); lineNumber, name, line);
...@@ -241,13 +285,24 @@ class RapidDataAndPredictionColumnsLoader extends AbstractEopLoader ...@@ -241,13 +285,24 @@ class RapidDataAndPredictionColumnsLoader extends AbstractEopLoader
// parse the UT1-UTC part // parse the UT1-UTC part
final double dtu1; final double dtu1;
if (ut1utcPart.trim().length() == 0) { if (ut1utcPartB.trim().length() == 0) {
// UT1-UTC part is blank // UT1-UTC part from bulletin B is blank
dtu1 = 0; if (ut1utcPartA.trim().length() == 0) {
// UT1-UTC part from bulletin A is blank
dtu1 = 0;
} else {
final Matcher ut1utcAMatcher = UT1_UTC_PATTERN_A.matcher(ut1utcPartA);
if (ut1utcAMatcher.matches()) {
dtu1 = Double.parseDouble(ut1utcAMatcher.group(1));
} else {
throw new OrekitException(OrekitMessages.UNABLE_TO_PARSE_LINE_IN_FILE,
lineNumber, name, line);
}
}
} else { } else {
final Matcher ut1utcMatcher = UT1_UTC_PATTERN.matcher(ut1utcPart); final Matcher ut1utcBMatcher = UT1_UTC_PATTERN_B.matcher(ut1utcPartB);
if (ut1utcMatcher.matches()) { if (ut1utcBMatcher.matches()) {
dtu1 = Double.parseDouble(ut1utcMatcher.group(1)); dtu1 = Double.parseDouble(ut1utcBMatcher.group(1));
} else { } else {
throw new OrekitException(OrekitMessages.UNABLE_TO_PARSE_LINE_IN_FILE, throw new OrekitException(OrekitMessages.UNABLE_TO_PARSE_LINE_IN_FILE,
lineNumber, name, line); lineNumber, name, line);
...@@ -256,13 +311,13 @@ class RapidDataAndPredictionColumnsLoader extends AbstractEopLoader ...@@ -256,13 +311,13 @@ class RapidDataAndPredictionColumnsLoader extends AbstractEopLoader
// parse the lod part // parse the lod part
final double lod; final double lod;
if (lodPart.trim().length() == 0) { if (lodPartA.trim().length() == 0) {
// lod part is blank // lod part from bulletin A is blank
lod = 0; lod = 0;
} else { } else {
final Matcher lodMatcher = LOD_PATTERN.matcher(lodPart); final Matcher lodAMatcher = LOD_PATTERN_A.matcher(lodPartA);
if (lodMatcher.matches()) { if (lodAMatcher.matches()) {
lod = UnitsConverter.MILLI_SECONDS_TO_SECONDS.convert(Double.parseDouble(lodMatcher.group(1))); lod = UnitsConverter.MILLI_SECONDS_TO_SECONDS.convert(Double.parseDouble(lodAMatcher.group(1)));
} else { } else {
throw new OrekitException(OrekitMessages.UNABLE_TO_PARSE_LINE_IN_FILE, throw new OrekitException(OrekitMessages.UNABLE_TO_PARSE_LINE_IN_FILE,
lineNumber, name, line); lineNumber, name, line);
...@@ -275,23 +330,46 @@ class RapidDataAndPredictionColumnsLoader extends AbstractEopLoader ...@@ -275,23 +330,46 @@ class RapidDataAndPredictionColumnsLoader extends AbstractEopLoader
final AbsoluteDate mjdDate = final AbsoluteDate mjdDate =
new AbsoluteDate(new DateComponents(DateComponents.MODIFIED_JULIAN_EPOCH, mjd), new AbsoluteDate(new DateComponents(DateComponents.MODIFIED_JULIAN_EPOCH, mjd),
getUtc()); getUtc());
if (nutationPart.trim().length() == 0) { if (nutationPartB.trim().length() == 0) {
// nutation part is blank // nutation part from bulletin B is blank
nro = new double[2]; if (nutationPartA.trim().length() == 0) {
equinox = new double[2]; // nutation part from bulletin A is blank
nro = new double[2];
equinox = new double[2];
} else {
final Matcher nutationAMatcher = NUTATION_PATTERN_A.matcher(nutationPartA);
if (nutationAMatcher.matches()) {
if (isNonRotatingOrigin) {
nro = new double[] {
UnitsConverter.MILLI_ARC_SECONDS_TO_RADIANS.convert(Double.parseDouble(nutationAMatcher.group(1))),
UnitsConverter.MILLI_ARC_SECONDS_TO_RADIANS.convert(Double.parseDouble(nutationAMatcher.group(3)))
};
equinox = getConverter().toEquinox(mjdDate, nro[0], nro[1]);
} else {
equinox = new double[] {
UnitsConverter.MILLI_ARC_SECONDS_TO_RADIANS.convert(Double.parseDouble(nutationAMatcher.group(1))),
UnitsConverter.MILLI_ARC_SECONDS_TO_RADIANS.convert(Double.parseDouble(nutationAMatcher.group(3)))
};
nro = getConverter().toNonRotating(mjdDate, equinox[0], equinox[1]);
}
} else {
throw new OrekitException(OrekitMessages.UNABLE_TO_PARSE_LINE_IN_FILE,
lineNumber, name, line);
}
}
} else { } else {
final Matcher nutationMatcher = NUTATION_PATTERN.matcher(nutationPart); final Matcher nutationBMatcher = NUTATION_PATTERN_B.matcher(nutationPartB);
if (nutationMatcher.matches()) { if (nutationBMatcher.matches()) {
if (isNonRotatingOrigin) { if (isNonRotatingOrigin) {
nro = new double[] { nro = new double[] {
UnitsConverter.MILLI_ARC_SECONDS_TO_RADIANS.convert(Double.parseDouble(nutationMatcher.group(1))), UnitsConverter.MILLI_ARC_SECONDS_TO_RADIANS.convert(Double.parseDouble(nutationBMatcher.group(1))),
UnitsConverter.MILLI_ARC_SECONDS_TO_RADIANS.convert(Double.parseDouble(nutationMatcher.group(3))) UnitsConverter.MILLI_ARC_SECONDS_TO_RADIANS.convert(Double.parseDouble(nutationBMatcher.group(2)))
}; };
equinox = getConverter().toEquinox(mjdDate, nro[0], nro[1]); equinox = getConverter().toEquinox(mjdDate, nro[0], nro[1]);
} else { } else {
equinox = new double[] { equinox = new double[] {
UnitsConverter.MILLI_ARC_SECONDS_TO_RADIANS.convert(Double.parseDouble(nutationMatcher.group(1))), UnitsConverter.MILLI_ARC_SECONDS_TO_RADIANS.convert(Double.parseDouble(nutationBMatcher.group(1))),
UnitsConverter.MILLI_ARC_SECONDS_TO_RADIANS.convert(Double.parseDouble(nutationMatcher.group(3))) UnitsConverter.MILLI_ARC_SECONDS_TO_RADIANS.convert(Double.parseDouble(nutationBMatcher.group(2)))
}; };
nro = getConverter().toNonRotating(mjdDate, equinox[0], equinox[1]); nro = getConverter().toNonRotating(mjdDate, equinox[0], equinox[1]);
} }
...@@ -317,4 +395,15 @@ class RapidDataAndPredictionColumnsLoader extends AbstractEopLoader ...@@ -317,4 +395,15 @@ class RapidDataAndPredictionColumnsLoader extends AbstractEopLoader
} }
/** Get a part of a line.
* @param line line to analyze
* @param start start index of the part
* @param end end index of the part
* @return either the line part if present or an empty string if line is too short
* @since 11.1
*/
private static String getPart(final String line, final int start, final int end) {
return (line.length() >= end) ? line.substring(start, end) : "";
}
} }
src/test/java/org/orekit/frames/RapidDataAndPredictionColumnsLoaderTest.java
+ 27
− 12
View file @ 86e679e2
...@@ -77,8 +77,8 @@ public class RapidDataAndPredictionColumnsLoaderTest extends AbstractFilesLoader ...@@ -77,8 +77,8 @@ public class RapidDataAndPredictionColumnsLoaderTest extends AbstractFilesLoader
new RapidDataAndPredictionColumnsLoader(false, "^finals\\.daily$", manager, () -> utc).fillHistory(converter, data); new RapidDataAndPredictionColumnsLoader(false, "^finals\\.daily$", manager, () -> utc).fillHistory(converter, data);
EOPHistory history = new EOPHistory(IERSConventions.IERS_1996, data, true); EOPHistory history = new EOPHistory(IERSConventions.IERS_1996, data, true);
// after 2011-06-01, the example daily file has no columns for Bulletin B data // after 2011-05-31, the example daily file has no columns for Bulletin B data
// we don't see anything since we ignore the columns from Bulletin B // we don't see anything since we fall back to bulletin A
AbsoluteDate t1Inf = new AbsoluteDate(2011, 6, 1, TimeScalesFactory.getUTC()); AbsoluteDate t1Inf = new AbsoluteDate(2011, 6, 1, TimeScalesFactory.getUTC());
Assert.assertEquals(-67.724, 3600000 * FastMath.toDegrees(history.getEquinoxNutationCorrection(t1Inf)[0]), 1.0e-10); Assert.assertEquals(-67.724, 3600000 * FastMath.toDegrees(history.getEquinoxNutationCorrection(t1Inf)[0]), 1.0e-10);
Assert.assertEquals(-11.807, 3600000 * FastMath.toDegrees(history.getEquinoxNutationCorrection(t1Inf)[1]), 1.0e-10); Assert.assertEquals(-11.807, 3600000 * FastMath.toDegrees(history.getEquinoxNutationCorrection(t1Inf)[1]), 1.0e-10);
...@@ -125,8 +125,8 @@ public class RapidDataAndPredictionColumnsLoaderTest extends AbstractFilesLoader ...@@ -125,8 +125,8 @@ public class RapidDataAndPredictionColumnsLoaderTest extends AbstractFilesLoader
new RapidDataAndPredictionColumnsLoader(true, "^finals2000A\\.daily$", manager, () -> utc).fillHistory(converter, data); new RapidDataAndPredictionColumnsLoader(true, "^finals2000A\\.daily$", manager, () -> utc).fillHistory(converter, data);
EOPHistory history = new EOPHistory(IERSConventions.IERS_2003, data, true); EOPHistory history = new EOPHistory(IERSConventions.IERS_2003, data, true);
// after 2011-06-01, the example daily file has no columns for Bulletin B data // after 2011-05-31, the example daily file has no columns for Bulletin B data
// we don't see anything since we ignore the columns from Bulletin B // we don't see anything since we fall back to bulletin A
AbsoluteDate t1Inf = new AbsoluteDate(2011, 6, 1, TimeScalesFactory.getUTC()); AbsoluteDate t1Inf = new AbsoluteDate(2011, 6, 1, TimeScalesFactory.getUTC());
Assert.assertEquals(-0.015313, 3600 * FastMath.toDegrees(history.getPoleCorrection(t1Inf).getXp()), 1.0e-10); Assert.assertEquals(-0.015313, 3600 * FastMath.toDegrees(history.getPoleCorrection(t1Inf).getXp()), 1.0e-10);
Assert.assertEquals( 0.403214, 3600 * FastMath.toDegrees(history.getPoleCorrection(t1Inf).getYp()), 1.0e-10); Assert.assertEquals( 0.403214, 3600 * FastMath.toDegrees(history.getPoleCorrection(t1Inf).getYp()), 1.0e-10);
...@@ -219,23 +219,38 @@ public class RapidDataAndPredictionColumnsLoaderTest extends AbstractFilesLoader ...@@ -219,23 +219,38 @@ public class RapidDataAndPredictionColumnsLoaderTest extends AbstractFilesLoader
} }
@Test @Test
public void testWrongPoleFormat() { public void testWrongPoleAFormat() {
doTestWrongFile("^finals2000A-wrong-pole-format\\.daily$", 7); doTestWrongFile("^finals2000A-wrong-pole-A-format\\.daily$", 7);
} }
@Test @Test
public void testWrongUT1UTCFormat() { public void testWrongPoleBFormat() {
doTestWrongFile("^finals2000A-wrong-ut1-utc-format\\.daily$", 7); doTestWrongFile("^finals2000A-wrong-pole-B-format\\.daily$", 7);
} }
@Test @Test
public void testWrongLODFormat() { public void testWrongUT1UTCAFormat() {
doTestWrongFile("^finals2000A-wrong-lod-format\\.daily$", 7); doTestWrongFile("^finals2000A-wrong-ut1-utc-A-format\\.daily$", 7);
} }
@Test @Test
public void testWrongNutationFormat() { public void testWrongUT1UTCBFormat() {
doTestWrongFile("^finals2000A-wrong-nutation-format\\.daily$", 7); doTestWrongFile("^finals2000A-wrong-ut1-utc-B-format\\.daily$", 7);
}
@Test
public void testWrongLODAFormat() {
doTestWrongFile("^finals2000A-wrong-lod-A-format\\.daily$", 7);
}
@Test
public void testWrongNutationAFormat() {
doTestWrongFile("^finals2000A-wrong-nutation-A-format\\.daily$", 7);
}
@Test
public void testWrongNutationBFormat() {
doTestWrongFile("^finals2000A-wrong-nutation-B-format\\.daily$", 7);
} }
private void doTestWrongFile(String fileName, int lineNumber) { private void doTestWrongFile(String fileName, int lineNumber) {
......
src/test/resources/rapid-data-columns/finals.daily
+ 1
− 1
View file @ 86e679e2
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
11 529 55710.00 I -0.017968 0.000021 0.398938 0.000024 I-0.2757582 0.0000136 0.8535 0.0070 I -66.573 0.243 -11.485 0.190 -0.017939 0.398907 -0.2757712 -66.252 -11.627 11 529 55710.00 I -0.017968 0.000021 0.398938 0.000024 I-0.2757582 0.0000136 0.8535 0.0070 I -66.573 0.243 -11.485 0.190 -0.017939 0.398907 -0.2757712 -66.252 -11.627
11 530 55711.00 I -0.017271 0.000026 0.400625 0.000028 I-0.2765663 0.0000096 0.7511 0.0090 I -67.085 0.261 -11.564 0.135 -0.017290 0.400656 -0.2765865 -66.849 -11.655 11 530 55711.00 I -0.017271 0.000026 0.400625 0.000028 I-0.2765663 0.0000096 0.7511 0.0090 I -67.085 0.261 -11.564 0.135 -0.017290 0.400656 -0.2765865 -66.849 -11.655
11 531 55712.00 I -0.016449 0.000017 0.401997 0.000022 I-0.2772616 0.0000117 0.6524 0.0069 I -67.480 0.270 -11.714 0.081 -0.016455 0.401976 -0.2772868 -67.359 -11.755 11 531 55712.00 I -0.016449 0.000017 0.401997 0.000022 I-0.2772616 0.0000117 0.6524 0.0069 I -67.480 0.270 -11.714 0.081 -0.016455 0.401976 -0.2772868 -67.359 -11.755
11 6 1 55713.00 I -0.015313 0.000019 0.403214 0.000030 I-0.2778790 0.0000100 0.5773 0.0074 I -67.724 0.377 -11.807 0.107 -0.015287 0.403222 -0.2778924 -67.454 -11.786 11 6 1 55713.00 I -0.015313 0.000019 0.403214 0.000030 I-0.2778790 0.0000100 0.5773 0.0074 I -67.724 0.377 -11.807 0.107
11 6 2 55714.00 I -0.014222 0.000019 0.404430 0.000029 I-0.2784173 0.0000091 0.5055 0.0069 I -67.800 0.377 -11.810 0.107 11 6 2 55714.00 I -0.014222 0.000019 0.404430 0.000029 I-0.2784173 0.0000091 0.5055 0.0069 I -67.800 0.377 -11.810 0.107
11 6 3 55715.00 I -0.013057 0.000019 0.405704 0.000029 I-0.2789050 0.0000094 0.4786 0.0057 I -67.759 0.377 -11.778 0.107 11 6 3 55715.00 I -0.013057 0.000019 0.405704 0.000029 I-0.2789050 0.0000094 0.4786 0.0057 I -67.759 0.377 -11.778 0.107
11 6 4 55716.00 I -0.011610 0.000019 0.407438 0.000029 I-0.2794129 0.0000068 0.5668 0.0051 I -67.765 0.377 -11.755 0.107 11 6 4 55716.00 I -0.011610 0.000019 0.407438 0.000029 I-0.2794129 0.0000068 0.5668 0.0051 I -67.765 0.377 -11.755 0.107
......
src/test/resources/rapid-data-columns/finals2000A-wrong-nutation-A-format.daily 0 → 100644
+ 8
− 0
View file @ 86e679e2
11 4 9 55660.00 I -0.043325 0.000025 0.293403 0.000023 I-0.2207251 0.0000051 0.7480 0.0043 I -0.056 0.119 -0.368 0.117
11 410 55661.00 I -0.043370 0.000025 0.295688 0.000038 I-0.2214932 0.0000046 0.7974 0.0035 I -0.059 0.119 -0.352 0.101
11 411 55662.00 I -0.043599 0.000022 0.297664 0.000038 I-0.2223373 0.0000047 0.8989 0.0031 I -0.071 0.119 -0.336 0.101
11 412 55663.00 I -0.043904 0.000019 0.299638 0.000036 I-0.2233126 0.0000043 1.0654 0.0031 I -0.092 0.119 -0.338 0.054
11 413 55664.00 I -0.044073 0.000050 0.301834 0.000037 I-0.2244740 0.0000041 1.2498 0.0030 I -0.121 0.067 -0.342 0.076
11 414 55665.00 I -0.044173 0.000049 0.304192 0.000037 I-0.2258064 0.0000041 1.4168 0.0029 I -0.158 0.067 -0.328 0.076
11 415 55666.00 I -0.044099 0.000043 0.306711 0.000032 I-0.2273035 0.0000042 1.5713 0.0030 I ###### 0.067 -0.317 0.076
11 416 55667.00 I -0.043920 0.000039 0.309372 0.000017 I-0.2289274 0.0000045 1.6609 0.0027 I -0.223 0.119 -0.332 0.115
src/test/resources/rapid-data-columns/finals2000A-wrong-nutation-format.daily → src/test/resources/rapid-data-columns/finals2000A-wrong-nutation-B-format.daily
+ 1
− 1
View file @ 86e679e2
...@@ -4,5 +4,5 @@ ...@@ -4,5 +4,5 @@
11 412 55663.00 I -0.043904 0.000019 0.299638 0.000036 I-0.2233126 0.0000043 1.0654 0.0031 I -0.092 0.119 -0.338 0.054 -0.043917 0.299592 -0.2233096 -0.014 -0.334 11 412 55663.00 I -0.043904 0.000019 0.299638 0.000036 I-0.2233126 0.0000043 1.0654 0.0031 I -0.092 0.119 -0.338 0.054 -0.043917 0.299592 -0.2233096 -0.014 -0.334
11 413 55664.00 I -0.044073 0.000050 0.301834 0.000037 I-0.2244740 0.0000041 1.2498 0.0030 I -0.121 0.067 -0.342 0.076 -0.044057 0.301844 -0.2244705 -0.080 -0.276 11 413 55664.00 I -0.044073 0.000050 0.301834 0.000037 I-0.2244740 0.0000041 1.2498 0.0030 I -0.121 0.067 -0.342 0.076 -0.044057 0.301844 -0.2244705 -0.080 -0.276
11 414 55665.00 I -0.044173 0.000049 0.304192 0.000037 I-0.2258064 0.0000041 1.4168 0.0029 I -0.158 0.067 -0.328 0.076 -0.044187 0.304190 -0.2258108 -0.153 -0.218 11 414 55665.00 I -0.044173 0.000049 0.304192 0.000037 I-0.2258064 0.0000041 1.4168 0.0029 I -0.158 0.067 -0.328 0.076 -0.044187 0.304190 -0.2258108 -0.153 -0.218
11 415 55666.00 I -0.044099 0.000043 0.306711 0.000032 I-0.2273035 0.0000042 1.5713 0.0030 I ###### 0.067 -0.317 0.076 -0.044071 0.306692 -0.2273021 -0.222 -0.164 11 415 55666.00 I -0.044099 0.000043 0.306711 0.000032 I-0.2273035 0.0000042 1.5713 0.0030 I -0.199 0.067 -0.317 0.076 -0.044071 0.306692 -0.2273021 ###### -0.164
11 416 55667.00 I -0.043920 0.000039 0.309372 0.000017 I-0.2289274 0.0000045 1.6609 0.0027 I -0.223 0.119 -0.332 0.115 -0.043888 0.309380 -0.2289336 -0.228 -0.158 11 416 55667.00 I -0.043920 0.000039 0.309372 0.000017 I-0.2289274 0.0000045 1.6609 0.0027 I -0.223 0.119 -0.332 0.115 -0.043888 0.309380 -0.2289336 -0.228 -0.158
src/test/resources/rapid-data-columns/finals2000A-wrong-pole-A-format.daily 0 → 100644
+ 8
− 0
View file @ 86e679e2
11 4 9 55660.00 I -0.043325 0.000025 0.293403 0.000023 I-0.2207251 0.0000051 0.7480 0.0043 I -0.056 0.119 -0.368 0.117
11 410 55661.00 I -0.043370 0.000025 0.295688 0.000038 I-0.2214932 0.0000046 0.7974 0.0035 I -0.059 0.119 -0.352 0.101
11 411 55662.00 I -0.043599 0.000022 0.297664 0.000038 I-0.2223373 0.0000047 0.8989 0.0031 I -0.071 0.119 -0.336 0.101
11 412 55663.00 I -0.043904 0.000019 0.299638 0.000036 I-0.2233126 0.0000043 1.0654 0.0031 I -0.092 0.119 -0.338 0.054
11 413 55664.00 I -0.044073 0.000050 0.301834 0.000037 I-0.2244740 0.0000041 1.2498 0.0030 I -0.121 0.067 -0.342 0.076
11 414 55665.00 I -0.044173 0.000049 0.304192 0.000037 I-0.2258064 0.0000041 1.4168 0.0029 I -0.158 0.067 -0.328 0.076
11 415 55666.00 I ######### 0.000043 0.306711 0.000032 I-0.2273035 0.0000042 1.5713 0.0030 I -0.199 0.067 -0.317 0.076
11 416 55667.00 I -0.043920 0.000039 0.309372 0.000017 I-0.2289274 0.0000045 1.6609 0.0027 I -0.223 0.119 -0.332 0.115
src/test/resources/rapid-data-columns/finals2000A-wrong-pole-format.daily → src/test/resources/rapid-data-columns/finals2000A-wrong-pole-B-format.daily
+ 1
− 1
View file @ 86e679e2
...@@ -4,5 +4,5 @@ ...@@ -4,5 +4,5 @@
11 412 55663.00 I -0.043904 0.000019 0.299638 0.000036 I-0.2233126 0.0000043 1.0654 0.0031 I -0.092 0.119 -0.338 0.054 -0.043917 0.299592 -0.2233096 -0.014 -0.334 11 412 55663.00 I -0.043904 0.000019 0.299638 0.000036 I-0.2233126 0.0000043 1.0654 0.0031 I -0.092 0.119 -0.338 0.054 -0.043917 0.299592 -0.2233096 -0.014 -0.334
11 413 55664.00 I -0.044073 0.000050 0.301834 0.000037 I-0.2244740 0.0000041 1.2498 0.0030 I -0.121 0.067 -0.342 0.076 -0.044057 0.301844 -0.2244705 -0.080 -0.276 11 413 55664.00 I -0.044073 0.000050 0.301834 0.000037 I-0.2244740 0.0000041 1.2498 0.0030 I -0.121 0.067 -0.342 0.076 -0.044057 0.301844 -0.2244705 -0.080 -0.276
11 414 55665.00 I -0.044173 0.000049 0.304192 0.000037 I-0.2258064 0.0000041 1.4168 0.0029 I -0.158 0.067 -0.328 0.076 -0.044187 0.304190 -0.2258108 -0.153 -0.218 11 414 55665.00 I -0.044173 0.000049 0.304192 0.000037 I-0.2258064 0.0000041 1.4168 0.0029 I -0.158 0.067 -0.328 0.076 -0.044187 0.304190 -0.2258108 -0.153 -0.218
11 415 55666.00 I ######### 0.000043 0.306711 0.000032 I-0.2273035 0.0000042 1.5713 0.0030 I -0.199 0.067 -0.317 0.076 -0.044071 0.306692 -0.2273021 -0.222 -0.164 11 415 55666.00 I -0.044099 0.000043 0.306711 0.000032 I-0.2273035 0.0000042 1.5713 0.0030 I -0.199 0.067 -0.317 0.076 ######### 0.306692 -0.2273021 -0.222 -0.164
11 416 55667.00 I -0.043920 0.000039 0.309372 0.000017 I-0.2289274 0.0000045 1.6609 0.0027 I -0.223 0.119 -0.332 0.115 -0.043888 0.309380 -0.2289336 -0.228 -0.158 11 416 55667.00 I -0.043920 0.000039 0.309372 0.000017 I-0.2289274 0.0000045 1.6609 0.0027 I -0.223 0.119 -0.332 0.115 -0.043888 0.309380 -0.2289336 -0.228 -0.158
src/test/resources/rapid-data-columns/finals2000A-wrong-ut1-utc-A-format.daily 0 → 100644
+ 8
− 0
View file @ 86e679e2
11 4 9 55660.00 I -0.043325 0.000025 0.293403 0.000023 I-0.2207251 0.0000051 0.7480 0.0043 I -0.056 0.119 -0.368 0.117
11 410 55661.00 I -0.043370 0.000025 0.295688 0.000038 I-0.2214932 0.0000046 0.7974 0.0035 I -0.059 0.119 -0.352 0.101
11 411 55662.00 I -0.043599 0.000022 0.297664 0.000038 I-0.2223373 0.0000047 0.8989 0.0031 I -0.071 0.119 -0.336 0.101
11 412 55663.00 I -0.043904 0.000019 0.299638 0.000036 I-0.2233126 0.0000043 1.0654 0.0031 I -0.092 0.119 -0.338 0.054
11 413 55664.00 I -0.044073 0.000050 0.301834 0.000037 I-0.2244740 0.0000041 1.2498 0.0030 I -0.121 0.067 -0.342 0.076
11 414 55665.00 I -0.044173 0.000049 0.304192 0.000037 I-0.2258064 0.0000041 1.4168 0.0029 I -0.158 0.067 -0.328 0.076
11 415 55666.00 I -0.044099 0.000043 0.306711 0.000032 I########## 0.0000042 1.5713 0.0030 I -0.199 0.067 -0.317 0.076
11 416 55667.00 I -0.043920 0.000039 0.309372 0.000017 I-0.2289274 0.0000045 1.6609 0.0027 I -0.223 0.119 -0.332 0.115
src/test/resources/rapid-data-columns/finals2000A-wrong-ut1-utc-format.daily → src/test/resources/rapid-data-columns/finals2000A-wrong-ut1-utc-B-format.daily
+ 1
− 1
View file @ 86e679e2
...@@ -4,5 +4,5 @@ ...@@ -4,5 +4,5 @@
11 412 55663.00 I -0.043904 0.000019 0.299638 0.000036 I-0.2233126 0.0000043 1.0654 0.0031 I -0.092 0.119 -0.338 0.054 -0.043917 0.299592 -0.2233096 -0.014 -0.334 11 412 55663.00 I -0.043904 0.000019 0.299638 0.000036 I-0.2233126 0.0000043 1.0654 0.0031 I -0.092 0.119 -0.338 0.054 -0.043917 0.299592 -0.2233096 -0.014 -0.334
11 413 55664.00 I -0.044073 0.000050 0.301834 0.000037 I-0.2244740 0.0000041 1.2498 0.0030 I -0.121 0.067 -0.342 0.076 -0.044057 0.301844 -0.2244705 -0.080 -0.276 11 413 55664.00 I -0.044073 0.000050 0.301834 0.000037 I-0.2244740 0.0000041 1.2498 0.0030 I -0.121 0.067 -0.342 0.076 -0.044057 0.301844 -0.2244705 -0.080 -0.276
11 414 55665.00 I -0.044173 0.000049 0.304192 0.000037 I-0.2258064 0.0000041 1.4168 0.0029 I -0.158 0.067 -0.328 0.076 -0.044187 0.304190 -0.2258108 -0.153 -0.218 11 414 55665.00 I -0.044173 0.000049 0.304192 0.000037 I-0.2258064 0.0000041 1.4168 0.0029 I -0.158 0.067 -0.328 0.076 -0.044187 0.304190 -0.2258108 -0.153 -0.218
11 415 55666.00 I -0.044099 0.000043 0.306711 0.000032 I########## 0.0000042 1.5713 0.0030 I -0.199 0.067 -0.317 0.076 -0.044071 0.306692 -0.2273021 -0.222 -0.164 11 415 55666.00 I -0.044099 0.000043 0.306711 0.000032 I-0.2273035 0.0000042 1.5713 0.0030 I -0.199 0.067 -0.317 0.076 -0.044071 0.306692 ########## -0.222 -0.164
11 416 55667.00 I -0.043920 0.000039 0.309372 0.000017 I-0.2289274 0.0000045 1.6609 0.0027 I -0.223 0.119 -0.332 0.115 -0.043888 0.309380 -0.2289336 -0.228 -0.158 11 416 55667.00 I -0.043920 0.000039 0.309372 0.000017 I-0.2289274 0.0000045 1.6609 0.0027 I -0.223 0.119 -0.332 0.115 -0.043888 0.309380 -0.2289336 -0.228 -0.158
src/test/resources/rapid-data-columns/finals2000A.daily
+ 1
− 1
View file @ 86e679e2
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
11 529 55710.00 I -0.017968 0.000021 0.398938 0.000024 I-0.2757582 0.0000136 0.8535 0.0070 I -0.239 0.097 -0.104 0.190 -0.017939 0.398907 -0.2757712 -0.112 -0.247 11 529 55710.00 I -0.017968 0.000021 0.398938 0.000024 I-0.2757582 0.0000136 0.8535 0.0070 I -0.239 0.097 -0.104 0.190 -0.017939 0.398907 -0.2757712 -0.112 -0.247
11 530 55711.00 I -0.017271 0.000026 0.400625 0.000028 I-0.2765663 0.0000096 0.7511 0.0090 I -0.251 0.104 -0.121 0.135 -0.017290 0.400656 -0.2765865 -0.157 -0.212 11 530 55711.00 I -0.017271 0.000026 0.400625 0.000028 I-0.2765663 0.0000096 0.7511 0.0090 I -0.251 0.104 -0.121 0.135 -0.017290 0.400656 -0.2765865 -0.157 -0.212
11 531 55712.00 I -0.016449 0.000017 0.401997 0.000022 I-0.2772616 0.0000117 0.6524 0.0069 I -0.259 0.107 -0.130 0.081 -0.016455 0.401976 -0.2772868 -0.211 -0.171 11 531 55712.00 I -0.016449 0.000017 0.401997 0.000022 I-0.2772616 0.0000117 0.6524 0.0069 I -0.259 0.107 -0.130 0.081 -0.016455 0.401976 -0.2772868 -0.211 -0.171
11 6 1 55713.00 I -0.015313 0.000019 0.403214 0.000030 I-0.2778790 0.0000100 0.5773 0.0074 I -0.279 0.150 -0.125 0.107 -0.015287 0.403222 -0.2778924 -0.172 -0.105 11 6 1 55713.00 I -0.015313 0.000019 0.403214 0.000030 I-0.2778790 0.0000100 0.5773 0.0074 I -0.279 0.150 -0.125 0.107
11 6 2 55714.00 I -0.014222 0.000019 0.404430 0.000029 I-0.2784173 0.0000091 0.5055 0.0069 I -0.310 0.150 -0.123 0.107 11 6 2 55714.00 I -0.014222 0.000019 0.404430 0.000029 I-0.2784173 0.0000091 0.5055 0.0069 I -0.310 0.150 -0.123 0.107
11 6 3 55715.00 I -0.013057 0.000019 0.405704 0.000029 I-0.2789050 0.0000094 0.4786 0.0057 I -0.357 0.150 -0.135 0.107 11 6 3 55715.00 I -0.013057 0.000019 0.405704 0.000029 I-0.2789050 0.0000094 0.4786 0.0057 I -0.357 0.150 -0.135 0.107
11 6 4 55716.00 I -0.011610 0.000019 0.407438 0.000029 I-0.2794129 0.0000068 0.5668 0.0051 I -0.431 0.150 -0.141 0.107 11 6 4 55716.00 I -0.011610 0.000019 0.407438 0.000029 I-0.2794129 0.0000068 0.5668 0.0051 I -0.431 0.150 -0.141 0.107
......
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