diff --git a/src/cosmic/_commit_hash.py b/src/cosmic/_commit_hash.py deleted file mode 100644 index c7231e10b..000000000 --- a/src/cosmic/_commit_hash.py +++ /dev/null @@ -1 +0,0 @@ -COMMIT_HASH = "320fc1503ecacafc73e27705114c30f3d566e37e" diff --git a/src/cosmic/_version.py b/src/cosmic/_version.py index 48481b58d..c65092076 100644 --- a/src/cosmic/_version.py +++ b/src/cosmic/_version.py @@ -1 +1 @@ -__version__ = "3.7.5" +__version__ = "3.7.7" diff --git a/src/cosmic/data/cosmic-settings.json b/src/cosmic/data/cosmic-settings.json index 929298367..ab4f8aae8 100644 --- a/src/cosmic/data/cosmic-settings.json +++ b/src/cosmic/data/cosmic-settings.json @@ -570,15 +570,19 @@ }, { "name": 5, - "description": "Same as 3, but multiplied by 0.33" + "description": "Same as 3, but multiplied by 0.33", + "version added": "3.7.7" }, { "name": 6, - "description": "Bjorklund 2023 https://doi.org/10.1051/0004-6361/202141948" + "description": "Bjorklund+2023", + "version added": "3.7.7" }, { "name": 7, - "description": "Kritcka, Kubat, Kritckova 2023 10.48550/arXiv.2311.01257" + "description": "Kritcka, Kubat & Kritckova 2024" + , + "version added": "3.7.7" } ] }, @@ -1241,7 +1245,8 @@ }, { "name": 7, - "description": "Follows Fryer+2022 remnant mass prescription" + "description": "follows the prescription from Fryer+2022; NS/BH delineated by fryer_mcrit_nsbh so mxns is not used", + "version_added": "3.7.7" } ] }, @@ -1282,13 +1287,14 @@ }, { "name": "fryer_fmix", - "description": "Sets the mixing fraction for the Fryer+2022 SN model", + "description": "Sets the mixing fraction for the Fryer+2022 SN model (remnantflag=7)", "type": "number", + "version_added": "3.7.7", "options-preface": "", "options": [ { "name": "positive values", - "description": "Sets the mixing fraction for the Fryer+2022 SN remnant mass model" + "description": "Sets the mixing fraction for the Fryer+2022 SN remnant mass model" }, { "name":1.0, @@ -1299,13 +1305,14 @@ }, { "name": "fryer_mcrit_nsbh", - "description": "Sets the critical core mass for the Fryer+2022 SN model", + "description": "Sets the critical core mass for delineating between NS and BHs with the Fryer+2022 SN model (remnantflag=7)", "type": "number", "options-preface": "", + "version_added": "3.7.7", "options": [ { "name": "positive values", - "description": "Sets the critical NS/BH core mass forthe Fryer+2022 SN remnant mass model (solar masses)" + "description": "Sets the critical NS/BH core mass for the Fryer+2022 SN remnant mass model (solar masses)" }, { "name":5.75, @@ -1440,7 +1447,8 @@ }, { "name": -5, - "description": "Uses Belczynski 'weak' PISN pulsations" + "description": "Uses Belczynski 'weak' PISN pulsations", + "version_added": "3.7.7" }, { "name": "positive values", diff --git a/src/cosmic/tests/data/Params.ini b/src/cosmic/tests/data/Params.ini index 331b80c27..5a0f1fbdc 100644 --- a/src/cosmic/tests/data/Params.ini +++ b/src/cosmic/tests/data/Params.ini @@ -299,6 +299,8 @@ natal_kick_array=[[-100.0,-100.0,-100.0,-100.0,0.0], [-100.0,-100.0,-100.0,-100. ; remnantflag=0: default BSE; remnantflag=1: Belczynski et al. 2002, ApJ, 572, 407 ; remnantflag=2: Belczynski et al. 2008; remnantflag=3: rapid prescription (Fryer+ 2012) ; remnantflag=4: delayed prescription (Fryer+ 2012) +; remnantflag=5: Mandel & Mueller 2020 +; remnantflag=6: Malstev+2025 as implemented by Willcox+2026 ; remnantflag=7: Use Fryer+2022 prescription (with fryer_fmix, fryer_mcrit_nsbh) ; default=4 remnantflag=3 diff --git a/src/cosmic/tests/data/kick_initial_conditions.h5 b/src/cosmic/tests/data/kick_initial_conditions.h5 index 8e6e428b7..d19b11b8a 100644 Binary files a/src/cosmic/tests/data/kick_initial_conditions.h5 and b/src/cosmic/tests/data/kick_initial_conditions.h5 differ