Skip to content

Commit 64cb1d7

Browse files
author
Ilya Mandel
committed
homogenise capitalisation of mandel-muller
1 parent b3eab7c commit 64cb1d7

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
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 09:51:18 2025 by COMPAS v03.26.02
2+
##~!!~## File Created Mon Oct 27 18:34:22 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
@@ -57,7 +57,7 @@ booleanChoices:
5757
# --allow-non-stripped-ECSN: False # Default: False
5858
# --pair-instability-supernovae: True # Default: True
5959
# --pulsational-pair-instability: True # Default: True
60-
# --USSN-kicks-override-Mandel-Muller: False # Default: False
60+
# --USSN-kicks-override-mandel-muller: False # Default: False
6161

6262
### PULSAR PARAMETERS
6363
# --evolve-pulsars: False # Default: False

src/Options.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1029,7 +1029,7 @@ bool Options::AddOptions(OptionValues *p_Options, po::options_description *p_Opt
10291029
("Enable mass transfer (default = " + std::string(p_Options->m_UseMassTransfer ? "TRUE" : "FALSE") + ")").c_str()
10301030
)
10311031
(
1032-
"USSN-kicks-override-Mandel-Muller",
1032+
"USSN-kicks-override-mandel-muller",
10331033
po::value<bool>(&p_Options->m_USSNKicksOverrideMandelMuller)->default_value(p_Options->m_USSNKicksOverrideMandelMuller)->implicit_value(true),
10341034
("Whether to use user-defined USSN kicks (as a fixed value) in lieu of the Mandel & Muller kick prescription for USSNe (default = " + std::string(p_Options->m_USSNKicksOverrideMandelMuller ? "TRUE" : "FALSE") + ")").c_str()
10351035
)

src/Options.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@ class Options {
710710

711711
"use-mass-loss",
712712
"use-mass-transfer",
713-
"USSN-kicks-override-Mandel-Muller",
713+
"USSN-kicks-override-mandel-muller",
714714

715715
"VMW-mass-loss-prescription",
716716
"version", "v",
@@ -1774,7 +1774,7 @@ class Options {
17741774
bool UseMassTransfer() const { return OPT_VALUE("use-mass-transfer", m_UseMassTransfer, true); }
17751775
bool UsePairInstabilitySupernovae() const { return OPT_VALUE("pair-instability-supernovae", m_UsePairInstabilitySupernovae, true); }
17761776
bool UsePulsationalPairInstability() const { return OPT_VALUE("pulsational-pair-instability", m_UsePulsationalPairInstability, true); }
1777-
bool USSNKicksOverrideMandelMuller() const { return OPT_VALUE("USSN-kicks-override-Mandel-Muller", m_USSNKicksOverrideMandelMuller, true); }
1777+
bool USSNKicksOverrideMandelMuller() const { return OPT_VALUE("USSN-kicks-override-mandel-muller", m_USSNKicksOverrideMandelMuller, true); }
17781778

17791779
VMS_MASS_LOSS_PRESCRIPTION VMSMassLossPrescription() const { return OPT_VALUE("VMS-mass-loss-prescription", m_VMSMassLossPrescription.type, true); }
17801780
double WolfRayetFactor() const { return OPT_VALUE("wolf-rayet-multiplier", m_WolfRayetFactor, true); }

src/changelog.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1670,11 +1670,11 @@
16701670
// 03.26.01 AB - October 24, 2025 - Option name change:
16711671
// - Main sequence core mass prescription ZERO renamed to HURLEY; deprecated ZERO
16721672
// 03.26.02 IM - October 27, 2025 - Enhancements
1673-
// - Added option --USSN-kicks-override-Mandel-Muller ; if set to true, use user-defined USSN kicks (as a fixed value) in lieu of the Mandel & Muller kick prescription for USSNe
1673+
// - Added option --USSN-kicks-override-mandel-muller ; if set to true, use user-defined USSN kicks (as a fixed value) in lieu of the Mandel & Muller kick prescription for USSNe
16741674
// - Replaced --scale-CHE-mass-loss-with-surface-helium-abundance with the more general --scale-mass-loss-with-surface-helium-abundance (applies to all MS stars, not just CHE stars)
16751675
// - Updated rotational velocity solver to use boost root finder
16761676
// 03.27.01 JR - October 27, 2025 - Defect repairs:
1677-
// - changed Options::OptionValue() to return correct value for option --USSN-kicks-override-Mandel-Muller
1677+
// - changed Options::OptionValue() to return correct value for option --USSN-kicks-override-mandel-muller
16781678
// - deprecated --scale-CHE-mass-loss-with-surface-helium-abundance in favour of --scale-mass-loss-with-surface-helium-abundance
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

src/yaml.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ namespace yaml {
123123
" --allow-non-stripped-ECSN",
124124
" --pair-instability-supernovae",
125125
" --pulsational-pair-instability",
126-
" --USSN-kicks-override-Mandel-Muller",
126+
" --USSN-kicks-override-mandel-muller",
127127
"",
128128
" ### PULSAR PARAMETERS",
129129
" --evolve-pulsars",

0 commit comments

Comments
 (0)