From 37f2d200b2f3ce7df2158e070e46cde52326106e Mon Sep 17 00:00:00 2001 From: Tom Wagg Date: Thu, 28 May 2026 14:27:17 -0400 Subject: [PATCH 1/2] Add new column to `kick_info`, remove `bkick`, create what's new page dynamically (#786) * remove bkick from existence * erase bonus kick_info_out array * add tphys to kick_info * update docs for kick_info * get kick info outputted into evolve * update version * clean up changelog and generate 'whats new' page * fill in extra columns if people just supply sse as stellar engine * actually use the z accuracy limit * fix evolv2 call in the benchmark file --- changelog.md | 126 ++-- docs/Makefile | 1 + docs/create_whats_new.py | 65 ++ docs/index.rst | 1 + docs/pages/output_info.rst | 8 +- src/cosmic/_version.py | 2 +- src/cosmic/evolve.py | 28 +- src/cosmic/src/benchmarkevolv2.f | 976 +++++++++++++++---------------- src/cosmic/src/comenv.f | 13 +- src/cosmic/src/evolv2.f | 28 +- src/cosmic/src/extra/evolv1.f | 3 +- src/cosmic/src/kick.f | 157 +---- src/cosmic/src/test_bse.f | 14 +- 13 files changed, 689 insertions(+), 733 deletions(-) create mode 100644 docs/create_whats_new.py diff --git a/changelog.md b/changelog.md index 594a77ba8..c20e55e4b 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,14 @@ # COSMIC Changelog -## Prepend only plese! +## Prepend only please! +## 4.1.0 + +- Additions/changes + - kick_info table now includes another column with the time of each supernova + +- Code cleanup + - Function signature for kick() and evolv2() in the fortran changed to remove ``bkick`` entirely + - Also removed ``kick_info_out``. Both of these can be reconstructed from ``kick_info`` ## 4.0.1 @@ -18,7 +26,7 @@ ## 3.7.8 - Additions/changes: - - Added `smt_periastron_check` setting, which allows the user to toggle whether to check for periastron collision during stable mass transfer. By default, we set this off, which changes the behaviour of previous versions since 3.6.0 (PR #694) which did check for contact at periastron during stable mass transfer. We set this to off as the radial expansion from SSE is likely overestimated, once we connect with COSMIC-METISSE this should likely be set to 1. + - Added ``smt_periastron_check`` setting, which allows the user to toggle whether to check for periastron collision during stable mass transfer. By default, we set this off, which changes the behaviour of previous versions since 3.6.0 (PR #694) which did check for contact at periastron during stable mass transfer. We set this to off as the radial expansion from SSE is likely overestimated, once we connect with COSMIC-METISSE this should likely be set to 1. ## 3.7.7 @@ -29,7 +37,7 @@ ## 3.7.6 - Additions/changes: - - Added `pool` and `nproc` parameters to the `independent` sampler. Users can either specify an existing multiprocessing pool or a number of processors to use to create a pool that will be used for the sampling. This offers significant speed-ups for samples larger than 10,000 binaries. + - Added ``pool`` and ``nproc`` parameters to the ``independent`` sampler. Users can either specify an existing multiprocessing pool or a number of processors to use to create a pool that will be used for the sampling. This offers significant speed-ups for samples larger than 10,000 binaries. ## 3.7.5 @@ -38,11 +46,8 @@ - Track mean_anomaly (save to kick_info) array even when a system is disrupted - Throw an error if invalid metallicities are provided for evolution -## 3.7.2-3.7.3 -Issues with PyPi, unreleased. - ## 3.7.4 -This release contains _several_ fixes to how CO core masses/remnant masses are handled. It also adds a new PISN prescription, windflag and LBV winds flag. +This release contains *several* fixes to how CO core masses/remnant masses are handled. It also adds a new PISN prescription, windflag and LBV winds flag. - Fixes: - Update ``mc_co`` and ``mc_he`` after adjusting ``mc = mcmax`` in ``hrdiag.f`` for stripped stars. This can be a fairly significant change, up to ~2 Msun. (Used to actually be up to 10 Msun because we added HeMS core mass growth) @@ -74,79 +79,96 @@ This release contains _several_ fixes to how CO core masses/remnant masses are h - Start new settings gallery in the documentation - Tag settings/options with the version they were added in the docs page and auto link them to release +## 3.7.2-3.7.3 +Issues with PyPi, unreleased. + ## 3.7.1 - - Bug fix [[#729](https://github.com/COSMIC-PopSynth/COSMIC/issues/729)]: ensure disruptions are logged with ``evol_type==11`` when SNe occur during CEs - - Bug fix [[#725](https://github.com/COSMIC-PopSynth/COSMIC/issues/725)]: set ``tb=sep=0`` for cases where AIC caused a WD to explode and leave behind no remnant (``evolve_type==9``) - - Bug fix [[#724](https://github.com/COSMIC-PopSynth/COSMIC/issues/724)]: remove bug where ``kstar=15`` was assigned its previous epoch mass after merging during a CE and the merger product goes SN + +- Bug fix ([#729](https://github.com/COSMIC-PopSynth/COSMIC/issues/729)): ensure disruptions are logged with ``evol_type==11`` when SNe occur during CEs +- Bug fix ([#725](https://github.com/COSMIC-PopSynth/COSMIC/issues/725)): set ``tb=sep=0`` for cases where AIC caused a WD to explode and leave behind no remnant (``evolve_type==9``) +- Bug fix ([#724](https://github.com/COSMIC-PopSynth/COSMIC/issues/724)): remove bug where ``kstar=15`` was assigned its previous epoch mass after merging during a CE and the merger product goes SN ## 3.7.0 - - Add `remnantflag=5`: The Mandel & Muller 2020 prescription for remnant masses - - Add `kickflag=6`: The Mandel & Muller 2020 prescription for natal kicks. This can be tuned with `mm_mu_ns` and `mm_mu_bh` - - Add `remnantflag=6`: The Maltsev+25 and Willcox+25 prescription for remnant masses. This can be tuned with `maltsev_mode` and `maltsev_fallback` - - (Docs) Any tutorial that uses a plain BSEDict now uses one that is drawn from the cosmic-settings.json file to avoid missing changes and saves us updating each docs page + +- Add ``remnantflag=5``: The Mandel & Muller 2020 prescription for remnant masses +- Add ``kickflag=6``: The Mandel & Muller 2020 prescription for natal kicks. This can be tuned with ``mm_mu_ns`` and ``mm_mu_bh`` +- Add ``remnantflag=6``: The Maltsev+25 and Willcox+25 prescription for remnant masses. This can be tuned with ``maltsev_mode`` and ``maltsev_fallback`` +- (Docs) Any tutorial that uses a plain BSEDict now uses one that is drawn from the cosmic-settings.json file to avoid missing changes and saves us updating each docs page ## 3.6.2 - - Add functions to `cosmic.utils` for initC IO that's more efficient (`save_initC`, `load_initC`) by saving - identical setting columns separately with only one copy - saves ~1kb per binary - - Make He and CO core masses available in output - - Change defaults; `qcflag=5` and `eccfac=10` - - Prevent users from supplying both `qmin` and `m2_min` - - Prevent users from supplying both `sep` and `porb` when sampling, calculate `porb` from `sep` as necessary - - Define `binstate=-1` as single stars + +- Add functions to ``cosmic.utils`` for initC IO that's more efficient (``save_initC``, ``load_initC``) by saving identical setting columns separately with only one copy - saves ~1kb per binary +- Make He and CO core masses available in output +- Change defaults; ``qcflag=5`` and ``eccfac=10`` +- Prevent users from supplying both ``qmin`` and ``m2_min`` +- Prevent users from supplying both ``sep`` and ``porb`` when sampling, calculate ``porb`` from ``sep`` as necessary +- Define ``binstate=-1`` as single stars ## 3.6.1 - - Add support for single stars in both independent and multidim sampling - - update documentation + +- Add support for single stars in both independent and multidim sampling +- update documentation ## 3.6.0 - - Overhaul documentation and added debugging environment - - Feature: Added Disberg+2025 kick prescription as a new choice of `kickflag` (`kickflag=5`). Applies log-normal distribution to regular CCSN, ECSN/USSN still use `sigmadiv` Maxwellian and BH fallback scaling is still applied via `bhflag` and `bhsigmafrac` as with `kickflag=1` + +- Overhaul documentation and added debugging environment +- Feature: Added Disberg+2025 kick prescription as a new choice of ``kickflag`` (``kickflag=5``). Applies log-normal distribution to regular CCSN, ECSN/USSN still use ``sigmadiv`` Maxwellian and BH fallback scaling is still applied via ``bhflag`` and ``bhsigmafrac`` as with ``kickflag=1`` ## 3.5.0 - - Feature: Added `bpp_columns` and `bcm_columns` parameters to the `evolve()` function to allow users to specify the columns in the bpp and bcm tables - - Bug fix: Changed `kick.f` to use the Pfahl+02 kick prescription by default instead of Kiel & Hurley 2009, this fixes ejection velocities of secondaries and also changed kick_info to have an extra column + +- Feature: Added ``bpp_columns`` and ``bcm_columns`` parameters to the ``evolve()`` function to allow users to specify the columns in the bpp and bcm tables +- Bug fix: Changed ``kick.f`` to use the Pfahl+02 kick prescription by default instead of Kiel & Hurley 2009, this fixes ejection velocities of secondaries and also changed kick_info to have an extra column ## 3.4.11 - - Added sampling options to ``independent`` sampler to allow for custom power law distributions for ``porb`` and ``q`` + +- Added sampling options to ``independent`` sampler to allow for custom power law distributions for ``porb`` and ``q`` ## 3.4.10 - - Bug fixes: `timestep_conditions` for `bcm` arrays now raise errors for invalid columns instead of failing silently - - Add `teff_1` and `teff_2` as variables that can be used to set `timestep_conditions` - - Add in `-1` option to turn off Magnetic Braking in htmb - - Added `central_bh` and `scale_with_central_bh` as options to the CMC sampler, in order to add central massive black holes to CMC initial conditions + +- Bug fixes: ``timestep_conditions`` for ``bcm`` arrays now raise errors for invalid columns instead of failing silently +- Add ``teff_1`` and ``teff_2`` as variables that can be used to set ``timestep_conditions`` +- Add in ``-1`` option to turn off Magnetic Braking in htmb +- Added ``central_bh`` and ``scale_with_central_bh`` as options to the CMC sampler, in order to add central massive black holes to CMC initial conditions ## 3.4.9 - - Added `sampling_target == "total_mass"` option to independent sampler so you can target a specific total mass instead of number of binaries - - Added `trim_extra_samples` parameter to the same function - which trims your samples to get as close as possible to the target total mass - - Bug fixes: secondaries of single stars are now marked as massless remnants instead of main sequence stars, binfrac=0.0 no longer leads to an infinite loop in sampling + +- Added ``sampling_target == "total_mass"`` option to independent sampler so you can target a specific total mass instead of number of binaries +- Added ``trim_extra_samples`` parameter to the same function - which trims your samples to get as close as possible to the target total mass +- Bug fixes: secondaries of single stars are now marked as massless remnants instead of main sequence stars, binfrac=0.0 no longer leads to an infinite loop in sampling ## 3.4.8 - - removed zsun_wind so that we can match stock BSE exactly and added extra documentation surrounding the winds - - added a NaN catch in cosmic-pop that throws a warning of NaNs, saves them to a file, and instructs the user to consider changing pts1 since this is the main driver of NaNs so far + +- removed zsun_wind so that we can match stock BSE exactly and added extra documentation surrounding the winds +- added a NaN catch in cosmic-pop that throws a warning of NaNs, saves them to a file, and instructs the user to consider changing pts1 since this is the main driver of NaNs so far ## 3.4.7 - - Exchanged any print statements for `warnings.warn` to allow silencing - - Fixed up docs to catch warnings + +- Exchanged any print statements for ``warnings.warn`` to allow silencing +- Fixed up docs to catch warnings ## 3.4.6 - - added new Eddington limit prescriptions for BH accretion - - cleaned up versioning + +- added new Eddington limit prescriptions for BH accretion +- cleaned up versioning ## 3.4.1-3.4.5 - - updated the actions to build properly + +- updated the actions to build properly ## 3.4.1 - - fixed sampling issues for renzo19 and sana12 so that they work with CMC - - update to Docker ubuntu image - - minor fixes to documentation to stop warnings/errors which break doc website deployment - - adds in build wheels for Python 3.9 and 3.10 - - add warning for mlwind prescriptions which assume zsun = 0.019 - - modifications to how m2min and qmin are specified in initial conditions sampling - - fixed sampling issues from Plummer profiles in cmc.py - - fixed Eddington limits such that wind accretion is limited to eddington and thus limits RLO accretion if the wind accretion is already super-Eddington - - fixed errors in Marchant+ PISN prescription + +- fixed sampling issues for renzo19 and sana12 so that they work with CMC +- update to Docker ubuntu image +- minor fixes to documentation to stop warnings/errors which break doc website deployment +- adds in build wheels for Python 3.9 and 3.10 +- add warning for mlwind prescriptions which assume zsun = 0.019 +- modifications to how m2min and qmin are specified in initial conditions sampling +- fixed sampling issues from Plummer profiles in cmc.py +- fixed Eddington limits such that wind accretion is limited to eddington and thus limits RLO accretion if the wind accretion is already super-Eddington +- fixed errors in Marchant+ PISN prescription ## 0.0 - 3.4 -See the discussed changes in our previous releases here: https://github.com/COSMIC-PopSynth/COSMIC/releases + +See the discussed changes in our previous releases [here](https://github.com/COSMIC-PopSynth/COSMIC/releases) diff --git a/docs/Makefile b/docs/Makefile index 98c9cf7cc..1fa18aba7 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -57,6 +57,7 @@ clean: html: apidoc python generate_default_bsedict.py python create_settings_html.py + python create_whats_new.py $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html @echo @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." diff --git a/docs/create_whats_new.py b/docs/create_whats_new.py new file mode 100644 index 000000000..d74954be8 --- /dev/null +++ b/docs/create_whats_new.py @@ -0,0 +1,65 @@ +""" + create_whats_new.py + + This file constructs the "What's New" section of the documentation, which highlights new features and settings in the latest version of COSMIC. It ingests the changelog and converts it to an rst file for the docs. + + Each heading that starts with ## is converted to a new section in the "What's New" page, and each bullet point is converted to a new feature. + The script also links any headings of the form "## x.x.x" to the corresponding release in GitHub + + Written by Tom Wagg +""" + +import re +from pathlib import Path + +def parse_changelog(changelog_path): + with open(changelog_path, 'r') as f: + changelog = f.read() + + # Split the changelog into sections based on "## " headings + sections = re.split(r'##\s+', changelog)[1:] # Skip the first split which is before the first heading + + parsed_sections = [] + for section in sections: + lines = section.strip().split('\n') + heading = lines[0].strip() + features = [line for line in lines[1:]] + + # if the first character of the heading is not a number, skip + if not re.match(r'^\d', heading): + continue + + # for each feature, replace markdown links of the form [text](link) with rst links of the form `text `_ + features = [re.sub(r'\[([^\]]+)\]\(([^)]+)\)', r'`\1 <\2>`_', feature) for feature in features] + + parsed_sections.append((heading, features)) + + return parsed_sections + +def generate_rst(parsed_sections, output_path): + with open(output_path, 'w') as f: + f.write("What's New in COSMIC\n") + f.write("====================\n\n") + + for heading, features in parsed_sections: + + f.write(f"v{heading}\n") + f.write(f"{'-' * (len(heading) + 1)}\n\n") + + # Check if the heading is a version number (e.g., "4.1.0") + if re.match(r'^\d+\.\d+\.\d+$', heading): + github_link = f"https://github.com/COSMIC-PopSynth/COSMIC/releases/tag/v{heading}" + f.write(f"`GitHub release <{github_link}>`_\n\n") + + for feature in features: + f.write(feature + "\n") + f.write("\n") + +if __name__ == "__main__": + changelog_path = Path("../CHANGELOG.md") + output_path = Path("_generated/whats_new.rst") + + parsed_sections = parse_changelog(changelog_path) + generate_rst(parsed_sections, output_path) + + print(f"Generated {output_path} from {changelog_path}") \ No newline at end of file diff --git a/docs/index.rst b/docs/index.rst index a3f5088a1..1a867896d 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -27,6 +27,7 @@ COSMIC (Compact Object Synthesis and Monte Carlo Investigation Code) is a rapid pages/multiprocessing pages/cite pages/developers + _generated/whats_new ***************** API documentation diff --git a/docs/pages/output_info.rst b/docs/pages/output_info.rst index 6d82b7454..f9c735ca1 100644 --- a/docs/pages/output_info.rst +++ b/docs/pages/output_info.rst @@ -182,8 +182,10 @@ velocity after both supernovae). ``kick_info[i,12]: delta_vsysy_2`` change in 3D velocity of the star=2 if system is disrupted (y-component) ``kick_info[i,13]: delta_vsysz_2`` change in 3D velocity of the star=2 if system is disrupted (z-component) ``kick_info[i,14]: vsys_2_total`` magnitude of velocity of star=2 if disrupted, accounting for both SNe [:math:`{\rm{km/s}}`] -``kick_info[i,15]: delta_theta_total`` angular change in orbital plane due to supernovae, relative to the pre-SN1 orbital plane [:math:`{\rm{degrees}}`] -``kick_info[i,16]: omega`` azimuthal angle of the orbital plane w.r.t. spins [:math:`{\rm{degrees}}`] -``kick_info[i,17]: randomseed`` random seed at the start of call to kick.f +``kick_info[i,15]: theta_euler`` First Euler angle of rotation of orbital plane after each SN +``kick_info[i,16]: phi_euler`` Second Euler angle of rotation of orbital plane after each SN +``kick_info[i,17]: psi_euler`` Third Euler angle of rotation of orbital plane after each SN +``kick_info[i,18]: randomseed`` random seed at the start of call to kick.f +``kick_info[i,19]: tphys`` time of the supernova in Myr ========================================== ======================================================================================================================================== diff --git a/src/cosmic/_version.py b/src/cosmic/_version.py index 76ad18b89..703970876 100644 --- a/src/cosmic/_version.py +++ b/src/cosmic/_version.py @@ -1 +1 @@ -__version__ = "4.0.1" +__version__ = "4.1.0" diff --git a/src/cosmic/evolve.py b/src/cosmic/evolve.py index 5749f23a7..34e778f8d 100644 --- a/src/cosmic/evolve.py +++ b/src/cosmic/evolve.py @@ -84,7 +84,7 @@ KICK_COLUMNS = ['star', 'disrupted', 'natal_kick', 'phi', 'theta', 'mean_anomaly', 'delta_vsysx_1', 'delta_vsysy_1', 'delta_vsysz_1', 'vsys_1_total', 'delta_vsysx_2', 'delta_vsysy_2', 'delta_vsysz_2', 'vsys_2_total', - 'theta_euler', 'phi_euler', 'psi_euler', 'randomseed', 'bin_num'] + 'theta_euler', 'phi_euler', 'psi_euler', 'randomseed', 'tphys', 'bin_num'] # We use the list of column in the initialbinarytable function to initialize # the list of columns that we will send to the fortran evolv2 function. @@ -512,8 +512,22 @@ def evolve(self, initialbinarytable, pool=None, bpp_columns=None, bcm_columns=No for col in mass_modifier_cols: initialbinarytable.loc[mask, col] *= mod - # need to ensure that the order of parameters that we pass to BSE - # is correct + # if stellar engine is METISSE then check all of the SSE columns are present and if not raise an error + if initialbinarytable['stellar_engine'].iloc[0] == 'metisse': + if not set(INITIAL_CONDITIONS_SSE_COLUMN).issubset(initialbinarytable.columns): + raise ValueError("If you want to use the METISSE stellar engine, you must provide the following in the SSEDict, initial binary table, or params file: path_to_tracks, path_to_he_tracks, z_accuracy_limit.") + else: + # if not using METISSE, set default values for the SSE columns if they are not present in the initial binary table + if 'stellar_engine' not in initialbinarytable.columns: + initialbinarytable = initialbinarytable.assign(stellar_engine='sse') + if 'path_to_tracks' not in initialbinarytable.columns: + initialbinarytable = initialbinarytable.assign(path_to_tracks='') + if 'path_to_he_tracks' not in initialbinarytable.columns: + initialbinarytable = initialbinarytable.assign(path_to_he_tracks='') + if 'z_accuracy_limit' not in initialbinarytable.columns: + initialbinarytable = initialbinarytable.assign(z_accuracy_limit=1e-2) + + # need to ensure that the order of parameters that we pass to BSE is correct initial_conditions = initialbinarytable[INITIAL_CONDITIONS_PASS_COLUMNS].to_dict('records') # ensure that metallicity is in the valid range (Z in [1e-4, 0.03]) @@ -746,14 +760,14 @@ def _evolve_single_system(f, zpars=None): _evolvebin.se_flags.using_metisse = 0 _evolvebin.metissevars.path_to_tracks = "" _evolvebin.metissevars.path_to_he_tracks = "" - _evolvebin.metissevars.z_match_limit = 1e-2 + _evolvebin.metissevars.z_match_limit = f["z_accuracy_limit"] _evolvebin.metissevars.METISSE_verbose = False elif f["stellar_engine"] == "metisse": _evolvebin.se_flags.using_metisse = 1 _evolvebin.se_flags.using_sse = 0 _evolvebin.metissevars.path_to_tracks = f["path_to_tracks"] _evolvebin.metissevars.path_to_he_tracks = f["path_to_he_tracks"] - _evolvebin.metissevars.z_match_limit = 1e-2 + _evolvebin.metissevars.z_match_limit = f["z_accuracy_limit"] _evolvebin.metissevars.METISSE_verbose = False else: raise ValueError("Use either 'sse' or 'metisse' as stellar engine") @@ -763,7 +777,7 @@ def _evolve_single_system(f, zpars=None): _evolvebin.col.n_col_bcm = f["n_col_bcm"] _evolvebin.col.col_inds_bcm = f["col_inds_bcm"] - [zpars, bpp_index, bcm_index, kick_info] = _evolvebin.evolv2([f["kstar_1"], f["kstar_2"]], + [zpars, kick_info, bpp_index, bcm_index] = _evolvebin.evolv2([f["kstar_1"], f["kstar_2"]], [f["mass_1"], f["mass_2"]], f["porb"], f["ecc"], f["metallicity"], f["tphysf"], f["dtp"], @@ -783,9 +797,7 @@ def _evolve_single_system(f, zpars=None): [f["bhspin_1"], f["bhspin_2"]], f["tphys"], zpars, - np.zeros(20), f["kick_info"]) - if bpp_index<0: raise ValueError("Failed in METISSE_zcnsts") else: diff --git a/src/cosmic/src/benchmarkevolv2.f b/src/cosmic/src/benchmarkevolv2.f index 8e127ffba..2c06766fb 100644 --- a/src/cosmic/src/benchmarkevolv2.f +++ b/src/cosmic/src/benchmarkevolv2.f @@ -101,8 +101,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 0.0; kstar(2) = 0.0 @@ -184,8 +184,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 0.0; kstar(2) = 0.0 @@ -267,8 +267,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 0.0; kstar(2) = 0.0 @@ -350,8 +350,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 0.0; kstar(2) = 0.0 @@ -433,8 +433,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 0.0; kstar(2) = 0.0 @@ -516,8 +516,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 0.0; kstar(2) = 0.0 @@ -599,8 +599,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 0.0; kstar(2) = 0.0 @@ -682,8 +682,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 0.0; kstar(2) = 0.0 @@ -765,8 +765,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 0.0; kstar(2) = 0.0 @@ -848,8 +848,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 0.0; kstar(2) = 0.0 @@ -931,8 +931,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 0.0; kstar(2) = 0.0 @@ -1014,8 +1014,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 0.0; kstar(2) = 0.0 @@ -1097,8 +1097,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 0.0; kstar(2) = 0.0 @@ -1180,8 +1180,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 0.0; kstar(2) = 0.0 @@ -1263,8 +1263,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 0.0; kstar(2) = 0.0 @@ -1346,8 +1346,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 0.0; kstar(2) = 0.0 @@ -1429,8 +1429,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 0.0; kstar(2) = 0.0 @@ -1512,8 +1512,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 0.0; kstar(2) = 0.0 @@ -1595,8 +1595,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 0.0; kstar(2) = 0.0 @@ -1678,8 +1678,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 0.0; kstar(2) = 0.0 @@ -1761,8 +1761,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 0.0; kstar(2) = 0.0 @@ -1844,8 +1844,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 0.0; kstar(2) = 0.0 @@ -1927,8 +1927,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 0.0; kstar(2) = 0.0 @@ -2010,8 +2010,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 0.0; kstar(2) = 0.0 @@ -2093,8 +2093,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -2176,8 +2176,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -2259,8 +2259,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -2342,8 +2342,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -2425,8 +2425,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -2508,8 +2508,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -2591,8 +2591,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -2674,8 +2674,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -2757,8 +2757,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -2840,8 +2840,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -2923,8 +2923,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -3006,8 +3006,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -3089,8 +3089,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -3172,8 +3172,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -3255,8 +3255,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -3338,8 +3338,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -3421,8 +3421,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -3504,8 +3504,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -3587,8 +3587,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -3670,8 +3670,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -3753,8 +3753,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -3836,8 +3836,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -3919,8 +3919,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -4002,8 +4002,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -4085,8 +4085,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -4168,8 +4168,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -4251,8 +4251,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -4334,8 +4334,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -4417,8 +4417,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -4500,8 +4500,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -4583,8 +4583,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -4666,8 +4666,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -4749,8 +4749,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -4832,8 +4832,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -4915,8 +4915,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -4998,8 +4998,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -5081,8 +5081,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -5164,8 +5164,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -5247,8 +5247,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -5330,8 +5330,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -5413,8 +5413,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -5496,8 +5496,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -5579,8 +5579,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -5662,8 +5662,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -5745,8 +5745,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -5828,8 +5828,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -5911,8 +5911,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -5994,8 +5994,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -6077,8 +6077,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -6160,8 +6160,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -6243,8 +6243,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -6326,8 +6326,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -6409,8 +6409,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -6492,8 +6492,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -6575,8 +6575,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -6658,8 +6658,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -6741,8 +6741,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -6824,8 +6824,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -6907,8 +6907,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -6990,8 +6990,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -7073,8 +7073,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -7156,8 +7156,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -7239,8 +7239,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -7322,8 +7322,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -7405,8 +7405,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -7488,8 +7488,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -7571,8 +7571,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -7654,8 +7654,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -7737,8 +7737,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -7820,8 +7820,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -7903,8 +7903,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -7986,8 +7986,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -8069,8 +8069,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -8152,8 +8152,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -8235,8 +8235,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -8318,8 +8318,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -8401,8 +8401,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -8484,8 +8484,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -8567,8 +8567,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -8650,8 +8650,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -8733,8 +8733,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -8816,8 +8816,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -8899,8 +8899,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -8982,8 +8982,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -9065,8 +9065,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -9148,8 +9148,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -9231,8 +9231,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -9314,8 +9314,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -9397,8 +9397,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -9480,8 +9480,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -9563,8 +9563,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -9646,8 +9646,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -9729,8 +9729,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -9812,8 +9812,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -9895,8 +9895,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -9978,8 +9978,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -10061,8 +10061,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -10144,8 +10144,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -10227,8 +10227,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -10310,8 +10310,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -10393,8 +10393,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -10476,8 +10476,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -10559,8 +10559,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -10642,8 +10642,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -10725,8 +10725,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -10808,8 +10808,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -10891,8 +10891,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -10974,8 +10974,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -11057,8 +11057,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -11140,8 +11140,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -11223,8 +11223,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -11306,8 +11306,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -11389,8 +11389,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -11472,8 +11472,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -11555,8 +11555,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -11638,8 +11638,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -11721,8 +11721,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -11804,8 +11804,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -11887,8 +11887,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -11970,8 +11970,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -12053,8 +12053,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -12136,8 +12136,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -12219,8 +12219,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -12302,8 +12302,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -12385,8 +12385,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -12468,8 +12468,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -12551,8 +12551,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -12634,8 +12634,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -12717,8 +12717,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -12800,8 +12800,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -12883,8 +12883,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -12966,8 +12966,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -13049,8 +13049,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -13132,8 +13132,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -13215,8 +13215,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -13298,8 +13298,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -13381,8 +13381,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -13464,8 +13464,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -13547,8 +13547,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -13630,8 +13630,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -13713,8 +13713,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -13796,8 +13796,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -13879,8 +13879,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -13962,8 +13962,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -14045,8 +14045,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -14128,8 +14128,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -14211,8 +14211,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -14294,8 +14294,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -14377,8 +14377,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -14460,8 +14460,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -14543,8 +14543,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -14626,8 +14626,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -14709,8 +14709,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -14792,8 +14792,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -14875,8 +14875,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -14958,8 +14958,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -15041,8 +15041,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -15124,8 +15124,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -15207,8 +15207,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -15290,8 +15290,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -15373,8 +15373,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -15456,8 +15456,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -15539,8 +15539,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -15622,8 +15622,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -15705,8 +15705,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -15788,8 +15788,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -15871,8 +15871,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -15954,8 +15954,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -16037,8 +16037,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -16120,8 +16120,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -16203,8 +16203,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -16286,8 +16286,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -16369,8 +16369,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -16452,8 +16452,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -16535,8 +16535,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -16618,8 +16618,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -16701,8 +16701,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -16784,8 +16784,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -16867,8 +16867,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -16950,8 +16950,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -17033,8 +17033,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -17116,8 +17116,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -17199,8 +17199,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -17282,8 +17282,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -17365,8 +17365,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -17448,8 +17448,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -17531,8 +17531,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -17614,8 +17614,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -17697,8 +17697,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -17780,8 +17780,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -17863,8 +17863,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -17946,8 +17946,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -18029,8 +18029,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -18112,8 +18112,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -18195,8 +18195,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -18278,8 +18278,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -18361,8 +18361,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -18444,8 +18444,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -18527,8 +18527,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 0.0 @@ -18610,8 +18610,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -18693,8 +18693,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -18776,8 +18776,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -18859,8 +18859,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -18942,8 +18942,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -19025,8 +19025,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -19108,8 +19108,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -19191,8 +19191,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -19274,8 +19274,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -19357,8 +19357,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -19440,8 +19440,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -19523,8 +19523,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -19606,8 +19606,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -19689,8 +19689,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -19772,8 +19772,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -19855,8 +19855,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -19938,8 +19938,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -20021,8 +20021,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -20104,8 +20104,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -20187,8 +20187,8 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) kstar(1) = 1.0; kstar(2) = 1.0 @@ -20270,7 +20270,7 @@ PROGRAM benchmarkevolv2 CALL evolv2(kstar,mass,tb,ecc,z,tphysf, & dtptmp,mass0,rad,lumin,massc,radc, & menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - & bhspin,tphys,zpars,bkick,kick_info, - & bpp_index_out,bcm_index_out,kick_info_out) + & bhspin,tphys,zpars,kick_info, + & bpp_index_out,bcm_index_out) END PROGRAM benchmarkevolv2 diff --git a/src/cosmic/src/comenv.f b/src/cosmic/src/comenv.f index d57bab563..849b0fe06 100644 --- a/src/cosmic/src/comenv.f +++ b/src/cosmic/src/comenv.f @@ -6,7 +6,7 @@ SUBROUTINE COMENV(M01,M1,MC1,AJ1,JSPIN1,KW1, & bhspin1,bhspin2,binstate,mergertype, & jp,tphys,switchedCE,rad,tms,evolve_type,disrupt, & lumin,B_0,bacc,tacc,epoch,menv_bpp,renv_bpp, - & bkick,deltam_1,deltam_2,dtm) + & deltam_1,deltam_2,dtm) IMPLICIT NONE INCLUDE 'const_bse.h' * @@ -51,8 +51,7 @@ SUBROUTINE COMENV(M01,M1,MC1,AJ1,JSPIN1,KW1, REAL*8 RC1,RC2,Q1,Q2,RL1,RL2,LAMB1,LAMB2 REAL*8 MENV,RENV,MENVD,RZAMS,vk REAL*8 Porbi,Porbf,Mcf,Menvf,qi,qf,G - REAL*8 kick_info(2,18),fallback,M1i,M2i - REAL*8 bkick(20) + REAL*8 kick_info(2,19),fallback,M1i,M2i REAL*8 bhspin1,bhspin2,dtm REAL*8 deltam_1,deltam_2 common /fall/fallback @@ -374,7 +373,7 @@ SUBROUTINE COMENV(M01,M1,MC1,AJ1,JSPIN1,KW1, endif CALL kick(KW1,M_postCE,mc_co(1),M1,M2,ECC,SEP_postCE, & JORB,vk,star1,R2,fallback,sigmahold, - & kick_info,disrupt,bkick) + & kick_info,disrupt,tphys) * Returning variable state to original naming convention MF = M_postCE SEPF = SEP_postCE @@ -701,7 +700,7 @@ SUBROUTINE COMENV(M01,M1,MC1,AJ1,JSPIN1,KW1, endif CALL kick(KW1,M_postCE,mc_co(1),M1,M2,ECC,SEP_postCE, & JORB,vk,star1,R2,fallback,sigmahold, - & kick_info,disrupt,bkick) + & kick_info,disrupt,tphys) * Returning variable state to original naming convention MF = M_postCE SEPF = SEP_postCE @@ -865,7 +864,7 @@ SUBROUTINE COMENV(M01,M1,MC1,AJ1,JSPIN1,KW1, endif CALL kick(KW2,M_postCE,mc_co(2),M2,M1,ECC,SEP_postCE, & JORB,vk,star2,R1,fallback,sigmahold, - & kick_info,disrupt,bkick) + & kick_info,disrupt,tphys) * Returning variable state to original naming convention MF = M_postCE SEPF = SEP_postCE @@ -1105,7 +1104,7 @@ SUBROUTINE COMENV(M01,M1,MC1,AJ1,JSPIN1,KW1, endif endif CALL kick(KW,MF,mc_co(1),M1,0.d0,0.d0,-1.d0,0.d0,vk,star1, - & 0.d0,fallback,sigmahold,kick_info,disrupt,bkick) + & 0.d0,fallback,sigmahold,kick_info,disrupt,tphys) if(output) write(*,*)'coel 2 6:',KW,M1,M01,R1,MENV,RENV ENDIF JSPIN1 = OORB*(K21*R1*R1*(M1-MC1)+K3*RC1*RC1*MC1) diff --git a/src/cosmic/src/evolv2.f b/src/cosmic/src/evolv2.f index 8e77e80ab..608371bf2 100644 --- a/src/cosmic/src/evolv2.f +++ b/src/cosmic/src/evolv2.f @@ -2,8 +2,8 @@ SUBROUTINE evolv2(kstar,mass,tb,ecc,z,tphysf, \ dtp,mass0,rad,lumin,massc,radc, \ menv,renv,ospin,B_0,bacc,tacc,epoch,tms, - \ bhspin,tphys,zpars,bkick,kick_info, - \ bpp_index_out,bcm_index_out,kick_info_out) + \ bhspin,tphys,zpars,kick_info, + \ bpp_index_out,bcm_index_out) IMPLICIT NONE INCLUDE 'const_bse.h' INCLUDE 'checkstate.h' @@ -167,9 +167,7 @@ SUBROUTINE evolv2(kstar,mass,tb,ecc,z,tphysf, REAL*8 mass1_bpp,mass2_bpp REAL*8 rad(2),rol(2),rol0(2),rdot(2),radc(2),renv(2),radx(2) REAL*8 lumin(2),k2str(2),q(2),dms(2),dmr(2),dmt(2) - REAL*8 dml,vorb2,vwind2,omv2,ivsqm,lacc,kick_info(2,18) - REAL*8 bkick(20) - REAL*8 kick_info_out(2,18) + REAL*8 dml,vorb2,vwind2,omv2,ivsqm,lacc,kick_info(2,19) REAL*8 sep,dr,tb,dme,tdyn,taum,dm1,dm2,dmchk,qc,dt,pd,rlperi REAL*8 m1ce,m2ce,mch,tmsnew,dm22,mew PARAMETER(mch=1.44d0) @@ -240,11 +238,9 @@ SUBROUTINE evolv2(kstar,mass,tb,ecc,z,tphysf, Cf2py intent(in) bhspin Cf2py intent(in) tphys Cf2py intent(in,out) zpars -Cf2py intent(in) bkick -Cf2py intent(in) kick_info +Cf2py intent(in,out) kick_info Cf2py intent(out) bpp_index_out Cf2py intent(out) bcm_index_out -Cf2py intent(out) kick_info_out if(using_cmc.eq.0)then @@ -326,7 +322,6 @@ SUBROUTINE evolv2(kstar,mass,tb,ecc,z,tphysf, if(using_cmc.eq.0)then bcm_index_out = 0 bpp_index_out = 0 - kick_info_out = 0.d0 endif @@ -1373,7 +1368,7 @@ SUBROUTINE evolv2(kstar,mass,tb,ecc,z,tphysf, & formation(2),binstate,mergertype,z,'bpp') CALL kick(kw,mass(k),mc_co(k),mt,0.d0,0.d0,-1.d0,0.d0, & vk,k,0.d0,fallback,sigmahold,kick_info, - & disrupt,bkick) + & disrupt,tphys) sigma = sigmahold !reset sigma after possible ECSN kick dist. Remove this if u want some kick link to the intial pulsar values... * set kick values for the bcm array @@ -1420,7 +1415,7 @@ SUBROUTINE evolv2(kstar,mass,tb,ecc,z,tphysf, CALL kick(kw,mass(k),mc_co(k),mt,mass(3-k),ecc,sep,jorb, & vk,k,rad(3-k),fallback,sigmahold,kick_info, - & disrupt,bkick) + & disrupt,tphys) sigma = sigmahold !reset sigma after possible ECSN kick dist. Remove this if u want some kick link to the intial pulsar values... * set kick values for the bcm array if(mass(3-k).lt.0.d0)then @@ -2483,7 +2478,7 @@ SUBROUTINE evolv2(kstar,mass,tb,ecc,z,tphysf, & bhspin(j1),bhspin(j2),binstate,mergertype, & bpp_ind,tphys,switchedCE,rad,tms,evolve_type, & disrupt, - & lumin,B_0,bacc,tacc,epoch,menv,renv,bkick, + & lumin,B_0,bacc,tacc,epoch,menv,renv, & deltam1_bcm,deltam2_bcm,dtm) if(j1.eq.2.and.kcomp2.eq.13.and.kstar(j2).eq.15.and. & kstar(j1).eq.13)then !PK. @@ -2623,7 +2618,7 @@ SUBROUTINE evolv2(kstar,mass,tb,ecc,z,tphysf, & formation(2),binstate,mergertype,z,'bpp') CALL kick(kw,mass(k),mc_co(k),mt,mass(3-k),ecc,sep,jorb,vk, & k,rad(3-k),fallback,sigmahold,kick_info, - & disrupt,bkick) + & disrupt,tphys) sigma = sigmahold ! check if kick caused a merger @@ -3844,7 +3839,7 @@ SUBROUTINE evolv2(kstar,mass,tb,ecc,z,tphysf, & formation(2),binstate,mergertype,z,'bpp') CALL kick(kw,mass(k),mc_co(k),mt,mass(3-k),ecc,sep,jorb,vk, & k,rad(3-k),fallback,sigmahold,kick_info, - & disrupt,bkick) + & disrupt,tphys) sigma = sigmahold !reset sigma after possible ECSN kick dist. Remove this if u want some kick link to the intial pulsar values... if(mass(3-k).lt.0.d0)then @@ -4187,7 +4182,7 @@ SUBROUTINE evolv2(kstar,mass,tb,ecc,z,tphysf, & bhspin(j1),bhspin(j2),binstate,mergertype, & bpp_ind,tphys,switchedCE,rad,tms,evolve_type, & disrupt, - & lumin,B_0,bacc,tacc,epoch,menv,renv,bkick, + & lumin,B_0,bacc,tacc,epoch,menv,renv, & deltam1_bcm,deltam2_bcm,dtm) if(output) write(*,*)'coal1:',tphys,kstar(j1),kstar(j2),coel, & mass(j1),mass(j2) @@ -4273,7 +4268,7 @@ SUBROUTINE evolv2(kstar,mass,tb,ecc,z,tphysf, & bhspin(j2),bhspin(j1),binstate,mergertype, & bpp_ind,tphys,switchedCE,rad,tms,evolve_type, & disrupt, - & lumin,B_0,bacc,tacc,epoch,menv,renv,bkick, + & lumin,B_0,bacc,tacc,epoch,menv,renv, & deltam1_bcm,deltam2_bcm,dtm) if(output) write(*,*)'coal2:',tphys,kstar(j1),kstar(j2),coel, & mass(j1),mass(j2) @@ -4902,7 +4897,6 @@ SUBROUTINE evolv2(kstar,mass,tb,ecc,z,tphysf, if(using_cmc.eq.0)then bcm_index_out = ip bpp_index_out = bpp_ind - kick_info_out = kick_info endif if (using_METISSE.eq.1) call dealloc_track() * diff --git a/src/cosmic/src/extra/evolv1.f b/src/cosmic/src/extra/evolv1.f index 780a65e75..082584b70 100644 --- a/src/cosmic/src/extra/evolv1.f +++ b/src/cosmic/src/extra/evolv1.f @@ -67,7 +67,6 @@ SUBROUTINE evolv1(kw,mass,mt,r,lum,mc,rc,menv,renv,ospin, REAL*8 dtj,evolve_type REAL*8 omdot,sigmahold,sn,bhspin,s REAL*8 djtx,djspint,jspbru,Kconst - REAL*8 bkick(20) * REAL ran3 EXTERNAL ran3 @@ -450,7 +449,7 @@ SUBROUTINE evolv1(kw,mass,mt,r,lum,mc,rc,menv,renv,ospin, endif CALL kick(kw,mass,mt,0.d0,0.d0,-1.d0,0.d0,vk,k, & 0.d0,fallback,sigmahold,kick_info, - & disrupt,bkick) + & disrupt) endif * * Force new NS or BH to have a birth spin peirod and magnetic field. diff --git a/src/cosmic/src/kick.f b/src/cosmic/src/kick.f index 67299594a..396b46992 100644 --- a/src/cosmic/src/kick.f +++ b/src/cosmic/src/kick.f @@ -1,5 +1,5 @@ SUBROUTINE kick(kw,m1,m1c,m1n,m2,ecc,sep,jorb,vk,sn, - & r2,fallback,sigmahold,kick_info,disrupt,bkick) + & r2,fallback,sigmahold,kick_info,disrupt,tphys) IMPLICIT NONE INCLUDE 'const_bse.h' * @@ -29,8 +29,6 @@ SUBROUTINE kick(kw,m1,m1c,m1n,m2,ecc,sep,jorb,vk,sn, * Original sigma value for the kick * kick_info: real*8 * Array with information about the supernova kicks (details below) -* bkick: real*8 -* Array with information about the kicks for CMC (details below) * jorb: real*8, output * Total orbital angular momentum of the binary * vk: real*8, output @@ -40,25 +38,28 @@ SUBROUTINE kick(kw,m1,m1c,m1n,m2,ecc,sep,jorb,vk,sn, integer kw,sn real*8 m1,m2,m1c,m1n,ecc,sep,jorb,vk,r2,fallback,sigmahold - real*8 kick_info(2,18), bkick(20) + real*8 kick_info(2,19),tphys logical disrupt * Use one of the two kick prescriptions based on the kickflag if(kickflag.lt.0)then * Original Kiel & Hurley 2009 prescription call kick_kiel(kw,m1,m1n,m2,ecc,sep,jorb,vk,sn, - & r2,fallback,sigmahold,kick_info,disrupt,bkick) + & r2,fallback,sigmahold,kick_info,disrupt) else * New Pfahl et al. 2002 prescription call kick_pfahl(kw,m1,m1c,m1n,m2,ecc,sep,jorb,vk,sn, - & r2,fallback,sigmahold,kick_info,disrupt,bkick) + & r2,fallback,sigmahold,kick_info,disrupt) end if + + kick_info(sn,19) = tphys + RETURN END SUBROUTINE kick_pfahl(kw,m1,m1c,m1n,m2,ecc,sep,jorb,vk,sn,r2, - & fallback,sigmahold,kick_info,disrupt,bkick) + & fallback,sigmahold,kick_info,disrupt) IMPLICIT NONE INCLUDE 'const_bse.h' * @@ -106,7 +107,7 @@ SUBROUTINE kick_pfahl(kw,m1,m1c,m1n,m2,ecc,sep,jorb,vk,sn,r2, real*8 theta,phi,sin_phi,cos_phi,sin_theta,cos_theta real*8 fallback,sigmahold,bound real*8 mean_mns,mean_mej,alphakick,betakick - real*8 bkick(20),r2,jorb + real*8 r2,jorb real*8 ecc_prev,a_prev,mtot,mtot_prev real*8 natal_kick(3), sep_vec(3), v_rel(3), v_rel_prev(3) real*8 a_prev_2, a_prev_3, cos_ecc_anom, sin_ecc_anom @@ -126,7 +127,7 @@ SUBROUTINE kick_pfahl(kw,m1,m1c,m1n,m2,ecc,sep,jorb,vk,sn,r2, * Output logical output,disrupt,collide * - real*8 kick_info(2,18) + real*8 kick_info(2,19) real ran3,xx external ran3 external RandomTruncatedNormal @@ -536,15 +537,6 @@ SUBROUTINE kick_pfahl(kw,m1,m1c,m1n,m2,ecc,sep,jorb,vk,sn,r2, kick_info(sn,11) = v_comp_rot(1) kick_info(sn,12) = v_comp_rot(2) kick_info(sn,13) = v_comp_rot(3) - - bkick(1) = float(sn) - bkick(2) = kick_info(sn,7) - bkick(3) = kick_info(sn,8) - bkick(4) = kick_info(sn,9) - bkick(5) = float(sn) - bkick(6) = kick_info(sn,11) - bkick(7) = kick_info(sn,12) - bkick(8) = kick_info(sn,13) * elseif(sn.eq.2)then kick_info(sn,11) = v_sn_rot(1) @@ -553,15 +545,6 @@ SUBROUTINE kick_pfahl(kw,m1,m1c,m1n,m2,ecc,sep,jorb,vk,sn,r2, kick_info(sn,7) = v_comp_rot(1) kick_info(sn,8) = v_comp_rot(2) kick_info(sn,9) = v_comp_rot(3) - - bkick(5) = float(sn) - bkick(6) = kick_info(sn,11) - bkick(7) = kick_info(sn,12) - bkick(8) = kick_info(sn,13) - bkick(9) = float(sn) - bkick(10) = kick_info(sn,7) - bkick(11) = kick_info(sn,8) - bkick(12) = kick_info(sn,9) endif * lastly, check if this supernova results in a collision between stars @@ -575,12 +558,6 @@ SUBROUTINE kick_pfahl(kw,m1,m1c,m1n,m2,ecc,sep,jorb,vk,sn,r2, kick_info(sn,11) = 0.d0 kick_info(sn,12) = 0.d0 kick_info(sn,13) = 0.d0 - bkick(6) = v_sn_rot(1) - bkick(7) = v_sn_rot(2) - bkick(8) = v_sn_rot(3) - bkick(10) = 0.d0 - bkick(11) = 0.d0 - bkick(12) = 0.d0 m2 = -1.d0*m2 endif @@ -611,26 +588,6 @@ SUBROUTINE kick_pfahl(kw,m1,m1c,m1n,m2,ecc,sep,jorb,vk,sn,r2, kick_info(sn,12) = 0 kick_info(sn,13) = 0 -* 1st time with kick. - if(bkick(1).le.0.d0)then - bkick(1) = float(sn) - bkick(2) = v_cm_rot(1) - bkick(3) = v_cm_rot(2) - bkick(4) = v_cm_rot(3) -* 2nd time with kick. - elseif(bkick(5).le.0.d0)then - bkick(5) = float(sn) - bkick(6) = v_cm_rot(1) - bkick(7) = v_cm_rot(2) - bkick(8) = v_cm_rot(3) -* 2nd time with kick if already disrupted. -* MJZ - would this if statement ever be hit? - elseif(bkick(5).gt.0.d0)then - bkick(9) = float(sn) - bkick(10) = v_cm_rot(1) - bkick(11) = v_cm_rot(2) - bkick(12) = v_cm_rot(3) - endif * In the impossible chance that the system is exactly parabolic... if(ecc.eq.1.d0.and.sn.eq.1)then kick_info(sn,7) = v_cm_rot(1) @@ -639,14 +596,6 @@ SUBROUTINE kick_pfahl(kw,m1,m1c,m1n,m2,ecc,sep,jorb,vk,sn,r2, kick_info(sn,11) = -v_cm_rot(1) kick_info(sn,12) = -v_cm_rot(2) kick_info(sn,13) = -v_cm_rot(3) - bkick(1) = float(sn) - bkick(2) = v_cm_rot(1) - bkick(3) = v_cm_rot(2) - bkick(4) = v_cm_rot(3) - bkick(5) = float(sn) - bkick(6) = -v_cm_rot(1) - bkick(7) = -v_cm_rot(2) - bkick(8) = -v_cm_rot(3) elseif(ecc.eq.1.d0.and.sn.eq.2)then kick_info(sn,7) = -v_cm_rot(1) kick_info(sn,8) = -v_cm_rot(2) @@ -654,14 +603,6 @@ SUBROUTINE kick_pfahl(kw,m1,m1c,m1n,m2,ecc,sep,jorb,vk,sn,r2, kick_info(sn,11) = v_cm_rot(1) kick_info(sn,12) = v_cm_rot(2) kick_info(sn,13) = v_cm_rot(3) - bkick(5) = float(sn) - bkick(6) = v_cm_rot(1) - bkick(7) = v_cm_rot(2) - bkick(8) = v_cm_rot(3) - bkick(9) = float(sn) - bkick(10) = -v_cm_rot(1) - bkick(11) = -v_cm_rot(2) - bkick(12) = -v_cm_rot(3) endif * Update the Euler angles for the orbital plane rotation @@ -774,7 +715,7 @@ SUBROUTINE kick_pfahl(kw,m1,m1c,m1n,m2,ecc,sep,jorb,vk,sn,r2, * ====================================================================== *** SUBROUTINE kick_kiel(kw,m1,m1n,m2,ecc,sep,jorb,vk,snstar,r2, - & fallback,sigmahold,kick_info,disrupt,bkick) + & fallback,sigmahold,kick_info,disrupt) IMPLICIT NONE INCLUDE 'const_bse.h' * @@ -856,11 +797,10 @@ SUBROUTINE kick_kiel(kw,m1,m1n,m2,ecc,sep,jorb,vk,snstar,r2, real*8 semilatrec,cangleofdeath,angleofdeath,energy real*8 fallback,sigmahold,bound real*8 mean_mns,mean_mej,alphakick,betakick - real*8 bkick(20) * Output logical output,disrupt * - real*8 kick_info(2,18) + real*8 kick_info(2,19) real ran3,xx external ran3 * @@ -892,9 +832,6 @@ SUBROUTINE kick_kiel(kw,m1,m1n,m2,ecc,sep,jorb,vk,snstar,r2, if(using_cmc.eq.0)then if(kick_info(1,1).eq.0) sn=1 if(kick_info(1,1).gt.0) sn=2 - else - if(bkick(1).eq.0) sn=1 - if(bkick(1).gt.0) sn=2 endif if(using_cmc.eq.0)then @@ -1300,15 +1237,6 @@ SUBROUTINE kick_kiel(kw,m1,m1n,m2,ecc,sep,jorb,vk,snstar,r2, * kick_info(sn,13) = (m1n/mbf)*vk*sphi - bkick(1) = float(snstar) - bkick(2) = kick_info(sn,7) - bkick(3) = kick_info(sn,8) - bkick(4) = kick_info(sn,9) - bkick(5) = float(snstar) - bkick(6) = kick_info(sn,11) - bkick(7) = kick_info(sn,12) - bkick(8) = kick_info(sn,13) - if(psins.lt.0.d0)then if(r2.gt.sepn*(ecc - 1.d0))then kick_info(sn,7) = vs(1) @@ -1317,12 +1245,6 @@ SUBROUTINE kick_kiel(kw,m1,m1n,m2,ecc,sep,jorb,vk,snstar,r2, kick_info(sn,11) = 0.d0 kick_info(sn,12) = 0.d0 kick_info(sn,13) = 0.d0 - bkick(2) = vs(1) - bkick(3) = vs(2) - bkick(4) = vs(3) - bkick(6) = 0.d0 - bkick(7) = 0.d0 - bkick(8) = 0.d0 m2 = -1.d0*m2 endif endif @@ -1348,15 +1270,6 @@ SUBROUTINE kick_kiel(kw,m1,m1n,m2,ecc,sep,jorb,vk,snstar,r2, * kick_info(sn,9) = (m1n/mbf)*vk*sphi - bkick(5) = float(snstar) - bkick(6) = kick_info(sn,11) - bkick(7) = kick_info(sn,12) - bkick(8) = kick_info(sn,13) - bkick(9) = float(snstar) - bkick(10) = kick_info(sn,7) - bkick(11) = kick_info(sn,8) - bkick(12) = kick_info(sn,9) - if(psins.lt.0.d0)then if(r2.gt.sepn*(ecc - 1.d0))then kick_info(sn,7) = vs(1) @@ -1365,12 +1278,6 @@ SUBROUTINE kick_kiel(kw,m1,m1n,m2,ecc,sep,jorb,vk,snstar,r2, kick_info(sn,11) = 0.d0 kick_info(sn,12) = 0.d0 kick_info(sn,13) = 0.d0 - bkick(6) = vs(1) - bkick(7) = vs(2) - bkick(8) = vs(3) - bkick(10) = 0.d0 - bkick(11) = 0.d0 - bkick(12) = 0.d0 m2 = -1.d0*m2 endif endif @@ -1390,30 +1297,6 @@ SUBROUTINE kick_kiel(kw,m1,m1n,m2,ecc,sep,jorb,vk,snstar,r2, kick_info(sn,13) = 0 endif - if(ecc.lt.1.d0)then -* if(ecc.eq.1.d0.or.ecc.lt.0.d0) m2 = -1.d0 * m2 -* 1st time with kick. - if(bkick(1).le.0.d0)then - bkick(1) = float(snstar) - bkick(2) = vs(1) - bkick(3) = vs(2) - bkick(4) = vs(3) -* 2nd time with kick. - elseif(bkick(5).le.0.d0)then - bkick(5) = float(snstar) - bkick(6) = vs(1) - bkick(7) = vs(2) - bkick(8) = vs(3) -* 2nd time with kick if already disrupted. -* MJZ - would this if statement ever be hit? - elseif(bkick(5).gt.0.d0)then - bkick(9) = float(snstar) - bkick(10) = vs(1) - bkick(11) = vs(2) - bkick(12) = vs(3) - endif - endif - * In the impossible chance that the system is exactly parabolic... if(ecc.eq.1.d0.and.snstar.eq.1)then kick_info(sn,7) = vs(1) @@ -1422,14 +1305,6 @@ SUBROUTINE kick_kiel(kw,m1,m1n,m2,ecc,sep,jorb,vk,snstar,r2, kick_info(sn,11) = -vs(1) kick_info(sn,12) = -vs(2) kick_info(sn,13) = -vs(3) - bkick(1) = float(snstar) - bkick(2) = vs(1) - bkick(3) = vs(2) - bkick(4) = vs(3) - bkick(5) = float(snstar) - bkick(6) = -vs(1) - bkick(7) = -vs(2) - bkick(8) = -vs(3) elseif(ecc.eq.1.d0.and.snstar.eq.2)then kick_info(sn,7) = -vs(1) kick_info(sn,8) = -vs(2) @@ -1437,14 +1312,6 @@ SUBROUTINE kick_kiel(kw,m1,m1n,m2,ecc,sep,jorb,vk,snstar,r2, kick_info(sn,11) = vs(1) kick_info(sn,12) = vs(2) kick_info(sn,13) = vs(3) - bkick(5) = float(snstar) - bkick(6) = vs(1) - bkick(7) = vs(2) - bkick(8) = vs(3) - bkick(9) = float(snstar) - bkick(10) = -vs(1) - bkick(11) = -vs(2) - bkick(12) = -vs(3) endif * Uncomment to randomly rotate system velocities diff --git a/src/cosmic/src/test_bse.f b/src/cosmic/src/test_bse.f index 79340aecd..ed03b9c89 100644 --- a/src/cosmic/src/test_bse.f +++ b/src/cosmic/src/test_bse.f @@ -37,14 +37,13 @@ PROGRAM bse * integer i,kw,kw2,kstar(2),j,k,time,idum integer bpp_index_out, bcm_index_out - real*8 kick_info_out(2,17) * - real*8 mass0(2),mass(2),z,zpars(20),vs(3),kick_info(2,18) + real*8 mass0(2),mass(2),z,zpars(20),vs(3),kick_info(2,19) real*8 epoch(2),tms(2),tphys,tphysf,dtp,aj real*8 rad(2),lum(2),ospin(2) real*8 massc(2),radc(2),menv(2),renv(2) real*8 tb,ecc,yearsc - real*8 B_0(2),bacc(2),tacc(2),bhspin(2),bkick(20) + real*8 B_0(2),bacc(2),tacc(2),bhspin(2) PARAMETER(yearsc=3.1557d+07) CHARACTER*8 label(16) * @@ -204,11 +203,6 @@ PROGRAM bse zsun = 0.014 kickflag = -1 using_cmc = 0 - - - do i=1,20 - bkick(i) = 0.d0 - enddo endif @@ -270,8 +264,8 @@ PROGRAM bse * CALL evolv2(kstar,mass,tb,ecc,z,tphysf,dtp,mass0,rad,lum, & massc,radc,menv,renv,ospin,B_0,bacc,tacc, - & epoch,tms,bhspin,tphys,zpars,bkick,kick_info, - & bcm_index_out,bpp_index_out,kick_info_out) + & epoch,tms,bhspin,tphys,zpars,kick_info, + & bcm_index_out,bpp_index_out) * ************************************************************************ * Output: From 78e18e96ca65dbe2adbca625304db880c177a895 Mon Sep 17 00:00:00 2001 From: Katie Breivik Date: Thu, 28 May 2026 15:16:06 -0400 Subject: [PATCH 2/2] hotfix for multiprocessing in cosmic-pop --- bin/cosmic-pop | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/bin/cosmic-pop b/bin/cosmic-pop index 7157878f2..bb9d272b8 100755 --- a/bin/cosmic-pop +++ b/bin/cosmic-pop @@ -429,14 +429,25 @@ if __name__ == '__main__': pass filters['timestep_conditions'] = [] - # Create a pool - bpp, bcm, initCond, kick_info = Evolve.evolve(initialbinarytable=IBT, - pool=pool, - BSEDict=BSEDict, - SSEDict=SSEDict, - idx=idx, - dtp=dtp, - timestep_conditions=filters['timestep_conditions']) + # For MPI, pass the pool directly; for local multiprocessing, pass nproc so + # Evolve.evolve creates a fresh pool whose workers fork after Fortran globals + # (checkstate, dtp_state) have been initialized, avoiding a deadlock. + if isinstance(pool, MPIPool): + bpp, bcm, initCond, kick_info = Evolve.evolve(initialbinarytable=IBT, + pool=pool, + BSEDict=BSEDict, + SSEDict=SSEDict, + idx=idx, + dtp=dtp, + timestep_conditions=filters['timestep_conditions']) + else: + bpp, bcm, initCond, kick_info = Evolve.evolve(initialbinarytable=IBT, + nproc=nproc, + BSEDict=BSEDict, + SSEDict=SSEDict, + idx=idx, + dtp=dtp, + timestep_conditions=filters['timestep_conditions']) # extract single stars