From 0782a73e594ea06fee858aff01c6f92197bd5e2f Mon Sep 17 00:00:00 2001 From: Jonathan Merritt Date: Thu, 5 Sep 2024 10:59:34 -0600 Subject: [PATCH 1/5] set mass loss to 0, and Dominant mass loss rate to NONE for remnants, and added Merritt2024 mass loss wrapper --- src/Remnants.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Remnants.h b/src/Remnants.h index b58224c8d..ba97feb25 100644 --- a/src/Remnants.h +++ b/src/Remnants.h @@ -59,7 +59,8 @@ class Remnants: virtual public BaseStar, public HeGB { const bool p_IsHeRich) { return CalculateMassAcceptanceRate(p_DonorMassRate, p_AccretorMassRate); } // Ignore the He content for non-WDs double CalculateMassLossRateHurley() { return 0.0; } - double CalculateMassLossRateBelczynski2010() { return 0.0; } + double CalculateMassLossRateBelczynski2010() { m_DominantMassLossRate = MASS_LOSS_TYPE::NONE ; return 0.0; } + double CalculateMassLossRateMerritt2024() { m_DominantMassLossRate = MASS_LOSS_TYPE::NONE ; return 0.0; } // double CalculatePerturbationMuOnPhase() const { return m_Mu; } // NO-OP From d2e9c0800851d249908b4cb960e8b820c6922d20 Mon Sep 17 00:00:00 2001 From: Jonathan Merritt Date: Thu, 5 Sep 2024 11:02:27 -0600 Subject: [PATCH 2/5] changelog --- src/changelog.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/changelog.h b/src/changelog.h index c7a914c45..1d183367b 100644 --- a/src/changelog.h +++ b/src/changelog.h @@ -1285,8 +1285,9 @@ // See "What's New" and option documentation for details. // (Issue #1170) // - added deprecation notice for '--mass-loss-prescription NONE' (should use ZERO) - missed in v03.00.00 +// 03.01.07 JDM - Sep 5, 2024 - Defect repair: +// - Set mass loss for remnants to zero. - -const std::string VERSION_STRING = "03.01.06"; +const std::string VERSION_STRING = "03.01.07"; # endif // __changelog_h__ From bce3c033d18d885662d51055893e0a712d149052 Mon Sep 17 00:00:00 2001 From: Jonathan Merritt Date: Thu, 5 Sep 2024 11:33:15 -0600 Subject: [PATCH 3/5] updated Hurley as well --- src/Remnants.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Remnants.h b/src/Remnants.h index ba97feb25..e21d68ea8 100644 --- a/src/Remnants.h +++ b/src/Remnants.h @@ -58,7 +58,7 @@ class Remnants: virtual public BaseStar, public HeGB { const double p_AccretorMassRate, const bool p_IsHeRich) { return CalculateMassAcceptanceRate(p_DonorMassRate, p_AccretorMassRate); } // Ignore the He content for non-WDs - double CalculateMassLossRateHurley() { return 0.0; } + double CalculateMassLossRateHurley() { m_DominantMassLossRate = MASS_LOSS_TYPE::NONE ; return 0.0; } double CalculateMassLossRateBelczynski2010() { m_DominantMassLossRate = MASS_LOSS_TYPE::NONE ; return 0.0; } double CalculateMassLossRateMerritt2024() { m_DominantMassLossRate = MASS_LOSS_TYPE::NONE ; return 0.0; } // From 779453ff75a7348ef901e18de45157b960a323cb Mon Sep 17 00:00:00 2001 From: Jonathan Merritt Date: Thu, 5 Sep 2024 11:39:15 -0600 Subject: [PATCH 4/5] updated DMLR tags in the logfiles docs --- ...tandard-logfiles-record-specification-stellar.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/online-docs/pages/User guide/COMPAS output/standard-logfiles-record-specification-stellar.rst b/online-docs/pages/User guide/COMPAS output/standard-logfiles-record-specification-stellar.rst index 4cd8546f6..cfb0a7210 100644 --- a/online-docs/pages/User guide/COMPAS output/standard-logfiles-record-specification-stellar.rst +++ b/online-docs/pages/User guide/COMPAS output/standard-logfiles-record-specification-stellar.rst @@ -381,17 +381,17 @@ Following is an alphabetical list of stellar properties available for inclusion * - None - = 0 - * - Nieuwenhuijzen and de Jager + * - GB (Giant Branch) - = 1 - * - Kudritzki and Reimers + * - LBV (Luminous Blue Variable) - = 2 - * - Vassiliadis and Wood + * - OB (Main Sequence) - = 3 - * - Wolf-Rayet-like (Hamann, Koesterke and de Koter) + * - RSG (Red Supergiant) - = 4 - * - Vink + * - VMS (Very Massive Main Sequence) - = 5 - * - Luminous Blue Variable + * - WR (Wolf-Rayet) - = 6 * - Header Strings: From a926117f854f4e9c01d1948a15444ae3f094c40c Mon Sep 17 00:00:00 2001 From: Ilya Mandel Date: Fri, 6 Sep 2024 10:05:19 +0200 Subject: [PATCH 5/5] Update changelog.h --- src/changelog.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/changelog.h b/src/changelog.h index 1d183367b..973fa1cd9 100644 --- a/src/changelog.h +++ b/src/changelog.h @@ -1286,7 +1286,7 @@ // (Issue #1170) // - added deprecation notice for '--mass-loss-prescription NONE' (should use ZERO) - missed in v03.00.00 // 03.01.07 JDM - Sep 5, 2024 - Defect repair: -// - Set mass loss for remnants to zero. +// - Set wind mass loss for remnants to zero. const std::string VERSION_STRING = "03.01.07";