Skip to content

Commit dec81a4

Browse files
authored
Merge pull request #152 from TomWagg/kickflag
Update `kickflag` to new `COSMIC` default
2 parents 716f013 + 5cd443b commit dec81a4

File tree

5 files changed

+10
-5
lines changed

5 files changed

+10
-5
lines changed

cogsworth/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "2.0.2"
1+
__version__ = "2.0.3"

cogsworth/pop.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ def __init__(self, n_binaries, processes=8, m1_cutoff=0, final_kstar1=list(range
145145
2.0/21.0, 2.0/21.0, 2.0/21.0, 2.0/21.0,
146146
2.0/21.0, 2.0/21.0, 2.0/21.0, 2.0/21.0],
147147
'bhspinflag': 0, 'bhspinmag': 0.0, 'rejuv_fac': 1.0, 'rejuvflag': 0, 'htpmb': 1,
148-
'ST_cr': 1, 'ST_tide': 1, 'bdecayfac': 1, 'rembar_massloss': 0.5, 'kickflag': 0,
148+
'ST_cr': 1, 'ST_tide': 1, 'bdecayfac': 1, 'rembar_massloss': 0.5, 'kickflag': 1,
149149
'zsun': 0.014, 'bhms_coll_flag': 0, 'don_lim': -1, 'acc_lim': -1, 'binfrac': 0.5,
150150
'rtmsflag': 0, 'wd_mass_lim': 1}
151151
self.BSE_settings.update(BSE_settings if ini_file is None else parse_inifile(ini_file)[0])

cogsworth/tests/test_pop.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -532,11 +532,11 @@ def test_translation(self):
532532
p.perform_stellar_evolution()
533533
p.translate_tables(replace_columns=False, label_type="short")
534534

535-
self.assertTrue(p.bpp["kstar_1"].dtype == np.float64)
535+
self.assertTrue(p.bpp["kstar_1"].dtype == np.int64)
536536
self.assertTrue((p.bpp["kstar_1_str"][p.bpp["kstar_1"] == 1] == "MS").all())
537537

538538
p.translate_tables(replace_columns=True)
539-
self.assertFalse(p.bpp["kstar_1"].dtype == np.float64)
539+
self.assertFalse(p.bpp["kstar_1"].dtype == np.int64)
540540

541541
def test_cartoon(self):
542542
"""Ensure that the cartoon plot works"""

docs/modules/changelog.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ Full changelog
44

55
This page tracks all of the changes that have been made to ``cogsworth``. We follow the standard versioning convention of A.B.C, where C is a patch/bugfix, B is a large bugfix or new feature and A is a major new breaking change. B/C are backwards compatible but A changes may be breaking.
66

7+
2.0.3
8+
=====
9+
- Update default `kickflag` to match COSMIC `v3.5.0`
10+
-
11+
712
2.0.2
813
=====
914
- Add some more flexbility to the ``plot_cartoon_binary`` function in terms of fontsize

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ install_requires =
2525
scipy >= 1.8
2626
pandas >= 2.1
2727
gala >= 1.9.1
28-
cosmic-popsynth >= 3.4.16
28+
cosmic-popsynth >= 3.5.0
2929

3030
[options.package_data]
3131
* = *.npy, *.npz

0 commit comments

Comments
 (0)