Allow alternative names equatorial_radius and polar_radius.

They are more explicit than `semimajor_axis` and `semiminor_axis`.
JSBSim-Team · Jul 25, 2021 · 0e4ef2a · 0e4ef2a
1 parent 7a8cd65
commit 0e4ef2a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/models/FGInertial.cpp b/src/models/FGInertial.cpp
@@ -94,8 +94,12 @@ bool FGInertial::Load(Element* el)
 
  if (el->FindElement("semimajor_axis"))
  a = el->FindElementValueAsNumberConvertTo("semimajor_axis", "FT");
+ else if (el->FindElement("equatorial_radius"))
+ a = el->FindElementValueAsNumberConvertTo("equatorial_radius", "FT");
  if (el->FindElement("semiminor_axis"))
  b = el->FindElementValueAsNumberConvertTo("semiminor_axis", "FT");
+ else if (el->FindElement("polar_radius"))
+ b = el->FindElementValueAsNumberConvertTo("polar_radius", "FT");
  if (el->FindElement("rotation_rate")) {
  double RotationRate = el->FindElementValueAsNumberConvertTo("rotation_rate", "RAD/SEC");
  vOmegaPlanet = {0., 0., RotationRate};
@@ -229,7 +233,7 @@ void FGInertial::SetGravityType(int gt)
  // Messages to warn the user about possible inconsistencies.
  switch (gt)
  {
- case eGravType::gtStandard: 
+ case eGravType::gtStandard:
  if (a != b)
  cout << "Warning: Standard gravity model has been set for a non-spherical planet" << endl;
  break;

diff --git a/tests/moon.xml b/tests/moon.xml
@@ -1,6 +1,6 @@
 <planet name="Moon">
- <semimajor_axis unit="KM">1738.1</semimajor_axis>
- <semiminor_axis unit="KM">1736.0</semiminor_axis>
+ <equatorial_radius unit="KM">1738.1</equatorial_radius>
+ <polar_radius unit="KM">1736.0</polar_radius>
  <rotation_rate unit="RAD/SEC">2.66167E-6</rotation_rate>
  <GM unit="M3/SEC2">4.9E12</GM>
  <J2>2.027E-4</J2>