pulled changelog from dev branch to avoid merge conflicts

TeamCOMPAS · Apr 8, 2024 · cc1be8c · cc1be8c
2 parents fd038ce + eeda005
commit cc1be8c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/BaseStar.cpp b/src/BaseStar.cpp
@@ -1775,7 +1775,7 @@ double BaseStar::CalculateMassLossRateBjorklundEddingtonFactor() const {
     const double YHe  = 0.1;                                            // Assumed constant by Bjorklund et al.
     double kappa_e    = 0.4 * (1.0 + iHe * YHe) / (1.0 + 4.0 * YHe);    // cm^2/g
     double kappa_e_SI = kappa_e * OPACITY_CGS_TO_SI;                    // m^2/kg
-    double top        = kappa_e_SI * m_Luminosity * LSOL;
+    double top        = kappa_e_SI * m_Luminosity * LSOLW;
     double bottom     = 4.0 * M_PI * G * C * m_Mass * MSOL_TO_KG; 
 
     return top / bottom;

diff --git a/src/changelog.h b/src/changelog.h
@@ -1113,8 +1113,11 @@
 //                                      - Defect repair : Added explicit definition `bool isUnstable = false` to avoid confusion in BaseBinaryStar.cpp
 //                                      - Defect repair : Fixed erroneous core mass values in ResolveSNIa in WhiteDwarfs.cpp. Was previously 0 for all core masses. 
 //                                      - Enhancement: Added output parameter TZAMS for internal variable m_TZAMS
-// 02.43.00    RTW - Mar 29, 2023    - Enhancement:
+// 02.43.00    RTW - Mar 29, 2024    - Enhancement:
 //                                      - Added Hirai pulsar rocket kick, and related options
+// 02.43.01    SS - Apr 8, 2024      - Defect repair
+//                                      - Fix CalculateMassLossRateBjorklundEddingtonFactor to use LSOLW (in SI) rather than LSOL (in cgs)        
+//
 // 02.44.00     VK - Apr 04, 2024    - Enhancement:
 //                                      - Added 'realistic' tides option, which implements dynamical tides. Functionality enabled with new option `--enable-realistic-tides`.  Default is no tides.
 //                                      - Dynamcial tides implementation follows Zahn, 1977, Eq. (5.5) , with the value of E_2 coming from Kushnir et al., 2017, Eq. (8).