Skip to content

Commit e6b18ed

Browse files
committed
bug fixes, change of default value
1 parent c18a089 commit e6b18ed

File tree

6 files changed

+14
-6
lines changed

6 files changed

+14
-6
lines changed

compas_python_utils/preprocessing/compasConfigDefault.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
##~!!~## COMPAS option values
2-
##~!!~## File Created Mon Oct 27 18:34:22 2025 by COMPAS v03.27.01
2+
##~!!~## File Created Thu Dec 4 10:29:03 2025 by COMPAS v03.27.01
33
##~!!~##
44
##~!!~## The default COMPAS YAML file (``compasConfigDefault.yaml``), as distributed, has
55
##~!!~## all COMPAS option entries commented so that the COMPAS default value for the
@@ -29,7 +29,7 @@ booleanChoices:
2929
# --enhance-CHE-lifetimes-luminosities: True # Default: True
3030
# --expel-convective-envelope-above-luminosity-threshold: False # Default: False
3131
# --natal-kick-for-PPISN: False # Default: False
32-
# --scale-mass-loss-with-surface-helium-abundance: True # Default: True
32+
# --scale-mass-loss-with-surface-helium-abundance: False # Default: False
3333

3434
### BINARY PROPERTIES
3535
# --allow-touching-at-birth: False # Default: False # record binaries that have stars touching at birth in output files

online-docs/pages/User guide/Program options/program-options-list-defaults.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1322,7 +1322,7 @@ Default = DECIN2023 |br|
13221322
**--scale-mass-loss-with-surface-helium-abundance** |br|
13231323
Scale mass loss for main sequence, including chemically homogeneously evolving (CHE), stars with the surface helium abundance.
13241324
Transition from OB/VMS to WR mass loss towards the end of the main sequence.
1325-
Default = TRUE
1325+
Default = FALSE
13261326

13271327
**--scale-terminal-wind-velocity-with-metallicity-power** |br|
13281328
Scale terminal wind velocity with metallicity to this power

src/BaseBinaryStar.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2025,6 +2025,10 @@ void BaseBinaryStar::CalculateWindsMassLoss(double p_Dt) {
20252025

20262026
m_aMassLossDiff = aWinds - m_SemiMajorAxisPrev; // change to orbit (semi-major axis) due to winds mass loss
20272027
}
2028+
else { // reset total mass loss rate to zero
2029+
m_Star1->UpdateTotalMassLossRate(0.0);
2030+
m_Star2->UpdateTotalMassLossRate(0.0);
2031+
}
20282032
}
20292033
}
20302034

src/CH.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class CH: virtual public BaseStar, public MS_gt_07 {
6868
double CalculateLuminosityAtPhaseEnd() const { return CalculateLuminosityAtPhaseEnd(m_Mass0); } // Use class member variables
6969

7070
double CalculateLuminosityOnPhase(const double p_Time, const double p_Mass, const double p_LZAMS) const;
71-
double CalculateLuminosityOnPhase() const { return m_Luminosity; }
71+
double CalculateLuminosityOnPhase() const { return CalculateLuminosityOnPhase(m_Age, m_Mass0, m_LZAMS0); }
7272

7373
// Mass loss rate
7474
double CalculateMassLossRateBelczynski2010() { return BaseStar::CalculateMassLossRateBelczynski2010() * CalculateMassLossRateEnhancementRotation(); }

src/Options.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ void Options::OptionValues::Initialise() {
376376
m_CheMode.type = CHE_MODE::PESSIMISTIC;
377377
m_CheMode.typeString = CHE_MODE_LABEL.at(m_CheMode.type);
378378
m_EnhanceCHELifetimesLuminosities = true; // default is to enhance
379-
m_ScaleMassLossWithSurfaceHeliumAbundance = true; // default is to scale the mass loss
379+
m_ScaleMassLossWithSurfaceHeliumAbundance = false; // default is not to scale the mass loss
380380

381381
// Supernova remnant mass prescription options
382382
m_RemnantMassPrescription.type = REMNANT_MASS_PRESCRIPTION::MULLERMANDEL;

src/changelog.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1679,6 +1679,10 @@
16791679
// - removed option --scale-CHE-mass-loss-with-surface-helium-abundance from "BSEonly" vector in Options.h
16801680
// - changed "scale-CHE-mass-loss-with-surface-helium-abundance" to "--scale-mass-loss-with-surface-helium-abundance" in "RangeExcluded" vector in Options.h
16811681
// - version should have been "v03.27.00" instead of "v03.26.02" - change included new functionality. This version is "v03.27.01" to compensate.
1682+
// 03.27.02 AB - December 4, 2025 - Defect repairs:
1683+
// - Changed default value of --scale-mass-loss-with-surface-helium-abundance to false
1684+
// - Corrected behaviour of MS stars that stopped ageing after mass transfer when mass loss is disabled (issue #1444)
1685+
// - Corrected luminosity evolution for CH stars (issue #1443)
16821686
//
16831687
//
16841688
// Version string format is MM.mm.rr, where
@@ -1690,7 +1694,7 @@
16901694
// if MM is incremented, set mm and rr to 00, even if defect repairs and minor enhancements were also made
16911695
// if mm is incremented, set rr to 00, even if defect repairs were also made
16921696

1693-
const std::string VERSION_STRING = "03.27.01";
1697+
const std::string VERSION_STRING = "03.27.02";
16941698

16951699

16961700
# endif // __changelog_h__

0 commit comments

Comments
 (0)