Merge pull request #1042 from jeffriley/issue-1034

Issue 1034 - change calls to CalculateMomentOfInertia() to CalculateMomentOfInertiaAU()
TeamCOMPAS · Dec 27, 2023 · 5167070 · 5167070
2 parents 0ff9d12 + 6def95c
commit 5167070
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/BaseBinaryStar.cpp b/src/BaseBinaryStar.cpp
@@ -272,8 +272,8 @@ void BaseBinaryStar::SetRemainingValues() {
     m_SemiMajorAxisAtDCOFormation = DEFAULT_INITIAL_DOUBLE_VALUE;
     m_EccentricityAtDCOFormation  = DEFAULT_INITIAL_DOUBLE_VALUE;
 
-    double momentOfInertia1       = m_Star1->CalculateMomentOfInertia();
-    double momentOfInertia2       = m_Star2->CalculateMomentOfInertia();
+    double momentOfInertia1       = m_Star1->CalculateMomentOfInertiaAU();
+    double momentOfInertia2       = m_Star2->CalculateMomentOfInertiaAu();
 
     m_TotalEnergy                 = CalculateTotalEnergy(m_SemiMajorAxis, m_Star1->Mass(), m_Star2->Mass(), m_Star1->Omega(), m_Star2->Omega(), momentOfInertia1, momentOfInertia2);
 

diff --git a/src/BaseStar.h b/src/BaseStar.h
@@ -40,7 +40,7 @@ class BaseStar {
 
     // getters - alphabetically
             double              Age() const                                                     { return m_Age; }
-            double              AngularMomentum() const                                         { return CalculateMomentOfInertia() * m_Omega; }
+            double              AngularMomentum() const                                         { return CalculateMomentOfInertiaAU() * m_Omega; }
             double              BindingEnergy_Fixed() const                                     { return m_BindingEnergies.fixed; }
             double              BindingEnergy_Nanjing() const                                   { return m_BindingEnergies.nanjing; }
             double              BindingEnergy_Loveridge() const                                 { return m_BindingEnergies.loveridge; }