Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 978a344841c0
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 60c82a7c7ad5
Choose a head ref
  • 6 commits
  • 7 files changed
  • 1 contributor

Commits on Apr 10, 2019

  1. WHU

    eggrobin committed Apr 10, 2019
    Copy the full SHA
    96cd6cf View commit details
  2. nonconformant

    eggrobin committed Apr 10, 2019
    Copy the full SHA
    e17efac View commit details
  3. new dialect

    eggrobin committed Apr 10, 2019
    Copy the full SHA
    af5408e View commit details
  4. みちびき

    eggrobin committed Apr 10, 2019
    Copy the full SHA
    d3550c7 View commit details
  5. Copy the full SHA
    38f487e View commit details
  6. Merge pull request #2130 from eggrobin/בלל

     巴別
    eggrobin authored Apr 10, 2019
    Copy the full SHA
    60c82a7 View commit details
1 change: 1 addition & 0 deletions astronomy/astronomy.vcxproj
Original file line number Diff line number Diff line change
@@ -29,6 +29,7 @@
<None Include="standard_product_3\nga20342.eph" />
<None Include="standard_product_3\README.md" />
<None Include="standard_product_3\ssaja102.b03007.e03017.DGS.sp3" />
<None Include="standard_product_3\WUM0MGXFIN_20190270000_01D_15M_ORB.SP3" />
<None Include="trappist_gravity_model.cfg" />
<None Include="trappist_gravity_model_slippist1.cfg" />
<None Include="trappist_initial_state_jd_2457000_000000000.cfg" />
3 changes: 3 additions & 0 deletions astronomy/astronomy.vcxproj.filters
Original file line number Diff line number Diff line change
@@ -101,6 +101,9 @@
<None Include="standard_product_3\ssaja102.b03007.e03017.DGS.sp3">
<Filter>Resource Files\Standard Product 3</Filter>
</None>
<None Include="standard_product_3\WUM0MGXFIN_20190270000_01D_15M_ORB.SP3">
<Filter>Resource Files\Standard Product 3</Filter>
</None>
</ItemGroup>
<ItemGroup>
<Text Include="sol_initial_state_jd_2433282_500000000.proto.txt">
15 changes: 12 additions & 3 deletions astronomy/standard_product_3.cpp
Original file line number Diff line number Diff line change
@@ -176,7 +176,7 @@ StandardProduct3::StandardProduct3(
case SatelliteGroup::General:
case SatelliteGroup::Galileo:
case SatelliteGroup::北斗:
case SatelliteGroup::準天頂衛星:
case SatelliteGroup::みちびき:
case SatelliteGroup::IRNSS:
CHECK_GE(version_, Version::C) << full_location;
break;
@@ -205,8 +205,15 @@ StandardProduct3::StandardProduct3(
LOG(FATAL) << u8"at least 5 +␣ records expected: " << location;
}
if (version_ < Version::D && number_of_satellite_id_records > 5) {
LOG(FATAL) << u8"exactly 5 +␣ records expected in SP3-" << version_ << ": "
<< location;
if (dialect == Dialect::ChineseMGEX) {
CHECK_EQ(number_of_satellite_id_records, 10)
<< u8"exactly 10 +␣ records expected in the " << dialect << ": "
<< location;
} else {
CHECK_EQ(number_of_satellite_id_records, 5)
<< u8"exactly 5 +␣ records expected in SP3-" << version_ << ": "
<< location;
}
}

// Header: ++ records.
@@ -472,6 +479,8 @@ std::ostream& operator<<(std::ostream& out,
return out << "ILRSB SP3 dialect";
case StandardProduct3::Dialect::GRGS:
return out << "GRGS SP3 dialect";
case StandardProduct3::Dialect::ChineseMGEX:
return out << "SHAO and WHU MGEX SP3 dialect";
default:
return out << "Unknown SP3 dialect (" << static_cast<int>(dialect) << ")";
}
15 changes: 14 additions & 1 deletion astronomy/standard_product_3.hpp
Original file line number Diff line number Diff line change
@@ -64,6 +64,19 @@ class StandardProduct3 {
// Divergence from the specification:
// - the velocities are in m/s instead of the standard dm/s.
GRGS,
// The MGEX files produced by the SHAO (Shanghai Astronomical Observatory,
// 上海天文台) and WHU (Wuhan University, 武汉大学) analysis centres are
// SP3-c, but contain more than 85 satellites. This is achieved by doubling
// the number of satellite ID records: there are 10 satellite ID records,
// for a maximum of 170 satellites.
// While SP3-d allows for an unlimited number of satellite ID records, it is
// questionable whether files in this dialect are valid SP3-d, aside from
// the version identifier: indeed, they often have lines containing only 0s
// to pad to 10 lines of satellite IDs, whereas the SP3-d documentation
// seems to suggest that such padding is restricted to a last partial line:
// “The last “+ ” line may contain zeroes if the number of satellites (given
// on line three) is not an even multiple of 17.”.
ChineseMGEX,
};

enum class SatelliteGroup : char {
@@ -72,7 +85,7 @@ class StandardProduct3 {
ГЛОНАСС = 'R',
Galileo = 'E',
北斗 = 'C',
準天頂衛星 = 'J',
みちびき = 'J',
IRNSS = 'I',
};

4 changes: 4 additions & 0 deletions astronomy/standard_product_3/README.md
Original file line number Diff line number Diff line change
@@ -49,6 +49,10 @@ See http://mgex.igs.org/IGS_MGEX_Products.php.
ftp://igs.ensg.eu/pub/igs/products/mgex/2034/ <br>
ftp://igs.ign.fr/pub/igs/products/mgex/2034/ <br>
ftp://cddis.gsfc.nasa.gov/gnss/products/mgex/2034/
- [WUM0MGXFIN_20190270000_01D_15M_ORB.SP3](WUM0MGXFIN_20190270000_01D_15M_ORB.SP3):<br>
ftp://igs.ensg.eu/pub/igs/products/mgex/2038/ <br>
ftp://igs.ign.fr/pub/igs/products/mgex/2038/ <br>
**not found** at ftp://cddis.gsfc.nasa.gov/gnss/products/mgex/2038/


### International GLONASS Experiment (IGEX) / International GLONASS Service Pilot Project (IGLOS-PP)
Loading