Typo fixes

Author: Ilya Mandel

src/CH.cpp

@@ -346,7 +346,7 @@ double CH::CalculateMassLossRateBelczynski2010() {
         MdotWR = BaseStar::CalculateMassLossRateWolfRayetZDependent(0.0);
 
         // Calculate fraction for combining these into total mass-loss rate
-        fractionOB = CalculateMassLossRateFractionOB(m_HeliumAbundanceSurface);
+        fractionOB = CalculateMassLossFractionOB(m_HeliumAbundanceSurface);
 
     }
 
@@ -381,7 +381,7 @@ double CH::CalculateMassLossRateMerritt2025() {
     double Mdot   = 0.0;
     double MdotOB = 0.0;
     double MdotWR = 0.0;
-    double weight = 1.0;    // Initialised to 1.0 to allow us to use the OB mass loss rate by default
+    double fractionOB = 1.0;    // Initialised to 1.0 to allow us to use the OB mass loss rate by default
 
     // Calculate OB mass loss rate according to the chosen prescription
     MdotOB = BaseStar::CalculateMassLossRateOB(OPTIONS->OBMassLossPrescription());  
@@ -397,14 +397,14 @@ double CH::CalculateMassLossRateMerritt2025() {
         delete clone; clone = nullptr;                                                                          // return the memory allocated for the clone  
 
         // Calculate weight for combining these into total mass-loss rate
-        weight = CalculateMassLossRateWeightOB(m_HeliumAbundanceSurface);
+        fractionOB = CalculateMassLossFractionOB(m_HeliumAbundanceSurface);
     }
 
+    // Finally, combine each of these prescriptions according to the OB wind fraction
+    Mdot = (fractionOB * MdotOB) + ((1.0 - fractionOB) * MdotWR);
+    
     // Set dominant mass loss rate
-    m_DominantMassLossRate = weight == 0 ? MASS_LOSS_TYPE::WR : MASS_LOSS_TYPE::OB;   
-
-    // Finally, combine each of these prescriptions according to the weight
-    Mdot = (weight * MdotOB) + ((1.0 - weight) * MdotWR);
+    m_DominantMassLossRate = (fractionOB * MdotOB) > ((1.0 - fractionOB) * MdotWR) ? MASS_LOSS_TYPE::OB : MASS_LOSS_TYPE::WR;
 
     // Enhance mass loss rate due to rotation
     Mdot *= CalculateMassLossRateEnhancementRotation();

src/CH.h

@@ -74,7 +74,7 @@ class CH: virtual public BaseStar, public MS_gt_07 {
     // Mass loss rate
     double          CalculateMassLossRateBelczynski2010();
     double          CalculateMassLossRateMerritt2025();
-    double          CalculateMassLossRateFractionOB(const double p_HeliumAbundanceSurface);
+    double          CalculateMassLossFractionOB(const double p_HeAbundanceSurface) const;
 
     // Radius
     double          CalculateRadiusOnPhase() const                      { return m_RZAMS; }                                                                                         // Constant from birth

src/changelog.h

@@ -1666,7 +1666,7 @@
 //                                          - Clamped gamma to [0.0, gamma] in Mainsequence.cpp::CalculateGamma() (per discussion just after eq 23 - confirmed in BSE Fortran source)
 //  03.26.00  IM - September 2, 2025    - Enhancement, defect repairs:
 //                                          - First (simplified) implementation of the Lau+ (2024) Hamstars thermally limited accretion prescription
-//                                          - Corrected errors in combining OB and WR winds in CH::CalculateMassLossRateBelczynski2010() and CH::CalculateMassLossRateFractionOB() [previously CalculateMassLossRateWeightOB()]
+//                                          - Corrected errors in combining OB and WR winds in CH::CalculateMassLossRateBelczynski2010(), CalculateMassLossRateMerritt2025() and CH::CalculateMassLossFractionOB() [previously CalculateMassLossRateWeightOB()]
 //
 // Version string format is MM.mm.rr, where
 //