Skip to content

Commit 3cf74d5

Browse files
author
Lieke van Son
committed
resolved merge conflict in pythonsubmit (pythonsubmit now reflects the submitfile used with COMPAS verion corresp. to data)
2 parents 835aba4 + c97632e commit 3cf74d5

File tree

16 files changed

+188
-76
lines changed

16 files changed

+188
-76
lines changed

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

Lines changed: 139 additions & 31 deletions
Large diffs are not rendered by default.

‎examples/methods_paper_plots/detailed_evolution/detailed_evol_plotter.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ def printEvolutionaryHistory(Data):
190190
beta=64/5*G**3*Data['Mass(1)'][i]*Data['Mass(2)'][i]*(Data['Mass(1)'][i]+Data['Mass(2)'][i])*Msunkg**3/c**5
191191
T0=(Data['SemiMajorAxis'][i]*Rsun)**4/4/beta
192192
e=Data['Eccentricity'][i]
193-
Tdelay=T0*(1-e**2)**(7/2)*(1+0.31*e**10 + 0.27*e**20 + 0.2*e**1000)/3.15e7/1e6
193+
Tdelay=T0*(1-e**2)**(7/2)*(1+0.27*e**10 + 0.33*e**20 + 0.2*e**1000)/3.15e7/1e6
194194
printFormattedEvolutionLine( Data['Time'][i]+Tdelay, 'GW merger in {:.1f} Myr'.format(Tdelay),
195195
Data['Mass(1)'][i], Data['Stellar_Type(1)'][i],
196196
Data['Mass(2)'][i], Data['Stellar_Type(2)'][i],

‎examples/methods_paper_plots/detailed_evolution/pythonSubmitDemo.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ class pythonProgramOptions:
180180
common_envelope_mass_accretion_min = 0.04 # For 'MACLEOD+2014' [Msol]
181181
common_envelope_mass_accretion_max = 0.10 # For 'MACLEOD+2014' [Msol]
182182
envelope_state_prescription = 'LEGACY'
183-
common_envelope_allow_radiative_envelope_surive = False
183+
common_envelope_allow_radiative_envelope_survive = False
184184
common_envelope_allow_immediate_RLOF_post_CE_survive = False
185185

186186
mass_loss_prescription = 'VINK'
@@ -365,7 +365,7 @@ def booleanChoices(self):
365365
self.pulsation_pair_instability,
366366
self.quiet,
367367
self.common_envelope_allow_main_sequence_survive,
368-
self.common_envelope_allow_radiative_envelope_surive,
368+
self.common_envelope_allow_radiative_envelope_survive,
369369
self.common_envelope_allow_immediate_RLOF_post_CE_survive,
370370
self.evolvePulsars,
371371
self.debug_to_file,
@@ -393,7 +393,7 @@ def booleanCommands(self):
393393
'--pulsational-pair-instability',
394394
'--quiet',
395395
'--common-envelope-allow-main-sequence-survive',
396-
'--common-envelope-allow-radiative-envelope-surive',
396+
'--common-envelope-allow-radiative-envelope-survive',
397397
'--common-envelope-allow-immediate-rlof-post-ce-survive',
398398
'--evolve-pulsars',
399399
'--debug-to-file',

‎examples/methods_paper_plots/fig_5_HR_diagram/pythonSubmit.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ class pythonProgramOptions:
170170
common_envelope_mass_accretion_min = 0.04 # For 'MACLEOD+2014' [Msol]
171171
common_envelope_mass_accretion_max = 0.10 # For 'MACLEOD+2014' [Msol]
172172
envelope_state_prescription = 'LEGACY'
173-
common_envelope_allow_radiative_envelope_surive = False
173+
common_envelope_allow_radiative_envelope_survive = False
174174
common_envelope_allow_immediate_RLOF_post_CE_survive = False
175175

176176
mass_loss_prescription = 'VINK'
@@ -354,7 +354,7 @@ def booleanChoices(self):
354354
self.pulsation_pair_instability,
355355
self.quiet,
356356
self.common_envelope_allow_main_sequence_survive,
357-
self.common_envelope_allow_radiative_envelope_surive,
357+
self.common_envelope_allow_radiative_envelope_survive,
358358
self.common_envelope_allow_immediate_RLOF_post_CE_survive,
359359
self.evolvePulsars,
360360
self.debug_to_file,
@@ -382,7 +382,7 @@ def booleanCommands(self):
382382
'--pulsational-pair-instability',
383383
'--quiet',
384384
'--common-envelope-allow-main-sequence-survive',
385-
'--common-envelope-allow-radiative-envelope-surive',
385+
'--common-envelope-allow-radiative-envelope-survive',
386386
'--common-envelope-allow-immediate-rlof-post-ce-survive',
387387
'--evolve-pulsars',
388388
'--debug-to-file',

‎examples/methods_paper_plots/fig_6_max_R/pythonSubmit.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ class pythonProgramOptions:
170170
common_envelope_mass_accretion_min = 0.04 # For 'MACLEOD+2014' [Msol]
171171
common_envelope_mass_accretion_max = 0.10 # For 'MACLEOD+2014' [Msol]
172172
envelope_state_prescription = 'LEGACY'
173-
common_envelope_allow_radiative_envelope_surive = False
173+
common_envelope_allow_radiative_envelope_survive = False
174174
common_envelope_allow_immediate_RLOF_post_CE_survive = False
175175

176176
mass_loss_prescription = 'VINK'
@@ -354,7 +354,7 @@ def booleanChoices(self):
354354
self.pulsation_pair_instability,
355355
self.quiet,
356356
self.common_envelope_allow_main_sequence_survive,
357-
self.common_envelope_allow_radiative_envelope_surive,
357+
self.common_envelope_allow_radiative_envelope_survive,
358358
self.common_envelope_allow_immediate_RLOF_post_CE_survive,
359359
self.evolvePulsars,
360360
self.debug_to_file,
@@ -382,7 +382,7 @@ def booleanCommands(self):
382382
'--pulsational-pair-instability',
383383
'--quiet',
384384
'--common-envelope-allow-main-sequence-survive',
385-
'--common-envelope-allow-radiative-envelope-surive',
385+
'--common-envelope-allow-radiative-envelope-survive',
386386
'--common-envelope-allow-immediate-rlof-post-ce-survive',
387387
'--evolve-pulsars',
388388
'--debug-to-file',

‎examples/methods_paper_plots/fig_8_initial_core_final_mass_relations/pythonSubmitDefaults.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ class pythonProgramOptions:
170170
common_envelope_mass_accretion_min = 0.04 # For 'MACLEOD+2014' [Msol]
171171
common_envelope_mass_accretion_max = 0.10 # For 'MACLEOD+2014' [Msol]
172172
envelope_state_prescription = 'LEGACY'
173-
common_envelope_allow_radiative_envelope_surive = False
173+
common_envelope_allow_radiative_envelope_survive = False
174174
common_envelope_allow_immediate_RLOF_post_CE_survive = False
175175

176176
mass_loss_prescription = 'VINK'
@@ -354,7 +354,7 @@ def booleanChoices(self):
354354
self.pulsation_pair_instability,
355355
self.quiet,
356356
self.common_envelope_allow_main_sequence_survive,
357-
self.common_envelope_allow_radiative_envelope_surive,
357+
self.common_envelope_allow_radiative_envelope_survive,
358358
self.common_envelope_allow_immediate_RLOF_post_CE_survive,
359359
self.evolvePulsars,
360360
self.debug_to_file,
@@ -382,7 +382,7 @@ def booleanCommands(self):
382382
'--pulsational-pair-instability',
383383
'--quiet',
384384
'--common-envelope-allow-main-sequence-survive',
385-
'--common-envelope-allow-radiative-envelope-surive',
385+
'--common-envelope-allow-radiative-envelope-survive',
386386
'--common-envelope-allow-immediate-rlof-post-ce-survive',
387387
'--evolve-pulsars',
388388
'--debug-to-file',

‎examples/methods_paper_plots/fig_8_initial_core_final_mass_relations/pythonSubmitFryerRapid.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ class pythonProgramOptions:
170170
common_envelope_mass_accretion_min = 0.04 # For 'MACLEOD+2014' [Msol]
171171
common_envelope_mass_accretion_max = 0.10 # For 'MACLEOD+2014' [Msol]
172172
envelope_state_prescription = 'LEGACY'
173-
common_envelope_allow_radiative_envelope_surive = False
173+
common_envelope_allow_radiative_envelope_survive = False
174174
common_envelope_allow_immediate_RLOF_post_CE_survive = False
175175

176176
mass_loss_prescription = 'VINK'
@@ -354,7 +354,7 @@ def booleanChoices(self):
354354
self.pulsation_pair_instability,
355355
self.quiet,
356356
self.common_envelope_allow_main_sequence_survive,
357-
self.common_envelope_allow_radiative_envelope_surive,
357+
self.common_envelope_allow_radiative_envelope_survive,
358358
self.common_envelope_allow_immediate_RLOF_post_CE_survive,
359359
self.evolvePulsars,
360360
self.debug_to_file,
@@ -382,7 +382,7 @@ def booleanCommands(self):
382382
'--pulsational-pair-instability',
383383
'--quiet',
384384
'--common-envelope-allow-main-sequence-survive',
385-
'--common-envelope-allow-radiative-envelope-surive',
385+
'--common-envelope-allow-radiative-envelope-survive',
386386
'--common-envelope-allow-immediate-rlof-post-ce-survive',
387387
'--evolve-pulsars',
388388
'--debug-to-file',

‎examples/methods_paper_plots/fig_8_initial_core_final_mass_relations/pythonSubmitMandelMueller.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ class pythonProgramOptions:
170170
common_envelope_mass_accretion_min = 0.04 # For 'MACLEOD+2014' [Msol]
171171
common_envelope_mass_accretion_max = 0.10 # For 'MACLEOD+2014' [Msol]
172172
envelope_state_prescription = 'LEGACY'
173-
common_envelope_allow_radiative_envelope_surive = False
173+
common_envelope_allow_radiative_envelope_survive = False
174174
common_envelope_allow_immediate_RLOF_post_CE_survive = False
175175

176176
mass_loss_prescription = 'VINK'
@@ -354,7 +354,7 @@ def booleanChoices(self):
354354
self.pulsation_pair_instability,
355355
self.quiet,
356356
self.common_envelope_allow_main_sequence_survive,
357-
self.common_envelope_allow_radiative_envelope_surive,
357+
self.common_envelope_allow_radiative_envelope_survive,
358358
self.common_envelope_allow_immediate_RLOF_post_CE_survive,
359359
self.evolvePulsars,
360360
self.debug_to_file,
@@ -382,7 +382,7 @@ def booleanCommands(self):
382382
'--pulsational-pair-instability',
383383
'--quiet',
384384
'--common-envelope-allow-main-sequence-survive',
385-
'--common-envelope-allow-radiative-envelope-surive',
385+
'--common-envelope-allow-radiative-envelope-survive',
386386
'--common-envelope-allow-immediate-rlof-post-ce-survive',
387387
'--evolve-pulsars',
388388
'--debug-to-file',

‎paper.bib‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2013,7 +2013,7 @@ @ARTICLE{Moe:2017ApJS
20132013
adsnote = {Provided by the SAO/NASA Astrophysics Data System}
20142014
}
20152015

2016-
@ARTICLE{2004MNRAS.350..407I,
2016+
@ARTICLE{BinaryC,
20172017
author = {{Izzard}, R.~G. and {Tout}, C.~A. and {Karakas}, A.~I. and {Pols}, O.~R.
20182018
},
20192019
title = "{A new synthetic model for asymptotic giant branch stars}",
@@ -6708,7 +6708,7 @@ @ARTICLE{1996ApJ...466..234L
67086708
adsnote = {Provided by the SAO/NASA Astrophysics Data System}
67096709
}
67106710

6711-
@ARTICLE{1996MNRAS.280.1035T,
6711+
@ARTICLE{IBiS,
67126712
author = {{Tutukov}, A. and {Yungelson}, L.},
67136713
title = "{Double-degenerate semidetached binaries with helium secondaries: cataclysmic variables, supersoft X-ray sources, supernovae and accretion-induced collapses}",
67146714
journal = {\mnras},
@@ -6747,7 +6747,7 @@ @ARTICLE{2009ARep...53..915L
67476747

67486748

67496749

6750-
@ARTICLE{1996A&A...310..489L,
6750+
@ARTICLE{Scenario,
67516751
author = {{Lipunov}, V.~M. and {Postnov}, K.~A. and {Prokhorov}, M.~E.},
67526752
title = "{The Scenario Machine: restrictions on key parameters of binary evolution.}",
67536753
journal = {\aap},
@@ -8440,7 +8440,7 @@ @ARTICLE{2010ApJ...725..496N
84408440
adsnote = {Provided by the SAO/NASA Astrophysics Data System}
84418441
}
84428442

8443-
@ARTICLE{1996A&A...309..179P,
8443+
@ARTICLE{SeBa,
84448444
author = {{Portegies Zwart}, S.~F. and {Verbunt}, F.},
84458445
title = "{Population synthesis of high-mass binaries.}",
84468446
journal = {\aap},

‎paper.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,9 @@ Binary population synthesis generates population models of isolated stellar bina
109109

110110
In particular, rapid binary population synthesis is needed in order to efficiently explore a broad parameter space of uncertain assumptions about the physics of stellar and binary evolution, including supernova remnant masses and natal kicks, mass transfer efficiency and stability, and the outcome of common-envelope events.
111111

112-
[COMPAS](https://compas.science) is such a rapid binary population synthesis suite. It parametrizes complex astrophysical processes with prescriptions calibrated to detailed models. COMPAS is designed to allow for flexible modifications as evolutionary models improve.
112+
A range of binary population synthesis codes have been developed over the last three decades. These include the Scenario Machine [@Scenario], IBiS [@IBiS], SeBa [@SeBa], BSE [@Hurley:2002rf], StarTrack [@Belczynski:2008], binary$\_$c [@BinaryC], MOBSE [@2018MNRAS.474.2959G] and COSMIC [@2019arXiv191100903B]. These codes range from private to semi-public to fully public, and differ in the range of available tools, computational complexity, and speed of execution.
113+
114+
[COMPAS](https://compas.science) is a rapid binary population synthesis suite. It parametrizes complex astrophysical processes with prescriptions calibrated to detailed models. COMPAS is designed to allow for flexible modifications as evolutionary models improve. All code is fully public and, including pre-processing and post-processing tools. COMPAS is computationally efficient, with a focus on the statistical analysis of large populations, particularly but not exclusively in the context of gravitational-wave astronomy.
113115

114116

115117
# Details

0 commit comments

Comments
 (0)