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: df50fd43aa8c
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c757f840f527
Choose a head ref
  • 8 commits
  • 9 files changed
  • 2 contributors

Commits on Dec 8, 2018

  1. actually use the constants from that resolution, instead of citing it…

    … and using masses of dubious provenance.
    eggrobin committed Dec 8, 2018
    Copy the full SHA
    e6f9c42 View commit details

Commits on Dec 9, 2018

  1. proto

    eggrobin committed Dec 9, 2018
    Copy the full SHA
    317711e View commit details
  2. not ggm

    eggrobin committed Dec 9, 2018
    Copy the full SHA
    7283acb View commit details
  3. comments

    eggrobin committed Dec 9, 2018
    Copy the full SHA
    325ba2e View commit details
  4. make it build

    eggrobin committed Dec 9, 2018
    Copy the full SHA
    2dde8c0 View commit details
  5. cetacean

    eggrobin committed Dec 9, 2018
    Copy the full SHA
    cbcc6cd View commit details
  6. tolerances

    eggrobin committed Dec 9, 2018
    Copy the full SHA
    f53722f View commit details
  7. Merge pull request #2024 from eggrobin/iau-xxix-b3

    Actually implement IAU 29 resolution B3
    pleroy authored Dec 9, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    c757f84 View commit details
2 changes: 1 addition & 1 deletion astronomy/trappist_dynamics_test.cpp
Original file line number Diff line number Diff line change
@@ -1172,7 +1172,7 @@ TEST_F(TrappistDynamicsTest, MathematicaTransits) {

std::string info;
double const χ² = Transitsχ²(observations, computations, info);
CHECK_LT(χ², 480.0);
CHECK_LT(χ², 482.0);
CHECK_GT(χ², 470.0);
LOG(ERROR) << u8"χ²: " << χ² << " " << info;
}
171 changes: 87 additions & 84 deletions astronomy/trappist_gravity_model.proto.txt
Original file line number Diff line number Diff line change
@@ -1,117 +1,120 @@
gravity_model {
solar_system_frame : SKY
# Right ascensions from a normal distribution with μ=-90, σ=0.05.
# Declinations from a normal distribution with μ=0, σ=0.05.
solar_system_frame : SKY
# Right ascensions from a normal distribution with μ=-90, σ=0.05°.
# Declinations from a normal distribution with μ=0, σ=0.05°.
# This standard deviation is the mode of the polar angle scatter distribution
# in figure 7 of Luger, Lustig-Yaeger, and Agol (2017), Planet-Planet
# Occultations in TRAPPIST-1 and Other Exoplanet Systems.

# Star.
# Mass and radius from "Early 2017 observations of TRAPPIST-1 with Spitzer",
# Delrez et al., 2018.
# Angular frequency from "Frequent flaring in the TRAPPIST-1 system — unsuited
# for life?", Vida et al., 2017.
body {
name : "Trappist-1"
mass : "0.0890 M☉"
reference_instant : "JD2457000.000000000"
mean_radius : "0.1210 R☉"
axis_right_ascension : "-89.9408 deg"
axis_declination : "0.0497342 deg"
reference_angle : "0 deg"
angular_frequency : "109.256 deg / d"
name : "Trappist-1"
gravitational_parameter : "0.0890 GM☉"
reference_instant : "JD2457000.000000000"
mean_radius : "0.1210 R☉"
axis_right_ascension : "-89.9408 deg"
axis_declination : "0.0497342 deg"
reference_angle : "0 deg"
angular_frequency : "109.256 deg / d"
}

# Planets.
# Masses and radii from "The nature of the TRAPPIST-1 exoplanets", Grimm et
# al., 2018.
# For planets b and c, the radius used is the radius of the core from table 4;
# For planets b and c, the mean radius is the radius of the core from table 4;
# We model envelope of volatiles as liquid water and ice on d through h, so
# the transit radius from table 2 is used there instead. All masses are from
# table 2.
# the transit radius from table 2 is used there instead. All masses and
# reference radii are from table 2.
# Angular frequencies from a linear fit of the transits over 100 years,
# assuming tidal locking.
# J2 from a log-normal distribution with median 0.001 (rougthly the J2 of
# Earth) and σ = 1.
body {
name : "Trappist-1b"
mass : "1.017 M🜨"
reference_instant : "JD2457000.000000000"
mean_radius : "1.01 R🜨"
axis_right_ascension : "-89.9077 deg"
axis_declination : "0.0561637 deg"
reference_angle : "0 deg"
angular_frequency : "238.280381526399 deg / d"
j2 : 0.000625831
reference_radius : "1.121 R🜨"
name : "Trappist-1b"
gravitational_parameter : "1.017 GM🜨"
reference_instant : "JD2457000.000000000"
mean_radius : "1.01 R🜨"
axis_right_ascension : "-89.9077 deg"
axis_declination : "0.0561637 deg"
reference_angle : "0 deg"
angular_frequency : "238.280381526399 deg / d"
j2 : 0.000625831
reference_radius : "1.121 R🜨"
}
body {
name : "Trappist-1c"
mass : "1.156 M🜨"
reference_instant : "JD2457000.000000000"
mean_radius : "1.06 R🜨"
axis_right_ascension : "-89.9829 deg"
axis_declination : "0.0787536 deg"
reference_angle : "0 deg"
angular_frequency : "148.649662442390 deg / d"
j2 : 0.000937274
reference_radius : "1.095 R🜨"
name : "Trappist-1c"
gravitational_parameter : "1.156 GM🜨"
reference_instant : "JD2457000.000000000"
mean_radius : "1.06 R🜨"
axis_right_ascension : "-89.9829 deg"
axis_declination : "0.0787536 deg"
reference_angle : "0 deg"
angular_frequency : "148.649662442390 deg / d"
j2 : 0.000937274
reference_radius : "1.095 R🜨"
}
body {
name : "Trappist-1d"
mass : "0.297 M🜨"
reference_instant : "JD2457000.000000000"
mean_radius : "0.784 R🜨"
axis_right_ascension : "-90.0387 deg"
axis_declination : "0.0106394 deg"
reference_angle : "0 deg"
angular_frequency : "88.8958290050067 deg / d"
j2 : 0.00189136
reference_radius : "0.784 R🜨"
name : "Trappist-1d"
gravitational_parameter : "0.297 GM🜨"
reference_instant : "JD2457000.000000000"
mean_radius : "0.784 R🜨"
axis_right_ascension : "-90.0387 deg"
axis_declination : "0.0106394 deg"
reference_angle : "0 deg"
angular_frequency : "88.8958290050067 deg / d"
j2 : 0.00189136
reference_radius : "0.784 R🜨"
}
body {
name : "Trappist-1e"
mass : "0.772 M🜨"
reference_instant : "JD2457000.000000000"
mean_radius : "0.910 R🜨"
axis_right_ascension : "-89.9999 deg"
axis_declination : "-0.0949119 deg"
reference_angle : "0 deg"
angular_frequency : "59.0190202231139 deg / d"
j2 : 0.000475803
reference_radius : "0.910 R🜨"
name : "Trappist-1e"
gravitational_parameter : "0.772 GM🜨"
reference_instant : "JD2457000.000000000"
mean_radius : "0.910 R🜨"
axis_right_ascension : "-89.9999 deg"
axis_declination : "-0.0949119 deg"
reference_angle : "0 deg"
angular_frequency : "59.0190202231139 deg / d"
j2 : 0.000475803
reference_radius : "0.910 R🜨"
}
body {
name : "Trappist-1f"
mass : "0.934 M🜨"
reference_instant : "JD2457000.000000000"
mean_radius : "1.046 R🜨"
axis_right_ascension : "-89.9582 deg"
axis_declination : "0.0404001 deg"
reference_angle : "0 deg"
angular_frequency : "39.1011616849564 deg / d"
j2 : 0.00264731
reference_radius : "1.046 R🜨"
name : "Trappist-1f"
gravitational_parameter : "0.934 GM🜨"
reference_instant : "JD2457000.000000000"
mean_radius : "1.046 R🜨"
axis_right_ascension : "-89.9582 deg"
axis_declination : "0.0404001 deg"
reference_angle : "0 deg"
angular_frequency : "39.1011616849564 deg / d"
j2 : 0.00264731
reference_radius : "1.046 R🜨"
}
body {
name : "Trappist-1g"
mass : "1.148 M🜨"
reference_instant : "JD2457000.000000000"
mean_radius : "1.148 R🜨"
axis_right_ascension : "-89.9896 deg"
axis_declination : "0.0367975 deg"
reference_angle : "0 deg"
angular_frequency : "29.1422346007618 deg / d"
j2 : 0.0000873713
reference_radius : "1.148 R🜨"
name : "Trappist-1g"
gravitational_parameter : "1.148 GM🜨"
reference_instant : "JD2457000.000000000"
mean_radius : "1.148 R🜨"
axis_right_ascension : "-89.9896 deg"
axis_declination : "0.0367975 deg"
reference_angle : "0 deg"
angular_frequency : "29.1422346007618 deg / d"
j2 : 0.0000873713
reference_radius : "1.148 R🜨"
}
body {
name : "Trappist-1h"
mass : "0.331 M🜨"
reference_instant : "JD2457000.000000000"
mean_radius : "0.773 R🜨"
axis_right_ascension : "-89.8993 deg"
axis_declination : "0.0130609 deg"
reference_angle : "0 deg"
angular_frequency : "19.1833342568893 deg / d"
j2 : 0.00166162
reference_radius : "0.773 R🜨"
name : "Trappist-1h"
gravitational_parameter : "0.331 GM🜨"
reference_instant : "JD2457000.000000000"
mean_radius : "0.773 R🜨"
axis_right_ascension : "-89.8993 deg"
axis_declination : "0.0130609 deg"
reference_angle : "0 deg"
angular_frequency : "19.1833342568893 deg / d"
j2 : 0.00166162
reference_radius : "0.773 R🜨"
}
}
1 change: 0 additions & 1 deletion benchmarks/dynamic_frame.cpp
Original file line number Diff line number Diff line change
@@ -52,7 +52,6 @@ using quantities::SIUnit;
using quantities::Speed;
using quantities::Time;
using quantities::astronomy::AstronomicalUnit;
using quantities::astronomy::EarthMass;
using quantities::astronomy::JulianYear;
using quantities::si::Kilo;
using quantities::si::Metre;
11 changes: 5 additions & 6 deletions physics/apsides_test.cpp
Original file line number Diff line number Diff line change
@@ -36,8 +36,7 @@ using quantities::Sqrt;
using quantities::Time;
using quantities::astronomy::AstronomicalUnit;
using quantities::astronomy::JulianYear;
using quantities::astronomy::SolarMass;
using quantities::constants::GravitationalConstant;
using quantities::astronomy::SolarGravitationalParameter;
using quantities::si::Degree;
using quantities::si::Kilo;
using quantities::si::Milli;
@@ -58,7 +57,7 @@ class ApsidesTest : public ::testing::Test {

TEST_F(ApsidesTest, ComputeApsidesDiscreteTrajectory) {
Instant const t0;
GravitationalParameter const μ = GravitationalConstant * SolarMass;
GravitationalParameter const μ = SolarGravitationalParameter;
auto const b = new MassiveBody(μ);

std::vector<not_null<std::unique_ptr<MassiveBody const>>> bodies;
@@ -143,7 +142,7 @@ TEST_F(ApsidesTest, ComputeApsidesDiscreteTrajectory) {
Position<World> const position = pair.second.position();
if (previous_time) {
EXPECT_THAT(time - *previous_time,
AlmostEquals(0.5 * T, 103, 3820));
AlmostEquals(0.5 * T, 103, 4936));
EXPECT_THAT((position - *previous_position).Norm(),
AlmostEquals(2.0 * a, 0, 176));
}
@@ -154,7 +153,7 @@ TEST_F(ApsidesTest, ComputeApsidesDiscreteTrajectory) {

TEST_F(ApsidesTest, ComputeNodes) {
Instant const t0;
GravitationalParameter const μ = GravitationalConstant * SolarMass;
GravitationalParameter const μ = SolarGravitationalParameter;
auto const b = new MassiveBody(μ);

std::vector<not_null<std::unique_ptr<MassiveBody const>>> bodies;
@@ -217,7 +216,7 @@ TEST_F(ApsidesTest, ComputeNodes) {
.coordinates()
.ToSpherical()
.longitude,
AlmostEquals(elements.longitude_of_ascending_node, 0, 100));
AlmostEquals(elements.longitude_of_ascending_node, 0, 104));
if (previous_time) {
EXPECT_THAT(time - *previous_time, AlmostEquals(*elements.period, 0, 20));
}
Loading