From c5657d6b1449834951e1db4350a98965faf1650f Mon Sep 17 00:00:00 2001 From: AstroJeff Date: Thu, 11 Dec 2025 14:02:33 -0500 Subject: [PATCH 001/389] Updating version number --- conda/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 8ff04fed37..d8ff8b5028 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -1,5 +1,5 @@ {% set name = "posydon" %} -{% set version = "2.2.2" %} +{% set version = "2.3.0" %} package: name: "{{ name|lower }}" From c5a4ce186fbb9bb61eac366ff290340314234ea2 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Thu, 18 Dec 2025 07:52:22 -0600 Subject: [PATCH 002/389] Create validate_binaries.sh --- dev-tools/validate_binaries.sh | 1 + 1 file changed, 1 insertion(+) create mode 100644 dev-tools/validate_binaries.sh diff --git a/dev-tools/validate_binaries.sh b/dev-tools/validate_binaries.sh new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/dev-tools/validate_binaries.sh @@ -0,0 +1 @@ + From b692409ae09bd78a686d25f72dc4f57a6507ca2d Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 18 Dec 2025 13:52:47 +0000 Subject: [PATCH 003/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/validate_binaries.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/dev-tools/validate_binaries.sh b/dev-tools/validate_binaries.sh index 8b13789179..e69de29bb2 100644 --- a/dev-tools/validate_binaries.sh +++ b/dev-tools/validate_binaries.sh @@ -1 +0,0 @@ - From 27d3195673dd11ab6fd87913e12c57e81627e16d Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Thu, 18 Dec 2025 08:10:24 -0600 Subject: [PATCH 004/389] Create dummy file baseline.h5 --- dev-tools/outputs/baseline.h5 | 1 + 1 file changed, 1 insertion(+) create mode 100644 dev-tools/outputs/baseline.h5 diff --git a/dev-tools/outputs/baseline.h5 b/dev-tools/outputs/baseline.h5 new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/dev-tools/outputs/baseline.h5 @@ -0,0 +1 @@ + From b90303facc10503c7766b5575a5fefc7590a5ea1 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 18 Dec 2025 14:10:32 +0000 Subject: [PATCH 005/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/outputs/baseline.h5 | 1 - 1 file changed, 1 deletion(-) diff --git a/dev-tools/outputs/baseline.h5 b/dev-tools/outputs/baseline.h5 index 8b13789179..e69de29bb2 100644 --- a/dev-tools/outputs/baseline.h5 +++ b/dev-tools/outputs/baseline.h5 @@ -1 +0,0 @@ - From 6d4253414ae88e41022a1a780a8fe86eaed93bb6 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Thu, 18 Dec 2025 08:20:43 -0600 Subject: [PATCH 006/389] outline script --- dev-tools/validate_binaries.sh | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dev-tools/validate_binaries.sh b/dev-tools/validate_binaries.sh index e69de29bb2..436b55647c 100644 --- a/dev-tools/validate_binaries.sh +++ b/dev-tools/validate_binaries.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +# A script for validating the outputs of 100 binaries, +# which can be compared to a baseline to monitor changes to the code. + +# script usage: ./validate_binaries.sh --branch candidate-branch + +# run candidate binaries and save to file +# ./evolve_binaries.sh +# save to file + +# evaluate tolerance for quantitative values + +# evaluate qualitative differences + +# warnings and error tracking + +# structured output + +# compare +# python compare_runs.py baseline.json candidate.json + + + + + +# outputs/baseline.h5 +# outputs/candidate_branchname.h5 +# outputs/comparison_branchname.txt From b689460e0f674e60ad1cce9e1da6fde386cd79ef Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 18 Dec 2025 14:20:52 +0000 Subject: [PATCH 007/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/validate_binaries.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/validate_binaries.sh b/dev-tools/validate_binaries.sh index 436b55647c..31b7c6d72a 100644 --- a/dev-tools/validate_binaries.sh +++ b/dev-tools/validate_binaries.sh @@ -1,6 +1,6 @@ #!/bin/bash -# A script for validating the outputs of 100 binaries, +# A script for validating the outputs of 100 binaries, # which can be compared to a baseline to monitor changes to the code. # script usage: ./validate_binaries.sh --branch candidate-branch From b662a751118f1261ab8cd13029b6c8f02f86c8f6 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Thu, 18 Dec 2025 08:28:17 -0600 Subject: [PATCH 008/389] Modify evolve_binaries.sh for saved output and logs in folder outputs --- dev-tools/evolve_binaries.sh | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dev-tools/evolve_binaries.sh b/dev-tools/evolve_binaries.sh index fc7a20fb3b..051dafcd13 100755 --- a/dev-tools/evolve_binaries.sh +++ b/dev-tools/evolve_binaries.sh @@ -28,6 +28,15 @@ mkdir -p "$WORK_DIR" FULL_PATH="$(realpath "$WORK_DIR")" CLONE_DIR="$FULL_PATH/POSYDON" +OUTPUT_DIR="$FULL_PATH/outputs" +LOG_DIR="$FULL_PATH/logs" + +SAFE_BRANCH="${BRANCH//\//_}" +OUTPUT_FILE="$OUTPUT_DIR/candidate_${SAFE_BRANCH}.h5" +LOG_FILE="$LOG_DIR/evolve_${SAFE_BRANCH}.log" + +mkdir -p "$OUTPUT_DIR" "$LOG_DIR" + echo "šŸ“‹ Copying script_data folder" # copy the script_data folder cp -r "./script_data" "$WORK_DIR" @@ -79,6 +88,11 @@ pip install -e "$CLONE_DIR" -q 2>&1 | sed 's/^/ /' echo "šŸš€ Running evolve_binaries.py" # # Run the Python script and capture output (stdout and stderr) -python script_data/1Zsun_binaries_suite.py > $FULL_PATH/evolve_binaries_$BRANCH.out 2>&1 +python script_data/1Zsun_binaries_suite.py --output "$OUTPUT_FILE" > "$LOG_FILE" 2>&1 + +if [ ! -f "$OUTPUT_FILE" ]; then + echo "ERROR: Results file was not created: $OUTPUT_FILE" + exit 2 +fi -echo -e "āœ… Script completed. Output saved to \n$FULL_PATH/evolve_binaries_$BRANCH.out" +echo -e "āœ… Script completed. Output saved to \n$OUTPUT_FILE" From 2aed3772ebfbe14068ac3d6a6ff40bb5984e8c5a Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Thu, 18 Dec 2025 08:57:20 -0600 Subject: [PATCH 009/389] Modify evolve_binary for HDF5 output and error handling --- dev-tools/script_data/1Zsun_binaries_suite.py | 63 ++++++++++++------- 1 file changed, 39 insertions(+), 24 deletions(-) diff --git a/dev-tools/script_data/1Zsun_binaries_suite.py b/dev-tools/script_data/1Zsun_binaries_suite.py index 5b2c416c3c..43bb667851 100644 --- a/dev-tools/script_data/1Zsun_binaries_suite.py +++ b/dev-tools/script_data/1Zsun_binaries_suite.py @@ -116,7 +116,15 @@ def print_failed_binary(binary,e, max_error_lines=3): print("-" * line_length) -def evolve_binary(binary): +def evolve_binary(binary,h5file,binary_id): + """ + Evolves a single binary, prints its evolution, and saves to HDF5. + + Args: + binary: BinaryStar object + h5file: open h5py.File object for writing + binary_id: unique identifier for this binary + """ # Capture warnings during evolution captured_warnings = [] @@ -137,44 +145,49 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): binary.evolve() # Display the evolution summary for successful evolution write_binary_to_screen(binary) - - # Show warnings if any were captured - if captured_warnings: - print(f"āš ļø {len(captured_warnings)} warning(s) raised during evolution:") - for i, warning in enumerate(captured_warnings[:3], 1): # Show max 3 warnings - print(f" {i}. {warning['category']}: {warning['message']}") - if len(captured_warnings) > 3: - print(f" ... and {len(captured_warnings) - 3} more warning(s)") - elif len(captured_warnings) <= 3: - for i in range(4-len(captured_warnings)): - print("") - else: - print(f"No warning(s) raised during evolution\n\n\n\n") - print("=" * line_length) + + # Save to HDF5 + df = binary.to_df(**{'extra_columns':{'step_names':'str'}}) + grp = h5file.create_group(f"binary_{binary_id}") + for col in df.columns: + grp.create_dataset(col, data=df[col].values) except Exception as e: - # turn off binary alarm in case of exception signal.alarm(0) print_failed_binary(binary, e) - # Show warnings if any were captured before the exception + err_grp = h5file.require_group(f"binary_{binary_id}/errors") + err_grp.attrs['exception_type'] = type(e).__name__ + err_grp.attrs['exception_message'] = str(e) + + finally: + # Always turn off binary alarm and restore warning handler + signal.alarm(0) + warnings.showwarning = old_showwarning + + # ensure binary group exists + grp = h5file.require_group(f"binary_{binary_id}") + + # Save warnings to h5 file if captured_warnings: - print(f"\nāš ļø {len(captured_warnings)} warning(s) raised before failure:") + warn_grp = grp.create_group("warnings") + for i, warning in enumerate(captured_warnings): + warn_subgrp = warn_grp.create_group(f"warning_{i}") + warn_subgrp.attrs['category'] = warning['category'] + warn_subgrp.attrs['message'] = warning['message'] + warn_subgrp.attrs['filename'] = warning['filename'] + warn_subgrp.attrs['lineno'] = warning['lineno'] + + print(f"āš ļø {len(captured_warnings)} warning(s) raised during evolution:") for i, warning in enumerate(captured_warnings[:3], 1): # Show max 3 warnings print(f" {i}. {warning['category']}: {warning['message']}") if len(captured_warnings) > 3: print(f" ... and {len(captured_warnings) - 3} more warning(s)") else: print(f"No warning(s) raised during evolution\n\n\n\n") - print("=" * line_length) - finally: - # Always turn off binary alarm and restore warning handler - signal.alarm(0) - warnings.showwarning = old_showwarning - def evolve_binaries(verbose): """Evolves a few binaries to validate their output @@ -763,6 +776,8 @@ def evolve_binaries(verbose): parser = argparse.ArgumentParser(description='Evolve binaries for validation.') parser.add_argument('--verbose', '-v', action='store_true', default=False, help='Enable verbose output (default: False)') + parser.add_argument("--output", type=str, required=True, + help="Path to save HDF5 output") args = parser.parse_args() evolve_binaries(verbose=args.verbose) From 493af0f0603efa5ef3604aaf0d77919dcb36b1c3 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 18 Dec 2025 14:57:38 +0000 Subject: [PATCH 010/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/script_data/1Zsun_binaries_suite.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dev-tools/script_data/1Zsun_binaries_suite.py b/dev-tools/script_data/1Zsun_binaries_suite.py index 43bb667851..e1b347bbe4 100644 --- a/dev-tools/script_data/1Zsun_binaries_suite.py +++ b/dev-tools/script_data/1Zsun_binaries_suite.py @@ -145,7 +145,7 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): binary.evolve() # Display the evolution summary for successful evolution write_binary_to_screen(binary) - + # Save to HDF5 df = binary.to_df(**{'extra_columns':{'step_names':'str'}}) grp = h5file.create_group(f"binary_{binary_id}") @@ -166,10 +166,10 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): # Always turn off binary alarm and restore warning handler signal.alarm(0) warnings.showwarning = old_showwarning - + # ensure binary group exists grp = h5file.require_group(f"binary_{binary_id}") - + # Save warnings to h5 file if captured_warnings: warn_grp = grp.create_group("warnings") @@ -179,7 +179,7 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): warn_subgrp.attrs['message'] = warning['message'] warn_subgrp.attrs['filename'] = warning['filename'] warn_subgrp.attrs['lineno'] = warning['lineno'] - + print(f"āš ļø {len(captured_warnings)} warning(s) raised during evolution:") for i, warning in enumerate(captured_warnings[:3], 1): # Show max 3 warnings print(f" {i}. {warning['category']}: {warning['message']}") @@ -776,7 +776,7 @@ def evolve_binaries(verbose): parser = argparse.ArgumentParser(description='Evolve binaries for validation.') parser.add_argument('--verbose', '-v', action='store_true', default=False, help='Enable verbose output (default: False)') - parser.add_argument("--output", type=str, required=True, + parser.add_argument("--output", type=str, required=True, help="Path to save HDF5 output") args = parser.parse_args() From 91c3d5f9d873b57bf47bfa1bcdb6ddc2a38ba547 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Thu, 18 Dec 2025 09:18:58 -0600 Subject: [PATCH 011/389] Update 1Zsun_binaries_suite.py to fix args in function calls --- dev-tools/script_data/1Zsun_binaries_suite.py | 1174 +++++++++-------- 1 file changed, 605 insertions(+), 569 deletions(-) diff --git a/dev-tools/script_data/1Zsun_binaries_suite.py b/dev-tools/script_data/1Zsun_binaries_suite.py index e1b347bbe4..c632db2b34 100644 --- a/dev-tools/script_data/1Zsun_binaries_suite.py +++ b/dev-tools/script_data/1Zsun_binaries_suite.py @@ -116,7 +116,7 @@ def print_failed_binary(binary,e, max_error_lines=3): print("-" * line_length) -def evolve_binary(binary,h5file,binary_id): +def evolve_binary(binary, h5file, binary_id): """ Evolves a single binary, prints its evolution, and saves to HDF5. @@ -189,588 +189,624 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): print(f"No warning(s) raised during evolution\n\n\n\n") print("=" * line_length) -def evolve_binaries(verbose): +def evolve_binaries(verbose,output_path): """Evolves a few binaries to validate their output """ sim_prop = load_inlist(verbose) - ######################################## - # Failing binary in matching - ######################################## - star_1 = SingleStar(**{'mass': 11.948472796094759, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [231.97383621190582, 5.927334890264575, 1.5990566013567014, 6.137994236518587]}) - star_2 = SingleStar(**{'mass': 7.636958434479617, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 190925.99636740884,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # Failing binary in matching - ######################################## - star_1 = SingleStar(**{'mass': 30.169861921689556, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [77.96834852144123, 0.05021460132555987, 2.3146518208348152, 1.733054979982291]}) - star_2 = SingleStar(**{'mass': 10.972734402996027, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 20479.71919353725,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # flipped S1 and S2 ? - ######################################## - star_1 = SingleStar(**{'mass': 9.474917413943635, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [133.5713935237759, 4.398754864537542, 2.703102872841114, 1.4633904612711142]}) - star_2 = SingleStar(**{'mass': 9.311073918196263, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 18.605997832086413,'eccentricity': 0.0}, properties = sim_prop) - - evolve_binary(binary) - ######################################## - # flipped S1 and S2 - ######################################## - star_1 = SingleStar(**{'mass': 10.438541, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star_2 = SingleStar(**{'mass': 1.400713, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 9.824025,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # flipped S1 and S2 - ######################################## - star_1= SingleStar(**{'mass': 9.845907 , 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - star_2 = SingleStar(**{'mass': 9.611029, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 3.820571,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # Normal binary evolution - ######################################## - star_1= SingleStar(**{'mass': 30.845907 , 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - star_2 = SingleStar(**{'mass': 30.611029, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 30.820571,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # Normal binary - ######################################## - star_1= SingleStar(**{'mass': 9.213534679594247 , 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [327.5906384501521, 1.7707176050073297, 1.573225822966838, 1.6757313876001914]}) - star_2 = SingleStar(**{'mass': 7.209878522799272, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 63123.74544474666,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # Normal binary - ######################################## - star_1= SingleStar(**{'mass': 9.561158487732602 , 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [317.5423844462847, 2.9095984678057603, 1.754121288652108, 2.3693917842468784]}) - star_2 = SingleStar(**{'mass': 9.382732464319286, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 27.77657038557851,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # Normal binary - ######################################## - star1 = SingleStar(**{'mass': 7.552858,#29829485, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [40.91509926587841, 2.6295454150818256, 1.6718337470964977, 6.0408769315244895]}) - star2 = SingleStar(**{'mass': 6.742063, #481560266, - 'state': 'H-rich_Core_H_burning', + with h5py.File(output_path,'w') as h5file: + binary_id=0 + + ######################################## + # Failing binary in matching + ######################################## + star_1 = SingleStar(**{'mass': 11.948472796094759, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [231.97383621190582, 5.927334890264575, 1.5990566013567014, 6.137994236518587]}) + star_2 = SingleStar(**{'mass': 7.636958434479617, 'state': 'H-rich_Core_H_burning','metallicity':1, 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 17.957531550841225, 'eccentricity': 0.0,}, - properties=sim_prop) - evolve_binary(binary) - ######################################## - # High BH spin options - ######################################## - star_1 = SingleStar(**{'mass': 31.616785, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [10, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - star_2 = SingleStar(**{'mass': 26.874267, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 501.99252706449792,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # Original a>1 spin error - ######################################## - star_1 = SingleStar(**{'mass': 18.107506844123645, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [528.2970725443025, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - star_2 = SingleStar(**{'mass': 15.641392951875442, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 151.99252706449792,'eccentricity': 0.0}, properties = sim_prop) - ######################################## - # FIXED disrupted crash - ######################################## - STAR1 = SingleStar(**{'mass': 52.967313, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 36.306444, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':12.877004, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED error with SN type - ######################################## - STAR1 = SingleStar(**{'mass': 17.782576, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass':3.273864, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED oRLO2 looping - ######################################## - STAR1 = SingleStar(**{'mass': 170.638207, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [4.921294, 4.31745, 1.777768, 3.509656]}) - STAR2 = SingleStar(**{'mass':37.917852, - 'state': 'H-rich_Core_H_burning', + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 190925.99636740884,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # Failing binary in matching + ######################################## + star_1 = SingleStar(**{'mass': 30.169861921689556, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [77.96834852144123, 0.05021460132555987, 2.3146518208348152, 1.733054979982291]}) + star_2 = SingleStar(**{'mass': 10.972734402996027, 'state': 'H-rich_Core_H_burning','metallicity':1, 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':113.352736, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # Redirect to step_CO_HeMS (H-rich non-burning?) - ######################################## - star_1 = SingleStar(**{'mass': 8.333579, 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [17.125568, 4.101834, 0.917541, 3.961291]}) - star_2 = SingleStar(**{'mass' : 8.208376, 'state' : 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 66.870417, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary) - ######################################## - # FIXED oRLO2 looping - ######################################## - star_1 = SingleStar(**{'mass': 16.921378, 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}) - star_2 = SingleStar(**{'mass' : 16.286318, 'state' : 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 37.958768, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary) - ######################################## - # FIXED? step_detached failure - ######################################## - STAR1 = SingleStar(**{'mass': 19.787769, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [24.464803, 0.666314, 1.954698, 5.598975]}) - STAR2 = SingleStar(**{'mass': 7.638741, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3007.865561, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # Disrupted binary - ######################################## - star_1 = SingleStar(**{'mass': 16.921378, 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}) - star_2 = SingleStar(**{'mass' : 16.286318, 'state' : 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3007.865561, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED Detached binary failure (low mass) - ######################################## - STAR1 = SingleStar(**{'mass': 9, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass':0.8, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED SN_TYPE = None crash - ######################################## - STAR1 = SingleStar(**{'mass': 17.782576, + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 20479.71919353725,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # flipped S1 and S2 ? + ######################################## + star_1 = SingleStar(**{'mass': 9.474917413943635, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [133.5713935237759, 4.398754864537542, 2.703102872841114, 1.4633904612711142]}) + star_2 = SingleStar(**{'mass': 9.311073918196263, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 18.605997832086413,'eccentricity': 0.0}, properties = sim_prop) + + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # flipped S1 and S2 + ######################################## + star_1 = SingleStar(**{'mass': 10.438541, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + star_2 = SingleStar(**{'mass': 1.400713, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 9.824025,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # flipped S1 and S2 + ######################################## + star_1= SingleStar(**{'mass': 9.845907 , 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) + star_2 = SingleStar(**{'mass': 9.611029, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 3.820571,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # Normal binary evolution + ######################################## + star_1= SingleStar(**{'mass': 30.845907 , 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) + star_2 = SingleStar(**{'mass': 30.611029, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 30.820571,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # Normal binary + ######################################## + star_1= SingleStar(**{'mass': 9.213534679594247 , 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [327.5906384501521, 1.7707176050073297, 1.573225822966838, 1.6757313876001914]}) + star_2 = SingleStar(**{'mass': 7.209878522799272, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 63123.74544474666,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # Normal binary + ######################################## + star_1= SingleStar(**{'mass': 9.561158487732602 , 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [317.5423844462847, 2.9095984678057603, 1.754121288652108, 2.3693917842468784]}) + star_2 = SingleStar(**{'mass': 9.382732464319286, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 27.77657038557851,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # Normal binary + ######################################## + star1 = SingleStar(**{'mass': 7.552858,#29829485, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [40.91509926587841, 2.6295454150818256, 1.6718337470964977, 6.0408769315244895]}) + star2 = SingleStar(**{'mass': 6.742063, #481560266, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 17.957531550841225, 'eccentricity': 0.0,}, + properties=sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # High BH spin options + ######################################## + star_1 = SingleStar(**{'mass': 31.616785, 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [10, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) + star_2 = SingleStar(**{'mass': 26.874267, 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 501.99252706449792,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # Original a>1 spin error + ######################################## + star_1 = SingleStar(**{'mass': 18.107506844123645, 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [528.2970725443025, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) + star_2 = SingleStar(**{'mass': 15.641392951875442, 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 151.99252706449792,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # FIXED disrupted crash + ######################################## + star1 = SingleStar(**{'mass': 52.967313, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 36.306444, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':12.877004, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # FIXED error with SN type + ######################################## + star1 = SingleStar(**{'mass': 17.782576, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass':3.273864, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass':3.273864, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED SN_TYPE errors - ######################################## - STAR1 = SingleStar(**{'mass': 6.782576, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass':3.273864, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED SN_TYPE errors - ######################################## - STAR1 = SingleStar(**{'mass': 40.638207, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [30.921294, 4.31745, 1.777768, 3.509656]}) - STAR2 = SingleStar(**{'mass':37.917852, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':2113.352736, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED ECSN errors? - ######################################## - STAR1 = SingleStar(**{'mass': 12.376778, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [80, 4.31745, 1.777768, 3.509656]}) - STAR2 = SingleStar(**{'mass': 9.711216, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':79.83702, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # Interpolator masses?? - ######################################## - STAR1 = SingleStar(**{'mass': 7.592921, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass':5.038679 , - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.537807, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # Interpolator masses? - ######################################## - star_1 = SingleStar(**{'mass': 38.741115, - 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [21.113771, 2.060135, 2.224789, 4.089729]}) - star_2 = SingleStar(**{'mass': 27.776178, - 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [282.712103, 0.296252, 1.628433, 5.623812]}) - - BINARY = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 93.387072, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED NaN spin - ######################################## - STAR1 = SingleStar(**{'mass': 70.066924, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0], - 'metallicity':1}) - STAR2 = SingleStar(**{'mass': 34.183110, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0], - 'metallicity':1}) - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.931492e+03, - 'separation': orbital_separation_from_period(5.931492e+03, STAR1.mass, STAR2.mass), - 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED NaN spin - ######################################## - STAR1 = SingleStar(**{'mass': 28.837286, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 6.874867, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':35.609894, - 'separation': orbital_separation_from_period(35.609894, STAR1.mass, STAR2.mass), - 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # oRLO2 issue - ######################################## - STAR1 = SingleStar(**{'mass':29.580210, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 28.814626, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':40.437993, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # oRLO2 issue - ######################################## - STAR1 = SingleStar(**{'mass':67.126795, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 19.622908, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':1484.768582, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # oRLO2 issue - ######################################## - STAR1 = SingleStar(**{'mass': 58.947503, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 56.660506, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':2011.300659, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # oRLO2 issue - ######################################## - STAR1 = SingleStar(**{'mass': 170.638207, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[47.979957374424956, 5.317304576107798, 2.7259013166068145, 4.700929589520818]}) - STAR2 = SingleStar(**{'mass': 37.917852, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':113.352736, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # oRLO2 issue - ######################################## - STAR1 = SingleStar(**{'mass': 109.540207, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 84.344530, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.651896, 'eccentricity': 0.0}, + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # FIXED oRLO2 looping + ######################################## + star1 = SingleStar(**{'mass': 170.638207, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [4.921294, 4.31745, 1.777768, 3.509656]}) + star2 = SingleStar(**{'mass':37.917852, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':113.352736, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # Redirect to step_CO_HeMS (H-rich non-burning?) + ######################################## + star_1 = SingleStar(**{'mass': 8.333579, 'state': 'H-rich_Core_H_burning',\ + 'natal_kick_array': [17.125568, 4.101834, 0.917541, 3.961291]}) + star_2 = SingleStar(**{'mass' : 8.208376, 'state' : 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 66.870417, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # FIXED oRLO2 looping + ######################################## + star_1 = SingleStar(**{'mass': 16.921378, 'state': 'H-rich_Core_H_burning',\ + 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}) + star_2 = SingleStar(**{'mass' : 16.286318, 'state' : 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 37.958768, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # FIXED? step_detached failure + ######################################## + star1 = SingleStar(**{'mass': 19.787769, 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [24.464803, 0.666314, 1.954698, 5.598975]}) + star2 = SingleStar(**{'mass': 7.638741, 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3007.865561, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # redirect - ######################################## - STAR1 = SingleStar(**{'mass': 13.889634, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass':0.490231, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':14513.150157, 'eccentricity': 0.0}, + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # Disrupted binary + ######################################## + star_1 = SingleStar(**{'mass': 16.921378, 'state': 'H-rich_Core_H_burning',\ + 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}) + star_2 = SingleStar(**{'mass' : 16.286318, 'state' : 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3007.865561, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # redirect - ######################################## - STAR1 = SingleStar(**{'mass': 9, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass':0.8, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # FIXED Detached binary failure (low mass) + ######################################## + star1 = SingleStar(**{'mass': 9, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass':0.8, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # FIXED SN_TYPE = None crash + ######################################## + star1 = SingleStar(**{'mass': 17.782576, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass':3.273864, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # FIXED SN_TYPE errors + ######################################## + star1 = SingleStar(**{'mass': 6.782576, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass':3.273864, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # Max time - ######################################## - star_1 = SingleStar(**{'mass': 103.07996766780799, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.2965418610971261, 2.0789170290719117, 3.207488023705968]}) - star_2 = SingleStar(**{'mass': 83.66522615073987, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 1449.1101985875678,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # Max time - ######################################## - star_1 = SingleStar(**{'mass': 8.860934140643465, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [11.818027275431337, 2.812412688633058, 0.4998731824233789, 2.9272630485628643]}) - star_2 = SingleStar(**{'mass': 8.584716012668551, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 20.82030114750744,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # PR421 - ######################################## - STAR1 = SingleStar(**{'mass': 24.035366, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 23.187355, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':18.865029, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # CE class - ######################################## - STAR1 = SingleStar(**{'mass':33.964274, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 28.98149, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':82.370989, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # PR574 - stepCE fix - ######################################## - STAR1 = SingleStar(**{'mass':29.580210, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 28.814626*0.4, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':300.437993, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # e_ZAMS error - ######################################## - star1 = SingleStar(**{'mass': 8.161885721822461, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 3.5907829421526154, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 36.873457164644144, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary) - - ######################################## - # e_ZAMS error - ######################################## - star1 = SingleStar(**{'mass': 35.24755025317775, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [19.755993125895806, 0.37149222852233904, 1.6588846085306563, - 1.434617029858906]}) - star2 = SingleStar(**{'mass': 30.000450298072902, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 24060.02101364665, 'eccentricity': 0.8085077857996965}, - properties = sim_prop) - evolve_binary(binary) - - ######################################## - # e_ZAMS error - ######################################## - star1 = SingleStar(**{'mass': 11.862930493162692, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 1.4739109294156703, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 4111.083887312003, 'eccentricity':0.0}, - properties = sim_prop) - evolve_binary(binary) - - ######################################## - # e_ZAMS error - ######################################## - star1 = SingleStar(**{'mass': 8.527361341212108, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 0.7061748406821822, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 2521.1927287891444, 'eccentricity':0.0}, - properties = sim_prop) - evolve_binary(binary) - - ######################################## - # e_ZAMS error - ######################################## - star1 = SingleStar(**{'mass': 13.661942533447398 ,#29829485, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 4.466151109802313 , #481560266, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3110.1346707516914, 'eccentricity':0.0}, + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # FIXED SN_TYPE errors + ######################################## + star1 = SingleStar(**{'mass': 40.638207, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [30.921294, 4.31745, 1.777768, 3.509656]}) + star2 = SingleStar(**{'mass':37.917852, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':2113.352736, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # FIXED ECSN errors? + ######################################## + star1 = SingleStar(**{'mass': 12.376778, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [80, 4.31745, 1.777768, 3.509656]}) + star2 = SingleStar(**{'mass': 9.711216, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':79.83702, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # Interpolator masses?? + ######################################## + star1 = SingleStar(**{'mass': 7.592921, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass':5.038679 , + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.537807, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # Interpolator masses? + ######################################## + star_1 = SingleStar(**{'mass': 38.741115, + 'state': 'H-rich_Core_H_burning',\ + 'natal_kick_array': [21.113771, 2.060135, 2.224789, 4.089729]}) + star_2 = SingleStar(**{'mass': 27.776178, + 'state': 'H-rich_Core_H_burning',\ + 'natal_kick_array': [282.712103, 0.296252, 1.628433, 5.623812]}) + + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 93.387072, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # FIXED NaN spin + ######################################## + star1 = SingleStar(**{'mass': 70.066924, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0], + 'metallicity':1}) + star2 = SingleStar(**{'mass': 34.183110, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0], + 'metallicity':1}) + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.931492e+03, + 'separation': orbital_separation_from_period(5.931492e+03, star1.mass, star2.mass), + 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # FIXED NaN spin + ######################################## + star1 = SingleStar(**{'mass': 28.837286, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 6.874867, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':35.609894, + 'separation': orbital_separation_from_period(35.609894, star1.mass, star2.mass), + 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # oRLO2 issue + ######################################## + star1 = SingleStar(**{'mass':29.580210, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 28.814626, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':40.437993, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # oRLO2 issue + ######################################## + star1 = SingleStar(**{'mass':67.126795, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 19.622908, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':1484.768582, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # oRLO2 issue + ######################################## + star1 = SingleStar(**{'mass': 58.947503, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 56.660506, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':2011.300659, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # oRLO2 issue + ######################################## + star1 = SingleStar(**{'mass': 170.638207, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[47.979957374424956, 5.317304576107798, 2.7259013166068145, 4.700929589520818]}) + star2 = SingleStar(**{'mass': 37.917852, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':113.352736, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # oRLO2 issue + ######################################## + star1 = SingleStar(**{'mass': 109.540207, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 84.344530, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.651896, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # redirect + ######################################## + star1 = SingleStar(**{'mass': 13.889634, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass':0.490231, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':14513.150157, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # redirect + ######################################## + star1 = SingleStar(**{'mass': 9, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass':0.8, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # Max time + ######################################## + star_1 = SingleStar(**{'mass': 103.07996766780799, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.2965418610971261, 2.0789170290719117, 3.207488023705968]}) + star_2 = SingleStar(**{'mass': 83.66522615073987, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 1449.1101985875678,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # Max time + ######################################## + star_1 = SingleStar(**{'mass': 8.860934140643465, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [11.818027275431337, 2.812412688633058, 0.4998731824233789, 2.9272630485628643]}) + star_2 = SingleStar(**{'mass': 8.584716012668551, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 20.82030114750744,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # PR421 + ######################################## + star1 = SingleStar(**{'mass': 24.035366, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 23.187355, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':18.865029, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # CE class + ######################################## + star1 = SingleStar(**{'mass':33.964274, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 28.98149, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':82.370989, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # PR574 - stepCE fix + ######################################## + star1 = SingleStar(**{'mass':29.580210, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 28.814626*0.4, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':300.437993, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # e_ZAMS error + ######################################## + star1 = SingleStar(**{'mass': 8.161885721822461, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 3.5907829421526154, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 36.873457164644144, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # e_ZAMS error + ######################################## + star1 = SingleStar(**{'mass': 35.24755025317775, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [19.755993125895806, 0.37149222852233904, 1.6588846085306563, + 1.434617029858906]}) + star2 = SingleStar(**{'mass': 30.000450298072902, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 24060.02101364665, 'eccentricity': 0.8085077857996965}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # e_ZAMS error + ######################################## + star1 = SingleStar(**{'mass': 11.862930493162692, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 1.4739109294156703, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 4111.083887312003, 'eccentricity':0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # e_ZAMS error + ######################################## + star1 = SingleStar(**{'mass': 8.527361341212108, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 0.7061748406821822, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 2521.1927287891444, 'eccentricity':0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # e_ZAMS error + ######################################## + star1 = SingleStar(**{'mass': 13.661942533447398 ,#29829485, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 4.466151109802313 , #481560266, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3110.1346707516914, 'eccentricity':0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 if __name__ == "__main__": parser = argparse.ArgumentParser(description='Evolve binaries for validation.') @@ -780,4 +816,4 @@ def evolve_binaries(verbose): help="Path to save HDF5 output") args = parser.parse_args() - evolve_binaries(verbose=args.verbose) + evolve_binaries(verbose=args.verbose, args.output) From 82392909bc5d53ba972de7b62223874f544723e4 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 18 Dec 2025 15:19:07 +0000 Subject: [PATCH 012/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/script_data/1Zsun_binaries_suite.py | 142 +++++++++--------- 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/dev-tools/script_data/1Zsun_binaries_suite.py b/dev-tools/script_data/1Zsun_binaries_suite.py index c632db2b34..9fbd21dbaf 100644 --- a/dev-tools/script_data/1Zsun_binaries_suite.py +++ b/dev-tools/script_data/1Zsun_binaries_suite.py @@ -206,7 +206,7 @@ def evolve_binaries(verbose,output_path): 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 190925.99636740884,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # Failing binary in matching @@ -217,7 +217,7 @@ def evolve_binaries(verbose,output_path): 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 20479.71919353725,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # flipped S1 and S2 ? @@ -228,8 +228,8 @@ def evolve_binaries(verbose,output_path): 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 18.605997832086413,'eccentricity': 0.0}, properties = sim_prop) - - evolve_binary(binary, h5file, binary_id) + + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # flipped S1 and S2 @@ -240,7 +240,7 @@ def evolve_binaries(verbose,output_path): 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 9.824025,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # flipped S1 and S2 @@ -251,7 +251,7 @@ def evolve_binaries(verbose,output_path): 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 3.820571,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # Normal binary evolution @@ -262,7 +262,7 @@ def evolve_binaries(verbose,output_path): 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 30.820571,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # Normal binary @@ -273,7 +273,7 @@ def evolve_binaries(verbose,output_path): 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 63123.74544474666,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # Normal binary @@ -284,7 +284,7 @@ def evolve_binaries(verbose,output_path): 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 27.77657038557851,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # Normal binary @@ -298,7 +298,7 @@ def evolve_binaries(verbose,output_path): binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 17.957531550841225, 'eccentricity': 0.0,}, properties=sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # High BH spin options @@ -309,7 +309,7 @@ def evolve_binaries(verbose,output_path): 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 501.99252706449792,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # Original a>1 spin error @@ -320,7 +320,7 @@ def evolve_binaries(verbose,output_path): 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 151.99252706449792,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # FIXED disrupted crash @@ -334,7 +334,7 @@ def evolve_binaries(verbose,output_path): binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':12.877004, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # FIXED error with SN type @@ -348,7 +348,7 @@ def evolve_binaries(verbose,output_path): binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # FIXED oRLO2 looping @@ -359,11 +359,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass':37.917852, 'state': 'H-rich_Core_H_burning', 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':113.352736, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # Redirect to step_CO_HeMS (H-rich non-burning?) @@ -375,7 +375,7 @@ def evolve_binaries(verbose,output_path): binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 66.870417, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # FIXED oRLO2 looping @@ -387,7 +387,7 @@ def evolve_binaries(verbose,output_path): binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 37.958768, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # FIXED? step_detached failure @@ -399,7 +399,7 @@ def evolve_binaries(verbose,output_path): binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3007.865561, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # Disrupted binary @@ -408,11 +408,11 @@ def evolve_binaries(verbose,output_path): 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}) star_2 = SingleStar(**{'mass' : 16.286318, 'state' : 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3007.865561, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # FIXED Detached binary failure (low mass) @@ -423,11 +423,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass':0.8, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # FIXED SN_TYPE = None crash @@ -438,11 +438,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass':3.273864, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # FIXED SN_TYPE errors @@ -453,11 +453,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass':3.273864, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # FIXED SN_TYPE errors @@ -468,11 +468,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass':37.917852, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':2113.352736, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # FIXED ECSN errors? @@ -483,12 +483,12 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass': 9.711216, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - + + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':79.83702, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # Interpolator masses?? @@ -499,11 +499,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass':5.038679 , 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.537807, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # Interpolator masses? @@ -514,11 +514,11 @@ def evolve_binaries(verbose,output_path): star_2 = SingleStar(**{'mass': 27.776178, 'state': 'H-rich_Core_H_burning',\ 'natal_kick_array': [282.712103, 0.296252, 1.628433, 5.623812]}) - + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 93.387072, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # FIXED NaN spin @@ -536,7 +536,7 @@ def evolve_binaries(verbose,output_path): 'separation': orbital_separation_from_period(5.931492e+03, star1.mass, star2.mass), 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # FIXED NaN spin @@ -547,13 +547,13 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass': 6.874867, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':35.609894, 'separation': orbital_separation_from_period(35.609894, star1.mass, star2.mass), 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # oRLO2 issue @@ -564,11 +564,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass': 28.814626, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':40.437993, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # oRLO2 issue @@ -579,11 +579,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass': 19.622908, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':1484.768582, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # oRLO2 issue @@ -594,11 +594,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass': 56.660506, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':2011.300659, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # oRLO2 issue @@ -609,11 +609,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass': 37.917852, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':113.352736, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # oRLO2 issue @@ -624,11 +624,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass': 84.344530, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.651896, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # redirect @@ -639,11 +639,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass':0.490231, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':14513.150157, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # redirect @@ -654,11 +654,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass':0.8, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # Max time @@ -671,7 +671,7 @@ def evolve_binaries(verbose,output_path): 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 1449.1101985875678,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # Max time @@ -684,7 +684,7 @@ def evolve_binaries(verbose,output_path): 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 20.82030114750744,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # PR421 @@ -695,11 +695,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass': 23.187355, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':18.865029, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # CE class @@ -710,11 +710,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass': 28.98149, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':82.370989, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # PR574 - stepCE fix @@ -725,11 +725,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass': 28.814626*0.4, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':300.437993, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # e_ZAMS error @@ -740,11 +740,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass': 3.5907829421526154, 'state': 'H-rich_Core_H_burning', 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 36.873457164644144, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # e_ZAMS error @@ -756,11 +756,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass': 30.000450298072902, 'state': 'H-rich_Core_H_burning', 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 24060.02101364665, 'eccentricity': 0.8085077857996965}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # e_ZAMS error @@ -771,11 +771,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass': 1.4739109294156703, 'state': 'H-rich_Core_H_burning', 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 4111.083887312003, 'eccentricity':0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # e_ZAMS error @@ -786,11 +786,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass': 0.7061748406821822, 'state': 'H-rich_Core_H_burning', 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 2521.1927287891444, 'eccentricity':0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # e_ZAMS error @@ -801,11 +801,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass': 4.466151109802313 , #481560266, 'state': 'H-rich_Core_H_burning', 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3110.1346707516914, 'eccentricity':0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 if __name__ == "__main__": From 1a0121391f3533f79fc09ce1bf3d5fddad9a2a90 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Thu, 18 Dec 2025 09:19:47 -0600 Subject: [PATCH 013/389] Update authors --- dev-tools/script_data/1Zsun_binaries_suite.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/script_data/1Zsun_binaries_suite.py b/dev-tools/script_data/1Zsun_binaries_suite.py index 9fbd21dbaf..03a896a0fc 100644 --- a/dev-tools/script_data/1Zsun_binaries_suite.py +++ b/dev-tools/script_data/1Zsun_binaries_suite.py @@ -3,7 +3,7 @@ Script to evolve a few binaries. Used for validation of the branch. -Author: Max Briel +Authors: Max Briel, Elizabeth Teng """ import argparse From e967e01a26114849142e973c2e54283b895ae734 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Thu, 18 Dec 2025 09:22:08 -0600 Subject: [PATCH 014/389] remove alarm calls that were never set Removed signal alarm handling in exception block. --- dev-tools/script_data/1Zsun_binaries_suite.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dev-tools/script_data/1Zsun_binaries_suite.py b/dev-tools/script_data/1Zsun_binaries_suite.py index 03a896a0fc..56a055144c 100644 --- a/dev-tools/script_data/1Zsun_binaries_suite.py +++ b/dev-tools/script_data/1Zsun_binaries_suite.py @@ -153,9 +153,6 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): grp.create_dataset(col, data=df[col].values) except Exception as e: - # turn off binary alarm in case of exception - signal.alarm(0) - print_failed_binary(binary, e) err_grp = h5file.require_group(f"binary_{binary_id}/errors") @@ -163,8 +160,6 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): err_grp.attrs['exception_message'] = str(e) finally: - # Always turn off binary alarm and restore warning handler - signal.alarm(0) warnings.showwarning = old_showwarning # ensure binary group exists From e5c07ce5c117c0b2728982563acde4b7899b11bb Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Thu, 18 Dec 2025 09:30:54 -0600 Subject: [PATCH 015/389] Enhance evolve_binaries.sh for better logging and error handling Updated the script to log output and check for errors. --- dev-tools/evolve_binaries.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dev-tools/evolve_binaries.sh b/dev-tools/evolve_binaries.sh index 051dafcd13..ee5dec4306 100755 --- a/dev-tools/evolve_binaries.sh +++ b/dev-tools/evolve_binaries.sh @@ -88,11 +88,16 @@ pip install -e "$CLONE_DIR" -q 2>&1 | sed 's/^/ /' echo "šŸš€ Running evolve_binaries.py" # # Run the Python script and capture output (stdout and stderr) -python script_data/1Zsun_binaries_suite.py --output "$OUTPUT_FILE" > "$LOG_FILE" 2>&1 +python script_data/1Zsun_binaries_suite.py --output "$OUTPUT_FILE" 2>&1 | tee "$LOG_FILE" if [ ! -f "$OUTPUT_FILE" ]; then echo "ERROR: Results file was not created: $OUTPUT_FILE" exit 2 fi +if [ $? -ne 0 ]; then + echo "ERROR: Python script exited with an error. Check $LOG_FILE for details." + exit 3 +fi + echo -e "āœ… Script completed. Output saved to \n$OUTPUT_FILE" From 1a82ac889fd463469509817f85c039b4d8dbf317 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 18 Dec 2025 15:31:21 +0000 Subject: [PATCH 016/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/evolve_binaries.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/evolve_binaries.sh b/dev-tools/evolve_binaries.sh index ee5dec4306..5e8e60183f 100755 --- a/dev-tools/evolve_binaries.sh +++ b/dev-tools/evolve_binaries.sh @@ -88,7 +88,7 @@ pip install -e "$CLONE_DIR" -q 2>&1 | sed 's/^/ /' echo "šŸš€ Running evolve_binaries.py" # # Run the Python script and capture output (stdout and stderr) -python script_data/1Zsun_binaries_suite.py --output "$OUTPUT_FILE" 2>&1 | tee "$LOG_FILE" +python script_data/1Zsun_binaries_suite.py --output "$OUTPUT_FILE" 2>&1 | tee "$LOG_FILE" if [ ! -f "$OUTPUT_FILE" ]; then echo "ERROR: Results file was not created: $OUTPUT_FILE" From 5525ea86146c2411d49431bf53d7a7d6d4bfc44c Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Thu, 18 Dec 2025 09:34:36 -0600 Subject: [PATCH 017/389] Fix argument passing for evolve_binaries function --- dev-tools/script_data/1Zsun_binaries_suite.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/script_data/1Zsun_binaries_suite.py b/dev-tools/script_data/1Zsun_binaries_suite.py index 56a055144c..f56cbe8823 100644 --- a/dev-tools/script_data/1Zsun_binaries_suite.py +++ b/dev-tools/script_data/1Zsun_binaries_suite.py @@ -811,4 +811,4 @@ def evolve_binaries(verbose,output_path): help="Path to save HDF5 output") args = parser.parse_args() - evolve_binaries(verbose=args.verbose, args.output) + evolve_binaries(verbose=args.verbose, output_path=args.output) From 138d804da8bd5e0a3fd170210e6128f25bb36b04 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Thu, 18 Dec 2025 09:46:05 -0600 Subject: [PATCH 018/389] fill in all code for validate_binaries.sh Updated script to accept branch and suffix as arguments, streamlined output file naming. --- dev-tools/validate_binaries.sh | 35 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/dev-tools/validate_binaries.sh b/dev-tools/validate_binaries.sh index 31b7c6d72a..04a041af06 100644 --- a/dev-tools/validate_binaries.sh +++ b/dev-tools/validate_binaries.sh @@ -3,27 +3,24 @@ # A script for validating the outputs of 100 binaries, # which can be compared to a baseline to monitor changes to the code. -# script usage: ./validate_binaries.sh --branch candidate-branch - -# run candidate binaries and save to file -# ./evolve_binaries.sh -# save to file - -# evaluate tolerance for quantitative values - -# evaluate qualitative differences - -# warnings and error tracking - -# structured output - -# compare -# python compare_runs.py baseline.json candidate.json +# script usage: ./validate_binaries.sh --branch candidate_branch +BRANCH=$1 +SUFFIX=$2 +# run candidate binaries and save to file +./evolve_binaries.sh "$BRANCH" +# compare quantitative, qualitative, warnings/errors, structured output +# create outputs/comparison_branchname.txt +SAFE_BRANCH="${BRANCH//\//_}" +CANDIDATE_FILE="outputs/candidate_${SAFE_BRANCH}.h5" +COMPARISON_FILE="outputs/comparison_${SAFE_BRANCH}${SUFFIX:+_$SUFFIX}.txt" +python compare_runs.py baseline.h5 "$CANDIDATE_FILE" > "$COMPARISON_FILE" +if [ $? -ne 0 ]; then + echo "Error: compare_runs.py failed. Check $COMPARISON_FILE" + exit 1 +fi -# outputs/baseline.h5 -# outputs/candidate_branchname.h5 -# outputs/comparison_branchname.txt +echo "Binary evolution comparison saved to $COMPARISON_FILE" From 12a528e85931d7769c5c88ec27874334c56b78cc Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Thu, 18 Dec 2025 09:52:48 -0600 Subject: [PATCH 019/389] starting point of compare_runs.py for comparing two h5 files --- dev-tools/compare_runs.py | 73 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 dev-tools/compare_runs.py diff --git a/dev-tools/compare_runs.py b/dev-tools/compare_runs.py new file mode 100644 index 0000000000..8444d08a88 --- /dev/null +++ b/dev-tools/compare_runs.py @@ -0,0 +1,73 @@ +#!/usr/bin/env python3 + +""" +Compare evolution outcomes of set of binaries saved to file with script_data/1Zsun_binaries_suite.py +Used for validation of the branch. + +Author: Elizabeth Teng +""" + + +import sys +import h5py +import numpy as np + +def compare_datasets(base, cand, path="/"): + """ + Recursively compare HDF5 datasets. + Returns a list of strings with differences. + """ + differences = [] + + for key in base.keys(): + base_item = base[key] + if key not in cand: + differences.append(f"{path}{key} missing in candidate") + continue + + cand_item = cand[key] + + if isinstance(base_item, h5py.Dataset): + base_data = base_item[()] + cand_data = cand_item[()] + + if np.issubdtype(base_data.dtype, np.number): + if not np.allclose(base_data, cand_data, rtol=1e-5, atol=1e-8): + differences.append(f"{path}{key} numeric mismatch") + else: + if not np.array_equal(base_data, cand_data): + differences.append(f"{path}{key} non-numeric mismatch") + + elif isinstance(base_item, h5py.Group): + differences.extend(compare_datasets(base_item, cand_item, path=f"{path}{key}/")) + + # Check for extra keys in candidate + for key in cand.keys(): + if key not in base: + differences.append(f"{path}{key} extra in candidate") + + return differences + + +def main(): + if len(sys.argv) != 3: + print("Usage: compare_runs.py baseline.h5 candidate.h5") + sys.exit(1) + + baseline_file = sys.argv[1] + candidate_file = sys.argv[2] + + with h5py.File(baseline_file, 'r') as base, h5py.File(candidate_file, 'r') as cand: + diffs = compare_datasets(base, cand) + + if diffs: + print("Differences found:") + for diff in diffs: + print(" -", diff) + sys.exit(1) + else: + print("No differences detected between baseline and candidate.") + + +if __name__ == "__main__": + main() From 9140a20923de22ac125df5447448b1a8539be8fa Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 18 Dec 2025 15:52:57 +0000 Subject: [PATCH 020/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/compare_runs.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dev-tools/compare_runs.py b/dev-tools/compare_runs.py index 8444d08a88..6ff28d81e2 100644 --- a/dev-tools/compare_runs.py +++ b/dev-tools/compare_runs.py @@ -9,43 +9,45 @@ import sys + import h5py import numpy as np + def compare_datasets(base, cand, path="/"): """ Recursively compare HDF5 datasets. Returns a list of strings with differences. """ differences = [] - + for key in base.keys(): base_item = base[key] if key not in cand: differences.append(f"{path}{key} missing in candidate") continue - + cand_item = cand[key] if isinstance(base_item, h5py.Dataset): base_data = base_item[()] cand_data = cand_item[()] - + if np.issubdtype(base_data.dtype, np.number): if not np.allclose(base_data, cand_data, rtol=1e-5, atol=1e-8): differences.append(f"{path}{key} numeric mismatch") else: if not np.array_equal(base_data, cand_data): differences.append(f"{path}{key} non-numeric mismatch") - + elif isinstance(base_item, h5py.Group): differences.extend(compare_datasets(base_item, cand_item, path=f"{path}{key}/")) - + # Check for extra keys in candidate for key in cand.keys(): if key not in base: differences.append(f"{path}{key} extra in candidate") - + return differences @@ -53,7 +55,7 @@ def main(): if len(sys.argv) != 3: print("Usage: compare_runs.py baseline.h5 candidate.h5") sys.exit(1) - + baseline_file = sys.argv[1] candidate_file = sys.argv[2] From b7f6f028469a21be1a4f0362e7ebeb2e7098e39d Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Fri, 9 Jan 2026 15:07:18 -0600 Subject: [PATCH 021/389] Add conda source detection in evolve_binaries.sh --- dev-tools/evolve_binaries.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-tools/evolve_binaries.sh b/dev-tools/evolve_binaries.sh index 5e8e60183f..2021995bff 100755 --- a/dev-tools/evolve_binaries.sh +++ b/dev-tools/evolve_binaries.sh @@ -52,6 +52,9 @@ elif [ -f "$HOME/anaconda3/etc/profile.d/conda.sh" ]; then source "$HOME/anaconda3/etc/profile.d/conda.sh" elif [ -f "/opt/homebrew/Caskroom/miniconda/base/etc/profile.d/conda.sh" ]; then source "/opt/homebrew/Caskroom/miniconda/base/etc/profile.d/conda.sh" +elif command -v conda >/dev/null 2>&1; then + CONDA_BASE=$(conda info --base) + source "${CONDA_BASE}/etc/profile.d/conda.sh" else echo -e "\033[31mError: Could not find conda installation. Please check your conda setup.\033[0m" exit 1 From cd618fd404b3fb27c210f144413d4b95a217b003 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Fri, 9 Jan 2026 15:19:30 -0600 Subject: [PATCH 022/389] Add h5py import to 1Zsun_binaries_suite.py --- dev-tools/script_data/1Zsun_binaries_suite.py | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-tools/script_data/1Zsun_binaries_suite.py b/dev-tools/script_data/1Zsun_binaries_suite.py index f56cbe8823..b994e0b475 100644 --- a/dev-tools/script_data/1Zsun_binaries_suite.py +++ b/dev-tools/script_data/1Zsun_binaries_suite.py @@ -11,6 +11,7 @@ import signal import sys import warnings +import h5py from posydon.binary_evol.binarystar import BinaryStar, SingleStar from posydon.binary_evol.simulationproperties import SimulationProperties From 17b7013c64ff816f78db01cc29ceaf8831a6d6be Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 9 Jan 2026 21:19:39 +0000 Subject: [PATCH 023/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/script_data/1Zsun_binaries_suite.py | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-tools/script_data/1Zsun_binaries_suite.py b/dev-tools/script_data/1Zsun_binaries_suite.py index b994e0b475..ee1b0386ee 100644 --- a/dev-tools/script_data/1Zsun_binaries_suite.py +++ b/dev-tools/script_data/1Zsun_binaries_suite.py @@ -11,6 +11,7 @@ import signal import sys import warnings + import h5py from posydon.binary_evol.binarystar import BinaryStar, SingleStar From 8cd3f6d802c4a28c2fe0dbfbceacaf9171d8dac5 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Fri, 9 Jan 2026 15:22:59 -0600 Subject: [PATCH 024/389] Modify usage comment in evolve_binaries.sh Updated script usage instructions to include PATH_TO_POSYODN_DATA. --- dev-tools/evolve_binaries.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/evolve_binaries.sh b/dev-tools/evolve_binaries.sh index 2021995bff..e6a98bbf76 100755 --- a/dev-tools/evolve_binaries.sh +++ b/dev-tools/evolve_binaries.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Script usage: ./evolve_binaries.sh +# Script usage: export PATH_TO_POSYODN_DATA, then run ./evolve_binaries.sh # This script clones the POSYDON repo to the specified branch (defaults to 'main'), # copies evolve_binaries.py, runs it, and saves output to evolve_binaries.out From e070b9ea3a4bd788064ccf26b96c3aa5f2221b6e Mon Sep 17 00:00:00 2001 From: dimsour94 Date: Thu, 15 Jan 2026 13:54:43 +0200 Subject: [PATCH 025/389] Maltsev implementation for co_core mass below 10 solar masses --- posydon/binary_evol/SN/step_SN.py | 266 +++++++++++++++++++++++++++++- 1 file changed, 263 insertions(+), 3 deletions(-) diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index 6881de110f..d4ce799983 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -132,6 +132,9 @@ class StepSN(object): * 'Couch+20-engine': Uses the results from [6]_ to describe the collapse of the star. + * 'Maltsev+25-engine': Uses the results from [8]_ + to describe the collapse of the star + engine : str Engine used for supernova remnanrt outcome propierties for the Sukhbold+16-engineand and Patton&Sukhbold20-engine mechanisms. @@ -254,6 +257,9 @@ class StepSN(object): Heger, A., and Pfahl, E. 2004, ApJ, 612, 1044. The Effects of Binary Evolution on the Dynamics of Core Collapse and Neutron Star Kicks + .. [8] K. Maltsev, F.R.N. Schneider, I. Mandel, B. Mueller, A. Heger, F.K. Roepke, + E. Laplace, 2025, A&A, 700, A20. Explodability criteria for the neutrino-driven + supernova mechanism """ def __init__(self, **kwargs): @@ -294,6 +300,9 @@ def __init__(self, **kwargs): self.Sukhbold16_engines = "Sukhbold+16-engine" self.Patton20_engines = "Patton&Sukhbold20-engine" self.Couch20_engines = "Couch+20-engine" + self.Maltsev25_engines = "Maltsev+25-engine" + + self.mechanisms = [ self.Fryer12_rapid, @@ -302,7 +311,8 @@ def __init__(self, **kwargs): self.direct_collapse_hecore, self.Sukhbold16_engines, self.Patton20_engines, - self.Couch20_engines + self.Couch20_engines, + self.Maltsev25_engines ] if self.mechanism in self.mechanisms: @@ -332,7 +342,7 @@ def __init__(self, **kwargs): path_engine_dataset=self.path_to_Couch_datasets, verbose=self.verbose) - elif self.mechanism == self.Patton20_engines: + elif self.mechanism in (self.Patton20_engines, self.Maltsev25_engines): self.path_to_Patton_datasets = path_to_Patton_datasets def format_data_Patton20(file_name): @@ -387,6 +397,10 @@ def format_data_Patton20(file_name): 'Kepler_mu4_table.dat') CO_core_params_M4, M4_target = format_data_Patton20( 'Kepler_M4_table.dat') + CO_core_params_Xi, Xi_target = format_data_Patton20( + 'Kepler_Xi_table.dat') + CO_core_params_sc, sc_target = format_data_Patton20( + 'Kepler_sc_table.dat') n_neighbors = 5 @@ -399,6 +413,14 @@ def format_data_Patton20(file_name): self.mu4_interpolator = neighbors.KNeighborsRegressor( n_neighbors, weights='distance') self.mu4_interpolator.fit(CO_core_params_mu4, mu4_target) + + self.Xi_interpolator = neighbors.KNeighborsRegressor( + n_neighbors, weights='distance') + self.Xi_interpolator.fit(CO_core_params_Xi, Xi_target) + + self.sc_interpolator = neighbors.KNeighborsRegressor( + n_neighbors, weights='distance') + self.sc_interpolator.fit(CO_core_params_sc, sc_target) if self.verbose: print('Done') else: @@ -1393,6 +1415,21 @@ def compute_m_rembar(self, star, m_PISN): m_rembar, f_fb, state = self.Patton20_corecollapse(star, self.engine, self.conserve_hydrogen_envelope) + + elif self.mechanism == self.Maltsev25_engines: + if star.SN_type == "ECSN": + if self.ECSN == 'Podsiadlowski+04': + m_proto = 1.38 + else: + m_proto = m_core + f_fb = 0.0 + m_fb = 0.0 + m_rembar = m_proto + m_fb + state = 'NS' + else: + m_rembar, f_fb, state = self.Maltsev25_corecollapse(star, + self.engine, + self.conserve_hydrogen_envelope) else: raise ValueError("Mechanism %s not supported." % self.mechanism) @@ -2254,8 +2291,11 @@ def get_M4_mu4_Patton20(self, CO_core_mass, C_core_abundance): """Get the M4 and mu4 using Patton+20.""" M4 = self.M4_interpolator.predict([[C_core_abundance, CO_core_mass]]) mu4 = self.mu4_interpolator.predict([[C_core_abundance, CO_core_mass]]) + Xi = self.Xi_interpolator.predict([[C_core_abundance, CO_core_mass]]) + sc = self.sc_interpolator.predict([[C_core_abundance, CO_core_mass]]) - return M4, mu4 + + return M4, mu4, Xi, sc def Patton20_corecollapse(self, star, engine, conserve_hydrogen_envelope=False): """Compute supernova final remnant mass and fallback fraction. @@ -2343,6 +2383,226 @@ def Patton20_corecollapse(self, star, engine, conserve_hydrogen_envelope=False): return m_rem, f_fb, state + + + + + + + + + + + + + + def Maltsev25_corecollapse(self, star, engine, conserve_hydrogen_envelope=False): + """Compute supernova final remnant mass and fallback fraction. + + It uses the results from [8]_. The prediction for the core-collapse + outcome is performed using the C core mass and its C abundance. + The criterion by [8]_ is used to determine the final outcome. + + Parameters + ---------- + star : obj + Star object of a collapsing star containing the MESA profile. + + Returns + ------- + m_rem : double + Remnant mass of the compact object in M_sun. + f_fb : double + Fallback mass of the compact object in M_sun. + + References + + + """ + Muller_k_parameters = { + 'M16': [0.005, 0.420] + } + + if engine not in Muller_k_parameters.keys(): + raise ValueError("Engine " + engine + " is not avaiable for the " + "Maltsev+25 core-collapse prescription, " + "please choose one of the following engines to " + "compute the collapse: \n" + "\n".join( + list(Muller_k_parameters.keys()))) + else: + + CO_core_mass, C_core_abundance = self.get_CO_core_params( + star, self.approx_at_he_depletion) + M4, mu4 = self.get_M4_mu4_Patton20(CO_core_mass, C_core_abundance) + M4 = M4[0] + mu4 = mu4[0] + Xi=Xi[0] + sc=sc[0] + mu4M4=mu4*M4 + star.M4 = M4 + star.mu4 = mu4 + star.Xi = Xi + star.sc = sc + + + k1 = Muller_k_parameters[engine][0] + k2 = Muller_k_parameters[engine][1] + + if CO_core_mass <= 2.5: + m_rem = 1.25 + f_fb = 0.0 + state = 'NS' + + + # In the Maltsev prescription, stars with CO core masses above 10 are allowed to explode. + # However, since this outcome depends on the mass-transfer (MT) history, we handle it + # in post-processing. For all CO core masses above 10, we assume a failed supernova + # with fallback = 1 at this stage. + elif CO_core_mass >= 10.0: + # Assuming BH formation by direct collapse + if conserve_hydrogen_envelope: + m_rem = star.mass + else: + m_rem = star.he_core_mass + f_fb = 1.0 + state = 'BH' + + elif (CO_core_mass < 10.0) and (CO_core_mass > 2.5): + ff = self.explod_crit(Xi, sc, mu4M4, mu4) + if ff=0: + if conserve_hydrogen_envelope: + m_rem = star.mass + else: + m_rem = star.he_core_mass + f_fb = 1.0 + state = 'BH' + else: + rem = self.NS_vs_fallbackBH(Xi, CO_core_mass, M4, mu4M4) + if rem==2: + m_rem = M4 + f_fb = 0.0 + state = 'NS' + else: + if conserve_hydrogen_envelope: + m_rem = star.mass + else: + m_rem = star.he_core_mass + f_fb = 1.0 + state = 'BH' + + + + return m_rem, f_fb, state + + + def NS_vs_fallbackBH(self, comp_val, mco_val, M4_val, mu4M4_val): + a, b = 1.75, -0.044 + # conditions for guaranteed NS formation + if comp_val <= 0.04 or (comp_val < a*mu4M4_val + b and comp_val <= 0.4) or M4_val/mco_val > 0.6: + rem = 2 + else: + # stochastic determination of the remnant type (NS versus fallback-BH) + rand_number = random.uniform(0,1) + if rand_number <= 0.15: + rem_type = 3 + else: + rem_type = 2 + return rem + + + + + + + + + def explod_crit(self, comp_val, sc_val, mu4M4_val, mu4_val): + ff1, ff2 = [], [] + unclassified = True + comp_crit1, comp_crit2 = 0.314, 0.544 # compactness + sc_crit1, sc_crit2 = 0.988, 1.169 # central specific entropy + mu4M4_crit1, mu4M4_crit2 = 0.247, 0.421 # product of M4 and mu4 + k1, k2 = 0.421, 0.005 + + # check whether criterion for failed SN is fulfilled + if comp_val > comp_crit2 or sc_val > sc_crit2: + ff2.append(0) + ff = 0 + unclassified = False + + # check whether criterion for successful SN is fulfilled + if comp_val < comp_crit1 or sc_val < sc_crit1: + ff1.append(1) + ff = 1 + unclassified = False + + # if there is contradiction or if the progenitor is unclassified based on comp & s_c + if (len(ff1) > 0 and len(ff2) > 0) or unclassified: + + # final fate classification based on mu4M4 + if mu4M4_val > mu4M4_crit2: + ff = 0 + elif mu4M4_val < mu4M4_crit1: + ff = 1 + # final fate classification based on reversed Ertl criterion + elif k2 + k1*mu4M4_val - mu4_val > 0: + ff = 0 + else: + ff = 1 + return ff + + + + + + + + + + + + + + + + + + ((k1 * (mu4 * M4) + k2) < mu4): + # The prediction is a failed explosion + # Assuming BH formation by direct collapse + if conserve_hydrogen_envelope: + m_rem = star.mass + else: + m_rem = star.he_core_mass + f_fb = 1.0 + state = 'BH' + else: + # The prediction is a succesful explosion + m_rem = M4 + f_fb = 0.0 + state = 'NS' + + return m_rem, f_fb, state + + + + + + + + + + + + + + + + + + + + class Sukhbold16_corecollapse(object): """Compute supernova final remnant mass, fallback fraction and CO type. From 8f0d157f1abaf08b25d2e0026ccab2133638434e Mon Sep 17 00:00:00 2001 From: dimsour94 Date: Thu, 15 Jan 2026 14:06:32 +0200 Subject: [PATCH 026/389] deleted lines --- posydon/binary_evol/SN/step_SN.py | 50 ------------------------------- 1 file changed, 50 deletions(-) diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index d4ce799983..ea253bf41f 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -2551,56 +2551,6 @@ def explod_crit(self, comp_val, sc_val, mu4M4_val, mu4_val): ff = 1 return ff - - - - - - - - - - - - - - - - - ((k1 * (mu4 * M4) + k2) < mu4): - # The prediction is a failed explosion - # Assuming BH formation by direct collapse - if conserve_hydrogen_envelope: - m_rem = star.mass - else: - m_rem = star.he_core_mass - f_fb = 1.0 - state = 'BH' - else: - # The prediction is a succesful explosion - m_rem = M4 - f_fb = 0.0 - state = 'NS' - - return m_rem, f_fb, state - - - - - - - - - - - - - - - - - - From f5785fdf4b9c92dc666841cdf15729534f04553f Mon Sep 17 00:00:00 2001 From: ezapartas Date: Thu, 15 Jan 2026 17:50:27 +0200 Subject: [PATCH 027/389] added comments in step_SN and allowed for storage of Xi and sc in singlestar object as scalar --- posydon/binary_evol/SN/step_SN.py | 54 +++++++++---------------------- posydon/binary_evol/singlestar.py | 4 +++ 2 files changed, 20 insertions(+), 38 deletions(-) diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index ea253bf41f..ae554adf27 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -20,7 +20,8 @@ "Tassos Fragos ", "Matthias Kruckow ", "Max Briel ", - "Seth Gossage " + "Seth Gossage ", + "Dimitris Souropanis " ] __credits__ = [ @@ -2383,19 +2384,6 @@ def Patton20_corecollapse(self, star, engine, conserve_hydrogen_envelope=False): return m_rem, f_fb, state - - - - - - - - - - - - - def Maltsev25_corecollapse(self, star, engine, conserve_hydrogen_envelope=False): """Compute supernova final remnant mass and fallback fraction. @@ -2420,7 +2408,7 @@ def Maltsev25_corecollapse(self, star, engine, conserve_hydrogen_envelope=False) """ Muller_k_parameters = { - 'M16': [0.005, 0.420] + 'M16': [0.005, 0.420] # Section 3.1.1. of [8]_ } if engine not in Muller_k_parameters.keys(): @@ -2452,13 +2440,12 @@ def Maltsev25_corecollapse(self, star, engine, conserve_hydrogen_envelope=False) m_rem = 1.25 f_fb = 0.0 state = 'NS' - # In the Maltsev prescription, stars with CO core masses above 10 are allowed to explode. # However, since this outcome depends on the mass-transfer (MT) history, we handle it - # in post-processing. For all CO core masses above 10, we assume a failed supernova + # in post-processing (for now). For all CO core masses above 10, we assume a failed supernova # with fallback = 1 at this stage. - elif CO_core_mass >= 10.0: + elif CO_core_mass >= 10.0: # Assuming BH formation by direct collapse if conserve_hydrogen_envelope: m_rem = star.mass @@ -2478,44 +2465,35 @@ def Maltsev25_corecollapse(self, star, engine, conserve_hydrogen_envelope=False) state = 'BH' else: rem = self.NS_vs_fallbackBH(Xi, CO_core_mass, M4, mu4M4) - if rem==2: + if rem==2: # successful SN with NS m_rem = M4 f_fb = 0.0 state = 'NS' - else: + else: # successful SN but with fallback BH if conserve_hydrogen_envelope: m_rem = star.mass else: m_rem = star.he_core_mass - f_fb = 1.0 + f_fb = 0.99 state = 'BH' - - return m_rem, f_fb, state - def NS_vs_fallbackBH(self, comp_val, mco_val, M4_val, mu4M4_val): - a, b = 1.75, -0.044 - # conditions for guaranteed NS formation + a, b = 1.75, -0.044 # eq. (8) of [8]_ + # conditions for guaranteed NS formation (eq. 7) if comp_val <= 0.04 or (comp_val < a*mu4M4_val + b and comp_val <= 0.4) or M4_val/mco_val > 0.6: rem = 2 - else: + else: # stochastic determination of the remnant type (NS versus fallback-BH) rand_number = random.uniform(0,1) - if rand_number <= 0.15: - rem_type = 3 + if rand_number <= 0.15: # probabily for fallback = 0.15 in Section 3.1.2. + rem_type = 3 # fallback BH, although successful SN else: - rem_type = 2 - return rem - - - - - - - + rem_type = 2 # NS formation + return rem + # implemented from Maltsev+25 def explod_crit(self, comp_val, sc_val, mu4M4_val, mu4_val): ff1, ff2 = [], [] unclassified = True diff --git a/posydon/binary_evol/singlestar.py b/posydon/binary_evol/singlestar.py index 8b194c8574..85701bed36 100644 --- a/posydon/binary_evol/singlestar.py +++ b/posydon/binary_evol/singlestar.py @@ -354,6 +354,10 @@ def __init__(self, **kwargs): self.M4 = None if not hasattr(self, 'mu4'): self.mu4 = None + if not hasattr(self, 'Xi'): + self.Xi = None + if not hasattr(self, 'sc'): + self.sc = None if not hasattr(self, 'interp1d'): self.interp1d = None From b6301719e8e928cd57ddaaa78b69bfa5281328d0 Mon Sep 17 00:00:00 2001 From: ezapartas Date: Thu, 15 Jan 2026 17:52:12 +0200 Subject: [PATCH 028/389] also added Xi and sc as options in the .ini file --- posydon/popsyn/population_params_default.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/posydon/popsyn/population_params_default.ini b/posydon/popsyn/population_params_default.ini index 2e06a9b3c4..0ac3dd1f77 100644 --- a/posydon/popsyn/population_params_default.ini +++ b/posydon/popsyn/population_params_default.ini @@ -567,6 +567,8 @@ 'he4_mass_ej', #'M4', #'mu4', + #'Xi', + #'sc', 'avg_c_in_c_core_at_He_depletion', 'co_core_mass_at_He_depletion', #'m_core_CE_1cent', @@ -655,6 +657,8 @@ 'he4_mass_ej', #'M4', #'mu4', + #'Xi', + #'sc', 'avg_c_in_c_core_at_He_depletion', 'co_core_mass_at_He_depletion', #'m_core_CE_1cent', From a0ca8ddecbacd31195ddce4d20bed07abddb9dba Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 15 Jan 2026 15:58:57 +0000 Subject: [PATCH 029/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/binary_evol/SN/step_SN.py | 40 +++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index ae554adf27..72177ce113 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -20,7 +20,7 @@ "Tassos Fragos ", "Matthias Kruckow ", "Max Briel ", - "Seth Gossage ", + "Seth Gossage ", "Dimitris Souropanis " ] @@ -258,8 +258,8 @@ class StepSN(object): Heger, A., and Pfahl, E. 2004, ApJ, 612, 1044. The Effects of Binary Evolution on the Dynamics of Core Collapse and Neutron Star Kicks - .. [8] K. Maltsev, F.R.N. Schneider, I. Mandel, B. Mueller, A. Heger, F.K. Roepke, - E. Laplace, 2025, A&A, 700, A20. Explodability criteria for the neutrino-driven + .. [8] K. Maltsev, F.R.N. Schneider, I. Mandel, B. Mueller, A. Heger, F.K. Roepke, + E. Laplace, 2025, A&A, 700, A20. Explodability criteria for the neutrino-driven supernova mechanism """ @@ -303,7 +303,7 @@ def __init__(self, **kwargs): self.Couch20_engines = "Couch+20-engine" self.Maltsev25_engines = "Maltsev+25-engine" - + self.mechanisms = [ self.Fryer12_rapid, @@ -313,7 +313,7 @@ def __init__(self, **kwargs): self.Sukhbold16_engines, self.Patton20_engines, self.Couch20_engines, - self.Maltsev25_engines + self.Maltsev25_engines ] if self.mechanism in self.mechanisms: @@ -414,7 +414,7 @@ def format_data_Patton20(file_name): self.mu4_interpolator = neighbors.KNeighborsRegressor( n_neighbors, weights='distance') self.mu4_interpolator.fit(CO_core_params_mu4, mu4_target) - + self.Xi_interpolator = neighbors.KNeighborsRegressor( n_neighbors, weights='distance') self.Xi_interpolator.fit(CO_core_params_Xi, Xi_target) @@ -2404,7 +2404,7 @@ def Maltsev25_corecollapse(self, star, engine, conserve_hydrogen_envelope=False) Fallback mass of the compact object in M_sun. References - + """ Muller_k_parameters = { @@ -2431,7 +2431,7 @@ def Maltsev25_corecollapse(self, star, engine, conserve_hydrogen_envelope=False) star.mu4 = mu4 star.Xi = Xi star.sc = sc - + k1 = Muller_k_parameters[engine][0] k2 = Muller_k_parameters[engine][1] @@ -2440,12 +2440,12 @@ def Maltsev25_corecollapse(self, star, engine, conserve_hydrogen_envelope=False) m_rem = 1.25 f_fb = 0.0 state = 'NS' - + # In the Maltsev prescription, stars with CO core masses above 10 are allowed to explode. # However, since this outcome depends on the mass-transfer (MT) history, we handle it # in post-processing (for now). For all CO core masses above 10, we assume a failed supernova # with fallback = 1 at this stage. - elif CO_core_mass >= 10.0: + elif CO_core_mass >= 10.0: # Assuming BH formation by direct collapse if conserve_hydrogen_envelope: m_rem = star.mass @@ -2484,39 +2484,39 @@ def NS_vs_fallbackBH(self, comp_val, mco_val, M4_val, mu4M4_val): # conditions for guaranteed NS formation (eq. 7) if comp_val <= 0.04 or (comp_val < a*mu4M4_val + b and comp_val <= 0.4) or M4_val/mco_val > 0.6: rem = 2 - else: + else: # stochastic determination of the remnant type (NS versus fallback-BH) rand_number = random.uniform(0,1) if rand_number <= 0.15: # probabily for fallback = 0.15 in Section 3.1.2. rem_type = 3 # fallback BH, although successful SN else: rem_type = 2 # NS formation - return rem - - # implemented from Maltsev+25 + return rem + + # implemented from Maltsev+25 def explod_crit(self, comp_val, sc_val, mu4M4_val, mu4_val): ff1, ff2 = [], [] unclassified = True comp_crit1, comp_crit2 = 0.314, 0.544 # compactness sc_crit1, sc_crit2 = 0.988, 1.169 # central specific entropy mu4M4_crit1, mu4M4_crit2 = 0.247, 0.421 # product of M4 and mu4 - k1, k2 = 0.421, 0.005 - + k1, k2 = 0.421, 0.005 + # check whether criterion for failed SN is fulfilled if comp_val > comp_crit2 or sc_val > sc_crit2: ff2.append(0) ff = 0 - unclassified = False + unclassified = False # check whether criterion for successful SN is fulfilled if comp_val < comp_crit1 or sc_val < sc_crit1: ff1.append(1) ff = 1 unclassified = False - + # if there is contradiction or if the progenitor is unclassified based on comp & s_c if (len(ff1) > 0 and len(ff2) > 0) or unclassified: - + # final fate classification based on mu4M4 if mu4M4_val > mu4M4_crit2: ff = 0 @@ -2529,7 +2529,7 @@ def explod_crit(self, comp_val, sc_val, mu4M4_val, mu4_val): ff = 1 return ff - + class Sukhbold16_corecollapse(object): From 2a4a569511e782b65ef244074ba6278d3ad7fb83 Mon Sep 17 00:00:00 2001 From: Max Briel Date: Mon, 9 Feb 2026 08:45:35 +0100 Subject: [PATCH 030/389] refactor of the independent samplings to use the distributions and IMFs --- posydon/popsyn/IMFs.py | 69 ++++ posydon/popsyn/distributions.py | 578 +++++++++++++++++++++++++++ posydon/popsyn/independent_sample.py | 119 ++---- posydon/popsyn/norm_pop.py | 12 +- posydon/utils/common_functions.py | 34 +- 5 files changed, 715 insertions(+), 97 deletions(-) diff --git a/posydon/popsyn/IMFs.py b/posydon/popsyn/IMFs.py index d144470a75..62055864fb 100644 --- a/posydon/popsyn/IMFs.py +++ b/posydon/popsyn/IMFs.py @@ -166,6 +166,39 @@ def imf(self, m): valid = self._check_valid(m) return m ** (-self.alpha) + def rvs(self, size=1, rng=None): + """Draw random samples from the Salpeter IMF. + + Uses analytical inverse transform sampling for efficiency. + + Parameters + ---------- + size : int, optional + Number of samples to draw (default: 1). + rng : numpy.random.Generator, optional + Random number generator. If None, uses np.random.default_rng(). + + Returns + ------- + ndarray + Random mass samples in solar masses. + """ + if rng is None: + rng = np.random.default_rng() + + # Analytical inverse transform sampling + # For power law IMF: m^(-alpha), the inverse CDF is: + # m = (u * (m_max^(1-alpha) - m_min^(1-alpha)) + m_min^(1-alpha))^(1/(1-alpha)) + normalization_constant = (1.0 - self.alpha) / ( + self.m_max**(1.0 - self.alpha) - self.m_min**(1.0 - self.alpha) + ) + u = rng.uniform(size=size) + masses = (u * (1.0 - self.alpha) / normalization_constant + + self.m_min**(1.0 - self.alpha))**(1.0 / (1.0 - self.alpha)) + + return masses + + class Kroupa2001(IMFBase): """Initial Mass Function based on Kroupa (2001), which is defined as a broken power-law: @@ -275,6 +308,42 @@ def imf(self, m): out[mask3] = const2 * (m[mask3] / self.m2break) ** (-self.alpha3) return out + def rvs(self, size=1, rng=None): + """Draw random samples from the Kroupa2001 IMF. + + Uses inverse transform sampling with discretized PDF for the + broken power-law distribution. + + Parameters + ---------- + size : int, optional + Number of samples to draw (default: 1). + rng : numpy.random.Generator, optional + Random number generator. If None, uses np.random.default_rng(). + + Returns + ------- + ndarray + Random mass samples in solar masses. + """ + if rng is None: + rng = np.random.default_rng() + + # Import here to avoid circular dependency + from posydon.utils.common_functions import inverse_sampler + + # Create discretized PDF for inverse sampling + # Use more points near the breaks for better accuracy + n_points = 2000 + m_grid = np.linspace(self.m_min, self.m_max, n_points) + pdf_values = self.imf(m_grid) + + # Sample using inverse transform method + masses = inverse_sampler(m_grid, pdf_values, size=size, rng=rng) + + return masses + + class Chabrier2003(IMFBase): """Chabrier2003 Initial Mass Function (IMF), which is defined as a lognormal distribution for low-mass stars and a power-law distribution diff --git a/posydon/popsyn/distributions.py b/posydon/popsyn/distributions.py index 36247403ab..82e721f804 100644 --- a/posydon/popsyn/distributions.py +++ b/posydon/popsyn/distributions.py @@ -5,6 +5,7 @@ ] import numpy as np from scipy.integrate import quad +from scipy.stats import truncnorm class FlatMassRatio: @@ -129,6 +130,26 @@ def pdf(self, q): pdf_values[valid] = self.flat_mass_ratio(q[valid]) * self.norm return pdf_values + def rvs(self, size=1, rng=None): + """Draw random samples from the flat mass ratio distribution. + + Parameters + ---------- + size : int, optional + Number of samples to draw (default: 1). + rng : numpy.random.Generator, optional + Random number generator. If None, uses np.random.default_rng(). + + Returns + ------- + float or ndarray + Random samples from the distribution. + """ + if rng is None: + rng = np.random.default_rng() + + return rng.uniform(self.q_min, self.q_max, size=size) + class Sana12Period(): """Period distribution from Sana et al. (2012). @@ -310,6 +331,72 @@ def pdf(self, p, m1): * self.norm(m1[valid])) return pdf_values + def rvs(self, size=1, m1=None, rng=None): + """Draw random samples from the Sana12 period distribution. + + Parameters + ---------- + size : int, optional + Number of samples to draw (default: 1). + m1 : float or array_like, optional + Primary mass(es). If array, must have length equal to size. + rng : numpy.random.Generator, optional + Random number generator. If None, uses np.random.default_rng(). + + Returns + ------- + ndarray + Random period samples in days. + + Raises + ------ + ValueError + If m1 is None or has incorrect size. + """ + if rng is None: + rng = np.random.default_rng() + + if m1 is None: + raise ValueError("m1 (primary mass) must be provided for Sana12Period sampling") + + m1 = np.atleast_1d(m1) + if m1.size == 1: + m1 = np.full(size, m1[0]) + elif m1.size != size: + raise ValueError(f"m1 must be a single value or have size={size}") + + # Import here to avoid circular dependency + from posydon.utils.common_functions import rejection_sampler + + periods = np.zeros(size) + + # For low mass stars (m1 <= 15), use log-uniform distribution + low_mass_mask = m1 <= self.mbreak + n_low = np.sum(low_mass_mask) + if n_low > 0: + periods[low_mass_mask] = 10**rng.uniform( + np.log10(self.p_min), + np.log10(self.p_max), + size=n_low + ) + + # For high mass stars (m1 > 15), use rejection sampling + high_mass_mask = ~low_mass_mask + n_high = np.sum(high_mass_mask) + if n_high > 0: + # Create PDF function for rejection sampler + def pdf_high_mass(logp): + return self.sana12_period(logp, self.mbreak + 1) + + periods[high_mass_mask] = 10**rejection_sampler( + size=n_high, + x_lim=[np.log10(self.p_min), np.log10(self.p_max)], + pdf=pdf_high_mass, + rng=rng + ) + + return periods + class PowerLawPeriod(): '''Power law period distribution with slope pi and boundaries m_min, m_max. @@ -438,6 +525,38 @@ def pdf(self, p): return pdf_values + def rvs(self, size=1, rng=None): + """Draw random samples from the power law period distribution. + + Parameters + ---------- + size : int, optional + Number of samples to draw (default: 1). + rng : numpy.random.Generator, optional + Random number generator. If None, uses np.random.default_rng(). + + Returns + ------- + ndarray + Random period samples in days. + """ + if rng is None: + rng = np.random.default_rng() + + # Import here to avoid circular dependency + from posydon.utils.common_functions import inverse_sampler + + # Create discretized PDF for inverse sampling + n_points = 1000 + logp_grid = np.linspace(np.log10(self.p_min), np.log10(self.p_max), n_points) + pdf_values = self.power_law_period(logp_grid) + + # Sample in log space + logp_samples = inverse_sampler(logp_grid, pdf_values, size=size, rng=rng) + + # Convert back to linear space + return 10**logp_samples + class LogUniform(): """Log-uniform distribution between specified minimum and maximum values. @@ -500,3 +619,462 @@ def pdf(self, x): pdf_values[valid] = self.norm return pdf_values + + def rvs(self, size=1, rng=None): + """Draw random samples from the log-uniform distribution. + + Parameters + ---------- + size : int, optional + Number of samples to draw (default: 1). + rng : numpy.random.Generator, optional + Random number generator. If None, uses np.random.default_rng(). + + Returns + ------- + ndarray + Random samples from the distribution. + """ + if rng is None: + rng = np.random.default_rng() + + # Sample uniformly in log space + log_samples = rng.uniform(np.log10(self.min), np.log10(self.max), size=size) + + # Convert back to linear space + return 10**log_samples + + +class ThermalEccentricity: + """Thermal eccentricity distribution for binary star systems. + + The thermal distribution follows pdf(e) = 2*e, which is the + distribution expected for binaries that have undergone significant + dynamical interactions or thermal relaxation. + + Parameters + ---------- + e_min : float, optional + Minimum eccentricity (default: 0.0). Must be in [0, 1). + e_max : float, optional + Maximum eccentricity (default: 1.0). Must be in (0, 1]. + + Raises + ------ + ValueError + If e_min or e_max are not in [0, 1], or if e_min >= e_max. + + Examples + -------- + >>> dist = ThermalEccentricity() + >>> e_samples = dist.rvs(size=1000) + """ + + def __init__(self, e_min=0.0, e_max=1.0): + """Initialize the thermal eccentricity distribution. + + Parameters + ---------- + e_min : float, optional + Minimum eccentricity (default: 0.0). Must be in [0, 1). + e_max : float, optional + Maximum eccentricity (default: 1.0). Must be in (0, 1]. + + Raises + ------ + ValueError + If e_min or e_max are not in [0, 1], or if e_min >= e_max. + """ + if not (0 <= e_min < 1): + raise ValueError("e_min must be in [0, 1)") + if not (0 < e_max <= 1): + raise ValueError("e_max must be in (0, 1]") + if e_min >= e_max: + raise ValueError("e_min must be less than e_max") + + self.e_min = e_min + self.e_max = e_max + self.norm = self._calculate_normalization() + + def __repr__(self): + """Return string representation of the distribution.""" + return f"ThermalEccentricity(e_min={self.e_min}, e_max={self.e_max})" + + def _repr_html_(self): + """Return HTML representation for Jupyter notebooks.""" + return (f"

Thermal Eccentricity Distribution

" + f"

e_min = {self.e_min}

" + f"

e_max = {self.e_max}

") + + def _calculate_normalization(self): + """Calculate the normalization constant for the thermal eccentricity + distribution. + + Returns + ------- + float + The normalization constant ensuring the PDF integrates to 1. + """ + # Integral of 2*e from e_min to e_max is e_max^2 - e_min^2 + integral = self.e_max**2 - self.e_min**2 + if integral == 0: + raise ValueError("Cannot normalize distribution: e_min == e_max") + return 1.0 / integral + + def thermal_eccentricity(self, e): + """Compute the thermal eccentricity distribution value. + + Parameters + ---------- + e : float or array_like + Eccentricity value(s). + + Returns + ------- + float or ndarray + Distribution value (2*e). + """ + return 2.0 * np.asarray(e) + + def pdf(self, e): + """Probability density function of the thermal eccentricity distribution. + + Parameters + ---------- + e : float or array_like + Eccentricity value(s). + + Returns + ------- + float or ndarray + Probability density at eccentricity e. + """ + e = np.asarray(e) + valid = (e >= self.e_min) & (e <= self.e_max) + pdf_values = np.zeros_like(e, dtype=float) + pdf_values[valid] = self.thermal_eccentricity(e[valid]) * self.norm + return pdf_values + + def rvs(self, size=1, rng=None): + """Draw random samples from the thermal eccentricity distribution. + + Uses the analytical inverse CDF: e = sqrt(u * (e_max^2 - e_min^2) + e_min^2) + + Parameters + ---------- + size : int, optional + Number of samples to draw (default: 1). + rng : numpy.random.Generator, optional + Random number generator. If None, uses np.random.default_rng(). + + Returns + ------- + ndarray + Random eccentricity samples in [e_min, e_max]. + """ + if rng is None: + rng = np.random.default_rng() + + # Inverse CDF: e = sqrt(u * (e_max^2 - e_min^2) + e_min^2) + u = rng.uniform(size=size) + return np.sqrt(u * (self.e_max**2 - self.e_min**2) + self.e_min**2) + + +class UniformEccentricity: + """Uniform eccentricity distribution for binary star systems. + + A flat distribution over eccentricities between e_min and e_max. + + Parameters + ---------- + e_min : float, optional + Minimum eccentricity (default: 0.0). Must be in [0, 1). + e_max : float, optional + Maximum eccentricity (default: 1.0). Must be in (0, 1]. + + Raises + ------ + ValueError + If e_min or e_max are not in [0, 1], or if e_min >= e_max. + + Examples + -------- + >>> dist = UniformEccentricity() + >>> e_samples = dist.rvs(size=1000) + """ + + def __init__(self, e_min=0.0, e_max=1.0): + """Initialize the uniform eccentricity distribution. + + Parameters + ---------- + e_min : float, optional + Minimum eccentricity (default: 0.0). Must be in [0, 1). + e_max : float, optional + Maximum eccentricity (default: 1.0). Must be in (0, 1]. + + Raises + ------ + ValueError + If e_min or e_max are not in [0, 1], or if e_min >= e_max. + """ + if not (0 <= e_min < 1): + raise ValueError("e_min must be in [0, 1)") + if not (0 < e_max <= 1): + raise ValueError("e_max must be in (0, 1]") + if e_min >= e_max: + raise ValueError("e_min must be less than e_max") + + self.e_min = e_min + self.e_max = e_max + self.norm = 1.0 / (e_max - e_min) + + def __repr__(self): + """Return string representation of the distribution.""" + return f"UniformEccentricity(e_min={self.e_min}, e_max={self.e_max})" + + def _repr_html_(self): + """Return HTML representation for Jupyter notebooks.""" + return (f"

Uniform Eccentricity Distribution

" + f"

e_min = {self.e_min}

" + f"

e_max = {self.e_max}

") + + def pdf(self, e): + """Probability density function of the uniform eccentricity distribution. + + Parameters + ---------- + e : float or array_like + Eccentricity value(s). + + Returns + ------- + float or ndarray + Probability density at eccentricity e. + """ + e = np.asarray(e) + valid = (e >= self.e_min) & (e <= self.e_max) + pdf_values = np.zeros_like(e, dtype=float) + pdf_values[valid] = self.norm + return pdf_values + + def rvs(self, size=1, rng=None): + """Draw random samples from the uniform eccentricity distribution. + + Parameters + ---------- + size : int, optional + Number of samples to draw (default: 1). + rng : numpy.random.Generator, optional + Random number generator. If None, uses np.random.default_rng(). + + Returns + ------- + ndarray + Random eccentricity samples in [e_min, e_max]. + """ + if rng is None: + rng = np.random.default_rng() + + return rng.uniform(self.e_min, self.e_max, size=size) + + +class ZeroEccentricity: + """Zero eccentricity distribution for circular binary orbits. + + All samples are exactly zero (circular orbits). The PDF is a Dirac delta + at e=0. + + Examples + -------- + >>> dist = ZeroEccentricity() + >>> e_samples = dist.rvs(size=1000) # All zeros + """ + + def __init__(self): + """Initialize the zero eccentricity distribution.""" + pass + + def __repr__(self): + """Return string representation of the distribution.""" + return "ZeroEccentricity()" + + def _repr_html_(self): + """Return HTML representation for Jupyter notebooks.""" + return "

Zero Eccentricity Distribution

e = 0 (circular orbits)

" + + def pdf(self, e): + """Probability density function of the zero eccentricity distribution. + + This is formally a Dirac delta at e=0. Returns 1.0 at e=0, 0.0 elsewhere. + + Parameters + ---------- + e : float or array_like + Eccentricity value(s). + + Returns + ------- + float or ndarray + 1.0 where e==0, 0.0 elsewhere. + """ + e = np.asarray(e) + return np.where(e == 0, 1.0, 0.0) + + def rvs(self, size=1, rng=None): + """Draw random samples from the zero eccentricity distribution. + + Parameters + ---------- + size : int, optional + Number of samples to draw (default: 1). + rng : numpy.random.Generator, optional + Random number generator (unused, included for API consistency). + + Returns + ------- + ndarray + Array of zeros with shape (size,). + """ + return np.zeros(size) + + +class LogNormalSeparation: + """Log-normal orbital separation distribution for binary star systems. + + Orbital separations are drawn from a log-normal distribution in log10 space, + truncated between specified minimum and maximum values. + + Parameters + ---------- + mean : float, optional + Mean of the log10 distribution (default: 3.5, corresponding to ~3162 Rsun). + sigma : float, optional + Standard deviation of the log10 distribution (default: 2.3). + min : float, optional + Minimum orbital separation in solar radii (default: 5.0). + max : float, optional + Maximum orbital separation in solar radii (default: 1e5). + + Raises + ------ + ValueError + If min is not positive, max <= min, or sigma <= 0. + + Examples + -------- + >>> dist = LogNormalSeparation(mean=3.0, sigma=1.5, min=10, max=1e6) + >>> separations = dist.rvs(size=1000) + + Notes + ----- + Uses scipy.stats.truncnorm for efficient sampling from the truncated + normal distribution in log10 space. + """ + + def __init__(self, mean=3.5, sigma=2.3, min=5.0, max=1e5): + """Initialize the log-normal separation distribution. + + Parameters + ---------- + mean : float, optional + Mean of the log10 distribution (default: 3.5). + sigma : float, optional + Standard deviation of the log10 distribution (default: 2.3). + min : float, optional + Minimum orbital separation in solar radii (default: 5.0). + max : float, optional + Maximum orbital separation in solar radii (default: 1e5). + + Raises + ------ + ValueError + If min is not positive, max <= min, or sigma <= 0. + """ + if min <= 0: + raise ValueError("min must be positive") + if max <= min: + raise ValueError("max must be greater than min") + if sigma <= 0: + raise ValueError("sigma must be positive") + + self.mean = mean + self.sigma = sigma + self.min = min + self.max = max + + # Compute truncation bounds for scipy.stats.truncnorm + self.a_low = (np.log10(min) - mean) / sigma + self.a_high = (np.log10(max) - mean) / sigma + + def __repr__(self): + """Return string representation of the distribution.""" + return (f"LogNormalSeparation(mean={self.mean}, sigma={self.sigma}, " + f"min={self.min}, max={self.max})") + + def _repr_html_(self): + """Return HTML representation for Jupyter notebooks.""" + return (f"

Log-Normal Separation Distribution

" + f"

mean (log10) = {self.mean}

" + f"

sigma (log10) = {self.sigma}

" + f"

min = {self.min} Rā˜‰

" + f"

max = {self.max} Rā˜‰

") + + def pdf(self, a): + """Probability density function of the log-normal separation distribution. + + Parameters + ---------- + a : float or array_like + Orbital separation(s) in solar radii. + + Returns + ------- + float or ndarray + Probability density at separation a. + """ + a = np.asarray(a) + valid = (a > 0) & (a >= self.min) & (a <= self.max) + pdf_values = np.zeros_like(a, dtype=float) + + log_a = np.log10(a[valid]) + # PDF of truncnorm in log space, transformed to linear space + # pdf(a) = pdf_log(log a) * |d(log a)/da| = pdf_log(log a) / (a * ln(10)) + pdf_values[valid] = truncnorm.pdf( + log_a, + self.a_low, self.a_high, + loc=self.mean, + scale=self.sigma + ) / (a[valid] * np.log(10)) + + return pdf_values + + def rvs(self, size=1, rng=None): + """Draw random samples from the log-normal separation distribution. + + Parameters + ---------- + size : int, optional + Number of samples to draw (default: 1). + rng : numpy.random.Generator, optional + Random number generator. If None, uses np.random.default_rng(). + + Returns + ------- + ndarray + Random orbital separation samples in solar radii. + """ + if rng is None: + rng = np.random.default_rng() + + # Sample from truncated normal in log10 space + log_separations = truncnorm.rvs( + self.a_low, self.a_high, + loc=self.mean, + scale=self.sigma, + size=size, + random_state=rng + ) + + # Convert back to linear space + return 10**log_separations diff --git a/posydon/popsyn/independent_sample.py b/posydon/popsyn/independent_sample.py index 13e99063c1..f75eec9d5a 100644 --- a/posydon/popsyn/independent_sample.py +++ b/posydon/popsyn/independent_sample.py @@ -16,6 +16,7 @@ import numpy as np from scipy.stats import truncnorm +from posydon.popsyn import IMFs, distributions from posydon.popsyn.Moes_distributions import Moe_17_PsandQs from posydon.utils.common_functions import rejection_sampler @@ -130,45 +131,11 @@ def generate_orbital_periods(primary_masses, # Sana H., et al., 2012, Science, 337, 444 if orbital_period_scheme == 'Sana+12_period_extended': - # compute periods as if all M1 <= 15Msun (where pi = 0.0) - orbital_periods_M_lt_15 = 10**RNG.uniform( - low=np.log10(orbital_period_min), - high=np.log10(orbital_period_max), - size=number_of_binaries) - - # compute periods as if all M1 > 15Msun - def pdf(logp): - pi = 0.55 - beta = 1 - pi - A = np.log10(10**0.15)**(-pi)*(np.log10(10**0.15) - - np.log10(orbital_period_min)) - B = 1./beta*(np.log10(orbital_period_max)**beta - - np.log10(10**0.15)**beta) - C = 1./(A + B) - pdf = np.zeros(len(logp)) - - for j, logp_j in enumerate(logp): - # for logP<=0.15 days, the pdf is uniform - if np.log10(orbital_period_min) <= logp_j and logp_j < 0.15: - pdf[j] = C*0.15**(-pi) - - # original Sana H., et al., 2012, Science, 337, 444 - elif 0.15 <= logp_j and logp_j < np.log10(orbital_period_max): - pdf[j] = C*logp_j**(-pi) - - else: - pdf[j] = 0. - - return pdf - - orbital_periods_M_gt_15 = 10**(rejection_sampler( - size=number_of_binaries, - x_lim=[np.log10(orbital_period_min), np.log10(orbital_period_max)], - pdf=pdf)) - - orbital_periods = np.where(primary_masses <= 15.0, - orbital_periods_M_lt_15, - orbital_periods_M_gt_15) + period_dist = distributions.Sana12Period( + p_min=orbital_period_min, + p_max=orbital_period_max + ) + orbital_periods = period_dist.rvs(size=number_of_binaries, m1=primary_masses, rng=RNG) else: raise ValueError("You must provide an allowed orbital period scheme.") @@ -216,10 +183,11 @@ def generate_orbital_separations(number_of_binaries=1, "orbital separation scheme.") if orbital_separation_scheme == 'log_uniform': - orbital_separations = 10**RNG.uniform( - low=np.log10(orbital_separation_min), - high=np.log10(orbital_separation_max), - size=number_of_binaries) + sep_dist = distributions.LogUniform( + min=orbital_separation_min, + max=orbital_separation_max + ) + orbital_separations = sep_dist.rvs(size=number_of_binaries, rng=RNG) if orbital_separation_max < orbital_separation_min: raise ValueError("`orbital_separation_max` must be " @@ -233,20 +201,13 @@ def generate_orbital_separations(number_of_binaries=1, "`log_orbital_separation_mean`, " "`log_orbital_separation_sigma`.") - # Set limits for truncated normal distribution - a_low = (np.log10(orbital_separation_min) - - log_orbital_separation_mean) / log_orbital_separation_sigma - a_high = (np.log10(orbital_separation_max) - - log_orbital_separation_mean) / log_orbital_separation_sigma - - # generate orbital separations from a truncted normal distribution - log_orbital_separations = truncnorm.rvs( - a_low, a_high, - loc=log_orbital_separation_mean, - scale=log_orbital_separation_sigma, - size=number_of_binaries, - random_state=RNG) - orbital_separations = 10**log_orbital_separations + sep_dist = distributions.LogNormalSeparation( + mean=log_orbital_separation_mean, + sigma=log_orbital_separation_sigma, + min=orbital_separation_min, + max=orbital_separation_max + ) + orbital_separations = sep_dist.rvs(size=number_of_binaries, rng=RNG) else: pass @@ -284,11 +245,14 @@ def generate_eccentricities(number_of_binaries=1, raise ValueError("You must provide an allowed eccentricity scheme.") if eccentricity_scheme == 'thermal': - eccentricities = np.sqrt(RNG.uniform(size=number_of_binaries)) + ecc_dist = distributions.ThermalEccentricity() + eccentricities = ecc_dist.rvs(size=number_of_binaries, rng=RNG) elif eccentricity_scheme == 'uniform': - eccentricities = RNG.uniform(size=number_of_binaries) + ecc_dist = distributions.UniformEccentricity() + eccentricities = ecc_dist.rvs(size=number_of_binaries, rng=RNG) elif eccentricity_scheme == 'zero': - eccentricities = np.zeros(number_of_binaries) + ecc_dist = distributions.ZeroEccentricity() + eccentricities = ecc_dist.rvs(size=number_of_binaries, rng=RNG) else: # This should never be reached pass @@ -331,12 +295,8 @@ def generate_primary_masses(number_of_binaries=1, # Salpeter E. E., 1955, ApJ, 121, 161 if primary_mass_scheme == 'Salpeter': - alpha = 2.35 - normalization_constant = (1.0-alpha) / (primary_mass_max**(1-alpha) - - primary_mass_min**(1-alpha)) - random_variable = RNG.uniform(size=number_of_binaries) - primary_masses = (random_variable*(1.0-alpha)/normalization_constant - + primary_mass_min**(1.0-alpha))**(1.0/(1.0-alpha)) + imf = IMFs.Salpeter(alpha=2.35, m_min=primary_mass_min, m_max=primary_mass_max) + primary_masses = imf.rvs(size=number_of_binaries, rng=RNG) # Kroupa P., Tout C. A., Gilmore G., 1993, MNRAS, 262, 545 elif primary_mass_scheme == 'Kroupa1993': @@ -349,12 +309,8 @@ def generate_primary_masses(number_of_binaries=1, # Kroupa P., 2001, MNRAS, 322, 231 elif primary_mass_scheme == 'Kroupa2001': - alpha = 2.3 - normalization_constant = (1.0-alpha) / (primary_mass_max**(1-alpha) - - primary_mass_min**(1-alpha)) - random_variable = RNG.uniform(size=number_of_binaries) - primary_masses = (random_variable*(1.0-alpha)/normalization_constant - + primary_mass_min**(1.0-alpha))**(1.0/(1.0-alpha)) + imf = IMFs.Kroupa2001(m_min=primary_mass_min, m_max=primary_mass_max) + primary_masses = imf.rvs(size=number_of_binaries, rng=RNG) else: pass @@ -404,13 +360,18 @@ def generate_secondary_masses(primary_masses, # Generate secondary masses if secondary_mass_scheme == 'flat_mass_ratio': - mass_ratio_min = np.max([secondary_mass_min / primary_masses, - np.ones(len(primary_masses))*0.05], axis=0) - mass_ratio_max = np.min([secondary_mass_max / primary_masses, - np.ones(len(primary_masses))], axis=0) - secondary_masses = ( - (mass_ratio_max - mass_ratio_min) * RNG.uniform( - size=number_of_binaries) + mass_ratio_min) * primary_masses + # Calculate mass ratio bounds for each primary mass + q_min = np.maximum(secondary_mass_min / primary_masses, 0.05) + q_max = np.minimum(secondary_mass_max / primary_masses, 1.0) + + # Sample mass ratios using the distribution class + # For mass-dependent bounds, we need to sample individually + mass_ratios = np.zeros(number_of_binaries) + for i in range(number_of_binaries): + q_dist = distributions.FlatMassRatio(q_min=q_min[i], q_max=q_max[i]) + mass_ratios[i] = q_dist.rvs(size=1, rng=RNG)[0] + + secondary_masses = primary_masses * mass_ratios if secondary_mass_scheme == 'q=1': secondary_masses = primary_masses diff --git a/posydon/popsyn/norm_pop.py b/posydon/popsyn/norm_pop.py index 4f2946504e..da195213a6 100644 --- a/posydon/popsyn/norm_pop.py +++ b/posydon/popsyn/norm_pop.py @@ -100,6 +100,7 @@ def get_pdf_for_m1(m1): [kwargs['secondary_mass_max'] / m1, np.ones(len(m1))], axis=0) + # Use FlatMassRatio distribution class q_dist = lambda q: np.where((q >= minimum) & (q <= maximum), 1/(maximum - minimum), 0) @@ -107,16 +108,17 @@ def get_pdf_for_m1(m1): q_pdf = lambda q, m1: get_pdf_for_m1(m1)(q) elif kwargs['secondary_mass_scheme'] == 'flat_mass_ratio': # flat mass ratio, where bounds are given - q_pdf = lambda q, m1=None: np.where( - (q > kwargs['q_min']) & (q <= kwargs['q_max']), - 1/(kwargs['q_max'] - kwargs['q_min']), - 0) + from posydon.popsyn.distributions import FlatMassRatio + q_dist = FlatMassRatio(q_min=kwargs['q_min'], q_max=kwargs['q_max']) + q_pdf = lambda q, m1=None: q_dist.pdf(q) else: # default to a flat distribution Pwarn("The secondary_mass_scheme is not defined use a flat mass ratio " "distribution in (0,1].", "UnsupportedModelWarning") - q_pdf = lambda q, m1=None: np.where((q > 0.0) & (q<=1.0), 1, 0) + from posydon.popsyn.distributions import FlatMassRatio + q_dist = FlatMassRatio(q_min=0.0, q_max=1.0) + q_pdf = lambda q, m1=None: q_dist.pdf(q) return q_pdf def get_binary_fraction_pdf(kwargs): diff --git a/posydon/utils/common_functions.py b/posydon/utils/common_functions.py index 9716a20051..93883bdcb6 100644 --- a/posydon/utils/common_functions.py +++ b/posydon/utils/common_functions.py @@ -669,7 +669,7 @@ def bondi_hoyle(binary, accretor, donor, idx=-1, wind_disk_criteria=True, return np.squeeze(mdot_acc) -def rejection_sampler(x=None, y=None, size=1, x_lim=None, pdf=None): +def rejection_sampler(x=None, y=None, size=1, x_lim=None, pdf=None, rng=None): """Generate a sample from a 1d PDF using the acceptance-rejection method. Parameters @@ -684,6 +684,8 @@ def rejection_sampler(x=None, y=None, size=1, x_lim=None, pdf=None): The boundary where the pdf function is defined if passed as pdf. pdf : func The pdf function + rng : numpy.random.Generator, optional + Random number generator. If None, uses np.random.default_rng(). Returns ------- @@ -691,6 +693,8 @@ def rejection_sampler(x=None, y=None, size=1, x_lim=None, pdf=None): An array with `size` random numbers generated from the PDF. """ + if rng is None: + rng = np.random.default_rng() if pdf is None: if ((x is None) or (y is None)): raise ValueError("x and y PDF values must be specified if no PDF" @@ -702,32 +706,32 @@ def rejection_sampler(x=None, y=None, size=1, x_lim=None, pdf=None): idxs = np.argsort(x) pdf = interp1d(x.take(idxs), y.take(idxs)) - x_rand = np.random.uniform(x.min(), x.max(), size) - y_rand = np.random.uniform(0, y.max(), size) + x_rand = rng.uniform(x.min(), x.max(), size) + y_rand = rng.uniform(0, y.max(), size) values = x_rand[y_rand <= pdf(x_rand)] while values.shape[0] < size: n = size - values.shape[0] - x_rand = np.random.uniform(x.min(), x.max(), n) - y_rand = np.random.uniform(0, y.max(), n) + x_rand = rng.uniform(x.min(), x.max(), n) + y_rand = rng.uniform(0, y.max(), n) values = np.hstack([values, x_rand[y_rand <= pdf(x_rand)]]) else: if x_lim is None: raise ValueError("x_lim must be specified for passed PDF function" " in rejection sampling") - x_rand = np.random.uniform(x_lim[0], x_lim[1], size) - pdf_max = max(pdf(np.random.uniform(x_lim[0], x_lim[1], 50000))) - y_rand = np.random.uniform(0, pdf_max, size) + x_rand = rng.uniform(x_lim[0], x_lim[1], size) + pdf_max = max(pdf(rng.uniform(x_lim[0], x_lim[1], 50000))) + y_rand = rng.uniform(0, pdf_max, size) values = x_rand[y_rand <= pdf(x_rand)] while values.shape[0] < size: n = size - values.shape[0] - x_rand = np.random.uniform(x_lim[0], x_lim[1], n) - y_rand = np.random.uniform(0, pdf_max, n) + x_rand = rng.uniform(x_lim[0], x_lim[1], n) + y_rand = rng.uniform(0, pdf_max, n) values = np.hstack([values, x_rand[y_rand <= pdf(x_rand)]]) return values -def inverse_sampler(x, y, size=1): +def inverse_sampler(x, y, size=1, rng=None): """Sample from a PDF using the inverse-sampling method. Parameters @@ -738,6 +742,8 @@ def inverse_sampler(x, y, size=1): The probablity density at `x` (or a scaled version of it). size : int Number of samples to generate. + rng : numpy.random.Generator, optional + Random number generator. If None, uses np.random.default_rng(). Returns ------- @@ -745,6 +751,8 @@ def inverse_sampler(x, y, size=1): The sample drawn from the PDF. """ + if rng is None: + rng = np.random.default_rng() # x should be sorted assert np.all(np.diff(x) > 0) # y should be above 0 @@ -757,7 +765,7 @@ def inverse_sampler(x, y, size=1): total_area = cumsum_areas[-1] # start the inverse sampling - u = np.random.uniform(size=size) + u = rng.uniform(size=size) # index of "bin" where each sampled value corresponds too u_indices = np.searchsorted(cumsum_areas, u * total_area) # the area that should be covered from the end of the previous bin @@ -779,7 +787,7 @@ def inverse_sampler(x, y, size=1): if n_where_nan: assert np.all(dy_bins[where_nan] == 0) sample[where_nan] = x[u_indices][where_nan] + ( - dx_bins[where_nan] * np.random.uniform(size=n_where_nan)) + dx_bins[where_nan] * rng.uniform(size=n_where_nan)) # make sure that everything worked as expected assert np.all(np.isfinite(sample)) From e948078f8da333350aac78743b1bc65569e01dce Mon Sep 17 00:00:00 2001 From: Max Briel Date: Mon, 9 Feb 2026 09:09:02 +0100 Subject: [PATCH 031/389] add Kroupa1993 IMF --- posydon/popsyn/IMFs.py | 98 ++++++++++++++++++++++++++++ posydon/popsyn/independent_sample.py | 8 +-- 2 files changed, 100 insertions(+), 6 deletions(-) diff --git a/posydon/popsyn/IMFs.py b/posydon/popsyn/IMFs.py index 62055864fb..6b76096763 100644 --- a/posydon/popsyn/IMFs.py +++ b/posydon/popsyn/IMFs.py @@ -199,6 +199,104 @@ def rvs(self, size=1, rng=None): return masses +class Kroupa1993(IMFBase): + """ + Initial Mass Function based on Kroupa et al. (1993), which is defined as: + + dN/dM = m^-2.7 + + References + ---------- + Kroupa P., Tout C. A., Gilmore G., 1993, MNRAS, 262, 545 + https://ui.adsabs.harvard.edu/abs/1993MNRAS.262..545K/abstract + + Parameters + ---------- + alpha : float, optional + The power-law index of the IMF (default is 2.7). + m_min : float, optional + The minimum allowable mass (default is 0.01) [Msun]. + m_max : float, optional + The maximum allowable mass (default is 200.0) [Msun]. + + Attributes + ---------- + alpha : float + Power-law index used in the IMF calculation. + m_min : float + Minimum stellar mass for the IMF [Msun]. + m_max : float + Maximum stellar mass for the IMF [Msun]. + """ + + def __init__(self, alpha=2.7, m_min=0.01, m_max=200.0): + self.alpha = alpha + super().__init__(m_min, m_max) + + def __repr__(self): + return (f"Kroupa1993(alpha={self.alpha}, " + f"m_min={self.m_min}, " + f"m_max={self.m_max})") + + def _repr_html_(self): + return (f"

Kroupa (1993) IMF

" + f"

alpha = {self.alpha}

" + f"

m_min = {self.m_min}

" + f"

m_max = {self.m_max}

") + + def imf(self, m): + '''Computes the IMF value for a given mass or array of masses 'm'. + Raises a ValueError if any value in 'm' is less than or equal to zero. + + Parameters + ---------- + m : float or array_like + Stellar mass or array of stellar masses [Msun]. + + Returns + ------- + float or ndarray + The IMF value for the given mass or masses. + ''' + m = np.asarray(m) + if np.any(m <= 0): + raise ValueError("Mass must be positive.") + valid = self._check_valid(m) + return m ** (-self.alpha) + + def rvs(self, size=1, rng=None): + """Draw random samples from the Kroupa1993 IMF. + + Uses analytical inverse transform sampling for efficiency. + + Parameters + ---------- + size : int, optional + Number of samples to draw (default: 1). + rng : numpy.random.Generator, optional + Random number generator. If None, uses np.random.default_rng(). + + Returns + ------- + ndarray + Random mass samples in solar masses. + """ + if rng is None: + rng = np.random.default_rng() + + # Analytical inverse transform sampling + # For power law IMF: m^(-alpha), the inverse CDF is: + # m = (u * (m_max^(1-alpha) - m_min^(1-alpha)) + m_min^(1-alpha))^(1/(1-alpha)) + normalization_constant = (1.0 - self.alpha) / ( + self.m_max**(1.0 - self.alpha) - self.m_min**(1.0 - self.alpha) + ) + u = rng.uniform(size=size) + masses = (u * (1.0 - self.alpha) / normalization_constant + + self.m_min**(1.0 - self.alpha))**(1.0 / (1.0 - self.alpha)) + + return masses + + class Kroupa2001(IMFBase): """Initial Mass Function based on Kroupa (2001), which is defined as a broken power-law: diff --git a/posydon/popsyn/independent_sample.py b/posydon/popsyn/independent_sample.py index f75eec9d5a..95d9c3c909 100644 --- a/posydon/popsyn/independent_sample.py +++ b/posydon/popsyn/independent_sample.py @@ -300,12 +300,8 @@ def generate_primary_masses(number_of_binaries=1, # Kroupa P., Tout C. A., Gilmore G., 1993, MNRAS, 262, 545 elif primary_mass_scheme == 'Kroupa1993': - alpha = 2.7 - normalization_constant = (1.0-alpha) / (primary_mass_max**(1-alpha) - - primary_mass_min**(1-alpha)) - random_variable = RNG.uniform(size=number_of_binaries) - primary_masses = (random_variable*(1.0-alpha)/normalization_constant - + primary_mass_min**(1.0-alpha))**(1.0/(1.0-alpha)) + imf = IMFs.Kroupa1993(alpha=2.7, m_min=primary_mass_min, m_max=primary_mass_max) + primary_masses = imf.rvs(size=number_of_binaries, rng=RNG) # Kroupa P., 2001, MNRAS, 322, 231 elif primary_mass_scheme == 'Kroupa2001': From 419eda39efe63f8c2a148e7013dfb739b19440a7 Mon Sep 17 00:00:00 2001 From: Max Briel Date: Mon, 9 Feb 2026 10:46:08 +0100 Subject: [PATCH 032/389] fix q boundaries --- posydon/popsyn/distributions.py | 10 +++++----- posydon/unit_tests/popsyn/test_distributions.py | 14 +++++--------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/posydon/popsyn/distributions.py b/posydon/popsyn/distributions.py index 82e721f804..aec4b4aa55 100644 --- a/posydon/popsyn/distributions.py +++ b/posydon/popsyn/distributions.py @@ -39,19 +39,19 @@ def __init__(self, q_min=0.05, q_max=1): Parameters ---------- q_min : float, optional - Minimum mass ratio (default: 0.05). Must be in (0, 1]. + Minimum mass ratio (default: 0.05). Must be in [0, 1). q_max : float, optional Maximum mass ratio (default: 1.0). Must be in (0, 1]. Raises ------ ValueError - If q_min or q_max are not in (0, 1], or if q_min >= q_max. + If q_min or q_max are not in valid range, or if q_min >= q_max. """ - if not (0 < q_min <= 1): - raise ValueError("q_min must be in (0, 1)") + if not (0 <= q_min < 1): + raise ValueError("q_min must be in [0, 1)") if not (0 < q_max <= 1): - raise ValueError("q_max must be in (0, 1)") + raise ValueError("q_max must be in (0, 1]") if q_min >= q_max: raise ValueError("q_min must be less than q_max") diff --git a/posydon/unit_tests/popsyn/test_distributions.py b/posydon/unit_tests/popsyn/test_distributions.py index c2f80cbedf..b781209bd7 100644 --- a/posydon/unit_tests/popsyn/test_distributions.py +++ b/posydon/unit_tests/popsyn/test_distributions.py @@ -45,24 +45,20 @@ def test_initialization_custom(self, custom_flat_ratio): def test_initialization_invalid_parameters(self): """Test that initialization raises ValueError for invalid parameters.""" - # Test q_min not in (0, 1] - with pytest.raises(ValueError, match="q_min must be in \\(0, 1\\)"): - FlatMassRatio(q_min=0.0, q_max=0.5) - - with pytest.raises(ValueError, match="q_min must be in \\(0, 1\\)"): + with pytest.raises(ValueError, match="q_min must be in \\[0, 1\\)"): FlatMassRatio(q_min=-0.1, q_max=0.5) - with pytest.raises(ValueError, match="q_min must be in \\(0, 1\\)"): + with pytest.raises(ValueError, match="q_min must be in \\[0, 1\\)"): FlatMassRatio(q_min=1.5, q_max=2.0) # Test q_max not in (0, 1] - with pytest.raises(ValueError, match="q_max must be in \\(0, 1\\)"): + with pytest.raises(ValueError, match="q_max must be in \\(0, 1\\]"): FlatMassRatio(q_min=0.1, q_max=0.0) - with pytest.raises(ValueError, match="q_max must be in \\(0, 1\\)"): + with pytest.raises(ValueError, match="q_max must be in \\(0, 1\\]"): FlatMassRatio(q_min=0.1, q_max=-0.1) - with pytest.raises(ValueError, match="q_max must be in \\(0, 1\\)"): + with pytest.raises(ValueError, match="q_max must be in \\(0, 1\\]"): FlatMassRatio(q_min=0.1, q_max=1.5) # Test q_min >= q_max From 6c0be9d76e44265fe95d61678e13f4cd6186aeae Mon Sep 17 00:00:00 2001 From: Max Briel Date: Mon, 9 Feb 2026 10:52:20 +0100 Subject: [PATCH 033/389] revert back to exlusion of q=0 in output --- posydon/popsyn/distributions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/popsyn/distributions.py b/posydon/popsyn/distributions.py index aec4b4aa55..ff0fdfd53b 100644 --- a/posydon/popsyn/distributions.py +++ b/posydon/popsyn/distributions.py @@ -125,7 +125,7 @@ def pdf(self, q): Probability density at mass ratio q. """ q = np.asarray(q) - valid = (q >= self.q_min) & (q <= self.q_max) + valid = (q > self.q_min) & (q <= self.q_max) pdf_values = np.zeros_like(q, dtype=float) pdf_values[valid] = self.flat_mass_ratio(q[valid]) * self.norm return pdf_values From 4d2915d887a52578cce95792235a809db3526b9f Mon Sep 17 00:00:00 2001 From: Max Briel Date: Mon, 9 Feb 2026 10:59:24 +0100 Subject: [PATCH 034/389] update unit tests to use a mock RNG class instead of patching np.uniform --- .../unit_tests/utils/test_common_functions.py | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/posydon/unit_tests/utils/test_common_functions.py b/posydon/unit_tests/utils/test_common_functions.py index ef405107b6..44786badf6 100644 --- a/posydon/unit_tests/utils/test_common_functions.py +++ b/posydon/unit_tests/utils/test_common_functions.py @@ -754,8 +754,10 @@ def mock_rand2(shape): approx(5.13970075150e-8, abs=6e-20) def test_rejection_sampler(self, monkeypatch): - def mock_uniform(low=0.0, high=1.0, size=1): - return np.linspace(low, high, num=size) + class MockRNG: + def uniform(self, low=0.0, high=1.0, size=1): + return np.linspace(low, high, num=size) + mock_rng = MockRNG() def mock_interp1d(x, y): if x[0] > x[-1]: raise ValueError @@ -786,7 +788,6 @@ def mock_pdf(x): +" function in rejection sampling"): totest.rejection_sampler(pdf=mock_pdf) # examples: - monkeypatch.setattr(np.random, "uniform", mock_uniform) monkeypatch.setattr(totest, "interp1d", mock_interp1d) tests = [(np.array([0.0, 1.0]), np.array([0.4, 0.6]), 5,\ np.array([0.0, 0.25, 0.5, 0.75, 1.0])),\ @@ -795,22 +796,24 @@ def mock_pdf(x): (np.array([1.0, 0.0]), np.array([0.2, 0.8]), 6,\ np.array([0.0, 0.2, 0.4, 0.0, 0.5, 0.0]))] for (x, y, s, r) in tests: - assert np.allclose(totest.rejection_sampler(x=x, y=y, size=s),\ + assert np.allclose(totest.rejection_sampler(x=x, y=y, size=s, rng=mock_rng),\ r) assert np.allclose(totest.rejection_sampler(x_lim=np.array([0.0,\ 1.0]),\ - pdf=mock_pdf, size=5),\ + pdf=mock_pdf, size=5, rng=mock_rng),\ np.array([0.0, 0.25, 0.0, 0.0, 0.0])) assert np.allclose(totest.rejection_sampler(x=np.array([1.0, 0.0]),\ y=np.array([0.2, 0.8]),\ x_lim=np.array([0.0,\ 1.0]),\ - pdf=mock_pdf, size=5),\ + pdf=mock_pdf, size=5, rng=mock_rng),\ np.array([0.0, 0.25, 0.0, 0.0, 0.0])) def test_inverse_sampler(self, monkeypatch): - def mock_uniform(low=0.0, high=1.0, size=1): - return np.linspace(low, high, num=size) + class MockRNG: + def uniform(self, low=0.0, high=1.0, size=1): + return np.linspace(low, high, num=size) + mock_rng = MockRNG() # missing argument with raises(TypeError, match="missing 2 required positional "\ +"arguments: 'x' and 'y'"): @@ -826,21 +829,21 @@ def mock_uniform(low=0.0, high=1.0, size=1): totest.inverse_sampler(x=np.array([0.0, 1.0]),\ y=np.array([-0.4, 0.6])) # examples: - monkeypatch.setattr(np.random, "uniform", mock_uniform) - assert np.allclose(totest.inverse_sampler(x=np.array([0.0, 1.0]),\ + output = totest.inverse_sampler(x=np.array([0.0, 1.0]),\ y=np.array([0.4, 0.6]),\ - size=5),\ + size=5, rng=mock_rng) + assert np.allclose(output,\ np.array([0.0, 0.29128785, 0.54950976, 0.78388218,\ 1.0])) assert np.allclose(totest.inverse_sampler(x=np.array([0.0, 1.0]),\ y=np.array([0.6, 0.4]),\ - size=4),\ + size=4, rng=mock_rng),\ np.array([0.0, 0.2919872, 0.61952386, 1.0])) with warns(RuntimeWarning, match="invalid value encountered in "\ +"divide"): assert np.allclose(totest.inverse_sampler(x=np.array([0.0, 1.0]),\ y=np.array([0.5, 0.5]),\ - size=5),\ + size=5, rng=mock_rng),\ np.array([0.0, 0.25, 0.5, 0.75, 1.0])) def test_histogram_sampler(self, monkeypatch): From feca7b76b2396f7ce35ba7540a05ea14b67dc94d Mon Sep 17 00:00:00 2001 From: Max Briel Date: Mon, 9 Feb 2026 11:03:38 +0100 Subject: [PATCH 035/389] set q_min inclusive again --- posydon/popsyn/distributions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/popsyn/distributions.py b/posydon/popsyn/distributions.py index ff0fdfd53b..aec4b4aa55 100644 --- a/posydon/popsyn/distributions.py +++ b/posydon/popsyn/distributions.py @@ -125,7 +125,7 @@ def pdf(self, q): Probability density at mass ratio q. """ q = np.asarray(q) - valid = (q > self.q_min) & (q <= self.q_max) + valid = (q >= self.q_min) & (q <= self.q_max) pdf_values = np.zeros_like(q, dtype=float) pdf_values[valid] = self.flat_mass_ratio(q[valid]) * self.norm return pdf_values From f220e10a87ce4389a9ac6fd86fee5becf2f7c108 Mon Sep 17 00:00:00 2001 From: Max Briel Date: Mon, 9 Feb 2026 11:11:58 +0100 Subject: [PATCH 036/389] fix q boundary --- posydon/popsyn/distributions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/popsyn/distributions.py b/posydon/popsyn/distributions.py index aec4b4aa55..ff0fdfd53b 100644 --- a/posydon/popsyn/distributions.py +++ b/posydon/popsyn/distributions.py @@ -125,7 +125,7 @@ def pdf(self, q): Probability density at mass ratio q. """ q = np.asarray(q) - valid = (q >= self.q_min) & (q <= self.q_max) + valid = (q > self.q_min) & (q <= self.q_max) pdf_values = np.zeros_like(q, dtype=float) pdf_values[valid] = self.flat_mass_ratio(q[valid]) * self.norm return pdf_values From f807624efd439dc2e3bb92c7b552d741cc81773f Mon Sep 17 00:00:00 2001 From: Max Briel Date: Mon, 9 Feb 2026 11:15:59 +0100 Subject: [PATCH 037/389] exlude lower bound --- posydon/unit_tests/popsyn/test_distributions.py | 1 + 1 file changed, 1 insertion(+) diff --git a/posydon/unit_tests/popsyn/test_distributions.py b/posydon/unit_tests/popsyn/test_distributions.py index b781209bd7..3e48bf889c 100644 --- a/posydon/unit_tests/popsyn/test_distributions.py +++ b/posydon/unit_tests/popsyn/test_distributions.py @@ -110,6 +110,7 @@ def test_pdf_within_range(self, custom_flat_ratio): q_values = np.linspace(custom_flat_ratio.q_min, custom_flat_ratio.q_max, 10) pdf_values = custom_flat_ratio.pdf(q_values) expected_pdf = custom_flat_ratio.norm * np.ones_like(q_values) + expected_pdf[0] = 0.0 # q_values[0] is equal to q_min, which is outside the valid range np.testing.assert_allclose(pdf_values, expected_pdf) def test_pdf_outside_range(self, custom_flat_ratio): From 531d4829210af659bb6a8183131b36895b408873 Mon Sep 17 00:00:00 2001 From: Max Briel Date: Mon, 9 Feb 2026 11:48:50 +0100 Subject: [PATCH 038/389] add rvs unit tests + add Chabrier2003 rvs function --- posydon/popsyn/IMFs.py | 40 +- posydon/unit_tests/popsyn/test_IMFs.py | 179 ++++++ .../unit_tests/popsyn/test_distributions.py | 563 ++++++++++++++++++ posydon/unit_tests/popsyn/test_norm_pop.py | 26 + 4 files changed, 805 insertions(+), 3 deletions(-) diff --git a/posydon/popsyn/IMFs.py b/posydon/popsyn/IMFs.py index 6b76096763..f4467b168c 100644 --- a/posydon/popsyn/IMFs.py +++ b/posydon/popsyn/IMFs.py @@ -9,6 +9,7 @@ import numpy as np from scipy.integrate import quad +from posydon.utils.common_functions import inverse_sampler, rejection_sampler from posydon.utils.posydonwarning import Pwarn @@ -101,6 +102,10 @@ def imf(self, m): # pragma: no cover ''' pass + def rvs(self, size=1, rng=None): + pass + + class Salpeter(IMFBase): """ Initial Mass Function based on Salpeter (1955), which is defined as: @@ -427,9 +432,6 @@ def rvs(self, size=1, rng=None): if rng is None: rng = np.random.default_rng() - # Import here to avoid circular dependency - from posydon.utils.common_functions import inverse_sampler - # Create discretized PDF for inverse sampling # Use more points near the breaks for better accuracy n_points = 2000 @@ -529,3 +531,35 @@ def imf(self, m): C = (1.0 / (self.m_break * sqrt_2pi_sigma)) * np.exp(-log_term_break) powerlaw = C * (m / self.m_break) ** (-self.alpha) return np.where(m < self.m_break, lognormal, powerlaw) + + def rvs(self, size=1, rng=None): + """Draw random samples from the Chabrier2003 IMF. + + Uses inverse transform sampling with discretized PDF for the + combined lognormal and power-law distribution. + + Parameters + ---------- + size : int, optional + Number of samples to draw (default: 1). + rng : numpy.random.Generator, optional + Random number generator. If None, uses np.random.default_rng(). + + Returns + ------- + ndarray + Random mass samples in solar masses. + """ + if rng is None: + rng = np.random.default_rng() + + # Create discretized PDF for inverse sampling + # Use more points near the transition for better accuracy + n_points = 2000 + m_grid = np.linspace(self.m_min, self.m_max, n_points) + pdf_values = self.imf(m_grid) + + # Sample using inverse transform method + masses = inverse_sampler(m_grid, pdf_values, size=size, rng=rng) + + return masses diff --git a/posydon/unit_tests/popsyn/test_IMFs.py b/posydon/unit_tests/popsyn/test_IMFs.py index 40e29c4839..485268bab9 100644 --- a/posydon/unit_tests/popsyn/test_IMFs.py +++ b/posydon/unit_tests/popsyn/test_IMFs.py @@ -158,6 +158,141 @@ def test_imf_outside_range_warning(self, default_imf): # Verify the function still returns values (just with warning) assert len(result) == 1 + def test_rvs_default(self, default_imf): + """Test random sampling from the Salpeter IMF.""" + # Test single sample + rng = np.random.default_rng(42) + sample = default_imf.rvs(size=1, rng=rng) + assert len(sample) == 1 + assert default_imf.m_min <= sample[0] <= default_imf.m_max + + # Test multiple samples + rng = np.random.default_rng(42) + samples = default_imf.rvs(size=1000, rng=rng) + assert len(samples) == 1000 + assert np.all(samples >= default_imf.m_min) + assert np.all(samples <= default_imf.m_max) + + def test_rvs_without_rng(self, default_imf): + """Test random sampling without providing an RNG.""" + samples = default_imf.rvs(size=100) + assert len(samples) == 100 + assert np.all(samples >= default_imf.m_min) + assert np.all(samples <= default_imf.m_max) + +class TestKroupa1993IMF: + @pytest.fixture + def default_kroupa1993(self): + """Fixture for default Kroupa1993 instance.""" + return IMFs.Kroupa1993() + + @pytest.fixture + def custom_kroupa1993(self): + """Fixture for custom Kroupa1993 instance.""" + return IMFs.Kroupa1993(alpha=2.5, m_min=0.05, m_max=150.0) + + def test_initialization_default(self, default_kroupa1993): + """Test default initialization of Kroupa1993 IMF.""" + assert default_kroupa1993.alpha == 2.7 + assert default_kroupa1993.m_min == 0.01 + assert default_kroupa1993.m_max == 200.0 + integral, _ = quad(default_kroupa1993.imf, + default_kroupa1993.m_min, + default_kroupa1993.m_max) + assert np.isclose(integral*default_kroupa1993.norm, 1.0, rtol=1e-5) + + def test_initialization_custom(self, custom_kroupa1993): + """Test custom initialization of Kroupa1993 IMF.""" + assert custom_kroupa1993.alpha == 2.5 + assert custom_kroupa1993.m_min == 0.05 + assert custom_kroupa1993.m_max == 150.0 + integral, _ = quad(custom_kroupa1993.imf, + custom_kroupa1993.m_min, + custom_kroupa1993.m_max) + assert np.isclose(integral*custom_kroupa1993.norm, 1.0, rtol=1e-5) + + def test_repr(self, default_kroupa1993): + """Test string representation.""" + rep_str = default_kroupa1993.__repr__() + assert "Kroupa1993(" in rep_str + assert "alpha=2.7" in rep_str + assert "m_min=0.01" in rep_str + assert "m_max=200.0" in rep_str + + def test_repr_html(self, default_kroupa1993): + """Test HTML representation.""" + html_str = default_kroupa1993._repr_html_() + assert "

Kroupa (1993) IMF

" in html_str + assert "alpha = 2.7" in html_str + assert "m_min = 0.01" in html_str + assert "m_max = 200.0" in html_str + + def test_invalid_mass(self, default_kroupa1993): + """Test that the imf method raises ValueError for invalid mass values.""" + with pytest.raises(ValueError, match="Mass must be positive."): + default_kroupa1993.imf(0) + with pytest.raises(ValueError, match="Mass must be positive."): + default_kroupa1993.imf(-1.0) + with pytest.raises(ValueError, match="Mass must be positive."): + default_kroupa1993.imf([0.0]) + + def test_imf(self, default_kroupa1993): + """Test the imf method for correct values.""" + # Test with an array of mass values + m_values = np.array([1.0, 2.0, 5.0, 10.0]) + expected = m_values ** (-default_kroupa1993.alpha) + computed = default_kroupa1993.imf(m_values) + assert np.allclose(computed, expected) + + # Test with a single mass value + m = 3.0 + expected = m ** (-default_kroupa1993.alpha) + computed = default_kroupa1993.imf(m) + assert np.isclose(computed, expected) + + def test_pdf_within_range(self, default_kroupa1993): + """Test that PDF returns correct values within the mass range.""" + m = np.linspace(default_kroupa1993.m_min, default_kroupa1993.m_max, 100) + pdf_values = default_kroupa1993.pdf(m) + expected_pdf = default_kroupa1993.imf(m) * default_kroupa1993.norm + assert np.allclose(pdf_values, expected_pdf) + + def test_pdf_outside_range(self, default_kroupa1993): + """Test that PDF returns zero for masses outside the mass range.""" + m = np.array([default_kroupa1993.m_min - 0.1, default_kroupa1993.m_max + 0.1]) + pdf_values = default_kroupa1993.pdf(m) + assert np.allclose(pdf_values, 0.0) + + def test_normalization(self, default_kroupa1993): + """Ensure that the integral of the PDF over the range is approximately 1.""" + integral, _ = quad(default_kroupa1993.pdf, + default_kroupa1993.m_min, + default_kroupa1993.m_max) + assert np.isclose(integral, 1.0, rtol=1e-5) + + def test_rvs_default(self, default_kroupa1993): + """Test random sampling from the Kroupa1993 IMF.""" + # Test single sample + rng = np.random.default_rng(42) + sample = default_kroupa1993.rvs(size=1, rng=rng) + assert len(sample) == 1 + assert default_kroupa1993.m_min <= sample[0] <= default_kroupa1993.m_max + + # Test multiple samples + rng = np.random.default_rng(42) + samples = default_kroupa1993.rvs(size=1000, rng=rng) + assert len(samples) == 1000 + assert np.all(samples >= default_kroupa1993.m_min) + assert np.all(samples <= default_kroupa1993.m_max) + + def test_rvs_without_rng(self, default_kroupa1993): + """Test random sampling without providing an RNG.""" + samples = default_kroupa1993.rvs(size=100) + assert len(samples) == 100 + assert np.all(samples >= default_kroupa1993.m_min) + assert np.all(samples <= default_kroupa1993.m_max) + + class TestKroupa2001IMF: @pytest.fixture def default_kroupa(self): @@ -277,6 +412,28 @@ def test_repr_html(self, default_kroupa): html_str = default_kroupa._repr_html_() assert "

Kroupa (2001) IMF

" in html_str + def test_rvs_default(self, default_kroupa): + """Test random sampling from the Kroupa2001 IMF.""" + # Test single sample + rng = np.random.default_rng(42) + sample = default_kroupa.rvs(size=1, rng=rng) + assert len(sample) == 1 + assert default_kroupa.m_min <= sample[0] <= default_kroupa.m_max + + # Test multiple samples + rng = np.random.default_rng(42) + samples = default_kroupa.rvs(size=1000, rng=rng) + assert len(samples) == 1000 + assert np.all(samples >= default_kroupa.m_min) + assert np.all(samples <= default_kroupa.m_max) + + def test_rvs_without_rng(self, default_kroupa): + """Test random sampling without providing an RNG.""" + samples = default_kroupa.rvs(size=100) + assert len(samples) == 100 + assert np.all(samples >= default_kroupa.m_min) + assert np.all(samples <= default_kroupa.m_max) + class TestChabrierIMF: @pytest.fixture def default_chabrier(self): @@ -401,3 +558,25 @@ def test_repr(self, default_chabrier): def test_repr_html(self, default_chabrier): html_str = default_chabrier._repr_html_() assert "

Chabrier IMF

" in html_str + + def test_rvs_default(self, default_chabrier): + """Test random sampling from the Chabrier2003 IMF.""" + # Test single sample + rng = np.random.default_rng(42) + sample = default_chabrier.rvs(size=1, rng=rng) + assert len(sample) == 1 + assert default_chabrier.m_min <= sample[0] <= default_chabrier.m_max + + # Test multiple samples + rng = np.random.default_rng(42) + samples = default_chabrier.rvs(size=1000, rng=rng) + assert len(samples) == 1000 + assert np.all(samples >= default_chabrier.m_min) + assert np.all(samples <= default_chabrier.m_max) + + def test_rvs_without_rng(self, default_chabrier): + """Test random sampling without providing an RNG.""" + samples = default_chabrier.rvs(size=100) + assert len(samples) == 100 + assert np.all(samples >= default_chabrier.m_min) + assert np.all(samples <= default_chabrier.m_max) diff --git a/posydon/unit_tests/popsyn/test_distributions.py b/posydon/unit_tests/popsyn/test_distributions.py index 3e48bf889c..23b787461e 100644 --- a/posydon/unit_tests/popsyn/test_distributions.py +++ b/posydon/unit_tests/popsyn/test_distributions.py @@ -10,9 +10,13 @@ from posydon.popsyn.distributions import ( FlatMassRatio, + LogNormalSeparation, LogUniform, PowerLawPeriod, Sana12Period, + ThermalEccentricity, + UniformEccentricity, + ZeroEccentricity, ) @@ -150,6 +154,23 @@ def test_normalization_integral(self, default_flat_ratio): integral, _ = quad(default_flat_ratio.pdf, default_flat_ratio.q_min, default_flat_ratio.q_max) np.testing.assert_allclose(integral, 1.0, rtol=1e-10) + def test_rvs(self, custom_flat_ratio): + """Test random sampling.""" + rng = np.random.default_rng(42) + samples = custom_flat_ratio.rvs(size=1000, rng=rng) + + assert len(samples) == 1000 + assert np.all(samples >= custom_flat_ratio.q_min) + assert np.all(samples <= custom_flat_ratio.q_max) + + def test_rvs_without_rng(self, custom_flat_ratio): + """Test random sampling without providing an RNG.""" + samples = custom_flat_ratio.rvs(size=100) + + assert len(samples) == 100 + assert np.all(samples >= custom_flat_ratio.q_min) + assert np.all(samples <= custom_flat_ratio.q_max) + class TestSana12Period: """Test class for Sana12Period distribution.""" @@ -314,6 +335,64 @@ def test_calculate_normalization_integration(self, default_sana12): norm_high = default_sana12._calculate_normalization(m1_high) assert norm_high > 0 + def test_rvs_with_m1_none(self, default_sana12): + """Test that rvs raises ValueError when m1 is None.""" + rng = np.random.default_rng(42) + + with pytest.raises(ValueError, match="m1 \\(primary mass\\) must be provided"): + default_sana12.rvs(size=10, m1=None, rng=rng) + + def test_rvs_with_m1_wrong_size(self, default_sana12): + """Test that rvs raises ValueError when m1 has wrong size.""" + rng = np.random.default_rng(42) + m1_wrong_size = np.array([10.0, 15.0]) + + with pytest.raises(ValueError, match="m1 must be a single value or have size="): + default_sana12.rvs(size=10, m1=m1_wrong_size, rng=rng) + + def test_rvs_low_mass(self, default_sana12): + """Test random sampling for low mass stars.""" + rng = np.random.default_rng(42) + m1 = 10.0 # Below mbreak + + samples = default_sana12.rvs(size=100, m1=m1, rng=rng) + + assert len(samples) == 100 + assert np.all(samples >= default_sana12.p_min) + assert np.all(samples <= default_sana12.p_max) + + def test_rvs_high_mass(self, default_sana12): + """Test random sampling for high mass stars.""" + rng = np.random.default_rng(42) + m1 = 25.0 # Above mbreak + + samples = default_sana12.rvs(size=100, m1=m1, rng=rng) + + assert len(samples) == 100 + assert np.all(samples >= default_sana12.p_min) + assert np.all(samples <= default_sana12.p_max) + + def test_rvs_mixed_masses(self, default_sana12): + """Test random sampling with array of masses.""" + rng = np.random.default_rng(42) + m1 = np.array([10.0, 15.0, 20.0, 25.0, 30.0]) + + samples = default_sana12.rvs(size=5, m1=m1, rng=rng) + + assert len(samples) == 5 + assert np.all(samples >= default_sana12.p_min) + assert np.all(samples <= default_sana12.p_max) + + def test_rvs_without_rng(self, default_sana12): + """Test random sampling without providing an RNG.""" + m1 = 20.0 + + samples = default_sana12.rvs(size=100, m1=m1) + + assert len(samples) == 100 + assert np.all(samples >= default_sana12.p_min) + assert np.all(samples <= default_sana12.p_max) + class TestPowerLawPeriod: """Test class for PowerLawPeriod distribution.""" @@ -510,6 +589,24 @@ def test_normalization_consistency(self, default_power_law): np.testing.assert_allclose(pdf_values, expected_pdf) + def test_rvs(self, custom_power_law): + """Test random sampling.""" + rng = np.random.default_rng(42) + + samples = custom_power_law.rvs(size=1000, rng=rng) + + assert len(samples) == 1000 + assert np.all(samples >= custom_power_law.p_min) + assert np.all(samples <= custom_power_law.p_max) + + def test_rvs_without_rng(self, custom_power_law): + """Test random sampling without providing an RNG.""" + samples = custom_power_law.rvs(size=100) + + assert len(samples) == 100 + assert np.all(samples >= custom_power_law.p_min) + assert np.all(samples <= custom_power_law.p_max) + class TestDistributionComparisons: """Test class for comparing distributions and edge cases.""" @@ -616,5 +713,471 @@ def test_initialization_invalid_parameters(self): with pytest.raises(ValueError, match="max must be greater than min"): LogUniform(min=1000.0, max=100.0) + with pytest.raises(ValueError, match="max must be greater than min"): + LogUniform(min=100.0, max=100.0) + + def test_repr(self): + """Test string representation.""" + log_uniform = LogUniform(min=10.0, max=1000.0) + rep_str = log_uniform.__repr__() + assert "LogUniform(" in rep_str + assert "min=10.0" in rep_str + assert "max=1000.0" in rep_str + + def test_repr_html(self): + """Test HTML representation.""" + log_uniform = LogUniform(min=10.0, max=1000.0) + html_str = log_uniform._repr_html_() + assert "

Log-Uniform Distribution

" in html_str + assert "min = 10.0" in html_str + assert "max = 1000.0" in html_str + + def test_pdf_within_range(self): + """Test PDF within the valid range.""" + log_uniform = LogUniform(min=10.0, max=1000.0) + x_values = np.array([10.0, 50.0, 100.0, 500.0, 1000.0]) + pdf_values = log_uniform.pdf(x_values) + expected = log_uniform.norm / x_values + np.testing.assert_allclose(pdf_values, expected) + + def test_pdf_outside_range(self): + """Test PDF outside the valid range.""" + log_uniform = LogUniform(min=10.0, max=1000.0) + # Below range + x_below = np.array([1.0, 5.0]) + pdf_below = log_uniform.pdf(x_below) + np.testing.assert_array_equal(pdf_below, np.zeros_like(x_below)) + + # Above range + x_above = np.array([2000.0, 5000.0]) + pdf_above = log_uniform.pdf(x_above) + np.testing.assert_array_equal(pdf_above, np.zeros_like(x_above)) + + def test_rvs(self): + """Test random sampling.""" + log_uniform = LogUniform(min=10.0, max=1000.0) + rng = np.random.default_rng(42) + samples = log_uniform.rvs(size=1000, rng=rng) + + assert len(samples) == 1000 + assert np.all(samples >= log_uniform.min) + assert np.all(samples <= log_uniform.max) + + def test_rvs_without_rng(self): + """Test random sampling without providing an RNG.""" + log_uniform = LogUniform(min=10.0, max=1000.0) + samples = log_uniform.rvs(size=100) + + assert len(samples) == 100 + assert np.all(samples >= log_uniform.min) + assert np.all(samples <= log_uniform.max) + + +class TestThermalEccentricity: + """Test class for ThermalEccentricity distribution.""" + + @pytest.fixture + def default_thermal(self): + """Fixture for default ThermalEccentricity instance.""" + return ThermalEccentricity() + + @pytest.fixture + def custom_thermal(self): + """Fixture for custom ThermalEccentricity instance.""" + return ThermalEccentricity(e_min=0.1, e_max=0.9) + + def test_initialization_default(self, default_thermal): + """Test default initialization.""" + assert default_thermal.e_min == 0.0 + assert default_thermal.e_max == 1.0 + assert hasattr(default_thermal, 'norm') + assert default_thermal.norm > 0 + + def test_initialization_custom(self, custom_thermal): + """Test custom initialization.""" + assert custom_thermal.e_min == 0.1 + assert custom_thermal.e_max == 0.9 + assert hasattr(custom_thermal, 'norm') + assert custom_thermal.norm > 0 + + def test_initialization_invalid_parameters(self): + """Test that initialization raises ValueError for invalid parameters.""" + # Test e_min not in [0, 1) + with pytest.raises(ValueError, match="e_min must be in \\[0, 1\\)"): + ThermalEccentricity(e_min=-0.1, e_max=0.5) + + with pytest.raises(ValueError, match="e_min must be in \\[0, 1\\)"): + ThermalEccentricity(e_min=1.5, e_max=2.0) + + # Test e_max not in (0, 1] + with pytest.raises(ValueError, match="e_max must be in \\(0, 1\\]"): + ThermalEccentricity(e_min=0.1, e_max=0.0) + + with pytest.raises(ValueError, match="e_max must be in \\(0, 1\\]"): + ThermalEccentricity(e_min=0.1, e_max=-0.1) + + with pytest.raises(ValueError, match="e_max must be in \\(0, 1\\]"): + ThermalEccentricity(e_min=0.1, e_max=1.5) + + # Test e_min >= e_max + with pytest.raises(ValueError, match="e_min must be less than e_max"): + ThermalEccentricity(e_min=0.8, e_max=0.5) + + with pytest.raises(ValueError, match="e_min must be less than e_max"): + ThermalEccentricity(e_min=0.5, e_max=0.5) + + def test_repr(self, custom_thermal): + """Test string representation.""" + rep_str = custom_thermal.__repr__() + assert "ThermalEccentricity(" in rep_str + assert "e_min=0.1" in rep_str + assert "e_max=0.9" in rep_str + + def test_repr_html(self, custom_thermal): + """Test HTML representation.""" + html_str = custom_thermal._repr_html_() + assert "

Thermal Eccentricity Distribution

" in html_str + assert "e_min = 0.1" in html_str + assert "e_max = 0.9" in html_str + + def test_thermal_eccentricity_method(self, default_thermal): + """Test the thermal_eccentricity method.""" + e_values = np.array([0.0, 0.25, 0.5, 0.75, 1.0]) + result = default_thermal.thermal_eccentricity(e_values) + expected = 2.0 * e_values + np.testing.assert_allclose(result, expected) + + def test_pdf_within_range(self, custom_thermal): + """Test PDF within the valid range.""" + e_values = np.linspace(custom_thermal.e_min, custom_thermal.e_max, 10) + pdf_values = custom_thermal.pdf(e_values) + + # All should be positive within range + assert np.all(pdf_values > 0) + + # Check normalization + expected = custom_thermal.thermal_eccentricity(e_values) * custom_thermal.norm + np.testing.assert_allclose(pdf_values, expected) + + def test_pdf_outside_range(self, custom_thermal): + """Test PDF outside the valid range.""" + # Below range + e_below = np.array([0.0, 0.05]) + pdf_below = custom_thermal.pdf(e_below) + np.testing.assert_array_equal(pdf_below, np.zeros_like(e_below)) + + # Above range + e_above = np.array([0.95, 1.0]) + pdf_above = custom_thermal.pdf(e_above) + np.testing.assert_array_equal(pdf_above, np.zeros_like(e_above)) + + def test_pdf_scalar_input(self, default_thermal): + """Test PDF with scalar input.""" + e = 0.5 + pdf_value = default_thermal.pdf(e) + expected = default_thermal.thermal_eccentricity(e) * default_thermal.norm + np.testing.assert_allclose(pdf_value, expected) + + def test_rvs(self, custom_thermal): + """Test random sampling.""" + rng = np.random.default_rng(42) + samples = custom_thermal.rvs(size=1000, rng=rng) + + assert len(samples) == 1000 + assert np.all(samples >= custom_thermal.e_min) + assert np.all(samples <= custom_thermal.e_max) + + def test_rvs_without_rng(self, custom_thermal): + """Test random sampling without providing an RNG.""" + samples = custom_thermal.rvs(size=100) + + assert len(samples) == 100 + assert np.all(samples >= custom_thermal.e_min) + assert np.all(samples <= custom_thermal.e_max) + + +class TestUniformEccentricity: + """Test class for UniformEccentricity distribution.""" + + @pytest.fixture + def default_uniform(self): + """Fixture for default UniformEccentricity instance.""" + return UniformEccentricity() + + @pytest.fixture + def custom_uniform(self): + """Fixture for custom UniformEccentricity instance.""" + return UniformEccentricity(e_min=0.1, e_max=0.9) + + def test_initialization_default(self, default_uniform): + """Test default initialization.""" + assert default_uniform.e_min == 0.0 + assert default_uniform.e_max == 1.0 + assert hasattr(default_uniform, 'norm') + assert default_uniform.norm == 1.0 + + def test_initialization_custom(self, custom_uniform): + """Test custom initialization.""" + assert custom_uniform.e_min == 0.1 + assert custom_uniform.e_max == 0.9 + assert hasattr(custom_uniform, 'norm') + expected_norm = 1.0 / (0.9 - 0.1) + np.testing.assert_allclose(custom_uniform.norm, expected_norm) + + def test_initialization_invalid_parameters(self): + """Test that initialization raises ValueError for invalid parameters.""" + # Test e_min not in [0, 1) + with pytest.raises(ValueError, match="e_min must be in \\[0, 1\\)"): + UniformEccentricity(e_min=-0.1, e_max=0.5) + + with pytest.raises(ValueError, match="e_min must be in \\[0, 1\\)"): + UniformEccentricity(e_min=1.5, e_max=2.0) + + # Test e_max not in (0, 1] + with pytest.raises(ValueError, match="e_max must be in \\(0, 1\\]"): + UniformEccentricity(e_min=0.1, e_max=0.0) + + with pytest.raises(ValueError, match="e_max must be in \\(0, 1\\]"): + UniformEccentricity(e_min=0.1, e_max=-0.1) + + with pytest.raises(ValueError, match="e_max must be in \\(0, 1\\]"): + UniformEccentricity(e_min=0.1, e_max=1.5) + + # Test e_min >= e_max + with pytest.raises(ValueError, match="e_min must be less than e_max"): + UniformEccentricity(e_min=0.8, e_max=0.5) + + with pytest.raises(ValueError, match="e_min must be less than e_max"): + UniformEccentricity(e_min=0.5, e_max=0.5) + + def test_repr(self, custom_uniform): + """Test string representation.""" + rep_str = custom_uniform.__repr__() + assert "UniformEccentricity(" in rep_str + assert "e_min=0.1" in rep_str + assert "e_max=0.9" in rep_str + + def test_repr_html(self, custom_uniform): + """Test HTML representation.""" + html_str = custom_uniform._repr_html_() + assert "

Uniform Eccentricity Distribution

" in html_str + assert "e_min = 0.1" in html_str + assert "e_max = 0.9" in html_str + + def test_pdf_within_range(self, custom_uniform): + """Test PDF within the valid range.""" + e_values = np.linspace(custom_uniform.e_min, custom_uniform.e_max, 10) + pdf_values = custom_uniform.pdf(e_values) + + # All should equal the normalization constant + expected = custom_uniform.norm * np.ones_like(e_values) + np.testing.assert_allclose(pdf_values, expected) + + def test_pdf_outside_range(self, custom_uniform): + """Test PDF outside the valid range.""" + # Below range + e_below = np.array([0.0, 0.05]) + pdf_below = custom_uniform.pdf(e_below) + np.testing.assert_array_equal(pdf_below, np.zeros_like(e_below)) + + # Above range + e_above = np.array([0.95, 1.0]) + pdf_above = custom_uniform.pdf(e_above) + np.testing.assert_array_equal(pdf_above, np.zeros_like(e_above)) + + def test_pdf_scalar_input(self, default_uniform): + """Test PDF with scalar input.""" + e = 0.5 + pdf_value = default_uniform.pdf(e) + np.testing.assert_allclose(pdf_value, default_uniform.norm) + + def test_rvs(self, custom_uniform): + """Test random sampling.""" + rng = np.random.default_rng(42) + samples = custom_uniform.rvs(size=1000, rng=rng) + + assert len(samples) == 1000 + assert np.all(samples >= custom_uniform.e_min) + assert np.all(samples <= custom_uniform.e_max) + + def test_rvs_without_rng(self, custom_uniform): + """Test random sampling without providing an RNG.""" + samples = custom_uniform.rvs(size=100) + + assert len(samples) == 100 + assert np.all(samples >= custom_uniform.e_min) + assert np.all(samples <= custom_uniform.e_max) + + +class TestZeroEccentricity: + """Test class for ZeroEccentricity distribution.""" + + @pytest.fixture + def zero_ecc(self): + """Fixture for ZeroEccentricity instance.""" + return ZeroEccentricity() + + def test_initialization(self, zero_ecc): + """Test initialization.""" + # Should have no parameters + assert isinstance(zero_ecc, ZeroEccentricity) + + def test_repr(self, zero_ecc): + """Test string representation.""" + rep_str = zero_ecc.__repr__() + assert "ZeroEccentricity()" in rep_str + + def test_repr_html(self, zero_ecc): + """Test HTML representation.""" + html_str = zero_ecc._repr_html_() + assert "

Zero Eccentricity Distribution

" in html_str + assert "e = 0 (circular orbits)" in html_str + + def test_pdf_at_zero(self, zero_ecc): + """Test PDF at e=0.""" + pdf_value = zero_ecc.pdf(0.0) + assert pdf_value == 1.0 + + def test_pdf_away_from_zero(self, zero_ecc): + """Test PDF for non-zero eccentricities.""" + e_values = np.array([0.1, 0.5, 0.9, 1.0]) + pdf_values = zero_ecc.pdf(e_values) + np.testing.assert_array_equal(pdf_values, np.zeros_like(e_values)) + + def test_pdf_mixed(self, zero_ecc): + """Test PDF with mixture of zero and non-zero values.""" + e_values = np.array([0.0, 0.1, 0.0, 0.5]) + pdf_values = zero_ecc.pdf(e_values) + expected = np.array([1.0, 0.0, 1.0, 0.0]) + np.testing.assert_array_equal(pdf_values, expected) + + def test_rvs(self, zero_ecc): + """Test random sampling.""" + rng = np.random.default_rng(42) + samples = zero_ecc.rvs(size=1000, rng=rng) + + # All samples should be zero + assert len(samples) == 1000 + np.testing.assert_array_equal(samples, np.zeros(1000)) + + def test_rvs_without_rng(self, zero_ecc): + """Test random sampling without providing an RNG.""" + samples = zero_ecc.rvs(size=100) + + # All samples should be zero + assert len(samples) == 100 + np.testing.assert_array_equal(samples, np.zeros(100)) + + +class TestLogNormalSeparation: + """Test class for LogNormalSeparation distribution.""" + + @pytest.fixture + def default_lognormal(self): + """Fixture for default LogNormalSeparation instance.""" + return LogNormalSeparation() + + @pytest.fixture + def custom_lognormal(self): + """Fixture for custom LogNormalSeparation instance.""" + return LogNormalSeparation(mean=1.0, sigma=0.5, min=10.0, max=1e4) + + def test_initialization_default(self, default_lognormal): + """Test default initialization.""" + assert default_lognormal.mean == 0.85 + assert default_lognormal.sigma == 0.37 + assert default_lognormal.min == 5.0 + assert default_lognormal.max == 1e5 + + def test_initialization_custom(self, custom_lognormal): + """Test custom initialization.""" + assert custom_lognormal.mean == 1.0 + assert custom_lognormal.sigma == 0.5 + assert custom_lognormal.min == 10.0 + assert custom_lognormal.max == 1e4 + + def test_initialization_invalid_parameters(self): + """Test that initialization raises ValueError for invalid parameters.""" + # Test min <= 0 + with pytest.raises(ValueError, match="min must be positive"): + LogNormalSeparation(mean=1.0, sigma=0.5, min=0.0, max=1000.0) + + with pytest.raises(ValueError, match="min must be positive"): + LogNormalSeparation(mean=1.0, sigma=0.5, min=-1.0, max=1000.0) + + # Test max <= min + with pytest.raises(ValueError, match="max must be greater than min"): + LogNormalSeparation(mean=1.0, sigma=0.5, min=1000.0, max=100.0) + + with pytest.raises(ValueError, match="max must be greater than min"): + LogNormalSeparation(mean=1.0, sigma=0.5, min=100.0, max=100.0) + + # Test sigma <= 0 + with pytest.raises(ValueError, match="sigma must be positive"): + LogNormalSeparation(mean=1.0, sigma=0.0, min=10.0, max=1000.0) + + with pytest.raises(ValueError, match="sigma must be positive"): + LogNormalSeparation(mean=1.0, sigma=-0.5, min=10.0, max=1000.0) + + def test_repr(self, custom_lognormal): + """Test string representation.""" + rep_str = custom_lognormal.__repr__() + assert "LogNormalSeparation(" in rep_str + assert "mean=1.0" in rep_str + assert "sigma=0.5" in rep_str + assert "min=10.0" in rep_str + assert "max=10000.0" in rep_str + + def test_repr_html(self, custom_lognormal): + """Test HTML representation.""" + html_str = custom_lognormal._repr_html_() + assert "

Log-Normal Separation Distribution

" in html_str + assert "mean (log10) = 1.0" in html_str + assert "sigma (log10) = 0.5" in html_str + + def test_pdf_within_range(self, custom_lognormal): + """Test PDF within the valid range.""" + a_values = np.array([10.0, 50.0, 100.0, 500.0, 1000.0]) + pdf_values = custom_lognormal.pdf(a_values) + + # All should be positive within range + assert np.all(pdf_values > 0) + + def test_pdf_outside_range(self, custom_lognormal): + """Test PDF outside the valid range.""" + # Below range + a_below = np.array([1.0, 5.0]) + pdf_below = custom_lognormal.pdf(a_below) + np.testing.assert_array_equal(pdf_below, np.zeros_like(a_below)) + + # Above range + a_above = np.array([2e4, 5e4]) + pdf_above = custom_lognormal.pdf(a_above) + np.testing.assert_array_equal(pdf_above, np.zeros_like(a_above)) + + def test_pdf_zero_and_negative(self, custom_lognormal): + """Test PDF for zero and negative values.""" + a_invalid = np.array([0.0, -10.0]) + pdf_invalid = custom_lognormal.pdf(a_invalid) + np.testing.assert_array_equal(pdf_invalid, np.zeros_like(a_invalid)) + + def test_rvs(self, custom_lognormal): + """Test random sampling.""" + rng = np.random.default_rng(42) + samples = custom_lognormal.rvs(size=1000, rng=rng) + + assert len(samples) == 1000 + assert np.all(samples >= custom_lognormal.min) + assert np.all(samples <= custom_lognormal.max) + + def test_rvs_without_rng(self, custom_lognormal): + """Test random sampling without providing an RNG.""" + samples = custom_lognormal.rvs(size=100) + + assert len(samples) == 100 + assert np.all(samples >= custom_lognormal.min) + assert np.all(samples <= custom_lognormal.max) + + with pytest.raises(ValueError, match="max must be greater than min"): LogUniform(min=100.0, max=100.0) diff --git a/posydon/unit_tests/popsyn/test_norm_pop.py b/posydon/unit_tests/popsyn/test_norm_pop.py index 1eb8f3fcce..a868d0d1b2 100644 --- a/posydon/unit_tests/popsyn/test_norm_pop.py +++ b/posydon/unit_tests/popsyn/test_norm_pop.py @@ -284,6 +284,32 @@ def test_mean_mass_without_q_bounds(self): 'orbital_period_max': 6000, } + mean_mass = norm_pop.get_mean_mass(params) + assert mean_mass > 0 + + def test_computed_q_min_greater_than_q_max_error(self): + # Test the validation error when computed q_min > q_max + # This happens when secondary_mass_min/primary_mass_min > secondary_mass_max/primary_mass_max + params = { + 'primary_mass_scheme': 'NonExistentIMF', + 'primary_mass_min': 10, + 'primary_mass_max': 20, + 'secondary_mass_min': 15, # Too high: 15/10 = 1.5 + 'secondary_mass_max': 5, # Too low: 5/20 = 0.25 + 'secondary_mass_scheme': 'flat_mass_ratio', + 'binary_fraction_scheme': 'const', + 'binary_fraction_const': 0.5, + 'orbital_scheme': 'period', + 'orbital_period_scheme': 'Sana+12_period_extended', + 'orbital_period_min': 0.35, + 'orbital_period_max': 6000, + } + + with pytest.raises(ValueError) as excinfo: + norm_pop.get_mean_mass(params) + + assert "q_min must be less than q_max" in str(excinfo.value) + # This should not raise an error and should return a valid mean mass result = norm_pop.get_mean_mass(params) assert isinstance(result, (float, np.floating)) From 878c98c4338ebb9d6fc5c9488328929951b00341 Mon Sep 17 00:00:00 2001 From: Max Briel Date: Mon, 9 Feb 2026 11:55:26 +0100 Subject: [PATCH 039/389] add repr and change logUniform pdf to include jacobian --- posydon/popsyn/distributions.py | 34 +++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/posydon/popsyn/distributions.py b/posydon/popsyn/distributions.py index ff0fdfd53b..1ae8c60d61 100644 --- a/posydon/popsyn/distributions.py +++ b/posydon/popsyn/distributions.py @@ -587,6 +587,28 @@ def __init__(self, min=5.0, max=1e5): self.norm = self._calculate_normalization() + def __repr__(self): + """Return string representation of the distribution. + + Returns + ------- + str + String representation showing the distribution parameters. + """ + return f"LogUniform(min={self.min}, max={self.max})" + + def _repr_html_(self): + """Return HTML representation for Jupyter notebooks. + + Returns + ------- + str + HTML string for rich display in notebooks. + """ + return (f"

Log-Uniform Distribution

" + f"

min = {self.min}

" + f"

max = {self.max}

") + def _calculate_normalization(self): """ Calculate the normalization constant for the log-uniform distribution. @@ -616,7 +638,7 @@ def pdf(self, x): valid = (x > 0) & (x >= self.min) & (x <= self.max) pdf_values = np.zeros_like(x, dtype=float) - pdf_values[valid] = self.norm + pdf_values[valid] = self.norm / x[valid] return pdf_values @@ -948,9 +970,9 @@ class LogNormalSeparation: Parameters ---------- mean : float, optional - Mean of the log10 distribution (default: 3.5, corresponding to ~3162 Rsun). + Mean of the log10 distribution (default: 0.85, corresponding to ~7.08 Rsun). sigma : float, optional - Standard deviation of the log10 distribution (default: 2.3). + Standard deviation of the log10 distribution (default: 0.37). min : float, optional Minimum orbital separation in solar radii (default: 5.0). max : float, optional @@ -972,15 +994,15 @@ class LogNormalSeparation: normal distribution in log10 space. """ - def __init__(self, mean=3.5, sigma=2.3, min=5.0, max=1e5): + def __init__(self, mean=0.85, sigma=0.37, min=5.0, max=1e5): """Initialize the log-normal separation distribution. Parameters ---------- mean : float, optional - Mean of the log10 distribution (default: 3.5). + Mean of the log10 distribution (default: 0.85). sigma : float, optional - Standard deviation of the log10 distribution (default: 2.3). + Standard deviation of the log10 distribution (default: 0.37). min : float, optional Minimum orbital separation in solar radii (default: 5.0). max : float, optional From 51219e9f7ba1a9542996c03fbc535acb870ba026 Mon Sep 17 00:00:00 2001 From: Max Briel Date: Mon, 9 Feb 2026 11:55:36 +0100 Subject: [PATCH 040/389] add repr and change logUniform pdf to include jacobian --- posydon/popsyn/distributions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/popsyn/distributions.py b/posydon/popsyn/distributions.py index 1ae8c60d61..85a13b1851 100644 --- a/posydon/popsyn/distributions.py +++ b/posydon/popsyn/distributions.py @@ -638,7 +638,7 @@ def pdf(self, x): valid = (x > 0) & (x >= self.min) & (x <= self.max) pdf_values = np.zeros_like(x, dtype=float) - pdf_values[valid] = self.norm / x[valid] + pdf_values[valid] = self.norm / x[valid] # PDF is constant in log space, so divide by x for linear space return pdf_values From 1806d719c7bf70fa7365ac5a6aa7b874a39031ca Mon Sep 17 00:00:00 2001 From: Max Briel Date: Mon, 9 Feb 2026 11:59:11 +0100 Subject: [PATCH 041/389] remove duplicate test --- posydon/unit_tests/popsyn/test_norm_pop.py | 27 ---------------------- 1 file changed, 27 deletions(-) diff --git a/posydon/unit_tests/popsyn/test_norm_pop.py b/posydon/unit_tests/popsyn/test_norm_pop.py index a868d0d1b2..db9f907850 100644 --- a/posydon/unit_tests/popsyn/test_norm_pop.py +++ b/posydon/unit_tests/popsyn/test_norm_pop.py @@ -287,33 +287,6 @@ def test_mean_mass_without_q_bounds(self): mean_mass = norm_pop.get_mean_mass(params) assert mean_mass > 0 - def test_computed_q_min_greater_than_q_max_error(self): - # Test the validation error when computed q_min > q_max - # This happens when secondary_mass_min/primary_mass_min > secondary_mass_max/primary_mass_max - params = { - 'primary_mass_scheme': 'NonExistentIMF', - 'primary_mass_min': 10, - 'primary_mass_max': 20, - 'secondary_mass_min': 15, # Too high: 15/10 = 1.5 - 'secondary_mass_max': 5, # Too low: 5/20 = 0.25 - 'secondary_mass_scheme': 'flat_mass_ratio', - 'binary_fraction_scheme': 'const', - 'binary_fraction_const': 0.5, - 'orbital_scheme': 'period', - 'orbital_period_scheme': 'Sana+12_period_extended', - 'orbital_period_min': 0.35, - 'orbital_period_max': 6000, - } - - with pytest.raises(ValueError) as excinfo: - norm_pop.get_mean_mass(params) - - assert "q_min must be less than q_max" in str(excinfo.value) - - # This should not raise an error and should return a valid mean mass - result = norm_pop.get_mean_mass(params) - assert isinstance(result, (float, np.floating)) - assert result > 0 class TestGetPdf: def test_single_star_pdf(self): From b132392c4a9c179fe1f81de58ec3b33dd0b7397e Mon Sep 17 00:00:00 2001 From: Max Briel Date: Mon, 9 Feb 2026 12:04:49 +0100 Subject: [PATCH 042/389] add pragma no cover --- posydon/popsyn/IMFs.py | 3 ++- posydon/popsyn/distributions.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/posydon/popsyn/IMFs.py b/posydon/popsyn/IMFs.py index f4467b168c..d09cf818a7 100644 --- a/posydon/popsyn/IMFs.py +++ b/posydon/popsyn/IMFs.py @@ -102,7 +102,8 @@ def imf(self, m): # pragma: no cover ''' pass - def rvs(self, size=1, rng=None): + @abstractmethod + def rvs(self, size=1, rng=None): # pragma: no cover pass diff --git a/posydon/popsyn/distributions.py b/posydon/popsyn/distributions.py index 85a13b1851..d8f1b66e5d 100644 --- a/posydon/popsyn/distributions.py +++ b/posydon/popsyn/distributions.py @@ -739,7 +739,7 @@ def _calculate_normalization(self): """ # Integral of 2*e from e_min to e_max is e_max^2 - e_min^2 integral = self.e_max**2 - self.e_min**2 - if integral == 0: + if integral == 0: # pragma: no cover raise ValueError("Cannot normalize distribution: e_min == e_max") return 1.0 / integral From 4fd1ba06012d2925209e4bc2d994328869899c3e Mon Sep 17 00:00:00 2001 From: Max Briel Date: Mon, 9 Feb 2026 12:07:06 +0100 Subject: [PATCH 043/389] add unite test from q_min>q_max from m2/m1 calculation --- posydon/unit_tests/popsyn/test_norm_pop.py | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/posydon/unit_tests/popsyn/test_norm_pop.py b/posydon/unit_tests/popsyn/test_norm_pop.py index db9f907850..e37c8e2b51 100644 --- a/posydon/unit_tests/popsyn/test_norm_pop.py +++ b/posydon/unit_tests/popsyn/test_norm_pop.py @@ -267,6 +267,29 @@ def test_q_min_greater_than_q_max_error(self): assert "q_min must be less than q_max" in str(excinfo.value) + def test_q_min_greater_than_q_max_computed_error(self): + # Test the validation error when computed q_min > q_max + # This happens when secondary_mass_min/primary_mass_min > secondary_mass_max/primary_mass_max + params = { + 'primary_mass_scheme': 'NonExistentIMF', + 'primary_mass_min': 5, + 'primary_mass_max': 10, + 'secondary_mass_min': 4, # 4/5 = 0.8 + 'secondary_mass_max': 6, # 6/10 = 0.6, so q_min (0.8) > q_max (0.6) + 'secondary_mass_scheme': 'flat_mass_ratio', + 'binary_fraction_scheme': 'const', + 'binary_fraction_const': 0.5, + 'orbital_scheme': 'period', + 'orbital_period_scheme': 'Sana+12_period_extended', + 'orbital_period_min': 0.35, + 'orbital_period_max': 6000, + } + + with pytest.raises(ValueError) as excinfo: + norm_pop.get_mean_mass(params) + + assert "q_min must be less than q_max" in str(excinfo.value) + def test_mean_mass_without_q_bounds(self): # Test the branch where q_min and q_max are computed from secondary masses params = { From c8a4b5a9bfd66885fca675d99354a93b36593342 Mon Sep 17 00:00:00 2001 From: dimsour94 Date: Mon, 9 Feb 2026 07:35:23 -0600 Subject: [PATCH 044/389] updates --- posydon/binary_evol/SN/step_SN.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index 72177ce113..56f8f53986 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -34,7 +34,7 @@ import copy import json import os - +import random import numpy as np import pandas as pd import scipy as sp @@ -813,7 +813,8 @@ def collapse_star(self, star): elif self.mechanism in [self.Sukhbold16_engines, self.Patton20_engines, - self.Couch20_engines]: + self.Couch20_engines, + self.Maltsev25_engines]: # The final remnant mass and and state # is computed by the selected mechanism @@ -2344,7 +2345,7 @@ def Patton20_corecollapse(self, star, engine, conserve_hydrogen_envelope=False): CO_core_mass, C_core_abundance = self.get_CO_core_params( star, self.approx_at_he_depletion) - M4, mu4 = self.get_M4_mu4_Patton20(CO_core_mass, C_core_abundance) + M4, mu4, Xi, sc = self.get_M4_mu4_Patton20(CO_core_mass, C_core_abundance) M4 = M4[0] mu4 = mu4[0] star.M4 = M4 @@ -2421,7 +2422,7 @@ def Maltsev25_corecollapse(self, star, engine, conserve_hydrogen_envelope=False) CO_core_mass, C_core_abundance = self.get_CO_core_params( star, self.approx_at_he_depletion) - M4, mu4 = self.get_M4_mu4_Patton20(CO_core_mass, C_core_abundance) + M4, mu4, Xi, sc = self.get_M4_mu4_Patton20(CO_core_mass, C_core_abundance) M4 = M4[0] mu4 = mu4[0] Xi=Xi[0] @@ -2456,7 +2457,7 @@ def Maltsev25_corecollapse(self, star, engine, conserve_hydrogen_envelope=False) elif (CO_core_mass < 10.0) and (CO_core_mass > 2.5): ff = self.explod_crit(Xi, sc, mu4M4, mu4) - if ff=0: + if ff==0: if conserve_hydrogen_envelope: m_rem = star.mass else: @@ -2488,9 +2489,9 @@ def NS_vs_fallbackBH(self, comp_val, mco_val, M4_val, mu4M4_val): # stochastic determination of the remnant type (NS versus fallback-BH) rand_number = random.uniform(0,1) if rand_number <= 0.15: # probabily for fallback = 0.15 in Section 3.1.2. - rem_type = 3 # fallback BH, although successful SN + rem = 3 # fallback BH, although successful SN else: - rem_type = 2 # NS formation + rem = 2 # NS formation return rem # implemented from Maltsev+25 From b9c896d96cee04f8c4b04801ed26b36dfc99b919 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 9 Feb 2026 13:37:18 +0000 Subject: [PATCH 045/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/binary_evol/SN/step_SN.py | 1 + 1 file changed, 1 insertion(+) diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index 56f8f53986..e73b6a43c8 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -35,6 +35,7 @@ import json import os import random + import numpy as np import pandas as pd import scipy as sp From f1984915d3e3f8a1116abb2f35884d4b5ae7d141 Mon Sep 17 00:00:00 2001 From: Max <14039563+maxbriel@users.noreply.github.com> Date: Tue, 10 Feb 2026 09:16:15 +0100 Subject: [PATCH 046/389] [enhancement] Add posydon version to POSYDON population files (#796) --- posydon/popsyn/binarypopulation.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/posydon/popsyn/binarypopulation.py b/posydon/popsyn/binarypopulation.py index eb0e0601f2..d4f6a1ac73 100644 --- a/posydon/popsyn/binarypopulation.py +++ b/posydon/popsyn/binarypopulation.py @@ -38,6 +38,7 @@ import psutil from tqdm import tqdm +import posydon from posydon.binary_evol.binarystar import BinaryStar from posydon.binary_evol.simulationproperties import SimulationProperties from posydon.binary_evol.singlestar import SingleStar, properties_massless_remnant @@ -77,7 +78,8 @@ 'orbital_separation_scheme', 'orbital_separation_min', 'orbital_separation_max', - 'eccentricity_scheme'] + 'eccentricity_scheme', + 'posydon_version'] HISTORY_MIN_ITEMSIZE = {'state': 30, 'event': 25, 'step_names': 21, @@ -587,7 +589,10 @@ def combine_saved_files(self, absolute_filepath, file_names, **kwargs): # store population metadata tmp_df = pd.DataFrame() for c in saved_ini_parameters: - tmp_df[c] = [self.kwargs[c]] + if c == 'posydon_version': + tmp_df[c] = [posydon.__version__] + else: + tmp_df[c] = [self.kwargs[c]] store.append('ini_parameters', tmp_df) tmp_df = pd.DataFrame( @@ -938,7 +943,10 @@ def save(self, fname, **kwargs): # store population metadata tmp_df = pd.DataFrame() for c in saved_ini_parameters: - tmp_df[c] = [self.kwargs[c]] + if c == 'posydon_version': + tmp_df[c] = [posydon.__version__] + else: + tmp_df[c] = [self.kwargs[c]] store.append('ini_parameters', tmp_df) tmp_df = pd.DataFrame( From 2e1efdfdbeab19613907fb5118411019b09e02a8 Mon Sep 17 00:00:00 2001 From: Max <14039563+maxbriel@users.noreply.github.com> Date: Tue, 10 Feb 2026 09:17:56 +0100 Subject: [PATCH 047/389] [fix] plot grid slice of termination_flag_1 without z_var_str (#801) --- posydon/visualization/plot2D.py | 57 +++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/posydon/visualization/plot2D.py b/posydon/visualization/plot2D.py index 68129794df..ccff667e99 100644 --- a/posydon/visualization/plot2D.py +++ b/posydon/visualization/plot2D.py @@ -633,6 +633,63 @@ def plot_panel(self, ax, extra_grid_call=False): 'likely all values are NaN.', "InappropriateValueWarning") sc_last = sc + else: + # Plot with default color when z_var is None and color is None + if self.slice_at_RLO: + for i in range(len(self.x_var[selection])): + if not isinstance(self.x_var_oRLO[selection][i], + float): + if not any( + pd.isna(self.x_var_oRLO[selection][i]) + ) and not any(pd.isna( + self.y_var_oRLO[selection][i])): + plt.plot( + self.x_var[selection][i], + self.y_var[selection][i], + marker=".", + color="black", + ) + plt.plot( + self.x_var_oRLO[selection][i], + self.y_var_oRLO[selection][i], + color="black", + ) + sc = ax.scatter( + self.x_var_oRLO[selection][i][-1], + self.y_var_oRLO[selection][i][-1], + marker=self.MARKERS_COLORS_LEGENDS[ + flag][0], + linewidths=self.MARKERS_COLORS_LEGENDS[ + flag][1], + c='gray', + s=self.marker_size, + ) + else: + plt.plot( + self.x_var[selection][i], + self.y_var[selection][i], + marker=".", + color="black", + ) + sc = ax.scatter( + self.x_var[selection][i], + self.y_var[selection][i], + marker=self.MARKERS_COLORS_LEGENDS[ + flag][0], + linewidths=self.MARKERS_COLORS_LEGENDS[ + flag][1], + c='gray', + s=self.marker_size, + ) + else: + sc = ax.scatter( + self.x_var[selection], + self.y_var[selection], + marker=self.MARKERS_COLORS_LEGENDS[flag][0], + linewidths=self.MARKERS_COLORS_LEGENDS[flag][1], + c='gray', + s=self.marker_size, + ) # collect scatters for legend if self.MARKERS_COLORS_LEGENDS[flag][3] not in scatters_legend: scatters.append(sc) From cdd434bb891861a56fa0434d0a6b8da1833d0248 Mon Sep 17 00:00:00 2001 From: Max <14039563+maxbriel@users.noreply.github.com> Date: Thu, 12 Feb 2026 11:00:02 +0100 Subject: [PATCH 048/389] [docs/enhancement/fix] Natal kick info + fixes a table (#803) * adds the units to the natal kick array info * Clarify description of natal kick velocity Implement @astro-abhishek suggestion --- .../pop_syn/single_star.rst | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/docs/_source/components-overview/pop_syn/single_star.rst b/docs/_source/components-overview/pop_syn/single_star.rst index a6454e5b6f..8873ee3427 100644 --- a/docs/_source/components-overview/pop_syn/single_star.rst +++ b/docs/_source/components-overview/pop_syn/single_star.rst @@ -103,20 +103,29 @@ The star properties are defined as follows Additional scalar properties are added during the evolution depending on which steps the star has undergone. These properties are not stored in the history. .. list-table:: Additional output - :header-rows: 1 - :widths: 50 150 + :header-rows: 1 + :widths: 50 150 * - Properties - Descriptions * - ``natal_kick_array`` - | The natal kick array for the star if it has undergone a SN. - | contains: - - * velocity - * theta - * phi - * mean anomaly - + | This has been replaced with the individual properties below. + | ``natal_kick_array`` contains: + + * velocity (km/s) + * azimuthal angle phi (radians) + * polar angle theta (radians) + * mean anomaly (radians) + + * - ``natal_kick_velocity`` + - The magnitude of the natal kick velocity in km/s. + * - ``natal_kick_phi`` + - The natal kick azimuthal angle phi in radians. + * - ``natal_kick_theta`` + - The natal kick polar angle theta in radians. + * - ``natal_kick_mean_anomaly`` + - The natal kick mean anomaly in radians. * - ``SN_type`` - The supernova type of the star. * - ``f_fb`` From 7b4c5c89b5c4efdb90a4a9eda53c70d8438aaf4f Mon Sep 17 00:00:00 2001 From: Max <14039563+maxbriel@users.noreply.github.com> Date: Thu, 12 Feb 2026 11:01:02 +0100 Subject: [PATCH 049/389] [enhancement/fix] Add more info on conda solver to website (#800) * add more info on conda solver to website * Apply suggestions from Seth Co-authored-by: Seth Gossage --------- Co-authored-by: Seth Gossage --- .../getting-started/installation-guide.rst | 12 +++++ .../installation-issues.rst | 51 +++++++++++++++---- 2 files changed, 52 insertions(+), 11 deletions(-) diff --git a/docs/_source/getting-started/installation-guide.rst b/docs/_source/getting-started/installation-guide.rst index fec6909bf6..6b9414ae6f 100644 --- a/docs/_source/getting-started/installation-guide.rst +++ b/docs/_source/getting-started/installation-guide.rst @@ -14,6 +14,18 @@ Installing POSYDON Anaconda (Recommended) ---------------------- +.. important:: + **Conda Version Requirements**: POSYDON requires a recent version of conda (version >= 23.1.0) with the libmamba solver for efficient dependency resolution. Older conda versions (especially those prior to v23.1.0) may take an extremely long time (hours or more) to resolve dependencies and may fail to complete installation. + + To check your conda version and solver configuration: + + .. code-block:: bash + + conda --version + conda config --show solver + + If you're using an older conda version or experiencing slow installation, please see the :ref:`troubleshooting guide ` for detailed instructions on updating conda or configuring the libmamba solver. + 1. **Install Anaconda** If you haven't already, download and install Anaconda from `Anaconda's official website `_. diff --git a/docs/_source/troubleshooting-faqs/installation-issues.rst b/docs/_source/troubleshooting-faqs/installation-issues.rst index aeed294d70..89abf4ac0a 100644 --- a/docs/_source/troubleshooting-faqs/installation-issues.rst +++ b/docs/_source/troubleshooting-faqs/installation-issues.rst @@ -5,20 +5,49 @@ Common Installation Issues From time to time, users might encounter issues during the installation of POSYDON. This page aims to address common installation problems and offer solutions. If your problem isn't covered here, please `report the issue `_ so we can assist you and possibly update this page for the benefit of others. -1. **Slow `conda` solving:** +1. **Slow `conda` solving or installation taking hours:** -`conda` can be very slow and sometimes gets stuck on "Verifying transaction" or "Executing transaction", especially when installing packages on a cluster. -It creates many small files, which can be difficult for HPC clusters to handle. -One way to speed up the installation is to use the `mamba` package manager, which is a drop-in replacement for `conda` but is much faster (`click here for more details `_). -Please proceed at your own discretion, as this has not been fully vetted. Alternatively, you can install the `libmamba` solver to speed up the solving process for new installations in a `conda` environment. -To install the `libmamba` solver, run the following command in your `conda` environment of choice or `base` `conda` environment: + **Conda Version Requirements**: POSYDON has a complex dependency tree, and older conda versions (especially those prior to v23.1.0) use very slow dependency solvers that can take hours or may never complete the installation process. Modern conda versions (>= 23.1.0) include the libmamba solver by default, which resolves dependencies efficiently in seconds to minutes. -```bash -conda install conda-libmamba-solver -``` + **Check your conda version and solver:** -This will install the `libmamba` solver, which is a drop-in replacement for the default `conda` solver. -This should speed up solving the environment and installing packages but is not guaranteed to work in all cases. + .. code-block:: bash + + conda --version + conda config --show solver + + **Solutions:** + + a. **Update conda** (Recommended): If you have administrative access or can install conda locally, we strongly recommend updating to the latest conda version (2025 or later), which includes the fast libmamba solver by default: + + .. code-block:: bash + + # Update conda in your base environment + conda update -n base conda + + # Or install a fresh conda distribution from https://www.anaconda.com/download + + b. **Install and configure the libmamba solver** (For existing conda installations): + + If you cannot update conda but have version 4.12 or later, you can install and configure the libmamba solver: + + .. code-block:: bash + + # Install the libmamba solver + conda install -n base conda-libmamba-solver + + # Set libmamba as the default solver + conda config --set solver libmamba + + # Verify the configuration + conda config --show solver + + c. **Use mamba** (Alternative): Another option is to use the `mamba` package manager, which is a drop-in replacement for `conda` but is much faster (`click here for more details `_). However, this approach has not been fully vetted with POSYDON. + + .. note:: + If you're on an HPC cluster with an old system-wide conda installation (e.g., conda 2021.11), you may need to install a recent conda version locally in your home directory rather than using the system version. + + `conda` can also be slow and sometimes gets stuck on "Verifying transaction" or "Executing transaction", especially when installing packages on a cluster, as it creates many small files which can be difficult for HPC clusters to handle. The libmamba solver helps with this issue as well. 2. **Failed Dependencies**: - **Description**: Sometimes, certain dependencies might fail to install or conflict with pre-existing ones. From aa3ca4ef3e0e89d5732b62297437f45bd5427413 Mon Sep 17 00:00:00 2001 From: Max <14039563+maxbriel@users.noreply.github.com> Date: Thu, 12 Feb 2026 11:01:59 +0100 Subject: [PATCH 050/389] [fix] allow for HR diagram of binary states to be loaded (#799) * [fix] allow for HR diagram of binary states to be loaded * add single star scenario test * commit changes * change mock --- posydon/grids/psygrid.py | 28 ++++- posydon/unit_tests/grids/test_psygrid.py | 129 +++++++++++++++++++++++ 2 files changed, 152 insertions(+), 5 deletions(-) diff --git a/posydon/grids/psygrid.py b/posydon/grids/psygrid.py index 8e57a26d1a..99b5c5dff8 100644 --- a/posydon/grids/psygrid.py +++ b/posydon/grids/psygrid.py @@ -2006,12 +2006,30 @@ def HR(self, idx, history='history1', states=False, verbose=False, raise TypeError('Invalid idx = {}!'.format(idx)) if states: - from posydon.binary_evol.singlestar import SingleStar star_states = [] - for run in runs: - star = SingleStar.from_run(run, history=True, profile=False) - star_states.append(check_state_of_star_history_array( - star, N=len(star.mass_history))) + # Check if this is a binary grid + if self.config["binary"]: + from posydon.binary_evol.binarystar import BinaryStar + for run in runs: + binary = BinaryStar.from_run(run, history=True, profiles=False) + # Extract the appropriate star based on history parameter + if history == 'history1': + star = binary.star_1 + elif history == 'history2': + star = binary.star_2 + else: + raise ValueError( + f"For binary grids with states=True, history must be " + f"'history1' or 'history2', not '{history}'" + ) + star_states.append(check_state_of_star_history_array( + star, N=len(star.mass_history))) + else: + from posydon.binary_evol.singlestar import SingleStar + for run in runs: + star = SingleStar.from_run(run, history=True, profile=False) + star_states.append(check_state_of_star_history_array( + star, N=len(star.mass_history))) else: star_states = None diff --git a/posydon/unit_tests/grids/test_psygrid.py b/posydon/unit_tests/grids/test_psygrid.py index 9d67a387f4..d2136c1ba9 100644 --- a/posydon/unit_tests/grids/test_psygrid.py +++ b/posydon/unit_tests/grids/test_psygrid.py @@ -969,6 +969,29 @@ def grid_path(self, tmp_path, binary_history, star_history, profile): return get_simple_PSyGrid(tmp_path, 1, binary_history, star_history,\ profile) + @fixture + def grid_path_single(self, tmp_path, star_history, profile): + # a path to a single-star psygrid file for testing + # Create a minimal binary_history for grid creation, then modify + minimal_binary_history = np.array([(1.0, 1.0), (1.1, 1.0e+2)], + dtype=[('period_days', ' Date: Tue, 17 Feb 2026 09:23:22 +0100 Subject: [PATCH 051/389] add integration binaries to the test suite --- dev-tools/script_data/1Zsun_binaries_suite.py | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/dev-tools/script_data/1Zsun_binaries_suite.py b/dev-tools/script_data/1Zsun_binaries_suite.py index 5b2c416c3c..7fa4535f5d 100644 --- a/dev-tools/script_data/1Zsun_binaries_suite.py +++ b/dev-tools/script_data/1Zsun_binaries_suite.py @@ -759,6 +759,62 @@ def evolve_binaries(verbose): properties = sim_prop) evolve_binary(binary) + ######################################## + # double CO step + ######################################## + # NS + WD example + star1 = SingleStar(**{'mass': 7.939736047577677, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + star1 = SingleStar(**{'mass': 6.661421823348241, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 28.576933942881404, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary) + # BH + NS example + star1 = SingleStar(**{'mass': 22.69609546427504, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 2.051704135150374, 1.73468853754093, 3.299716078528058]}) + star2 = SingleStar(**{'mass': 16.39690317352072, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 5.934599002039066, 2.4331072903106974, 1.9933166215820504]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 70.37960820393167, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary) + # WD + WD example + star1 = SingleStar(**{'mass': 6.661421823348241, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 6.661421823348241, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 28.576933942881404, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary) + # NS + NS example + star1 = SingleStar(**{'mass': 16.458995075687447, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 3.661376360771944, 0.7219969332243381, 4.919284439555057]}) + star2 = SingleStar(**{'mass': 12.580980419413521, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 4.944467687452352, 1.2845384190953326, 1.6806849171480245]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 247.4244399689946, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary) + if __name__ == "__main__": parser = argparse.ArgumentParser(description='Evolve binaries for validation.') parser.add_argument('--verbose', '-v', action='store_true', default=False, From 83e4872bb2d73b497c56a65e57285e51f5fab270 Mon Sep 17 00:00:00 2001 From: Max Briel Date: Tue, 17 Feb 2026 09:26:16 +0100 Subject: [PATCH 052/389] add BH+BH test --- dev-tools/script_data/1Zsun_binaries_suite.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dev-tools/script_data/1Zsun_binaries_suite.py b/dev-tools/script_data/1Zsun_binaries_suite.py index 7fa4535f5d..3ebda0a2af 100644 --- a/dev-tools/script_data/1Zsun_binaries_suite.py +++ b/dev-tools/script_data/1Zsun_binaries_suite.py @@ -815,6 +815,20 @@ def evolve_binaries(verbose): properties = sim_prop) evolve_binary(binary) + # BH + BH + star1 = SingleStar(**{'mass': 31.077951593283725, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 1.9047595342945016, 0.7097181927314352, 2.892753852818733]}) + star2 = SingleStar(**{'mass': 27.8239810278115, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 4.004970175991886, 2.2544428565691472, 3.420828590003044]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 27.429155057946318, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary) + if __name__ == "__main__": parser = argparse.ArgumentParser(description='Evolve binaries for validation.') parser.add_argument('--verbose', '-v', action='store_true', default=False, From 2f8e915a4b9aa3d8eb8e0309ddcaa7402626d63b Mon Sep 17 00:00:00 2001 From: Max Briel Date: Tue, 17 Feb 2026 13:34:43 +0100 Subject: [PATCH 053/389] add time as output parameter --- dev-tools/script_data/1Zsun_binaries_suite.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/script_data/1Zsun_binaries_suite.py b/dev-tools/script_data/1Zsun_binaries_suite.py index 3ebda0a2af..a896df8fe9 100644 --- a/dev-tools/script_data/1Zsun_binaries_suite.py +++ b/dev-tools/script_data/1Zsun_binaries_suite.py @@ -19,7 +19,7 @@ target_rows = 12 line_length = 140 -columns_to_show = ['step_names', 'state', 'event', 'S1_state', 'S1_mass', 'S2_state', 'S2_mass', 'orbital_period'] +columns_to_show = ['step_names', 'state', 'event', 'S1_state', 'S1_mass', 'S2_state', 'S2_mass', 'orbital_period', 'time'] def load_inlist(verbose): From cd19659788c85134d6751797b91fab69b4270276 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Thu, 26 Feb 2026 04:09:34 -0600 Subject: [PATCH 054/389] refactor binary validation suite: multi metallicity support, bug fixes, generate baseline, add more specificity to compare_runs --- dev-tools/.gitignore | 14 + dev-tools/check_outputs.ipynb | 512 +++++++++++ dev-tools/compare_runs.py | 429 ++++++++- dev-tools/evolve_binaries.sh | 185 ++-- dev-tools/generate_baseline.sh | 96 +++ dev-tools/script_data/1Zsun_binaries_suite.py | 815 ------------------ ...inaries_params.ini => binaries_params.ini} | 2 + dev-tools/script_data/binaries_suite.py | 694 +++++++++++++++ dev-tools/validate_binaries.sh | 170 +++- 9 files changed, 1961 insertions(+), 956 deletions(-) create mode 100644 dev-tools/.gitignore create mode 100644 dev-tools/check_outputs.ipynb create mode 100644 dev-tools/generate_baseline.sh delete mode 100644 dev-tools/script_data/1Zsun_binaries_suite.py rename dev-tools/script_data/{1Zsun_binaries_params.ini => binaries_params.ini} (99%) create mode 100644 dev-tools/script_data/binaries_suite.py diff --git a/dev-tools/.gitignore b/dev-tools/.gitignore new file mode 100644 index 0000000000..1cea72efc6 --- /dev/null +++ b/dev-tools/.gitignore @@ -0,0 +1,14 @@ +# Remove the accidentally staged clone +git rm --cached -r workdirs/ + +# Create .gitignore +cat > .gitignore << 'EOF' +workdirs/ +outputs/ +logs/ +baselines/ +test_*.h5 +EOF + +git add .gitignore + diff --git a/dev-tools/check_outputs.ipynb b/dev-tools/check_outputs.ipynb new file mode 100644 index 0000000000..c0073df835 --- /dev/null +++ b/dev-tools/check_outputs.ipynb @@ -0,0 +1,512 @@ +{ + "cells": [ + { + "cell_type": "code", + "execution_count": 1, + "id": "7e9791d3", + "metadata": {}, + "outputs": [], + "source": [ + "import argparse\n", + "import os\n", + "import signal\n", + "import sys\n", + "import warnings\n", + "import h5py\n", + "import pandas as pd\n", + "\n", + "from posydon.binary_evol.binarystar import BinaryStar, SingleStar\n", + "from posydon.binary_evol.simulationproperties import SimulationProperties\n", + "from posydon.popsyn.io import simprop_kwargs_from_ini\n", + "from posydon.utils.common_functions import orbital_separation_from_period" + ] + }, + { + "cell_type": "code", + "execution_count": 2, + "id": "327be9fe", + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "env: PATH_TO_POSYDON=/projects/b1119/eteng/software/valid/POSYDON/\n", + "env: PATH_TO_POSYDON_DATA=/projects/b1119/POSYDON_popsynth_data/v2/250520_newSNe/\n" + ] + } + ], + "source": [ + "%env PATH_TO_POSYDON=/projects/b1119/eteng/software/valid/POSYDON/\n", + "%env PATH_TO_POSYDON_DATA=/projects/b1119/POSYDON_popsynth_data/v2/250520_newSNe/" + ] + }, + { + "cell_type": "code", + "execution_count": 4, + "id": "994f6ebf", + "metadata": {}, + "outputs": [ + { + "ename": "HDF5ExtError", + "evalue": "HDF5 error back trace\n\n File \"H5F.c\", line 836, in H5Fopen\n unable to synchronously open file\n File \"H5F.c\", line 796, in H5F__open_api_common\n unable to open file\n File \"H5VLcallback.c\", line 3863, in H5VL_file_open\n open failed\n File \"H5VLcallback.c\", line 3675, in H5VL__file_open\n open failed\n File \"H5VLnative_file.c\", line 128, in H5VL__native_file_open\n unable to open file\n File \"H5Fint.c\", line 2018, in H5F_open\n unable to read superblock\n File \"H5Fsuper.c\", line 600, in H5F__super_read\n truncated file: eof = 96, sblock->base_addr = 0, stored_eof = 2048\n\nEnd of HDF5 error back trace\n\nUnable to open/create file './POSYDON_main/outputs/candidate_main.h5'", + "output_type": "error", + "traceback": [ + "\u001b[31m---------------------------------------------------------------------------\u001b[39m", + "\u001b[31mHDF5ExtError\u001b[39m Traceback (most recent call last)", + "\u001b[36mCell\u001b[39m\u001b[36m \u001b[39m\u001b[32mIn[4]\u001b[39m\u001b[32m, line 1\u001b[39m\n\u001b[32m----> \u001b[39m\u001b[32m1\u001b[39m df = \u001b[43mpd\u001b[49m\u001b[43m.\u001b[49m\u001b[43mread_hdf\u001b[49m\u001b[43m(\u001b[49m\u001b[33;43m'\u001b[39;49m\u001b[33;43m./POSYDON_main/outputs/candidate_main.h5\u001b[39;49m\u001b[33;43m'\u001b[39;49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[33;43m\"\u001b[39;49m\u001b[33;43mevolution\u001b[39;49m\u001b[33;43m\"\u001b[39;49m\u001b[43m)\u001b[49m\n\u001b[32m 2\u001b[39m warnings = pd.read_hdf(\u001b[33m'\u001b[39m\u001b[33m./POSYDON_main/outputs/candidate_main.h5\u001b[39m\u001b[33m'\u001b[39m, \u001b[33m\"\u001b[39m\u001b[33mwarnings\u001b[39m\u001b[33m\"\u001b[39m)\n", + "\u001b[36mFile \u001b[39m\u001b[32m~/.conda/envs/valid/lib/python3.11/site-packages/pandas/io/pytables.py:426\u001b[39m, in \u001b[36mread_hdf\u001b[39m\u001b[34m(path_or_buf, key, mode, errors, where, start, stop, columns, iterator, chunksize, **kwargs)\u001b[39m\n\u001b[32m 423\u001b[39m \u001b[38;5;28;01mif\u001b[39;00m \u001b[38;5;129;01mnot\u001b[39;00m exists:\n\u001b[32m 424\u001b[39m \u001b[38;5;28;01mraise\u001b[39;00m \u001b[38;5;167;01mFileNotFoundError\u001b[39;00m(\u001b[33mf\u001b[39m\u001b[33m\"\u001b[39m\u001b[33mFile \u001b[39m\u001b[38;5;132;01m{\u001b[39;00mpath_or_buf\u001b[38;5;132;01m}\u001b[39;00m\u001b[33m does not exist\u001b[39m\u001b[33m\"\u001b[39m)\n\u001b[32m--> \u001b[39m\u001b[32m426\u001b[39m store = \u001b[43mHDFStore\u001b[49m\u001b[43m(\u001b[49m\u001b[43mpath_or_buf\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mmode\u001b[49m\u001b[43m=\u001b[49m\u001b[43mmode\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43merrors\u001b[49m\u001b[43m=\u001b[49m\u001b[43merrors\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43m*\u001b[49m\u001b[43m*\u001b[49m\u001b[43mkwargs\u001b[49m\u001b[43m)\u001b[49m\n\u001b[32m 427\u001b[39m \u001b[38;5;66;03m# can't auto open/close if we are using an iterator\u001b[39;00m\n\u001b[32m 428\u001b[39m \u001b[38;5;66;03m# so delegate to the iterator\u001b[39;00m\n\u001b[32m 429\u001b[39m auto_close = \u001b[38;5;28;01mTrue\u001b[39;00m\n", + "\u001b[36mFile \u001b[39m\u001b[32m~/.conda/envs/valid/lib/python3.11/site-packages/pandas/io/pytables.py:585\u001b[39m, in \u001b[36mHDFStore.__init__\u001b[39m\u001b[34m(self, path, mode, complevel, complib, fletcher32, **kwargs)\u001b[39m\n\u001b[32m 583\u001b[39m \u001b[38;5;28mself\u001b[39m._fletcher32 = fletcher32\n\u001b[32m 584\u001b[39m \u001b[38;5;28mself\u001b[39m._filters = \u001b[38;5;28;01mNone\u001b[39;00m\n\u001b[32m--> \u001b[39m\u001b[32m585\u001b[39m \u001b[38;5;28;43mself\u001b[39;49m\u001b[43m.\u001b[49m\u001b[43mopen\u001b[49m\u001b[43m(\u001b[49m\u001b[43mmode\u001b[49m\u001b[43m=\u001b[49m\u001b[43mmode\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43m*\u001b[49m\u001b[43m*\u001b[49m\u001b[43mkwargs\u001b[49m\u001b[43m)\u001b[49m\n", + "\u001b[36mFile \u001b[39m\u001b[32m~/.conda/envs/valid/lib/python3.11/site-packages/pandas/io/pytables.py:745\u001b[39m, in \u001b[36mHDFStore.open\u001b[39m\u001b[34m(self, mode, **kwargs)\u001b[39m\n\u001b[32m 739\u001b[39m msg = (\n\u001b[32m 740\u001b[39m \u001b[33m\"\u001b[39m\u001b[33mCannot open HDF5 file, which is already opened, \u001b[39m\u001b[33m\"\u001b[39m\n\u001b[32m 741\u001b[39m \u001b[33m\"\u001b[39m\u001b[33meven in read-only mode.\u001b[39m\u001b[33m\"\u001b[39m\n\u001b[32m 742\u001b[39m )\n\u001b[32m 743\u001b[39m \u001b[38;5;28;01mraise\u001b[39;00m \u001b[38;5;167;01mValueError\u001b[39;00m(msg)\n\u001b[32m--> \u001b[39m\u001b[32m745\u001b[39m \u001b[38;5;28mself\u001b[39m._handle = \u001b[43mtables\u001b[49m\u001b[43m.\u001b[49m\u001b[43mopen_file\u001b[49m\u001b[43m(\u001b[49m\u001b[38;5;28;43mself\u001b[39;49m\u001b[43m.\u001b[49m\u001b[43m_path\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[38;5;28;43mself\u001b[39;49m\u001b[43m.\u001b[49m\u001b[43m_mode\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43m*\u001b[49m\u001b[43m*\u001b[49m\u001b[43mkwargs\u001b[49m\u001b[43m)\u001b[49m\n", + "\u001b[36mFile \u001b[39m\u001b[32m~/.conda/envs/valid/lib/python3.11/site-packages/tables/file.py:296\u001b[39m, in \u001b[36mopen_file\u001b[39m\u001b[34m(filename, mode, title, root_uep, filters, **kwargs)\u001b[39m\n\u001b[32m 291\u001b[39m \u001b[38;5;28;01mraise\u001b[39;00m \u001b[38;5;167;01mValueError\u001b[39;00m(\n\u001b[32m 292\u001b[39m \u001b[33m\"\u001b[39m\u001b[33mThe file \u001b[39m\u001b[33m'\u001b[39m\u001b[38;5;132;01m%s\u001b[39;00m\u001b[33m'\u001b[39m\u001b[33m is already opened. Please \u001b[39m\u001b[33m\"\u001b[39m\n\u001b[32m 293\u001b[39m \u001b[33m\"\u001b[39m\u001b[33mclose it before reopening in write mode.\u001b[39m\u001b[33m\"\u001b[39m % filename)\n\u001b[32m 295\u001b[39m \u001b[38;5;66;03m# Finally, create the File instance, and return it\u001b[39;00m\n\u001b[32m--> \u001b[39m\u001b[32m296\u001b[39m \u001b[38;5;28;01mreturn\u001b[39;00m \u001b[43mFile\u001b[49m\u001b[43m(\u001b[49m\u001b[43mfilename\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mmode\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mtitle\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mroot_uep\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mfilters\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43m*\u001b[49m\u001b[43m*\u001b[49m\u001b[43mkwargs\u001b[49m\u001b[43m)\u001b[49m\n", + "\u001b[36mFile \u001b[39m\u001b[32m~/.conda/envs/valid/lib/python3.11/site-packages/tables/file.py:746\u001b[39m, in \u001b[36mFile.__init__\u001b[39m\u001b[34m(self, filename, mode, title, root_uep, filters, **kwargs)\u001b[39m\n\u001b[32m 743\u001b[39m \u001b[38;5;28mself\u001b[39m.params = params\n\u001b[32m 745\u001b[39m \u001b[38;5;66;03m# Now, it is time to initialize the File extension\u001b[39;00m\n\u001b[32m--> \u001b[39m\u001b[32m746\u001b[39m \u001b[38;5;28;43mself\u001b[39;49m\u001b[43m.\u001b[49m\u001b[43m_g_new\u001b[49m\u001b[43m(\u001b[49m\u001b[43mfilename\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mmode\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43m*\u001b[49m\u001b[43m*\u001b[49m\u001b[43mparams\u001b[49m\u001b[43m)\u001b[49m\n\u001b[32m 748\u001b[39m \u001b[38;5;66;03m# Check filters and set PyTables format version for new files.\u001b[39;00m\n\u001b[32m 749\u001b[39m new = \u001b[38;5;28mself\u001b[39m._v_new\n", + "\u001b[36mFile \u001b[39m\u001b[32m~/.conda/envs/valid/lib/python3.11/site-packages/tables/hdf5extension.pyx:514\u001b[39m, in \u001b[36mtables.hdf5extension.File._g_new\u001b[39m\u001b[34m()\u001b[39m\n", + "\u001b[31mHDF5ExtError\u001b[39m: HDF5 error back trace\n\n File \"H5F.c\", line 836, in H5Fopen\n unable to synchronously open file\n File \"H5F.c\", line 796, in H5F__open_api_common\n unable to open file\n File \"H5VLcallback.c\", line 3863, in H5VL_file_open\n open failed\n File \"H5VLcallback.c\", line 3675, in H5VL__file_open\n open failed\n File \"H5VLnative_file.c\", line 128, in H5VL__native_file_open\n unable to open file\n File \"H5Fint.c\", line 2018, in H5F_open\n unable to read superblock\n File \"H5Fsuper.c\", line 600, in H5F__super_read\n truncated file: eof = 96, sblock->base_addr = 0, stored_eof = 2048\n\nEnd of HDF5 error back trace\n\nUnable to open/create file './POSYDON_main/outputs/candidate_main.h5'" + ] + } + ], + "source": [ + "df = pd.read_hdf('./POSYDON_main/outputs/candidate_main.h5', \"evolution\")\n", + "warnings = pd.read_hdf('./POSYDON_main/outputs/candidate_main.h5', \"warnings\")" + ] + }, + { + "cell_type": "code", + "execution_count": 56, + "id": "7028a060", + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Index(['state', 'event', 'time', 'separation', 'orbital_period',\n", + " 'eccentricity', 'rl_relative_overflow_1', 'rl_relative_overflow_2',\n", + " 'lg_mtransfer_rate', 'mass_transfer_case',\n", + " ...\n", + " 'S2_mass_conv_reg_fortides', 'S2_thickness_conv_reg_fortides',\n", + " 'S2_radius_conv_reg_fortides', 'S2_lambda_CE_1cent',\n", + " 'S2_lambda_CE_10cent', 'S2_lambda_CE_30cent',\n", + " 'S2_lambda_CE_pure_He_star_10cent', 'S2_total_mass_h1',\n", + " 'S2_total_mass_he4', 'binary_id'],\n", + " dtype='object', length=134)\n" + ] + } + ], + "source": [ + "print(df.keys())" + ] + }, + { + "cell_type": "code", + "execution_count": 20, + "id": "76233b25", + "metadata": { + "collapsed": true + }, + "outputs": [ + { + "data": { + "text/html": [ + "
\n", + "\n", + "\n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + "
binary_idexception_typeexception_message
01ValueErrorTrying to store a string with len [27] in [S1_...
02ValueErrorTrying to store a string with len [12] in [sta...
03ValueErrorTrying to store a string with len [9] in [even...
04ValueErrorTrying to store a string with len [9] in [even...
05ValueErrorTrying to store a string with len [9] in [even...
07ValueErrorTrying to store a string with len [27] in [S1_...
08ValueErrorTrying to store a string with len [10] in [eve...
09ValueErrorTrying to store a string with len [7] in [even...
010ValueErrorTrying to store a string with len [27] in [S1_...
011ValueErrorTrying to store a string with len [7] in [even...
012ValueErrorTrying to store a string with len [7] in [even...
013ValueErrorTrying to store a string with len [7] in [even...
014ValueErrorTrying to store a string with len [23] in [S1_...
015ValueErrorTrying to store a string with len [9] in [even...
016ValueErrorTrying to store a string with len [9] in [even...
018ValueErrorTrying to store a string with len [7] in [even...
019ValueErrorTrying to store a string with len [7] in [even...
020ValueErrorTrying to store a string with len [7] in [even...
021ValueErrorTrying to store a string with len [7] in [even...
022ValueErrorTrying to store a string with len [9] in [even...
023ValueErrorTrying to store a string with len [9] in [even...
024ValueErrorTrying to store a string with len [9] in [even...
025ValueErrorTrying to store a string with len [7] in [even...
026ValueErrorTrying to store a string with len [9] in [even...
027ValueErrorTrying to store a string with len [7] in [even...
028ValueErrorTrying to store a string with len [7] in [even...
029ValueErrorTrying to store a string with len [7] in [even...
030ValueErrorTrying to store a string with len [7] in [even...
031ValueErrorTrying to store a string with len [7] in [even...
032ValueErrorTrying to store a string with len [7] in [even...
033ValueErrorTrying to store a string with len [7] in [even...
034ValueErrorTrying to store a string with len [7] in [even...
035ValueErrorTrying to store a string with len [9] in [even...
036ValueErrorTrying to store a string with len [7] in [even...
037ValueErrorTrying to store a string with len [10] in [eve...
038ValueErrorTrying to store a string with len [9] in [even...
039MatchingErrorGrid matching failed for merged binary. \\nseco...
040ClassificationErrorBinary is in the detached step but has stable ...
041ValueErrorTrying to store a string with len [7] in [even...
042FlowErrorEvolution of H-rich/He-rich stars in RLO onto ...
043ValueErrorTrying to store a string with len [7] in [even...
\n", + "
" + ], + "text/plain": [ + " binary_id exception_type \\\n", + "0 1 ValueError \n", + "0 2 ValueError \n", + "0 3 ValueError \n", + "0 4 ValueError \n", + "0 5 ValueError \n", + "0 7 ValueError \n", + "0 8 ValueError \n", + "0 9 ValueError \n", + "0 10 ValueError \n", + "0 11 ValueError \n", + "0 12 ValueError \n", + "0 13 ValueError \n", + "0 14 ValueError \n", + "0 15 ValueError \n", + "0 16 ValueError \n", + "0 18 ValueError \n", + "0 19 ValueError \n", + "0 20 ValueError \n", + "0 21 ValueError \n", + "0 22 ValueError \n", + "0 23 ValueError \n", + "0 24 ValueError \n", + "0 25 ValueError \n", + "0 26 ValueError \n", + "0 27 ValueError \n", + "0 28 ValueError \n", + "0 29 ValueError \n", + "0 30 ValueError \n", + "0 31 ValueError \n", + "0 32 ValueError \n", + "0 33 ValueError \n", + "0 34 ValueError \n", + "0 35 ValueError \n", + "0 36 ValueError \n", + "0 37 ValueError \n", + "0 38 ValueError \n", + "0 39 MatchingError \n", + "0 40 ClassificationError \n", + "0 41 ValueError \n", + "0 42 FlowError \n", + "0 43 ValueError \n", + "\n", + " exception_message \n", + "0 Trying to store a string with len [27] in [S1_... \n", + "0 Trying to store a string with len [12] in [sta... \n", + "0 Trying to store a string with len [9] in [even... \n", + "0 Trying to store a string with len [9] in [even... \n", + "0 Trying to store a string with len [9] in [even... \n", + "0 Trying to store a string with len [27] in [S1_... \n", + "0 Trying to store a string with len [10] in [eve... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [27] in [S1_... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [23] in [S1_... \n", + "0 Trying to store a string with len [9] in [even... \n", + "0 Trying to store a string with len [9] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [9] in [even... \n", + "0 Trying to store a string with len [9] in [even... \n", + "0 Trying to store a string with len [9] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [9] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [9] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [10] in [eve... \n", + "0 Trying to store a string with len [9] in [even... \n", + "0 Grid matching failed for merged binary. \\nseco... \n", + "0 Binary is in the detached step but has stable ... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Evolution of H-rich/He-rich stars in RLO onto ... \n", + "0 Trying to store a string with len [7] in [even... " + ] + }, + "execution_count": 20, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "errors" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "68d4d8a8", + "metadata": {}, + "outputs": [], + "source": [] + } + ], + "metadata": { + "kernelspec": { + "display_name": "valid", + "language": "python", + "name": "valid" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.11.14" + } + }, + "nbformat": 4, + "nbformat_minor": 5 +} diff --git a/dev-tools/compare_runs.py b/dev-tools/compare_runs.py index 6ff28d81e2..0d2fe2df7e 100644 --- a/dev-tools/compare_runs.py +++ b/dev-tools/compare_runs.py @@ -1,75 +1,412 @@ #!/usr/bin/env python3 - """ -Compare evolution outcomes of set of binaries saved to file with script_data/1Zsun_binaries_suite.py -Used for validation of the branch. +Compare evolution outcomes of test binaries saved by binaries_suite.py. -Author: Elizabeth Teng -""" +Reports three categories of differences: + 1. QUANTITATIVE: any numeric difference beyond floating-point representation + 2. QUALITATIVE: changes to categorical/string columns (states, events, step names, SN types, etc.) + 3. WARNINGS & ERRORS: changes to warnings raised or binaries that error out +By default, uses exact comparison (atol=0, rtol=0). The --loose flag enables +a small tolerance for cases where minor floating-point differences are expected. -import sys +Usage: + python compare_runs.py baseline.h5 candidate.h5 + python compare_runs.py baseline.h5 candidate.h5 --verbose + python compare_runs.py baseline.h5 candidate.h5 --loose + +Authors: Elizabeth Teng +""" -import h5py +import argparse +import sys +import os import numpy as np +import pandas as pd -def compare_datasets(base, cand, path="/"): - """ - Recursively compare HDF5 datasets. - Returns a list of strings with differences. +# Columns that represent qualitative (categorical) evolution properties. +# Any column matching these names will be compared as exact string matches +# and reported under "QUALITATIVE" differences. +QUALITATIVE_COLUMNS = { + 'state', 'event', 'step_names', 'S1_state', 'S2_state', + 'SN_type', 'S1_SN_type', 'S2_SN_type', + 'interp_class_HMS_HMS', 'interp_class_CO_HMS_RLO', + 'interp_class_CO_HeMS', 'interp_class_CO_HeMS_RLO', + 'mt_history_HMS_HMS', 'mt_history_CO_HMS_RLO', + 'mt_history_CO_HeMS', 'mt_history_CO_HeMS_RLO', + 'mass_transfer_case', +} + + +def classify_column(col, dtype): + """Classify a column as 'qualitative' or 'quantitative'.""" + if col in QUALITATIVE_COLUMNS: + return 'qualitative' + if pd.api.types.is_numeric_dtype(dtype): + return 'quantitative' + # Catch-all: treat remaining object/string columns as qualitative + return 'qualitative' + + +def compare_evolution_tables(base_df, cand_df, rtol, atol): + """Compare two evolution DataFrames, reporting per-binary diffs. + + Returns: + dict with keys 'quantitative', 'qualitative', 'structural' + each mapping to a list of diff strings. """ - differences = [] + quant_diffs = [] + qual_diffs = [] + struct_diffs = [] + + # Check that binary_id columns exist + if 'binary_id' not in base_df.columns or 'binary_id' not in cand_df.columns: + struct_diffs.append("'binary_id' column missing; cannot do per-binary comparison") + return {'quantitative': quant_diffs, 'qualitative': qual_diffs, 'structural': struct_diffs} + + base_ids = set(base_df['binary_id'].unique()) + cand_ids = set(cand_df['binary_id'].unique()) + + # Missing/extra binaries + for bid in sorted(base_ids - cand_ids): + struct_diffs.append(f"Binary {bid}: MISSING in candidate") + for bid in sorted(cand_ids - base_ids): + struct_diffs.append(f"Binary {bid}: EXTRA in candidate") + + common_ids = sorted(base_ids & cand_ids) - for key in base.keys(): - base_item = base[key] - if key not in cand: - differences.append(f"{path}{key} missing in candidate") + for bid in common_ids: + b = base_df[base_df['binary_id'] == bid].reset_index(drop=True) + c = cand_df[cand_df['binary_id'] == bid].reset_index(drop=True) + + # ā”€ā”€ Error status changes ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ + base_failed = 'exception_type' in b.columns and b['exception_type'].notna().any() + cand_failed = 'exception_type' in c.columns and c['exception_type'].notna().any() + + if base_failed != cand_failed: + if cand_failed: + exc = c['exception_type'].dropna().iloc[0] if 'exception_type' in c.columns else "unknown" + msg = c['exception_message'].dropna().iloc[0] if 'exception_message' in c.columns else "" + struct_diffs.append(f"Binary {bid}: NEWLY FAILING ({exc}: {msg})") + else: + struct_diffs.append(f"Binary {bid}: NEWLY PASSING (was failing in baseline)") + continue + + if base_failed and cand_failed: + b_exc = str(b['exception_type'].dropna().iloc[0]) if 'exception_type' in b.columns else "" + c_exc = str(c['exception_type'].dropna().iloc[0]) if 'exception_type' in c.columns else "" + b_msg = str(b['exception_message'].dropna().iloc[0]) if 'exception_message' in b.columns else "" + c_msg = str(c['exception_message'].dropna().iloc[0]) if 'exception_message' in c.columns else "" + if b_exc != c_exc: + struct_diffs.append(f"Binary {bid}: error type changed ('{b_exc}' -> '{c_exc}')") + if b_msg != c_msg: + struct_diffs.append(f"Binary {bid}: error message changed ('{b_msg}' -> '{c_msg}')") continue - cand_item = cand[key] + # ā”€ā”€ Step count ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ + if len(b) != len(c): + struct_diffs.append( + f"Binary {bid}: evolution step count differs " + f"(baseline={len(b)}, candidate={len(c)})" + ) + + # ā”€ā”€ Column presence ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ + base_only_cols = set(b.columns) - set(c.columns) - {'binary_id'} + cand_only_cols = set(c.columns) - set(b.columns) - {'binary_id'} + if base_only_cols: + struct_diffs.append(f"Binary {bid}: columns only in baseline: {sorted(base_only_cols)}") + if cand_only_cols: + struct_diffs.append(f"Binary {bid}: columns only in candidate: {sorted(cand_only_cols)}") + + # ā”€ā”€ Per-column comparison ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ + common_cols = sorted(set(b.columns) & set(c.columns) - {'binary_id'}) + min_rows = min(len(b), len(c)) + + for col in common_cols: + b_col = b[col].iloc[:min_rows] + c_col = c[col].iloc[:min_rows] + col_type = classify_column(col, b_col.dtype) - if isinstance(base_item, h5py.Dataset): - base_data = base_item[()] - cand_data = cand_item[()] + if col_type == 'quantitative': + b_arr = b_col.to_numpy(dtype=float) + c_arr = c_col.to_numpy(dtype=float) + + # NaN handling: both NaN = match, one NaN = mismatch + both_nan = np.isnan(b_arr) & np.isnan(c_arr) + one_nan = np.isnan(b_arr) ^ np.isnan(c_arr) + + if one_nan.any(): + nan_steps = np.where(one_nan)[0].tolist() + direction = [] + for s in nan_steps[:5]: + bv = "NaN" if np.isnan(b_arr[s]) else f"{b_arr[s]:.6g}" + cv = "NaN" if np.isnan(c_arr[s]) else f"{c_arr[s]:.6g}" + direction.append(f"step {s}: {bv} -> {cv}") + quant_diffs.append( + f"Binary {bid}, '{col}': NaN mismatch at {len(nan_steps)} step(s): " + + "; ".join(direction) + ) + + # Compare non-NaN values + valid = ~(np.isnan(b_arr) | np.isnan(c_arr)) + if valid.any(): + b_valid = b_arr[valid] + c_valid = c_arr[valid] + not_equal = b_valid != c_valid + + if rtol == 0 and atol == 0: + # Exact comparison + if not_equal.any(): + diff_indices = np.where(valid)[0][not_equal] + abs_diff = np.abs(b_valid[not_equal] - c_valid[not_equal]) + worst = np.argmax(abs_diff) + worst_step = diff_indices[worst] + quant_diffs.append( + f"Binary {bid}, '{col}': {not_equal.sum()} value(s) differ. " + f"Largest abs diff = {abs_diff[worst]:.6e} " + f"at step {worst_step} " + f"(baseline={b_valid[not_equal][worst]:.15g}, " + f"candidate={c_valid[not_equal][worst]:.15g})" + ) + else: + # Tolerance-based comparison + if not np.allclose(b_valid, c_valid, rtol=rtol, atol=atol): + abs_diff = np.abs(b_valid - c_valid) + with np.errstate(divide='ignore', invalid='ignore'): + denom = np.maximum(np.abs(b_valid), atol) + rel_diff = abs_diff / denom + worst = np.argmax(abs_diff) + worst_step = np.where(valid)[0][worst] + quant_diffs.append( + f"Binary {bid}, '{col}': numeric mismatch " + f"(max abs diff = {abs_diff[worst]:.6e}, " + f"max rel diff = {rel_diff[worst]:.6e}, " + f"at step {worst_step}, " + f"baseline={b_valid[worst]:.15g}, " + f"candidate={c_valid[worst]:.15g})" + ) - if np.issubdtype(base_data.dtype, np.number): - if not np.allclose(base_data, cand_data, rtol=1e-5, atol=1e-8): - differences.append(f"{path}{key} numeric mismatch") else: - if not np.array_equal(base_data, cand_data): - differences.append(f"{path}{key} non-numeric mismatch") + # Qualitative comparison: exact string match + b_str = b_col.astype(str).values + c_str = c_col.astype(str).values + mismatches = np.where(b_str != c_str)[0] + if len(mismatches) > 0: + details = [] + for s in mismatches[:5]: + details.append(f"step {s}: '{b_str[s]}' -> '{c_str[s]}'") + qual_diffs.append( + f"Binary {bid}, '{col}': {len(mismatches)} step(s) differ: " + + "; ".join(details) + ) - elif isinstance(base_item, h5py.Group): - differences.extend(compare_datasets(base_item, cand_item, path=f"{path}{key}/")) + return {'quantitative': quant_diffs, 'qualitative': qual_diffs, 'structural': struct_diffs} - # Check for extra keys in candidate - for key in cand.keys(): - if key not in base: - differences.append(f"{path}{key} extra in candidate") - return differences +def compare_warnings_tables(base_df, cand_df): + """Compare warning tables between baseline and candidate. + + Returns list of diff strings. + """ + diffs = [] + + if base_df is None and cand_df is None: + return diffs + if base_df is None: + diffs.append(f"Candidate has {len(cand_df)} warning(s), baseline has none") + return diffs + if cand_df is None: + diffs.append(f"Baseline has {len(base_df)} warning(s), candidate has none") + return diffs + + if len(base_df) != len(cand_df): + diffs.append(f"Total warning count differs (baseline={len(base_df)}, candidate={len(cand_df)})") + + # Per-binary warning comparison + if 'binary_id' in base_df.columns and 'binary_id' in cand_df.columns: + base_grouped = base_df.groupby('binary_id') + cand_grouped = cand_df.groupby('binary_id') + all_ids = sorted(set(base_df['binary_id'].unique()) | set(cand_df['binary_id'].unique())) + + for bid in all_ids: + b_warnings = base_grouped.get_group(bid) if bid in base_grouped.groups else pd.DataFrame() + c_warnings = cand_grouped.get_group(bid) if bid in cand_grouped.groups else pd.DataFrame() + + b_count = len(b_warnings) + c_count = len(c_warnings) + + if b_count == 0 and c_count > 0: + cats = c_warnings['category'].unique().tolist() if 'category' in c_warnings.columns else ['unknown'] + diffs.append(f"Binary {bid}: {c_count} NEW warning(s) in candidate ({', '.join(str(c) for c in cats)})") + elif b_count > 0 and c_count == 0: + diffs.append(f"Binary {bid}: {b_count} warning(s) REMOVED in candidate") + elif b_count != c_count: + diffs.append(f"Binary {bid}: warning count changed ({b_count} -> {c_count})") + elif b_count > 0: + # Same count ā€” check if warning categories or messages changed + if 'category' in b_warnings.columns and 'category' in c_warnings.columns: + b_cats = sorted(b_warnings['category'].astype(str).tolist()) + c_cats = sorted(c_warnings['category'].astype(str).tolist()) + if b_cats != c_cats: + diffs.append(f"Binary {bid}: warning categories changed ({b_cats} -> {c_cats})") + + if 'message' in b_warnings.columns and 'message' in c_warnings.columns: + b_msgs = sorted(b_warnings['message'].astype(str).tolist()) + c_msgs = sorted(c_warnings['message'].astype(str).tolist()) + if b_msgs != c_msgs: + diffs.append(f"Binary {bid}: warning messages changed") + + return diffs + + +def read_table_safe(store, key): + """Read a table from HDFStore, returning None if it doesn't exist.""" + try: + if key in store: + return store[key] + except Exception: + pass + return None def main(): - if len(sys.argv) != 3: - print("Usage: compare_runs.py baseline.h5 candidate.h5") - sys.exit(1) + parser = argparse.ArgumentParser( + description="Compare baseline and candidate binary evolution HDF5 files.", + formatter_class=argparse.RawDescriptionHelpFormatter, + epilog=""" +By default, uses EXACT comparison (any numeric difference is reported). +Use --loose to allow small floating-point tolerances (rtol=1e-12, atol=1e-15). + """, + ) + parser.add_argument("baseline", help="Path to baseline HDF5 file") + parser.add_argument("candidate", help="Path to candidate HDF5 file") + parser.add_argument("--loose", action="store_true", + help="Allow small floating-point tolerance (rtol=1e-12, atol=1e-15)") + parser.add_argument("--rtol", type=float, default=None, + help="Override relative tolerance (default: 0, or 1e-12 with --loose)") + parser.add_argument("--atol", type=float, default=None, + help="Override absolute tolerance (default: 0, or 1e-15 with --loose)") + parser.add_argument("--verbose", "-v", action="store_true", + help="Print extra diagnostic info") + args = parser.parse_args() - baseline_file = sys.argv[1] - candidate_file = sys.argv[2] + # Set tolerances + if args.loose: + rtol = args.rtol if args.rtol is not None else 1e-12 + atol = args.atol if args.atol is not None else 1e-15 + else: + rtol = args.rtol if args.rtol is not None else 0.0 + atol = args.atol if args.atol is not None else 0.0 - with h5py.File(baseline_file, 'r') as base, h5py.File(candidate_file, 'r') as cand: - diffs = compare_datasets(base, cand) + for f in [args.baseline, args.candidate]: + if not os.path.exists(f): + print(f"ERROR: File not found: {f}", file=sys.stderr) + sys.exit(2) - if diffs: - print("Differences found:") - for diff in diffs: - print(" -", diff) - sys.exit(1) + quant_diffs = [] + qual_diffs = [] + struct_diffs = [] + warn_diffs = [] + + try: + with pd.HDFStore(args.baseline, mode='r') as base_store, \ + pd.HDFStore(args.candidate, mode='r') as cand_store: + + base_keys = set(base_store.keys()) + cand_keys = set(cand_store.keys()) + + if args.verbose: + print(f"Baseline keys: {sorted(base_keys)}") + print(f"Candidate keys: {sorted(cand_keys)}") + + # ā”€ā”€ Evolution table ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ + base_evol = read_table_safe(base_store, '/evolution') + cand_evol = read_table_safe(cand_store, '/evolution') + + if base_evol is None and cand_evol is None: + struct_diffs.append("Neither file contains an 'evolution' table") + elif base_evol is None: + struct_diffs.append("Baseline missing 'evolution' table") + elif cand_evol is None: + struct_diffs.append("Candidate missing 'evolution' table") + else: + if args.verbose: + n_base = base_evol['binary_id'].nunique() if 'binary_id' in base_evol.columns else '?' + n_cand = cand_evol['binary_id'].nunique() if 'binary_id' in cand_evol.columns else '?' + print(f"Baseline: {n_base} binaries, {len(base_evol)} total rows") + print(f"Candidate: {n_cand} binaries, {len(cand_evol)} total rows") + + evol_results = compare_evolution_tables(base_evol, cand_evol, rtol, atol) + quant_diffs.extend(evol_results['quantitative']) + qual_diffs.extend(evol_results['qualitative']) + struct_diffs.extend(evol_results['structural']) + + # ā”€ā”€ Warnings table ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ + base_warn = read_table_safe(base_store, '/warnings') + cand_warn = read_table_safe(cand_store, '/warnings') + warn_diffs.extend(compare_warnings_tables(base_warn, cand_warn)) + + # ā”€ā”€ Extra/missing top-level keys ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ + for k in sorted(base_keys - cand_keys): + if k not in ['/evolution', '/warnings', '/metadata']: + struct_diffs.append(f"Table '{k}' missing in candidate") + for k in sorted(cand_keys - base_keys): + if k not in ['/evolution', '/warnings', '/metadata']: + struct_diffs.append(f"Table '{k}' extra in candidate") + + except Exception as e: + print(f"ERROR reading HDF5 files: {e}", file=sys.stderr) + sys.exit(2) + + # ā”€ā”€ Report ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ + total_diffs = len(quant_diffs) + len(qual_diffs) + len(struct_diffs) + len(warn_diffs) + tol_label = f"rtol={rtol}, atol={atol}" if rtol > 0 or atol > 0 else "EXACT (rtol=0, atol=0)" + + print("=" * 70) + print("POSYDON Binary Validation ā€” Comparison Report") + print(f" Baseline: {args.baseline}") + print(f" Candidate: {args.candidate}") + print(f" Tolerances: {tol_label}") + print("=" * 70) + + if struct_diffs: + print(f"\n--- STRUCTURAL ({len(struct_diffs)}) ---") + print(" (missing/extra binaries, step count changes, newly failing/passing, errors)\n") + for d in struct_diffs: + print(f" - {d}") + + if qual_diffs: + print(f"\n--- QUALITATIVE ({len(qual_diffs)}) ---") + print(" (state, event, step name, SN type, interpolation class changes)\n") + for d in qual_diffs: + print(f" - {d}") + + if quant_diffs: + print(f"\n--- QUANTITATIVE ({len(quant_diffs)}) ---") + print(" (any numeric value change)\n") + for d in quant_diffs: + print(f" - {d}") + + if warn_diffs: + print(f"\n--- WARNINGS ({len(warn_diffs)}) ---") + print(" (new, removed, or changed warnings)\n") + for d in warn_diffs: + print(f" - {d}") + + print("\n" + "=" * 70) + if total_diffs == 0: + print("RESULT: IDENTICAL ā€” candidate matches baseline exactly.") + sys.exit(0) else: - print("No differences detected between baseline and candidate.") + print(f"RESULT: {total_diffs} DIFFERENCE(S) DETECTED") + print(f" Structural: {len(struct_diffs)}") + print(f" Qualitative: {len(qual_diffs)}") + print(f" Quantitative: {len(quant_diffs)}") + print(f" Warnings: {len(warn_diffs)}") + print("=" * 70) + sys.exit(1) if __name__ == "__main__": - main() + main() \ No newline at end of file diff --git a/dev-tools/evolve_binaries.sh b/dev-tools/evolve_binaries.sh index 2021995bff..8bfcceef2a 100755 --- a/dev-tools/evolve_binaries.sh +++ b/dev-tools/evolve_binaries.sh @@ -1,69 +1,86 @@ #!/bin/bash -# Script usage: ./evolve_binaries.sh -# This script clones the POSYDON repo to the specified branch (defaults to 'main'), -# copies evolve_binaries.py, runs it, and saves output to evolve_binaries.out - -# Set default branch to 'main' if not provided -BRANCH=${1:-main} -REPO_URL="https://github.com/POSYDON-code/POSYDON" - -if [[ -n "$2" ]]; then - SHA=$2 - WORK_DIR="POSYDON_${BRANCH}_${SHA}" -else - WORK_DIR="POSYDON_$BRANCH" -fi - -# Remove existing directory if it exists -if [ -d "$WORK_DIR" ]; then - echo "šŸ—‘ļø Removing existing directory: $WORK_DIR" - rm -rf "$WORK_DIR" +# ============================================================================= +# evolve_binaries.sh ā€” Clone a POSYDON branch, install it, and run the +# binary validation suite at all requested metallicities. +# +# Usage: +# ./evolve_binaries.sh [sha] [metallicities] +# +# Examples: +# ./evolve_binaries.sh main # all metallicities +# ./evolve_binaries.sh feature/my-fix abc123f # specific commit +# ./evolve_binaries.sh main "" "1 0.45 0.1" # subset of metallicities +# +# Output structure: +# outputs//candidate_Zsun.h5 ā€” evolution results per metallicity +# logs//evolve_Zsun.log ā€” log per metallicity +# workdirs/POSYDON_/ ā€” cloned repo + conda env +# ============================================================================= + +set -euo pipefail +# Load git if needed +if ! command -v git >/dev/null 2>&1; then + if command -v module >/dev/null 2>&1; then + module load git + fi fi -echo "šŸ“ Creating working directory: $WORK_DIR" -# Create the working directory -mkdir -p "$WORK_DIR" +# ā”€ā”€ Configuration ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ +ALL_METALLICITIES="2 1 0.45 0.2 0.1 0.01 0.001 0.0001" -FULL_PATH="$(realpath "$WORK_DIR")" -CLONE_DIR="$FULL_PATH/POSYDON" +BRANCH=${1:-main} +SHA=${2:-} +METALLICITIES=${3:-$ALL_METALLICITIES} -OUTPUT_DIR="$FULL_PATH/outputs" -LOG_DIR="$FULL_PATH/logs" +REPO_URL="https://github.com/POSYDON-code/POSYDON" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +# Sanitize branch name for filesystem SAFE_BRANCH="${BRANCH//\//_}" -OUTPUT_FILE="$OUTPUT_DIR/candidate_${SAFE_BRANCH}.h5" -LOG_FILE="$LOG_DIR/evolve_${SAFE_BRANCH}.log" -mkdir -p "$OUTPUT_DIR" "$LOG_DIR" -echo "šŸ“‹ Copying script_data folder" -# copy the script_data folder -cp -r "./script_data" "$WORK_DIR" +# Directories (all relative to SCRIPT_DIR, the dev-tools root) +WORK_DIR="$SCRIPT_DIR/workdirs/POSYDON_${SAFE_BRANCH}" +OUTPUT_DIR="$SCRIPT_DIR/outputs/${SAFE_BRANCH}" +LOG_DIR="$SCRIPT_DIR/logs/${SAFE_BRANCH}" +CLONE_DIR="$WORK_DIR/POSYDON" -cd "$WORK_DIR" +mkdir -p "$OUTPUT_DIR" "$LOG_DIR" -# Initialize conda for bash +# ā”€ā”€ Conda Setup ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ echo "šŸ”§ Initializing conda" -# Source conda's shell integration -if [ -f "$HOME/miniconda3/etc/profile.d/conda.sh" ]; then - source "$HOME/miniconda3/etc/profile.d/conda.sh" -elif [ -f "$HOME/anaconda3/etc/profile.d/conda.sh" ]; then - source "$HOME/anaconda3/etc/profile.d/conda.sh" -elif [ -f "/opt/homebrew/Caskroom/miniconda/base/etc/profile.d/conda.sh" ]; then - source "/opt/homebrew/Caskroom/miniconda/base/etc/profile.d/conda.sh" -elif command -v conda >/dev/null 2>&1; then - CONDA_BASE=$(conda info --base) - source "${CONDA_BASE}/etc/profile.d/conda.sh" -else - echo -e "\033[31mError: Could not find conda installation. Please check your conda setup.\033[0m" - exit 1 +CONDA_SH="" +for candidate in \ + "$HOME/miniconda3/etc/profile.d/conda.sh" \ + "$HOME/anaconda3/etc/profile.d/conda.sh" \ + "/opt/homebrew/Caskroom/miniconda/base/etc/profile.d/conda.sh"; do + if [ -f "$candidate" ]; then + CONDA_SH="$candidate" + break + fi +done + +if [ -z "$CONDA_SH" ]; then + if command -v conda >/dev/null 2>&1; then + CONDA_SH="$(conda info --base)/etc/profile.d/conda.sh" + else + echo "ERROR: Could not find conda installation." >&2 + exit 1 + fi fi +source "$CONDA_SH" + +# ā”€ā”€ Clone Repository ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ +if [ -d "$WORK_DIR" ]; then + echo "šŸ—‘ļø Removing existing work directory: $WORK_DIR" + rm -rf "$WORK_DIR" +fi +mkdir -p "$WORK_DIR" -# Clone the repository to the specified branch echo "šŸ”„ Cloning POSYDON repository (branch: $BRANCH)" -if ! git clone -b "$BRANCH" "$REPO_URL" "$CLONE_DIR" 2>&1 | sed 's/^/ /'; then - echo -e "\033[31mError: Failed to clone branch '$BRANCH'. Please check if the branch exists.\033[0m" +if ! git clone -b "$BRANCH" "$REPO_URL" "$CLONE_DIR" 2>&1 | sed 's/^/ /'; then + echo "ERROR: Failed to clone branch '$BRANCH'." >&2 exit 1 fi @@ -78,29 +95,59 @@ if [[ -n "$SHA" ]]; then cd - fi -# Create conda environment for POSYDON v2 -echo "šŸ Creating conda environment" -conda create --prefix="$FULL_PATH/conda_env" python=3.11 -y -q 2>&1 | sed 's/^/ /' +# ā”€ā”€ Create Conda Environment ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ +ENV_PREFIX="$WORK_DIR/conda_env" -echo "āš” Activating conda environment" -conda activate "$FULL_PATH/conda_env" +echo "šŸ Creating conda environment at $ENV_PREFIX" +conda create --prefix="$ENV_PREFIX" python=3.11 -y -q 2>&1 | sed 's/^/ /' +conda activate "$ENV_PREFIX" -# install POSYDON manually echo "šŸ“¦ Installing POSYDON" -pip install -e "$CLONE_DIR" -q 2>&1 | sed 's/^/ /' - -echo "šŸš€ Running evolve_binaries.py" -# # Run the Python script and capture output (stdout and stderr) -python script_data/1Zsun_binaries_suite.py --output "$OUTPUT_FILE" 2>&1 | tee "$LOG_FILE" +pip install -e "$CLONE_DIR" -q 2>&1 | sed 's/^/ /' + +# ā”€ā”€ Run Suite for Each Metallicity ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ +SUITE_SCRIPT="$SCRIPT_DIR/script_data/binaries_suite.py" +FAILED=0 + +for Z in $METALLICITIES; do + OUTPUT_FILE="$OUTPUT_DIR/candidate_${Z}Zsun.h5" + LOG_FILE="$LOG_DIR/evolve_${Z}Zsun.log" + + echo "" + echo "============================================================" + echo " šŸš€ Evolving binaries for Z = ${Z} Zsun" + echo " Output: $OUTPUT_FILE" + echo " Log: $LOG_FILE" + echo "============================================================" + + if python "$SUITE_SCRIPT" \ + --metallicity "$Z" \ + --output "$OUTPUT_FILE" \ + 2>&1 | tee "$LOG_FILE"; then + + if [ ! -f "$OUTPUT_FILE" ]; then + echo "WARNING: Output file not created for Z=${Z}" >&2 + FAILED=$((FAILED + 1)) + else + echo " Z=${Z} Zsun complete." + fi + else + echo "WARNING: Suite failed for Z=${Z}. Check $LOG_FILE" >&2 + FAILED=$((FAILED + 1)) + fi +done -if [ ! -f "$OUTPUT_FILE" ]; then - echo "ERROR: Results file was not created: $OUTPUT_FILE" - exit 2 -fi +# ā”€ā”€ Deactivate Environment ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ +conda deactivate -if [ $? -ne 0 ]; then - echo "ERROR: Python script exited with an error. Check $LOG_FILE for details." - exit 3 +echo "" +echo "============================================================" +if [ $FAILED -eq 0 ]; then + echo "āœ… All metallicities completed successfully." +else + echo "Completed with $FAILED failure(s)." fi +echo " Outputs in: $OUTPUT_DIR/" +echo "============================================================" -echo -e "āœ… Script completed. Output saved to \n$OUTPUT_FILE" +exit $FAILED \ No newline at end of file diff --git a/dev-tools/generate_baseline.sh b/dev-tools/generate_baseline.sh new file mode 100644 index 0000000000..a4e31534a7 --- /dev/null +++ b/dev-tools/generate_baseline.sh @@ -0,0 +1,96 @@ +#!/bin/bash +# ============================================================================= +# generate_baseline.sh ā€” Generate baseline HDF5 files from a designated branch. +# +# This runs the binary validation suite against a chosen branch (or commit) +# and saves the results as the baseline for future comparisons. +# +# Usage: +# ./generate_baseline.sh [sha] [metallicities] +# +# Examples: +# ./generate_baseline.sh main # baseline from main, all Z +# ./generate_baseline.sh v2.1.0 # baseline from a release tag +# ./generate_baseline.sh main abc123f # baseline from a specific commit +# ./generate_baseline.sh main "" "1 0.45" # baseline for subset of Z +# +# Output: +# baselines//baseline_Zsun.h5 ā€” one file per metallicity +# baselines//baseline_info.txt ā€” records branch, commit SHA, date +# ============================================================================= + +set -euo pipefail + +BRANCH=${1:-main} +SHA=${2:-} +METALLICITIES=${3:-"2 1 0.45 0.2 0.1 0.01 0.001 0.0001"} + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +SAFE_BRANCH="${BRANCH//\//_}" +BASELINE_DIR="$SCRIPT_DIR/baselines/${SAFE_BRANCH}" + +echo "============================================================" +echo " POSYDON Binary Validation ā€” Generating Baseline" +echo " Branch: $BRANCH" +echo " SHA: ${SHA:-HEAD}" +echo " Metallicities: $METALLICITIES" +echo " Output dir: $BASELINE_DIR" +echo "============================================================" + +# ā”€ā”€ Step 1: Evolve binaries for the baseline branch ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ +echo "" +echo "Step 1: Evolving binaries on branch '$BRANCH'..." +"$SCRIPT_DIR/evolve_binaries.sh" "$BRANCH" "$SHA" "$METALLICITIES" + +# ā”€ā”€ Step 2: Copy results into the baselines directory ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ +echo "" +echo "Step 2: Copying results to baseline directory..." + +mkdir -p "$BASELINE_DIR" + +CANDIDATE_DIR="$SCRIPT_DIR/outputs/${SAFE_BRANCH}" +COPIED=0 + +for Z in $METALLICITIES; do + SRC="$CANDIDATE_DIR/candidate_${Z}Zsun.h5" + DST="$BASELINE_DIR/baseline_${Z}Zsun.h5" + + if [ -f "$SRC" ]; then + cp "$SRC" "$DST" + echo " Saved: $DST" + COPIED=$((COPIED + 1)) + else + echo " WARNING: Missing output for Z=${Z}: $SRC" >&2 + fi +done + +# ā”€ā”€ Step 3: Record baseline metadata ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ +CLONE_DIR="$SCRIPT_DIR/workdirs/POSYDON_${SAFE_BRANCH}/POSYDON" +ACTUAL_SHA="" +if [ -d "$CLONE_DIR" ]; then + ACTUAL_SHA=$(cd "$CLONE_DIR" && git rev-parse HEAD 2>/dev/null || echo "unknown") +fi + +INFO_FILE="$BASELINE_DIR/baseline_info.txt" +cat > "$INFO_FILE" << EOF +POSYDON Binary Validation Baseline +=================================== +Branch: $BRANCH +Commit SHA: ${ACTUAL_SHA:-unknown} +Requested SHA: ${SHA:-HEAD} +Generated: $(date -u '+%Y-%m-%d %H:%M:%S UTC') +Metallicities: $METALLICITIES +Files: $COPIED +EOF + +echo "" +echo "============================================================" +echo " Baseline generated: $COPIED file(s)" +echo " Info: $INFO_FILE" +echo " Directory: $BASELINE_DIR" +echo "============================================================" + +if [ $COPIED -eq 0 ]; then + echo "ERROR: No baseline files were created!" >&2 + exit 1 +fi \ No newline at end of file diff --git a/dev-tools/script_data/1Zsun_binaries_suite.py b/dev-tools/script_data/1Zsun_binaries_suite.py deleted file mode 100644 index b994e0b475..0000000000 --- a/dev-tools/script_data/1Zsun_binaries_suite.py +++ /dev/null @@ -1,815 +0,0 @@ -#!/usr/bin/env python3 -""" -Script to evolve a few binaries. -Used for validation of the branch. - -Authors: Max Briel, Elizabeth Teng -""" - -import argparse -import os -import signal -import sys -import warnings -import h5py - -from posydon.binary_evol.binarystar import BinaryStar, SingleStar -from posydon.binary_evol.simulationproperties import SimulationProperties -from posydon.popsyn.io import simprop_kwargs_from_ini -from posydon.utils.common_functions import orbital_separation_from_period - -target_rows = 12 -line_length = 140 -columns_to_show = ['step_names', 'state', 'event', 'S1_state', 'S1_mass', 'S2_state', 'S2_mass', 'orbital_period'] - -def load_inlist(verbose): - - sim_kwargs = simprop_kwargs_from_ini('script_data/1Zsun_binaries_params.ini', verbose=verbose) - metallicity = {'metallicity':1, 'verbose':verbose} - - sim_kwargs['step_HMS_HMS'][1].update(metallicity) - sim_kwargs['step_CO_HeMS'][1].update(metallicity) - sim_kwargs['step_CO_HMS_RLO'][1].update(metallicity) - sim_kwargs['step_CO_HeMS_RLO'][1].update(metallicity) - sim_kwargs['step_detached'][1].update(metallicity) - sim_kwargs['step_disrupted'][1].update(metallicity) - sim_kwargs['step_merged'][1].update(metallicity) - sim_kwargs['step_initially_single'][1].update(metallicity) - - sim_prop = SimulationProperties(**sim_kwargs) - - sim_prop.load_steps(verbose=verbose) - return sim_prop - -def write_binary_to_screen(binary): - """Writes a binary DataFrame prettily to the screen - - Args: - binary: BinaryStar object with evolved data - """ - df = binary.to_df(**{'extra_columns':{'step_names':'str'}}) - - # Filter to only existing columns - available_columns = [col for col in columns_to_show if col in df.columns] - df_filtered = df[available_columns] - - # Reset index to use a counter instead of NaN - df_filtered = df_filtered.reset_index(drop=True) - - print("=" * line_length) - - # Print the DataFrame - df_string = df_filtered.to_string(index=True, float_format='%.3f') - print(df_string) - - # Add empty lines to reach exactly 10 rows of output - current_rows = len(df_filtered) + 1 # add one for header - - if current_rows < target_rows: - # Calculate the width of the output to print empty lines of the same width - lines = df_string.split('\n') - if len(lines) > 1: - # Use the width of the data lines (skip header) - empty_lines_needed = target_rows - current_rows - for i in range(empty_lines_needed): - print("") - - print("-" * line_length) - - -def print_failed_binary(binary,e, max_error_lines=3): - - print("=" * line_length) - print(f"šŸšØ Binary Evolution Failed!") - print(f"Exception: {type(e).__name__}") - print(f"Message: {e}") - - # Get the binary's current state and limit output - try: - df = binary.to_df(**{'extra_columns':{'step_names':'str'}}) - if len(df) > 0: - # Select only the desired columns - - available_columns = [col for col in columns_to_show if col in df.columns] - df_filtered = df[available_columns] - - # Reset index to use a counter instead of NaN - df_filtered = df_filtered.reset_index(drop=True) - - # Limit to max_error_lines - if len(df_filtered) > max_error_lines: - df_filtered = df_filtered.tail(max_error_lines) - print(f"\nShowing last {max_error_lines} evolution steps before failure:") - else: - print(f"\nEvolution steps before failure ({len(df_filtered)} steps):") - - df_string = df_filtered.to_string(index=True, float_format='%.3f') - print(df_string) - - current_rows = len(df_filtered) + 1 + 5 # add one for header - empty_lines_needed = target_rows - current_rows - for i in range(empty_lines_needed): - print("") - else: - print("\nNo evolution steps recorded before failure.") - except Exception as inner_e: - print(f"\nCould not retrieve binary state: {inner_e}") - - print("-" * line_length) - -def evolve_binary(binary, h5file, binary_id): - """ - Evolves a single binary, prints its evolution, and saves to HDF5. - - Args: - binary: BinaryStar object - h5file: open h5py.File object for writing - binary_id: unique identifier for this binary - """ - - # Capture warnings during evolution - captured_warnings = [] - - def warning_handler(message, category, filename, lineno, file=None, line=None): - captured_warnings.append({ - 'message': str(message), - 'category': category.__name__, - 'filename': filename, - 'lineno': lineno - }) - - # Set up warning capture - old_showwarning = warnings.showwarning - warnings.showwarning = warning_handler - - try: - binary.evolve() - # Display the evolution summary for successful evolution - write_binary_to_screen(binary) - - # Save to HDF5 - df = binary.to_df(**{'extra_columns':{'step_names':'str'}}) - grp = h5file.create_group(f"binary_{binary_id}") - for col in df.columns: - grp.create_dataset(col, data=df[col].values) - - except Exception as e: - print_failed_binary(binary, e) - - err_grp = h5file.require_group(f"binary_{binary_id}/errors") - err_grp.attrs['exception_type'] = type(e).__name__ - err_grp.attrs['exception_message'] = str(e) - - finally: - warnings.showwarning = old_showwarning - - # ensure binary group exists - grp = h5file.require_group(f"binary_{binary_id}") - - # Save warnings to h5 file - if captured_warnings: - warn_grp = grp.create_group("warnings") - for i, warning in enumerate(captured_warnings): - warn_subgrp = warn_grp.create_group(f"warning_{i}") - warn_subgrp.attrs['category'] = warning['category'] - warn_subgrp.attrs['message'] = warning['message'] - warn_subgrp.attrs['filename'] = warning['filename'] - warn_subgrp.attrs['lineno'] = warning['lineno'] - - print(f"āš ļø {len(captured_warnings)} warning(s) raised during evolution:") - for i, warning in enumerate(captured_warnings[:3], 1): # Show max 3 warnings - print(f" {i}. {warning['category']}: {warning['message']}") - if len(captured_warnings) > 3: - print(f" ... and {len(captured_warnings) - 3} more warning(s)") - else: - print(f"No warning(s) raised during evolution\n\n\n\n") - print("=" * line_length) - -def evolve_binaries(verbose,output_path): - """Evolves a few binaries to validate their output - """ - sim_prop = load_inlist(verbose) - - with h5py.File(output_path,'w') as h5file: - binary_id=0 - - ######################################## - # Failing binary in matching - ######################################## - star_1 = SingleStar(**{'mass': 11.948472796094759, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [231.97383621190582, 5.927334890264575, 1.5990566013567014, 6.137994236518587]}) - star_2 = SingleStar(**{'mass': 7.636958434479617, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 190925.99636740884,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # Failing binary in matching - ######################################## - star_1 = SingleStar(**{'mass': 30.169861921689556, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [77.96834852144123, 0.05021460132555987, 2.3146518208348152, 1.733054979982291]}) - star_2 = SingleStar(**{'mass': 10.972734402996027, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 20479.71919353725,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # flipped S1 and S2 ? - ######################################## - star_1 = SingleStar(**{'mass': 9.474917413943635, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [133.5713935237759, 4.398754864537542, 2.703102872841114, 1.4633904612711142]}) - star_2 = SingleStar(**{'mass': 9.311073918196263, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 18.605997832086413,'eccentricity': 0.0}, properties = sim_prop) - - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # flipped S1 and S2 - ######################################## - star_1 = SingleStar(**{'mass': 10.438541, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star_2 = SingleStar(**{'mass': 1.400713, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 9.824025,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # flipped S1 and S2 - ######################################## - star_1= SingleStar(**{'mass': 9.845907 , 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - star_2 = SingleStar(**{'mass': 9.611029, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 3.820571,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # Normal binary evolution - ######################################## - star_1= SingleStar(**{'mass': 30.845907 , 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - star_2 = SingleStar(**{'mass': 30.611029, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 30.820571,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # Normal binary - ######################################## - star_1= SingleStar(**{'mass': 9.213534679594247 , 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [327.5906384501521, 1.7707176050073297, 1.573225822966838, 1.6757313876001914]}) - star_2 = SingleStar(**{'mass': 7.209878522799272, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 63123.74544474666,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # Normal binary - ######################################## - star_1= SingleStar(**{'mass': 9.561158487732602 , 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [317.5423844462847, 2.9095984678057603, 1.754121288652108, 2.3693917842468784]}) - star_2 = SingleStar(**{'mass': 9.382732464319286, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 27.77657038557851,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # Normal binary - ######################################## - star1 = SingleStar(**{'mass': 7.552858,#29829485, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [40.91509926587841, 2.6295454150818256, 1.6718337470964977, 6.0408769315244895]}) - star2 = SingleStar(**{'mass': 6.742063, #481560266, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 17.957531550841225, 'eccentricity': 0.0,}, - properties=sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # High BH spin options - ######################################## - star_1 = SingleStar(**{'mass': 31.616785, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [10, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - star_2 = SingleStar(**{'mass': 26.874267, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 501.99252706449792,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # Original a>1 spin error - ######################################## - star_1 = SingleStar(**{'mass': 18.107506844123645, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [528.2970725443025, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - star_2 = SingleStar(**{'mass': 15.641392951875442, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 151.99252706449792,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # FIXED disrupted crash - ######################################## - star1 = SingleStar(**{'mass': 52.967313, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 36.306444, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':12.877004, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # FIXED error with SN type - ######################################## - star1 = SingleStar(**{'mass': 17.782576, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass':3.273864, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # FIXED oRLO2 looping - ######################################## - star1 = SingleStar(**{'mass': 170.638207, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [4.921294, 4.31745, 1.777768, 3.509656]}) - star2 = SingleStar(**{'mass':37.917852, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':113.352736, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # Redirect to step_CO_HeMS (H-rich non-burning?) - ######################################## - star_1 = SingleStar(**{'mass': 8.333579, 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [17.125568, 4.101834, 0.917541, 3.961291]}) - star_2 = SingleStar(**{'mass' : 8.208376, 'state' : 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 66.870417, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # FIXED oRLO2 looping - ######################################## - star_1 = SingleStar(**{'mass': 16.921378, 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}) - star_2 = SingleStar(**{'mass' : 16.286318, 'state' : 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 37.958768, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # FIXED? step_detached failure - ######################################## - star1 = SingleStar(**{'mass': 19.787769, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [24.464803, 0.666314, 1.954698, 5.598975]}) - star2 = SingleStar(**{'mass': 7.638741, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3007.865561, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # Disrupted binary - ######################################## - star_1 = SingleStar(**{'mass': 16.921378, 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}) - star_2 = SingleStar(**{'mass' : 16.286318, 'state' : 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3007.865561, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # FIXED Detached binary failure (low mass) - ######################################## - star1 = SingleStar(**{'mass': 9, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass':0.8, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # FIXED SN_TYPE = None crash - ######################################## - star1 = SingleStar(**{'mass': 17.782576, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass':3.273864, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # FIXED SN_TYPE errors - ######################################## - star1 = SingleStar(**{'mass': 6.782576, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass':3.273864, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # FIXED SN_TYPE errors - ######################################## - star1 = SingleStar(**{'mass': 40.638207, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [30.921294, 4.31745, 1.777768, 3.509656]}) - star2 = SingleStar(**{'mass':37.917852, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':2113.352736, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # FIXED ECSN errors? - ######################################## - star1 = SingleStar(**{'mass': 12.376778, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [80, 4.31745, 1.777768, 3.509656]}) - star2 = SingleStar(**{'mass': 9.711216, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':79.83702, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # Interpolator masses?? - ######################################## - star1 = SingleStar(**{'mass': 7.592921, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass':5.038679 , - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.537807, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # Interpolator masses? - ######################################## - star_1 = SingleStar(**{'mass': 38.741115, - 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [21.113771, 2.060135, 2.224789, 4.089729]}) - star_2 = SingleStar(**{'mass': 27.776178, - 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [282.712103, 0.296252, 1.628433, 5.623812]}) - - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 93.387072, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # FIXED NaN spin - ######################################## - star1 = SingleStar(**{'mass': 70.066924, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0], - 'metallicity':1}) - star2 = SingleStar(**{'mass': 34.183110, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0], - 'metallicity':1}) - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.931492e+03, - 'separation': orbital_separation_from_period(5.931492e+03, star1.mass, star2.mass), - 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # FIXED NaN spin - ######################################## - star1 = SingleStar(**{'mass': 28.837286, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 6.874867, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':35.609894, - 'separation': orbital_separation_from_period(35.609894, star1.mass, star2.mass), - 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # oRLO2 issue - ######################################## - star1 = SingleStar(**{'mass':29.580210, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 28.814626, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':40.437993, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # oRLO2 issue - ######################################## - star1 = SingleStar(**{'mass':67.126795, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 19.622908, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':1484.768582, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # oRLO2 issue - ######################################## - star1 = SingleStar(**{'mass': 58.947503, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 56.660506, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':2011.300659, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # oRLO2 issue - ######################################## - star1 = SingleStar(**{'mass': 170.638207, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[47.979957374424956, 5.317304576107798, 2.7259013166068145, 4.700929589520818]}) - star2 = SingleStar(**{'mass': 37.917852, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':113.352736, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # oRLO2 issue - ######################################## - star1 = SingleStar(**{'mass': 109.540207, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 84.344530, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.651896, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # redirect - ######################################## - star1 = SingleStar(**{'mass': 13.889634, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass':0.490231, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':14513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # redirect - ######################################## - star1 = SingleStar(**{'mass': 9, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass':0.8, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # Max time - ######################################## - star_1 = SingleStar(**{'mass': 103.07996766780799, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.2965418610971261, 2.0789170290719117, 3.207488023705968]}) - star_2 = SingleStar(**{'mass': 83.66522615073987, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 1449.1101985875678,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # Max time - ######################################## - star_1 = SingleStar(**{'mass': 8.860934140643465, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [11.818027275431337, 2.812412688633058, 0.4998731824233789, 2.9272630485628643]}) - star_2 = SingleStar(**{'mass': 8.584716012668551, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 20.82030114750744,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # PR421 - ######################################## - star1 = SingleStar(**{'mass': 24.035366, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 23.187355, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':18.865029, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # CE class - ######################################## - star1 = SingleStar(**{'mass':33.964274, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 28.98149, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':82.370989, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # PR574 - stepCE fix - ######################################## - star1 = SingleStar(**{'mass':29.580210, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 28.814626*0.4, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':300.437993, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # e_ZAMS error - ######################################## - star1 = SingleStar(**{'mass': 8.161885721822461, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 3.5907829421526154, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 36.873457164644144, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # e_ZAMS error - ######################################## - star1 = SingleStar(**{'mass': 35.24755025317775, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [19.755993125895806, 0.37149222852233904, 1.6588846085306563, - 1.434617029858906]}) - star2 = SingleStar(**{'mass': 30.000450298072902, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 24060.02101364665, 'eccentricity': 0.8085077857996965}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # e_ZAMS error - ######################################## - star1 = SingleStar(**{'mass': 11.862930493162692, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 1.4739109294156703, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 4111.083887312003, 'eccentricity':0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # e_ZAMS error - ######################################## - star1 = SingleStar(**{'mass': 8.527361341212108, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 0.7061748406821822, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 2521.1927287891444, 'eccentricity':0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # e_ZAMS error - ######################################## - star1 = SingleStar(**{'mass': 13.661942533447398 ,#29829485, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 4.466151109802313 , #481560266, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3110.1346707516914, 'eccentricity':0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - -if __name__ == "__main__": - parser = argparse.ArgumentParser(description='Evolve binaries for validation.') - parser.add_argument('--verbose', '-v', action='store_true', default=False, - help='Enable verbose output (default: False)') - parser.add_argument("--output", type=str, required=True, - help="Path to save HDF5 output") - args = parser.parse_args() - - evolve_binaries(verbose=args.verbose, output_path=args.output) diff --git a/dev-tools/script_data/1Zsun_binaries_params.ini b/dev-tools/script_data/binaries_params.ini similarity index 99% rename from dev-tools/script_data/1Zsun_binaries_params.ini rename to dev-tools/script_data/binaries_params.ini index f5400f3117..c001928c2b 100644 --- a/dev-tools/script_data/1Zsun_binaries_params.ini +++ b/dev-tools/script_data/binaries_params.ini @@ -1,4 +1,6 @@ # POSYDON default BinaryPopulation inifile, use ConfigParser syntax +# This ini is used ONLY for SimulationProperties configuration. +# Metallicity is overridden at runtime by binaries_suite.py. [environment_variables] PATH_TO_POSYDON = '' diff --git a/dev-tools/script_data/binaries_suite.py b/dev-tools/script_data/binaries_suite.py new file mode 100644 index 0000000000..08e0365dd9 --- /dev/null +++ b/dev-tools/script_data/binaries_suite.py @@ -0,0 +1,694 @@ +#!/usr/bin/env python3 +""" +Script to evolve a set of test binaries at a given metallicity. +Used for validation of POSYDON branches. + +Usage: + python binaries_suite.py --output results.h5 --metallicity 1 + python binaries_suite.py --output results.h5 --metallicity 0.45 --verbose + +Authors: Max Briel, Elizabeth Teng +""" + +import argparse +import os +import sys +import warnings +import pandas as pd + +from posydon.binary_evol.binarystar import BinaryStar, SingleStar +from posydon.binary_evol.simulationproperties import SimulationProperties +from posydon.popsyn.io import simprop_kwargs_from_ini +from posydon.utils.common_functions import orbital_separation_from_period + +AVAILABLE_METALLICITIES = [2., 1., 0.45, 0.2, 0.1, 0.01, 0.001, 0.0001] + +# Display settings +TARGET_ROWS = 12 +LINE_LENGTH = 80 +COLUMNS_TO_SHOW = ['step_names', 'state', 'event', + 'S1_state', 'S1_mass', + 'S2_state', 'S2_mass', 'orbital_period'] + +def load_inlist(metallicity, verbose, ini_path=None): + """Load simulation properties from ini file and configure for given metallicity. + + Args: + metallicity: float, metallicity in solar units + verbose: bool + ini_path: str, path to ini file (auto-detected if None) + + Returns: + SimulationProperties object with loaded steps + """ + if ini_path is None: + script_dir = os.path.dirname(os.path.abspath(__file__)) + ini_path = os.path.join(script_dir, 'binaries_params.ini') + + if not os.path.exists(ini_path): + raise FileNotFoundError(f"INI file not found: {ini_path}") + + sim_kwargs = simprop_kwargs_from_ini(ini_path, verbose=verbose) + + metallicity_kwargs = {'metallicity': metallicity, 'verbose': verbose} + + metallicity_steps = ['step_HMS_HMS', 'step_CO_HeMS', 'step_CO_HMS_RLO', + 'step_CO_HeMS_RLO', 'step_detached', 'step_disrupted', + 'step_merged', 'step_initially_single'] + for step_name in metallicity_steps: + if step_name in sim_kwargs: + sim_kwargs[step_name][1].update(metallicity_kwargs) + + sim_prop = SimulationProperties(**sim_kwargs) + sim_prop.load_steps(verbose=verbose) + return sim_prop + +def write_binary_to_screen(binary): + """Writes a binary DataFrame to screen.""" + df = binary.to_df(**{'extra_columns':{'step_names':'str'}}) + + # Filter to only existing columns + available_columns = [col for col in COLUMNS_TO_SHOW if col in df.columns] + df_filtered = df[available_columns].reset_index(drop=True) + + print("=" * LINE_LENGTH) + + # Print the DataFrame + df_string = df_filtered.to_string(index=True, float_format='%.3f') + print(df_string) + + # Add empty lines to reach exactly 10 rows of output + current_rows = len(df_filtered) + 1 # add one for header + + if current_rows < TARGET_ROWS: + for _ in range(TARGET_ROWS - current_rows): + print("") + + print("-" * LINE_LENGTH) + + +def print_failed_binary(binary,e, max_error_lines=3): + """Print information about a binary that failed to evolve.""" + + print("=" * LINE_LENGTH) + print(f"šŸšØ Binary Evolution Failed!") + print(f"Exception: {type(e).__name__}") + print(f"Message: {e}") + + # Get the binary's current state and limit output + try: + df = binary.to_df(**{'extra_columns':{'step_names':'str'}}) + if len(df) > 0: + # Select only the desired columns + + available_columns = [col for col in COLUMNS_TO_SHOW if col in df.columns] + df_filtered = df[available_columns].reset_index(drop=True) + + # Limit to max_error_lines + if len(df_filtered) > max_error_lines: + df_filtered = df_filtered.tail(max_error_lines) + print(f"\nShowing last {max_error_lines} evolution steps before failure:") + else: + print(f"\nEvolution steps before failure ({len(df_filtered)} steps):") + + df_string = df_filtered.to_string(index=True, float_format='%.3f') + print(df_string) + + current_rows = len(df_filtered) + 1 + 5 # add one for header + empty_lines_needed = TARGET_ROWS - current_rows + for _ in range(max(0, empty_lines_needed)): + print("") + else: + print("\nNo evolution steps recorded before failure.") + except Exception as inner_e: + print(f"\nCould not retrieve binary state: {inner_e}") + + print("-" * LINE_LENGTH) + +def evolve_binary(binary, h5file, binary_id): + """ + Evolves a single binary, prints its evolution, and saves to HDF5. + + Args: + binary: BinaryStar object + h5file: open pd.HDFStore object for writing + binary_id: unique identifier for this binary + """ + + # Capture warnings during evolution + captured_warnings = [] + + def warning_handler(message, category, filename, lineno, file=None, line=None): + captured_warnings.append({ + "binary_id": int(binary_id), + "category": category.__name__, + "message": str(message), + "filename": filename, + "lineno": lineno + }) + + # Set up warning capture + old_showwarning = warnings.showwarning + warnings.showwarning = warning_handler + + print(f"Binary {binary_id}") + evolution_df = None + + try: + binary.evolve() + write_binary_to_screen(binary) + evolution_df = binary.to_df(extra_columns={'step_names':'str'}) + + except Exception as e: + print_failed_binary(binary, e) + + # If evolution fails, create a minimal df with error info + evolution_df = pd.DataFrame([{ + "binary_id": int(binary_id), + "exception_type": type(e).__name__, + "exception_message": str(e) + }]) + + finally: + warnings.showwarning = old_showwarning + + # Ensure we always have a dataframe + if evolution_df is not None: + # Decode bytes columns if needed + for col in evolution_df.select_dtypes([object]): + if evolution_df[col].apply(lambda x: isinstance(x, bytes)).any(): + evolution_df[col] = evolution_df[col].apply( + lambda x: x.decode('utf-8') if isinstance(x, bytes) else x + ) + + # Always ensure binary_id exists + if "binary_id" not in evolution_df.columns: + evolution_df["binary_id"] = int(binary_id) + + # Defragment + evolution_df = evolution_df.copy() + + # Determine min_itemsize from the dataframe we're actually saving + string_cols = evolution_df.select_dtypes([object]).columns + min_itemsize = {col: 100 for col in string_cols} + h5file.append("evolution", evolution_df, format="table", + data_columns=True, min_itemsize=min_itemsize) + + # Save warnings + if captured_warnings: + warn_df = pd.DataFrame(captured_warnings) + # Ensure consistent string column sizes for warnings table + warn_string_cols = warn_df.select_dtypes([object]).columns + warn_min_itemsize = {col: 200 for col in warn_string_cols} + h5file.append("warnings", warn_df, format="table", + min_itemsize=warn_min_itemsize) + print(f"āš ļø {len(captured_warnings)} warning(s) raised during evolution:") + for i, w in enumerate(captured_warnings[:3], 1): + print(f" {i}. {w['category']}: {w['message'][:80]}") + if len(captured_warnings) > 3: + print(f" ... and {len(captured_warnings) - 3} more warning(s)") + else: + print(f" No warning(s) raised during evolution") + + print(f"āœ… Finished binary {binary_id}") + print("=" * LINE_LENGTH) + + + +def get_test_binaries(metallicity, sim_prop): + """Return the list of test binaries as (star1_kwargs, star2_kwargs, binary_kwargs, description) tuples. + + All binaries use the specified metallicity. + """ + Z = metallicity + + binaries = [ + # 0: Failing binary in matching + ({'mass': 11.948472796094759, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [231.97383621190582, 5.927334890264575, 1.5990566013567014, 6.137994236518587]}, + {'mass': 7.636958434479617, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 190925.99636740884, 'eccentricity': 0.0}, + "Failing binary in matching"), + + # 1: Failing binary in matching + ({'mass': 30.169861921689556, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [77.96834852144123, 0.05021460132555987, 2.3146518208348152, 1.733054979982291]}, + {'mass': 10.972734402996027, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 20479.71919353725, 'eccentricity': 0.0}, + "Failing binary in matching"), + + # 2: Flipped S1 and S2 (near-equal mass) + ({'mass': 9.474917413943635, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [133.5713935237759, 4.398754864537542, 2.703102872841114, 1.4633904612711142]}, + {'mass': 9.311073918196263, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 18.605997832086413, 'eccentricity': 0.0}, + "Flipped S1 and S2 (near-equal mass)"), + + # 3: Flipped S1 and S2 (high mass ratio) + ({'mass': 10.438541, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 1.400713, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 9.824025, 'eccentricity': 0.0}, + "Flipped S1 and S2 (high mass ratio)"), + + # 4: Flipped S1 and S2 + ({'mass': 9.845907, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}, + {'mass': 9.611029, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 3.820571, 'eccentricity': 0.0}, + "Flipped S1 and S2"), + + # 5: Normal binary evolution (high mass) + ({'mass': 30.845907, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}, + {'mass': 30.611029, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 30.820571, 'eccentricity': 0.0}, + "Normal binary evolution (high mass)"), + + # 6: Normal binary (wide orbit) + ({'mass': 9.213534679594247, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [327.5906384501521, 1.7707176050073297, 1.573225822966838, 1.6757313876001914]}, + {'mass': 7.209878522799272, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 63123.74544474666, 'eccentricity': 0.0}, + "Normal binary (wide orbit)"), + + # 7: Normal binary (near-equal mass, close) + ({'mass': 9.561158487732602, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [317.5423844462847, 2.9095984678057603, 1.754121288652108, 2.3693917842468784]}, + {'mass': 9.382732464319286, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 27.77657038557851, 'eccentricity': 0.0}, + "Normal binary (near-equal mass, close)"), + + # 8: Normal binary + ({'mass': 7.552858, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [40.91509926587841, 2.6295454150818256, 1.6718337470964977, 6.0408769315244895]}, + {'mass': 6.742063, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 17.957531550841225, 'eccentricity': 0.0}, + "Normal binary"), + + # 9: High BH spin options + ({'mass': 31.616785, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [10, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}, + {'mass': 26.874267, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 501.99252706449792, 'eccentricity': 0.0}, + "High BH spin options"), + + # 10: Original a>1 spin error + ({'mass': 18.107506844123645, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [528.2970725443025, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}, + {'mass': 15.641392951875442, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 151.99252706449792, 'eccentricity': 0.0}, + "Original a>1 spin error"), + + # 11: FIXED disrupted crash + ({'mass': 52.967313, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 36.306444, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 12.877004, 'eccentricity': 0.0}, + "FIXED disrupted crash"), + + # 12: FIXED error with SN type + ({'mass': 17.782576, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 3.273864, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 4513.150157, 'eccentricity': 0.0}, + "FIXED error with SN type"), + + # 13: FIXED oRLO2 looping + ({'mass': 170.638207, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [4.921294, 4.31745, 1.777768, 3.509656]}, + {'mass': 37.917852, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 113.352736, 'eccentricity': 0.0}, + "FIXED oRLO2 looping"), + + # 14: Redirect to step_CO_HeMS + ({'mass': 8.333579, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [17.125568, 4.101834, 0.917541, 3.961291]}, + {'mass': 8.208376, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 66.870417, 'eccentricity': 0.0}, + "Redirect to step_CO_HeMS"), + + # 15: FIXED oRLO2 looping + ({'mass': 16.921378, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}, + {'mass': 16.286318, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 37.958768, 'eccentricity': 0.0}, + "FIXED oRLO2 looping"), + + # 16: FIXED step_detached failure + ({'mass': 19.787769, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [24.464803, 0.666314, 1.954698, 5.598975]}, + {'mass': 7.638741, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 3007.865561, 'eccentricity': 0.0}, + "FIXED step_detached failure"), + + # 17: Disrupted binary + ({'mass': 16.921378, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}, + {'mass': 16.286318, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 3007.865561, 'eccentricity': 0.0}, + "Disrupted binary"), + + # 18: FIXED Detached binary failure (low mass) + ({'mass': 9, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 0.8, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 4513.150157, 'eccentricity': 0.0}, + "FIXED Detached binary failure (low mass)"), + + # 19: FIXED SN_TYPE = None crash + ({'mass': 17.782576, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 3.273864, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 4513.150157, 'eccentricity': 0.0}, + "FIXED SN_TYPE = None crash"), + + # 20: FIXED SN_TYPE errors (low mass primary) + ({'mass': 6.782576, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 3.273864, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 4513.150157, 'eccentricity': 0.0}, + "FIXED SN_TYPE errors (low mass primary)"), + + # 21: FIXED SN_TYPE errors (high mass) + ({'mass': 40.638207, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [30.921294, 4.31745, 1.777768, 3.509656]}, + {'mass': 37.917852, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 2113.352736, 'eccentricity': 0.0}, + "FIXED SN_TYPE errors (high mass)"), + + # 22: FIXED ECSN errors + ({'mass': 12.376778, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [80, 4.31745, 1.777768, 3.509656]}, + {'mass': 9.711216, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 79.83702, 'eccentricity': 0.0}, + "FIXED ECSN errors"), + + # 23: Interpolator masses (close) + ({'mass': 7.592921, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 5.038679, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 5.537807, 'eccentricity': 0.0}, + "Interpolator masses (close)"), + + # 24: Interpolator masses (both kicked) + ({'mass': 38.741115, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [21.113771, 2.060135, 2.224789, 4.089729]}, + {'mass': 27.776178, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [282.712103, 0.296252, 1.628433, 5.623812]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 93.387072, 'eccentricity': 0.0}, + "Interpolator masses (both kicked)"), + + # 25: FIXED NaN spin (very high mass, wide) + ({'mass': 70.066924, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 34.183110, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 5.931492e+03, 'eccentricity': 0.0}, + "FIXED NaN spin (very high mass, wide)"), + + # 26: FIXED NaN spin + ({'mass': 28.837286, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 6.874867, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 35.609894, 'eccentricity': 0.0}, + "FIXED NaN spin"), + + # 27: oRLO2 issue (near-equal mass) + ({'mass': 29.580210, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 28.814626, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 40.437993, 'eccentricity': 0.0}, + "oRLO2 issue (near-equal mass)"), + + # 28: oRLO2 issue (high mass ratio) + ({'mass': 67.126795, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 19.622908, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 1484.768582, 'eccentricity': 0.0}, + "oRLO2 issue (high mass ratio)"), + + # 29: oRLO2 issue (very high mass, near-equal) + ({'mass': 58.947503, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 56.660506, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 2011.300659, 'eccentricity': 0.0}, + "oRLO2 issue (very high mass, near-equal)"), + + # 30: oRLO2 issue (extreme mass, kicked) + ({'mass': 170.638207, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [47.979957374424956, 5.317304576107798, 2.7259013166068145, 4.700929589520818]}, + {'mass': 37.917852, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 113.352736, 'eccentricity': 0.0}, + "oRLO2 issue (extreme mass, kicked)"), + + # 31: oRLO2 issue (very high mass, close) + ({'mass': 109.540207, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 84.344530, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 5.651896, 'eccentricity': 0.0}, + "oRLO2 issue (very high mass, close)"), + + # 32: Redirect (extreme mass ratio) + ({'mass': 13.889634, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 0.490231, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 14513.150157, 'eccentricity': 0.0}, + "Redirect (extreme mass ratio)"), + + # 33: Redirect (low mass secondary) + ({'mass': 9, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 0.8, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 4513.150157, 'eccentricity': 0.0}, + "Redirect (low mass secondary)"), + + # 34: Max time (very high mass, wide) + ({'mass': 103.07996766780799, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.2965418610971261, 2.0789170290719117, 3.207488023705968]}, + {'mass': 83.66522615073987, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 1449.1101985875678, 'eccentricity': 0.0}, + "Max time (very high mass, wide)"), + + # 35: Max time + ({'mass': 8.860934140643465, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [11.818027275431337, 2.812412688633058, 0.4998731824233789, 2.9272630485628643]}, + {'mass': 8.584716012668551, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 20.82030114750744, 'eccentricity': 0.0}, + "Max time"), + + # 36: PR421 + ({'mass': 24.035366, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 23.187355, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 18.865029, 'eccentricity': 0.0}, + "PR421"), + + # 37: CE class + ({'mass': 33.964274, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 28.98149, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 82.370989, 'eccentricity': 0.0}, + "CE class"), + + # 38: PR574 - stepCE fix + ({'mass': 29.580210, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 28.814626 * 0.4, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 300.437993, 'eccentricity': 0.0}, + "PR574 - stepCE fix"), + + # 39: e_ZAMS error + ({'mass': 8.161885721822461, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 3.5907829421526154, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 36.873457164644144, 'eccentricity': 0.0}, + "e_ZAMS error"), + + # 40: e_ZAMS error (eccentric) + ({'mass': 35.24755025317775, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [19.755993125895806, 0.37149222852233904, 1.6588846085306563, 1.434617029858906]}, + {'mass': 30.000450298072902, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 24060.02101364665, 'eccentricity': 0.8085077857996965}, + "e_ZAMS error (eccentric)"), + + # 41: e_ZAMS error (high mass ratio) + ({'mass': 11.862930493162692, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 1.4739109294156703, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 4111.083887312003, 'eccentricity': 0.0}, + "e_ZAMS error (high mass ratio)"), + + # 42: e_ZAMS error (extreme mass ratio) + ({'mass': 8.527361341212108, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 0.7061748406821822, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 2521.1927287891444, 'eccentricity': 0.0}, + "e_ZAMS error (extreme mass ratio)"), + + # 43: e_ZAMS error + ({'mass': 13.661942533447398, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 4.466151109802313, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 3110.1346707516914, 'eccentricity': 0.0}, + "e_ZAMS error"), + ] + + return binaries + + +def evolve_binaries(metallicity, verbose, output_path, ini_path=None): + """Evolves the test binary suite at the given metallicity and saves results. + + Args: + metallicity: float, metallicity in solar units + verbose: bool + output_path: str, path to save HDF5 output + ini_path: str, path to ini file (auto-detected if None) + """ + print(f"{'=' * LINE_LENGTH}") + print(f" Evolving test binaries at Z = {metallicity} Zsun") + print(f" Output: {output_path}") + print(f"{'=' * LINE_LENGTH}\n") + + sim_prop = load_inlist(metallicity, verbose, ini_path) + test_binaries = get_test_binaries(metallicity, sim_prop) + + with pd.HDFStore(output_path, mode="w") as h5file: + # Save metadata + meta_df = pd.DataFrame([{ + 'metallicity': metallicity, + 'n_binaries': len(test_binaries), + }]) + h5file.put("metadata", meta_df, format="table") + + for binary_id, (s1_kw, s2_kw, bin_kw, description) in enumerate(test_binaries): + print(f"\n[{binary_id}/{len(test_binaries)-1}] {description}") + + star_1 = SingleStar(**s1_kw) + star_2 = SingleStar(**s2_kw) + + # Add separation from period if not explicitly provided + if 'separation' not in bin_kw and 'orbital_period' in bin_kw: + bin_kw['separation'] = orbital_separation_from_period( + bin_kw['orbital_period'], star_1.mass, star_2.mass + ) + + binary = BinaryStar(star_1, star_2, **bin_kw, properties=sim_prop) + evolve_binary(binary, h5file, binary_id) + + print(f"\n{'=' * LINE_LENGTH}") + print(f" All {len(test_binaries)} binaries complete. Results saved to {output_path}") + print(f"{'=' * LINE_LENGTH}") + +if __name__ == "__main__": + parser = argparse.ArgumentParser( + description='Evolve test binaries for POSYDON branch validation.', + formatter_class=argparse.ArgumentDefaultsHelpFormatter + ) + parser.add_argument('--verbose', '-v', action='store_true', default=False, + help='Enable verbose output') + parser.add_argument('--output', type=str, required=True, + help='Path to save HDF5 output') + parser.add_argument('--metallicity', '-Z', type=float, default=1.0, + help=f'Metallicity in solar units. Available: {AVAILABLE_METALLICITIES}') + parser.add_argument('--ini', type=str, default=None, + help='Path to params ini file (auto-detected if not given)') + args = parser.parse_args() + + if args.metallicity not in AVAILABLE_METALLICITIES: + print(f"WARNING: Metallicity {args.metallicity} not in standard set {AVAILABLE_METALLICITIES}.") + print(f"Proceeding anyway, but POSYDON grids may not exist for this value.") + + evolve_binaries( + metallicity=args.metallicity, + verbose=args.verbose, + output_path=args.output, + ini_path=args.ini, + ) \ No newline at end of file diff --git a/dev-tools/validate_binaries.sh b/dev-tools/validate_binaries.sh index 04a041af06..2ae354b4fa 100644 --- a/dev-tools/validate_binaries.sh +++ b/dev-tools/validate_binaries.sh @@ -1,26 +1,144 @@ -#!/bin/bash - -# A script for validating the outputs of 100 binaries, -# which can be compared to a baseline to monitor changes to the code. - -# script usage: ./validate_binaries.sh --branch candidate_branch - -BRANCH=$1 -SUFFIX=$2 - -# run candidate binaries and save to file -./evolve_binaries.sh "$BRANCH" - -# compare quantitative, qualitative, warnings/errors, structured output -# create outputs/comparison_branchname.txt -SAFE_BRANCH="${BRANCH//\//_}" -CANDIDATE_FILE="outputs/candidate_${SAFE_BRANCH}.h5" -COMPARISON_FILE="outputs/comparison_${SAFE_BRANCH}${SUFFIX:+_$SUFFIX}.txt" -python compare_runs.py baseline.h5 "$CANDIDATE_FILE" > "$COMPARISON_FILE" - -if [ $? -ne 0 ]; then - echo "Error: compare_runs.py failed. Check $COMPARISON_FILE" - exit 1 -fi - -echo "Binary evolution comparison saved to $COMPARISON_FILE" +#!/bin/bash +# ============================================================================= +# validate_binaries.sh ā€” Run the full validation pipeline: +# 1. Evolve test binaries on a candidate branch +# 2. Compare against baseline files +# +# Usage: +# ./validate_binaries.sh [baseline_branch] [metallicities] +# +# Examples: +# ./validate_binaries.sh feature/new-SN # compare vs main baseline +# ./validate_binaries.sh feature/new-SN v2.1.0 # compare vs v2.1.0 baseline +# ./validate_binaries.sh feature/new-SN main "1 0.45" # subset of metallicities +# +# Prerequisites: +# Run generate_baseline.sh first to create baseline files. +# +# Output: +# outputs//comparison_Zsun.txt ā€” per-metallicity comparison reports +# outputs//comparison_summary.txt ā€” overall summary +# ============================================================================= + +set -euo pipefail + +CANDIDATE_BRANCH=${1:?Usage: ./validate_binaries.sh [baseline_branch] [metallicities]} +BASELINE_BRANCH=${2:-main} +METALLICITIES=${3:-"2 1 0.45 0.2 0.1 0.01 0.001 0.0001"} + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +SAFE_CANDIDATE="${CANDIDATE_BRANCH//\//_}" +SAFE_BASELINE="${BASELINE_BRANCH//\//_}" + +BASELINE_DIR="$SCRIPT_DIR/baselines/${SAFE_BASELINE}" +OUTPUT_DIR="$SCRIPT_DIR/outputs/${SAFE_CANDIDATE}" +SUMMARY_FILE="$OUTPUT_DIR/comparison_summary.txt" + +echo "============================================================" +echo " POSYDON Binary Validation" +echo " Candidate: $CANDIDATE_BRANCH" +echo " Baseline: $BASELINE_BRANCH" +echo " Metallicities: $METALLICITIES" +echo "============================================================" + +# ā”€ā”€ Verify baseline exists ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ +if [ ! -d "$BASELINE_DIR" ]; then + echo "ERROR: Baseline directory not found: $BASELINE_DIR" >&2 + echo "Run generate_baseline.sh first:" >&2 + echo " ./generate_baseline.sh $BASELINE_BRANCH" >&2 + exit 1 +fi + +# Check that at least one baseline file exists +BASELINE_COUNT=0 +for Z in $METALLICITIES; do + if [ -f "$BASELINE_DIR/baseline_${Z}Zsun.h5" ]; then + BASELINE_COUNT=$((BASELINE_COUNT + 1)) + fi +done +if [ $BASELINE_COUNT -eq 0 ]; then + echo "ERROR: No baseline files found in $BASELINE_DIR for requested metallicities." >&2 + exit 1 +fi +echo " Found $BASELINE_COUNT baseline file(s)." + +# ā”€ā”€ Step 1: Evolve binaries on candidate branch ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ +echo "" +echo "Step 1: Evolving binaries on candidate branch '$CANDIDATE_BRANCH'..." +"$SCRIPT_DIR/evolve_binaries.sh" "$CANDIDATE_BRANCH" "" "$METALLICITIES" + +# ā”€ā”€ Step 2: Compare each metallicity ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ +echo "" +echo "Step 2: Comparing results..." + +TOTAL=0 +PASS=0 +FAIL=0 +SKIP=0 + +# Initialize summary +mkdir -p "$OUTPUT_DIR" +cat > "$SUMMARY_FILE" << EOF +POSYDON Binary Validation ā€” Comparison Summary +================================================ +Candidate branch: $CANDIDATE_BRANCH +Baseline branch: $BASELINE_BRANCH +Date: $(date -u '+%Y-%m-%d %H:%M:%S UTC') +================================================ + +EOF + +for Z in $METALLICITIES; do + TOTAL=$((TOTAL + 1)) + + BASELINE_FILE="$BASELINE_DIR/baseline_${Z}Zsun.h5" + CANDIDATE_FILE="$OUTPUT_DIR/candidate_${Z}Zsun.h5" + COMPARISON_FILE="$OUTPUT_DIR/comparison_${Z}Zsun.txt" + + echo "" + echo "--- Z = ${Z} Zsun ---" + + if [ ! -f "$BASELINE_FILE" ]; then + echo " SKIP: No baseline file for Z=${Z}" + echo "Z = ${Z} Zsun: SKIPPED (no baseline)" >> "$SUMMARY_FILE" + SKIP=$((SKIP + 1)) + continue + fi + + if [ ! -f "$CANDIDATE_FILE" ]; then + echo " FAIL: No candidate file for Z=${Z}" + echo "Z = ${Z} Zsun: FAIL (no candidate output)" >> "$SUMMARY_FILE" + FAIL=$((FAIL + 1)) + continue + fi + + if python "$SCRIPT_DIR/compare_runs.py" "$BASELINE_FILE" "$CANDIDATE_FILE" \ + 2>&1 | tee "$COMPARISON_FILE"; then + echo " PASS: No differences" + echo "Z = ${Z} Zsun: PASS" >> "$SUMMARY_FILE" + PASS=$((PASS + 1)) + else + echo " DIFFERENCES DETECTED ā€” see $COMPARISON_FILE" + echo "Z = ${Z} Zsun: DIFFERENCES DETECTED (see comparison_${Z}Zsun.txt)" >> "$SUMMARY_FILE" + FAIL=$((FAIL + 1)) + fi +done + +# ā”€ā”€ Final Summary ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ +cat >> "$SUMMARY_FILE" << EOF + +================================================ +TOTAL: $TOTAL | PASS: $PASS | FAIL: $FAIL | SKIP: $SKIP +EOF + +echo "" +echo "============================================================" +echo " Validation Summary" +echo " TOTAL: $TOTAL | PASS: $PASS | FAIL: $FAIL | SKIP: $SKIP" +echo " Full summary: $SUMMARY_FILE" +echo "============================================================" + +if [ $FAIL -gt 0 ]; then + exit 1 +fi +exit 0 \ No newline at end of file From 396e94b592ef604ded1a805f52ab80385c9f8a3c Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Thu, 26 Feb 2026 04:15:34 -0600 Subject: [PATCH 055/389] gitignore --- dev-tools/.gitignore | 9 - dev-tools/check_outputs.ipynb | 512 ---------------------------------- 2 files changed, 521 deletions(-) delete mode 100644 dev-tools/check_outputs.ipynb diff --git a/dev-tools/.gitignore b/dev-tools/.gitignore index 1cea72efc6..bec9d97e5a 100644 --- a/dev-tools/.gitignore +++ b/dev-tools/.gitignore @@ -1,14 +1,5 @@ -# Remove the accidentally staged clone -git rm --cached -r workdirs/ - -# Create .gitignore -cat > .gitignore << 'EOF' workdirs/ outputs/ logs/ baselines/ test_*.h5 -EOF - -git add .gitignore - diff --git a/dev-tools/check_outputs.ipynb b/dev-tools/check_outputs.ipynb deleted file mode 100644 index c0073df835..0000000000 --- a/dev-tools/check_outputs.ipynb +++ /dev/null @@ -1,512 +0,0 @@ -{ - "cells": [ - { - "cell_type": "code", - "execution_count": 1, - "id": "7e9791d3", - "metadata": {}, - "outputs": [], - "source": [ - "import argparse\n", - "import os\n", - "import signal\n", - "import sys\n", - "import warnings\n", - "import h5py\n", - "import pandas as pd\n", - "\n", - "from posydon.binary_evol.binarystar import BinaryStar, SingleStar\n", - "from posydon.binary_evol.simulationproperties import SimulationProperties\n", - "from posydon.popsyn.io import simprop_kwargs_from_ini\n", - "from posydon.utils.common_functions import orbital_separation_from_period" - ] - }, - { - "cell_type": "code", - "execution_count": 2, - "id": "327be9fe", - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "env: PATH_TO_POSYDON=/projects/b1119/eteng/software/valid/POSYDON/\n", - "env: PATH_TO_POSYDON_DATA=/projects/b1119/POSYDON_popsynth_data/v2/250520_newSNe/\n" - ] - } - ], - "source": [ - "%env PATH_TO_POSYDON=/projects/b1119/eteng/software/valid/POSYDON/\n", - "%env PATH_TO_POSYDON_DATA=/projects/b1119/POSYDON_popsynth_data/v2/250520_newSNe/" - ] - }, - { - "cell_type": "code", - "execution_count": 4, - "id": "994f6ebf", - "metadata": {}, - "outputs": [ - { - "ename": "HDF5ExtError", - "evalue": "HDF5 error back trace\n\n File \"H5F.c\", line 836, in H5Fopen\n unable to synchronously open file\n File \"H5F.c\", line 796, in H5F__open_api_common\n unable to open file\n File \"H5VLcallback.c\", line 3863, in H5VL_file_open\n open failed\n File \"H5VLcallback.c\", line 3675, in H5VL__file_open\n open failed\n File \"H5VLnative_file.c\", line 128, in H5VL__native_file_open\n unable to open file\n File \"H5Fint.c\", line 2018, in H5F_open\n unable to read superblock\n File \"H5Fsuper.c\", line 600, in H5F__super_read\n truncated file: eof = 96, sblock->base_addr = 0, stored_eof = 2048\n\nEnd of HDF5 error back trace\n\nUnable to open/create file './POSYDON_main/outputs/candidate_main.h5'", - "output_type": "error", - "traceback": [ - "\u001b[31m---------------------------------------------------------------------------\u001b[39m", - "\u001b[31mHDF5ExtError\u001b[39m Traceback (most recent call last)", - "\u001b[36mCell\u001b[39m\u001b[36m \u001b[39m\u001b[32mIn[4]\u001b[39m\u001b[32m, line 1\u001b[39m\n\u001b[32m----> \u001b[39m\u001b[32m1\u001b[39m df = \u001b[43mpd\u001b[49m\u001b[43m.\u001b[49m\u001b[43mread_hdf\u001b[49m\u001b[43m(\u001b[49m\u001b[33;43m'\u001b[39;49m\u001b[33;43m./POSYDON_main/outputs/candidate_main.h5\u001b[39;49m\u001b[33;43m'\u001b[39;49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[33;43m\"\u001b[39;49m\u001b[33;43mevolution\u001b[39;49m\u001b[33;43m\"\u001b[39;49m\u001b[43m)\u001b[49m\n\u001b[32m 2\u001b[39m warnings = pd.read_hdf(\u001b[33m'\u001b[39m\u001b[33m./POSYDON_main/outputs/candidate_main.h5\u001b[39m\u001b[33m'\u001b[39m, \u001b[33m\"\u001b[39m\u001b[33mwarnings\u001b[39m\u001b[33m\"\u001b[39m)\n", - "\u001b[36mFile \u001b[39m\u001b[32m~/.conda/envs/valid/lib/python3.11/site-packages/pandas/io/pytables.py:426\u001b[39m, in \u001b[36mread_hdf\u001b[39m\u001b[34m(path_or_buf, key, mode, errors, where, start, stop, columns, iterator, chunksize, **kwargs)\u001b[39m\n\u001b[32m 423\u001b[39m \u001b[38;5;28;01mif\u001b[39;00m \u001b[38;5;129;01mnot\u001b[39;00m exists:\n\u001b[32m 424\u001b[39m \u001b[38;5;28;01mraise\u001b[39;00m \u001b[38;5;167;01mFileNotFoundError\u001b[39;00m(\u001b[33mf\u001b[39m\u001b[33m\"\u001b[39m\u001b[33mFile \u001b[39m\u001b[38;5;132;01m{\u001b[39;00mpath_or_buf\u001b[38;5;132;01m}\u001b[39;00m\u001b[33m does not exist\u001b[39m\u001b[33m\"\u001b[39m)\n\u001b[32m--> \u001b[39m\u001b[32m426\u001b[39m store = \u001b[43mHDFStore\u001b[49m\u001b[43m(\u001b[49m\u001b[43mpath_or_buf\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mmode\u001b[49m\u001b[43m=\u001b[49m\u001b[43mmode\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43merrors\u001b[49m\u001b[43m=\u001b[49m\u001b[43merrors\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43m*\u001b[49m\u001b[43m*\u001b[49m\u001b[43mkwargs\u001b[49m\u001b[43m)\u001b[49m\n\u001b[32m 427\u001b[39m \u001b[38;5;66;03m# can't auto open/close if we are using an iterator\u001b[39;00m\n\u001b[32m 428\u001b[39m \u001b[38;5;66;03m# so delegate to the iterator\u001b[39;00m\n\u001b[32m 429\u001b[39m auto_close = \u001b[38;5;28;01mTrue\u001b[39;00m\n", - "\u001b[36mFile \u001b[39m\u001b[32m~/.conda/envs/valid/lib/python3.11/site-packages/pandas/io/pytables.py:585\u001b[39m, in \u001b[36mHDFStore.__init__\u001b[39m\u001b[34m(self, path, mode, complevel, complib, fletcher32, **kwargs)\u001b[39m\n\u001b[32m 583\u001b[39m \u001b[38;5;28mself\u001b[39m._fletcher32 = fletcher32\n\u001b[32m 584\u001b[39m \u001b[38;5;28mself\u001b[39m._filters = \u001b[38;5;28;01mNone\u001b[39;00m\n\u001b[32m--> \u001b[39m\u001b[32m585\u001b[39m \u001b[38;5;28;43mself\u001b[39;49m\u001b[43m.\u001b[49m\u001b[43mopen\u001b[49m\u001b[43m(\u001b[49m\u001b[43mmode\u001b[49m\u001b[43m=\u001b[49m\u001b[43mmode\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43m*\u001b[49m\u001b[43m*\u001b[49m\u001b[43mkwargs\u001b[49m\u001b[43m)\u001b[49m\n", - "\u001b[36mFile \u001b[39m\u001b[32m~/.conda/envs/valid/lib/python3.11/site-packages/pandas/io/pytables.py:745\u001b[39m, in \u001b[36mHDFStore.open\u001b[39m\u001b[34m(self, mode, **kwargs)\u001b[39m\n\u001b[32m 739\u001b[39m msg = (\n\u001b[32m 740\u001b[39m \u001b[33m\"\u001b[39m\u001b[33mCannot open HDF5 file, which is already opened, \u001b[39m\u001b[33m\"\u001b[39m\n\u001b[32m 741\u001b[39m \u001b[33m\"\u001b[39m\u001b[33meven in read-only mode.\u001b[39m\u001b[33m\"\u001b[39m\n\u001b[32m 742\u001b[39m )\n\u001b[32m 743\u001b[39m \u001b[38;5;28;01mraise\u001b[39;00m \u001b[38;5;167;01mValueError\u001b[39;00m(msg)\n\u001b[32m--> \u001b[39m\u001b[32m745\u001b[39m \u001b[38;5;28mself\u001b[39m._handle = \u001b[43mtables\u001b[49m\u001b[43m.\u001b[49m\u001b[43mopen_file\u001b[49m\u001b[43m(\u001b[49m\u001b[38;5;28;43mself\u001b[39;49m\u001b[43m.\u001b[49m\u001b[43m_path\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[38;5;28;43mself\u001b[39;49m\u001b[43m.\u001b[49m\u001b[43m_mode\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43m*\u001b[49m\u001b[43m*\u001b[49m\u001b[43mkwargs\u001b[49m\u001b[43m)\u001b[49m\n", - "\u001b[36mFile \u001b[39m\u001b[32m~/.conda/envs/valid/lib/python3.11/site-packages/tables/file.py:296\u001b[39m, in \u001b[36mopen_file\u001b[39m\u001b[34m(filename, mode, title, root_uep, filters, **kwargs)\u001b[39m\n\u001b[32m 291\u001b[39m \u001b[38;5;28;01mraise\u001b[39;00m \u001b[38;5;167;01mValueError\u001b[39;00m(\n\u001b[32m 292\u001b[39m \u001b[33m\"\u001b[39m\u001b[33mThe file \u001b[39m\u001b[33m'\u001b[39m\u001b[38;5;132;01m%s\u001b[39;00m\u001b[33m'\u001b[39m\u001b[33m is already opened. Please \u001b[39m\u001b[33m\"\u001b[39m\n\u001b[32m 293\u001b[39m \u001b[33m\"\u001b[39m\u001b[33mclose it before reopening in write mode.\u001b[39m\u001b[33m\"\u001b[39m % filename)\n\u001b[32m 295\u001b[39m \u001b[38;5;66;03m# Finally, create the File instance, and return it\u001b[39;00m\n\u001b[32m--> \u001b[39m\u001b[32m296\u001b[39m \u001b[38;5;28;01mreturn\u001b[39;00m \u001b[43mFile\u001b[49m\u001b[43m(\u001b[49m\u001b[43mfilename\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mmode\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mtitle\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mroot_uep\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mfilters\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43m*\u001b[49m\u001b[43m*\u001b[49m\u001b[43mkwargs\u001b[49m\u001b[43m)\u001b[49m\n", - "\u001b[36mFile \u001b[39m\u001b[32m~/.conda/envs/valid/lib/python3.11/site-packages/tables/file.py:746\u001b[39m, in \u001b[36mFile.__init__\u001b[39m\u001b[34m(self, filename, mode, title, root_uep, filters, **kwargs)\u001b[39m\n\u001b[32m 743\u001b[39m \u001b[38;5;28mself\u001b[39m.params = params\n\u001b[32m 745\u001b[39m \u001b[38;5;66;03m# Now, it is time to initialize the File extension\u001b[39;00m\n\u001b[32m--> \u001b[39m\u001b[32m746\u001b[39m \u001b[38;5;28;43mself\u001b[39;49m\u001b[43m.\u001b[49m\u001b[43m_g_new\u001b[49m\u001b[43m(\u001b[49m\u001b[43mfilename\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mmode\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43m*\u001b[49m\u001b[43m*\u001b[49m\u001b[43mparams\u001b[49m\u001b[43m)\u001b[49m\n\u001b[32m 748\u001b[39m \u001b[38;5;66;03m# Check filters and set PyTables format version for new files.\u001b[39;00m\n\u001b[32m 749\u001b[39m new = \u001b[38;5;28mself\u001b[39m._v_new\n", - "\u001b[36mFile \u001b[39m\u001b[32m~/.conda/envs/valid/lib/python3.11/site-packages/tables/hdf5extension.pyx:514\u001b[39m, in \u001b[36mtables.hdf5extension.File._g_new\u001b[39m\u001b[34m()\u001b[39m\n", - "\u001b[31mHDF5ExtError\u001b[39m: HDF5 error back trace\n\n File \"H5F.c\", line 836, in H5Fopen\n unable to synchronously open file\n File \"H5F.c\", line 796, in H5F__open_api_common\n unable to open file\n File \"H5VLcallback.c\", line 3863, in H5VL_file_open\n open failed\n File \"H5VLcallback.c\", line 3675, in H5VL__file_open\n open failed\n File \"H5VLnative_file.c\", line 128, in H5VL__native_file_open\n unable to open file\n File \"H5Fint.c\", line 2018, in H5F_open\n unable to read superblock\n File \"H5Fsuper.c\", line 600, in H5F__super_read\n truncated file: eof = 96, sblock->base_addr = 0, stored_eof = 2048\n\nEnd of HDF5 error back trace\n\nUnable to open/create file './POSYDON_main/outputs/candidate_main.h5'" - ] - } - ], - "source": [ - "df = pd.read_hdf('./POSYDON_main/outputs/candidate_main.h5', \"evolution\")\n", - "warnings = pd.read_hdf('./POSYDON_main/outputs/candidate_main.h5', \"warnings\")" - ] - }, - { - "cell_type": "code", - "execution_count": 56, - "id": "7028a060", - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "Index(['state', 'event', 'time', 'separation', 'orbital_period',\n", - " 'eccentricity', 'rl_relative_overflow_1', 'rl_relative_overflow_2',\n", - " 'lg_mtransfer_rate', 'mass_transfer_case',\n", - " ...\n", - " 'S2_mass_conv_reg_fortides', 'S2_thickness_conv_reg_fortides',\n", - " 'S2_radius_conv_reg_fortides', 'S2_lambda_CE_1cent',\n", - " 'S2_lambda_CE_10cent', 'S2_lambda_CE_30cent',\n", - " 'S2_lambda_CE_pure_He_star_10cent', 'S2_total_mass_h1',\n", - " 'S2_total_mass_he4', 'binary_id'],\n", - " dtype='object', length=134)\n" - ] - } - ], - "source": [ - "print(df.keys())" - ] - }, - { - "cell_type": "code", - "execution_count": 20, - "id": "76233b25", - "metadata": { - "collapsed": true - }, - "outputs": [ - { - "data": { - "text/html": [ - "
\n", - "\n", - "\n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - "
binary_idexception_typeexception_message
01ValueErrorTrying to store a string with len [27] in [S1_...
02ValueErrorTrying to store a string with len [12] in [sta...
03ValueErrorTrying to store a string with len [9] in [even...
04ValueErrorTrying to store a string with len [9] in [even...
05ValueErrorTrying to store a string with len [9] in [even...
07ValueErrorTrying to store a string with len [27] in [S1_...
08ValueErrorTrying to store a string with len [10] in [eve...
09ValueErrorTrying to store a string with len [7] in [even...
010ValueErrorTrying to store a string with len [27] in [S1_...
011ValueErrorTrying to store a string with len [7] in [even...
012ValueErrorTrying to store a string with len [7] in [even...
013ValueErrorTrying to store a string with len [7] in [even...
014ValueErrorTrying to store a string with len [23] in [S1_...
015ValueErrorTrying to store a string with len [9] in [even...
016ValueErrorTrying to store a string with len [9] in [even...
018ValueErrorTrying to store a string with len [7] in [even...
019ValueErrorTrying to store a string with len [7] in [even...
020ValueErrorTrying to store a string with len [7] in [even...
021ValueErrorTrying to store a string with len [7] in [even...
022ValueErrorTrying to store a string with len [9] in [even...
023ValueErrorTrying to store a string with len [9] in [even...
024ValueErrorTrying to store a string with len [9] in [even...
025ValueErrorTrying to store a string with len [7] in [even...
026ValueErrorTrying to store a string with len [9] in [even...
027ValueErrorTrying to store a string with len [7] in [even...
028ValueErrorTrying to store a string with len [7] in [even...
029ValueErrorTrying to store a string with len [7] in [even...
030ValueErrorTrying to store a string with len [7] in [even...
031ValueErrorTrying to store a string with len [7] in [even...
032ValueErrorTrying to store a string with len [7] in [even...
033ValueErrorTrying to store a string with len [7] in [even...
034ValueErrorTrying to store a string with len [7] in [even...
035ValueErrorTrying to store a string with len [9] in [even...
036ValueErrorTrying to store a string with len [7] in [even...
037ValueErrorTrying to store a string with len [10] in [eve...
038ValueErrorTrying to store a string with len [9] in [even...
039MatchingErrorGrid matching failed for merged binary. \\nseco...
040ClassificationErrorBinary is in the detached step but has stable ...
041ValueErrorTrying to store a string with len [7] in [even...
042FlowErrorEvolution of H-rich/He-rich stars in RLO onto ...
043ValueErrorTrying to store a string with len [7] in [even...
\n", - "
" - ], - "text/plain": [ - " binary_id exception_type \\\n", - "0 1 ValueError \n", - "0 2 ValueError \n", - "0 3 ValueError \n", - "0 4 ValueError \n", - "0 5 ValueError \n", - "0 7 ValueError \n", - "0 8 ValueError \n", - "0 9 ValueError \n", - "0 10 ValueError \n", - "0 11 ValueError \n", - "0 12 ValueError \n", - "0 13 ValueError \n", - "0 14 ValueError \n", - "0 15 ValueError \n", - "0 16 ValueError \n", - "0 18 ValueError \n", - "0 19 ValueError \n", - "0 20 ValueError \n", - "0 21 ValueError \n", - "0 22 ValueError \n", - "0 23 ValueError \n", - "0 24 ValueError \n", - "0 25 ValueError \n", - "0 26 ValueError \n", - "0 27 ValueError \n", - "0 28 ValueError \n", - "0 29 ValueError \n", - "0 30 ValueError \n", - "0 31 ValueError \n", - "0 32 ValueError \n", - "0 33 ValueError \n", - "0 34 ValueError \n", - "0 35 ValueError \n", - "0 36 ValueError \n", - "0 37 ValueError \n", - "0 38 ValueError \n", - "0 39 MatchingError \n", - "0 40 ClassificationError \n", - "0 41 ValueError \n", - "0 42 FlowError \n", - "0 43 ValueError \n", - "\n", - " exception_message \n", - "0 Trying to store a string with len [27] in [S1_... \n", - "0 Trying to store a string with len [12] in [sta... \n", - "0 Trying to store a string with len [9] in [even... \n", - "0 Trying to store a string with len [9] in [even... \n", - "0 Trying to store a string with len [9] in [even... \n", - "0 Trying to store a string with len [27] in [S1_... \n", - "0 Trying to store a string with len [10] in [eve... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [27] in [S1_... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [23] in [S1_... \n", - "0 Trying to store a string with len [9] in [even... \n", - "0 Trying to store a string with len [9] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [9] in [even... \n", - "0 Trying to store a string with len [9] in [even... \n", - "0 Trying to store a string with len [9] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [9] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [9] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [10] in [eve... \n", - "0 Trying to store a string with len [9] in [even... \n", - "0 Grid matching failed for merged binary. \\nseco... \n", - "0 Binary is in the detached step but has stable ... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Evolution of H-rich/He-rich stars in RLO onto ... \n", - "0 Trying to store a string with len [7] in [even... " - ] - }, - "execution_count": 20, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "errors" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "id": "68d4d8a8", - "metadata": {}, - "outputs": [], - "source": [] - } - ], - "metadata": { - "kernelspec": { - "display_name": "valid", - "language": "python", - "name": "valid" - }, - "language_info": { - "codemirror_mode": { - "name": "ipython", - "version": 3 - }, - "file_extension": ".py", - "mimetype": "text/x-python", - "name": "python", - "nbconvert_exporter": "python", - "pygments_lexer": "ipython3", - "version": "3.11.14" - } - }, - "nbformat": 4, - "nbformat_minor": 5 -} From 1f260a86db3803b1cd901ac31bf27648deb66143 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 26 Feb 2026 10:17:22 +0000 Subject: [PATCH 056/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/compare_runs.py | 6 +++--- dev-tools/evolve_binaries.sh | 2 +- dev-tools/generate_baseline.sh | 2 +- dev-tools/script_data/binaries_suite.py | 17 +++++++++-------- dev-tools/validate_binaries.sh | 2 +- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dev-tools/compare_runs.py b/dev-tools/compare_runs.py index 0d2fe2df7e..a19c0f9ddc 100644 --- a/dev-tools/compare_runs.py +++ b/dev-tools/compare_runs.py @@ -19,12 +19,12 @@ """ import argparse -import sys import os +import sys + import numpy as np import pandas as pd - # Columns that represent qualitative (categorical) evolution properties. # Any column matching these names will be compared as exact string matches # and reported under "QUALITATIVE" differences. @@ -409,4 +409,4 @@ def main(): if __name__ == "__main__": - main() \ No newline at end of file + main() diff --git a/dev-tools/evolve_binaries.sh b/dev-tools/evolve_binaries.sh index 8bfcceef2a..30f7d7b745 100755 --- a/dev-tools/evolve_binaries.sh +++ b/dev-tools/evolve_binaries.sh @@ -150,4 +150,4 @@ fi echo " Outputs in: $OUTPUT_DIR/" echo "============================================================" -exit $FAILED \ No newline at end of file +exit $FAILED diff --git a/dev-tools/generate_baseline.sh b/dev-tools/generate_baseline.sh index a4e31534a7..845b52cf3c 100644 --- a/dev-tools/generate_baseline.sh +++ b/dev-tools/generate_baseline.sh @@ -93,4 +93,4 @@ echo "============================================================" if [ $COPIED -eq 0 ]; then echo "ERROR: No baseline files were created!" >&2 exit 1 -fi \ No newline at end of file +fi diff --git a/dev-tools/script_data/binaries_suite.py b/dev-tools/script_data/binaries_suite.py index 08e0365dd9..157dc0dbab 100644 --- a/dev-tools/script_data/binaries_suite.py +++ b/dev-tools/script_data/binaries_suite.py @@ -14,6 +14,7 @@ import os import sys import warnings + import pandas as pd from posydon.binary_evol.binarystar import BinaryStar, SingleStar @@ -26,7 +27,7 @@ # Display settings TARGET_ROWS = 12 LINE_LENGTH = 80 -COLUMNS_TO_SHOW = ['step_names', 'state', 'event', +COLUMNS_TO_SHOW = ['step_names', 'state', 'event', 'S1_state', 'S1_mass', 'S2_state', 'S2_mass', 'orbital_period'] @@ -150,9 +151,9 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): # Set up warning capture old_showwarning = warnings.showwarning warnings.showwarning = warning_handler - + print(f"Binary {binary_id}") - evolution_df = None + evolution_df = None try: binary.evolve() @@ -171,7 +172,7 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): finally: warnings.showwarning = old_showwarning - + # Ensure we always have a dataframe if evolution_df is not None: # Decode bytes columns if needed @@ -212,9 +213,9 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): print(f"āœ… Finished binary {binary_id}") print("=" * LINE_LENGTH) - - - + + + def get_test_binaries(metallicity, sim_prop): """Return the list of test binaries as (star1_kwargs, star2_kwargs, binary_kwargs, description) tuples. @@ -691,4 +692,4 @@ def evolve_binaries(metallicity, verbose, output_path, ini_path=None): verbose=args.verbose, output_path=args.output, ini_path=args.ini, - ) \ No newline at end of file + ) diff --git a/dev-tools/validate_binaries.sh b/dev-tools/validate_binaries.sh index 2ae354b4fa..6f902cf65d 100644 --- a/dev-tools/validate_binaries.sh +++ b/dev-tools/validate_binaries.sh @@ -141,4 +141,4 @@ echo "============================================================" if [ $FAIL -gt 0 ]; then exit 1 fi -exit 0 \ No newline at end of file +exit 0 From 3bd64d03e1eceff04ca3e6c873c0a2d5970e906b Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sat, 7 Mar 2026 23:34:03 -0600 Subject: [PATCH 057/389] reorganizing dev-tools directory andnew scripts for binary population testing --- dev-tools/evolve_population.sh | 84 ++ .../inlists/binary_test_params.ini | 548 +++++++++++++ .../inlists/population_test_params.ini | 668 +++++++++++++++ .../inlists/test_multiZ_population_params.ini | 668 +++++++++++++++ .../script_data/src/1Zsun_binaries_suite.py | 768 ++++++++++++++++++ dev-tools/script_data/src/binaries_suite.py | 87 ++ .../script_data/src/binary_test_cases.py | 616 ++++++++++++++ dev-tools/script_data/src/formatting.py | 3 + dev-tools/script_data/src/test_pops.py | 112 +++ dev-tools/script_data/src/utils.py | 111 +++ 10 files changed, 3665 insertions(+) create mode 100644 dev-tools/evolve_population.sh create mode 100644 dev-tools/script_data/inlists/binary_test_params.ini create mode 100644 dev-tools/script_data/inlists/population_test_params.ini create mode 100644 dev-tools/script_data/inlists/test_multiZ_population_params.ini create mode 100644 dev-tools/script_data/src/1Zsun_binaries_suite.py create mode 100644 dev-tools/script_data/src/binaries_suite.py create mode 100644 dev-tools/script_data/src/binary_test_cases.py create mode 100644 dev-tools/script_data/src/formatting.py create mode 100644 dev-tools/script_data/src/test_pops.py create mode 100644 dev-tools/script_data/src/utils.py diff --git a/dev-tools/evolve_population.sh b/dev-tools/evolve_population.sh new file mode 100644 index 0000000000..fc7a20fb3b --- /dev/null +++ b/dev-tools/evolve_population.sh @@ -0,0 +1,84 @@ +#!/bin/bash + +# Script usage: ./evolve_binaries.sh +# This script clones the POSYDON repo to the specified branch (defaults to 'main'), +# copies evolve_binaries.py, runs it, and saves output to evolve_binaries.out + +# Set default branch to 'main' if not provided +BRANCH=${1:-main} +REPO_URL="https://github.com/POSYDON-code/POSYDON" + +if [[ -n "$2" ]]; then + SHA=$2 + WORK_DIR="POSYDON_${BRANCH}_${SHA}" +else + WORK_DIR="POSYDON_$BRANCH" +fi + +# Remove existing directory if it exists +if [ -d "$WORK_DIR" ]; then + echo "šŸ—‘ļø Removing existing directory: $WORK_DIR" + rm -rf "$WORK_DIR" +fi + +echo "šŸ“ Creating working directory: $WORK_DIR" +# Create the working directory +mkdir -p "$WORK_DIR" + +FULL_PATH="$(realpath "$WORK_DIR")" +CLONE_DIR="$FULL_PATH/POSYDON" + +echo "šŸ“‹ Copying script_data folder" +# copy the script_data folder +cp -r "./script_data" "$WORK_DIR" + +cd "$WORK_DIR" + +# Initialize conda for bash +echo "šŸ”§ Initializing conda" +# Source conda's shell integration +if [ -f "$HOME/miniconda3/etc/profile.d/conda.sh" ]; then + source "$HOME/miniconda3/etc/profile.d/conda.sh" +elif [ -f "$HOME/anaconda3/etc/profile.d/conda.sh" ]; then + source "$HOME/anaconda3/etc/profile.d/conda.sh" +elif [ -f "/opt/homebrew/Caskroom/miniconda/base/etc/profile.d/conda.sh" ]; then + source "/opt/homebrew/Caskroom/miniconda/base/etc/profile.d/conda.sh" +else + echo -e "\033[31mError: Could not find conda installation. Please check your conda setup.\033[0m" + exit 1 +fi + +# Clone the repository to the specified branch +echo "šŸ”„ Cloning POSYDON repository (branch: $BRANCH)" +if ! git clone -b "$BRANCH" "$REPO_URL" "$CLONE_DIR" 2>&1 | sed 's/^/ /'; then + echo -e "\033[31mError: Failed to clone branch '$BRANCH'. Please check if the branch exists.\033[0m" + exit 1 +fi + +# if SHA is provided, checkout that commit +if [[ -n "$SHA" ]]; then + echo "šŸ”„ Checking out commit: $SHA" + cd "$CLONE_DIR" + if ! git checkout "$SHA" 2>&1 | sed 's/^/ /'; then + echo -e "\033[31mError: Failed to checkout commit '$SHA'. Please check if the commit exists.\033[0m" + exit 1 + fi + cd - +fi + +# Create conda environment for POSYDON v2 +echo "šŸ Creating conda environment" +conda create --prefix="$FULL_PATH/conda_env" python=3.11 -y -q 2>&1 | sed 's/^/ /' + +echo "āš” Activating conda environment" +conda activate "$FULL_PATH/conda_env" + +# install POSYDON manually +echo "šŸ“¦ Installing POSYDON" +pip install -e "$CLONE_DIR" -q 2>&1 | sed 's/^/ /' + +echo "šŸš€ Running evolve_binaries.py" +# # Run the Python script and capture output (stdout and stderr) +python script_data/1Zsun_binaries_suite.py > $FULL_PATH/evolve_binaries_$BRANCH.out 2>&1 + +echo -e "āœ… Script completed. Output saved to \n$FULL_PATH/evolve_binaries_$BRANCH.out" diff --git a/dev-tools/script_data/inlists/binary_test_params.ini b/dev-tools/script_data/inlists/binary_test_params.ini new file mode 100644 index 0000000000..f5400f3117 --- /dev/null +++ b/dev-tools/script_data/inlists/binary_test_params.ini @@ -0,0 +1,548 @@ +# POSYDON default BinaryPopulation inifile, use ConfigParser syntax + +[environment_variables] + PATH_TO_POSYDON = '' + + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;; SimulationProperties ;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +[flow] + import = ['posydon.binary_evol.flow_chart', 'flow_chart'] + # builtin posydon flow + absolute_import = None + # If given, use an absolute filepath to user defined flow: ['', ''] + +[step_HMS_HMS] + import = ['posydon.binary_evol.MESA.step_mesa', 'MS_MS_step'] + # builtin posydon step + absolute_import = None + # If given, use an absolute filepath to user defined step: ['', ''] + interpolation_path = None + # found by default + interpolation_filename = None + # found by default + interpolation_method = 'linear3c_kNN' + # 'nearest_neighbour' 'linear3c_kNN' '1NN_1NN' + save_initial_conditions = True + # only for interpolation_method='nearest_neighbour' + track_interpolation = False + # True False + stop_method = 'stop_at_max_time' + # 'stop_at_end' 'stop_at_max_time' 'stop_at_condition' + stop_star = 'star_1' + # only for stop_method='stop_at_condition' 'star_1' 'star_2' + stop_var_name = None + # only for stop_method='stop_at_condition' str + stop_value = None + # only for stop_method='stop_at_condition' float + stop_interpolate = True + # True False + verbose = False + # True False + + +[step_CO_HeMS] + import = ['posydon.binary_evol.MESA.step_mesa', 'CO_HeMS_step'] + # builtin posydon step + absolute_import = None + # If given, use an absolute filepath to user defined step: ['', ''] + interpolation_path = None + # found by default + interpolation_filename = None + # found by default + interpolation_method = 'linear3c_kNN' + # 'nearest_neighbour' 'linear3c_kNN' '1NN_1NN' + save_initial_conditions = True + # only for interpolation_method='nearest_neighbour' + track_interpolation = False + # True False + stop_method = 'stop_at_max_time' + # 'stop_at_end' 'stop_at_max_time' 'stop_at_condition' + stop_star = 'star_1' + # only for stop_method='stop_at_condition' 'star_1' 'star_2' + stop_var_name = None + # only for stop_method='stop_at_condition' str + stop_value = None + # only for stop_method='stop_at_condition' float + stop_interpolate = True + # True False + verbose = False + # True False + +[step_CO_HMS_RLO] + import = ['posydon.binary_evol.MESA.step_mesa', 'CO_HMS_RLO_step'] + # builtin posydon step + absolute_import = None + # If given, use an absolute filepath to user defined step: ['', ''] + interpolation_path = None + # found by default + interpolation_filename = None + # found by default + interpolation_method = 'linear3c_kNN' + # 'nearest_neighbour' 'linear3c_kNN' '1NN_1NN' + save_initial_conditions = True + # only for interpolation_method='nearest_neighbour' + track_interpolation = False + # True False + stop_method = 'stop_at_max_time' + # 'stop_at_end' 'stop_at_max_time' 'stop_at_condition' + stop_star = 'star_1' + # only for stop_method='stop_at_condition' 'star_1' 'star_2' + stop_var_name = None + # only for stop_method='stop_at_condition' str + stop_value = None + # only for stop_method='stop_at_condition' float + stop_interpolate = True + # True False + verbose = False + # True False + +[step_CO_HeMS_RLO] + import = ['posydon.binary_evol.MESA.step_mesa', 'CO_HeMS_RLO_step'] + # builtin posydon step + absolute_import = None + # If given, use an absolute filepath to user defined step: ['', ''] + interpolation_path = None + # found by default + interpolation_filename = None + # found by default + interpolation_method = 'linear3c_kNN' + # 'nearest_neighbour' 'linear3c_kNN' '1NN_1NN' + save_initial_conditions = True + # only for interpolation_method='nearest_neighbour' + track_interpolation = False + # True False + stop_method = 'stop_at_max_time' + # 'stop_at_end' 'stop_at_max_time' 'stop_at_condition' + stop_star = 'star_1' + # only for stop_method='stop_at_condition' 'star_1' 'star_2' + stop_var_name = None + # only for stop_method='stop_at_condition' str + stop_value = None + # only for stop_method='stop_at_condition' float + stop_interpolate = True + # True False + verbose = False + # True False + + +[step_detached] + import = ['posydon.binary_evol.DT.step_detached', 'detached_step'] + # builtin posydon step + absolute_import = None + # If given, use an absolute filepath to user defined step: ['', ''] + matching_method = 'minimize' + #'minimize' 'root' + do_wind_loss = True + # True, False + do_tides = True + # True, False + do_gravitational_radiation = True + # True, False + do_magnetic_braking = True + # True, False + do_stellar_evolution_and_spin_from_winds = True + # True, False + RLO_orbit_at_orbit_with_same_am = False + # True, False + #record_matching = False + # True, False + verbose = False + # True, False + +[step_disrupted] + import = ['posydon.binary_evol.DT.step_disrupted','DisruptedStep'] + # builtin posydon step + absolute_import = None + # If given, use an absolute filepath to user defined step: ['', ''] + +[step_merged] + import = ['posydon.binary_evol.DT.step_merged','MergedStep'] + # builtin posydon step + absolute_import = None + # If given, use an absolute filepath to user defined step: ['', ''] + +[step_initially_single] + import = ['posydon.binary_evol.DT.step_initially_single','InitiallySingleStep'] + # builtin posydon step + absolute_import = None + # If given, use an absolute filepath to user defined step: ['', ''] + +[step_CE] + import = ['posydon.binary_evol.CE.step_CEE', 'StepCEE'] + # builtin posydon step + absolute_import = None + # If given, use an absolute filepath to user defined step: ['', ''] + prescription='alpha-lambda' + # 'alpha-lambda' + common_envelope_efficiency=1.0 + # float in (0, inf) + common_envelope_option_for_lambda='lambda_from_grid_final_values' + # (1) 'default_lambda', (2) 'lambda_from_grid_final_values', + # (3) 'lambda_from_profile_gravitational', + # (4) 'lambda_from_profile_gravitational_plus_internal', + # (5) 'lambda_from_profile_gravitational_plus_internal_minus_recombination' + common_envelope_lambda_default=0.5 + # float in (0, inf) used only for option (1) + common_envelope_option_for_HG_star="optimistic" + # 'optimistic', 'pessimistic' + common_envelope_alpha_thermal=1.0 + # float in (0, inf) used only for option for (4), (5) + core_definition_H_fraction=0.3 + # 0.01, 0.1, 0.3 + core_definition_He_fraction=0.1 + # 0.1 + CEE_tolerance_err = 0.001 + # float (0, inf) + common_envelope_option_after_succ_CEE = 'two_phases_stableMT' + # 'two_phases_stableMT' 'one_phase_variable_core_definition' + # 'two_phases_windloss' + verbose = False + # True False + +[step_SN] + import = ['posydon.binary_evol.SN.step_SN', 'StepSN'] + # builtin posydon step + absolute_import = None + # 'package' kwarg for importlib.import_module + mechanism = 'Fryer+12-delayed' + # v2 interpolators support: 'Fryer+12-rapid', 'Fryer+12-delayed', + # 'Sukhbold+16-engine', 'Patton&Sukhbold20-engine' + # need profiles: 'direct' + engine = '' + # 'N20' or 'W20' for 'Sukhbold+16-engine', 'Patton&Sukhbold20-engine' + # '' for the others + PISN = "Hendriks+23" + # v2 interpolators support: "Hendriks+23" + # other options: None, "Marchant+19" + PISN_CO_shift = 0.0 + # Only when using Hendriks+23 + # float (-inf,inf) + # v2 interpolators support: 0.0 + PPI_extra_mass_loss = -20.0 + # Only when using Hendriks+23 + # float (-inf,inf) + # v2 interpolators support: 0.0 or -20.0 + ECSN = "Tauris+15" + # "Tauris+15", "Podsiadlowski+04" + conserve_hydrogen_envelope = False + # True, False + conserve_hydrogen_PPI = False + # Only when using Hendriks+23 + # True, False + max_neutrino_mass_loss = 0.5 + # float (0,inf) + # v2 interpolators support: 0.5 + max_NS_mass = 2.5 + # float (0,inf) + # v2 interpolators support: 2.5 + use_interp_values = True + # True, False + use_profiles = True + # True, False + use_core_masses = True + # True, False + allow_spin_None = False + # True, False + approx_at_he_depletion = False + # True, False + kick = True + # True, False + kick_normalisation = 'one_over_mass' + # "one_minus_fallback", "one_over_mass", "NS_one_minus_fallback_BH_one", + # "one", "zero", "asym_ej", "linear", "log_normal" + sigma_kick_CCSN_NS = 265.0 + # float (0,inf) + sigma_kick_CCSN_BH = 265.0 + # float (0,inf) + sigma_kick_ECSN = 20.0 + # float (0,inf) + verbose = False + # True False + +[step_dco] + import = ['posydon.binary_evol.DT.double_CO', 'DoubleCO'] + # builtin posydon step + absolute_import = None + # If given, use an absolute filepath to user defined step: ['', ''] + n_o_steps_history = None + +[step_end] + import = ['posydon.binary_evol.step_end', 'step_end'] + # builtin posydon step + absolute_import = None + # If given, use an absolute filepath to user defined step: ['', ''] + +[extra_hooks] + import_1 = ['posydon.binary_evol.simulationproperties', 'TimingHooks'] + # builtin posydon hook + absolute_import_1 = None + # If given, use an absolute filepath to user defined step: ['', ''] + kwargs_1 = {} + + import_2 = ['posydon.binary_evol.simulationproperties', 'StepNamesHooks'] + # builtin posydon hook + absolute_import_2 = None + # If given, use an absolute filepath to user defined step: ['', ''] + kwargs_2 = {} + + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;; BinaryPopulation ;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +[BinaryPopulation_options] + optimize_ram = True + # save population in batches + ram_per_cpu = None + # set maximum ram per cpu before batch saving (GB) + dump_rate = 2000 + # batch save after evolving N binaries + # this should be at least 500 for populations of 100,000 binaries or more + temp_directory = 'batches' + # folder for keeping batch files + tqdm = False + # progress bar + breakdown_to_df = True + # convert BinaryStars into DataFrames after evolution + use_MPI = False + # use only for local MPI runs + metallicity = [1.] #[2., 1., 0.45, 0.2, 0.1, 0.01, 0.001, 0.0001] + # In units of solar metallicity + error_checking_verbose = False + # if True, write all POSYDON errors to stderr at runtime, default=False + warnings_verbose = False + # if True, write all POSYDON warnings to stderr at runtime, default=False + history_verbose = False + # if True, record extra functional steps in the output DataFrames + # (These steps represent internal workings of POSYDON rather than physical phases of evolution) + entropy = None + # `None` uses system entropy (recommended) + number_of_binaries = 10 + # int + binary_fraction_scheme = 'const' + #'const' 'Moe_17' + binary_fraction_const = 1.0 + # float 0< fraction <=1 + star_formation = 'burst' + # 'constant' 'burst' 'custom_linear' 'custom_log10' 'custom_linear_histogram' 'custom_log10_histogram' + max_simulation_time = 13.8e9 + # float (0,inf) + + read_samples_from_file = '' + # path to file to read initial parameters from (if empty string get random samples) + primary_mass_scheme = 'Kroupa2001' + # 'Salpeter', 'Kroupa1993', 'Kroupa2001' + primary_mass_min = 7.0 + # float (0,130) + primary_mass_max = 150.0 + # float (0,130) + secondary_mass_scheme = 'flat_mass_ratio' + # 'flat_mass_ratio', 'q=1' + secondary_mass_min = 0.5 + # float (0,130) + secondary_mass_max = 150.0 + # float (0,130) + orbital_scheme = 'period' + # 'separation', 'period' + orbital_period_scheme = 'Sana+12_period_extended' + # used only for orbital_scheme = 'period' + orbital_period_min = 0.75 + # float (0,inf) + orbital_period_max = 6000.0 + # float (0,inf) + #orbital_separation_scheme = 'log_uniform' + # used only for orbital_scheme = 'separation', 'log_uniform', 'log_normal' + #orbital_separation_min = 5.0 + # float (0,inf) + #orbital_separation_max = 1e5 + # float (0,inf) + #log_orbital_separation_mean = None + # float (0,inf) used only for orbital_separation_scheme ='log_normal' + #log_orbital_separation_sigma = None + # float (0,inf) used only for orbital_separation_scheme ='log_normal' + eccentricity_scheme = 'zero' + # 'zero' 'thermal' 'uniform' + + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;; Saving Output ;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +[BinaryStar_output] + extra_columns = {'step_names':'string', 'step_times':'float64'} + # 'step_times' with from posydon.binary_evol.simulationproperties import TimingHooks + + # LIST BINARY PROPERTIES + only_select_columns=[ + 'state', + 'event', + 'time', + #'separation', + 'orbital_period', + 'eccentricity', + #'V_sys', + #'rl_relative_overflow_1', + #'rl_relative_overflow_2', + 'lg_mtransfer_rate', + #'mass_transfer_case', + #'trap_radius', + #'acc_radius', + #'t_sync_rad_1', + #'t_sync_conv_1', + #'t_sync_rad_2', + #'t_sync_conv_2', + #'nearest_neighbour_distance', + ] + scalar_names=[ + 'interp_class_HMS_HMS', + 'interp_class_CO_HMS_RLO', + 'interp_class_CO_HeMS', + 'interp_class_CO_HeMS_RLO', + 'mt_history_HMS_HMS', + 'mt_history_CO_HMS_RLO', + 'mt_history_CO_HeMS', + 'mt_history_CO_HeMS_RLO', + ] + +[SingleStar_1_output] + # LIST STAR PROPERTIES TO SAVE + include_S1=True + # True, False + only_select_columns=[ + 'state', + #'metallicity', + 'mass', + 'log_R', + 'log_L', + 'lg_mdot', + #'lg_system_mdot', + #'lg_wind_mdot', + 'he_core_mass', + 'he_core_radius', + #'c_core_mass', + #'c_core_radius', + #'o_core_mass', + #'o_core_radius', + 'co_core_mass', + 'co_core_radius', + 'center_h1', + 'center_he4', + #'center_c12', + #'center_n14', + #'center_o16', + 'surface_h1', + 'surface_he4', + #'surface_c12', + #'surface_n14', + #'surface_o16', + #'log_LH', + #'log_LHe', + #'log_LZ', + #'log_Lnuc', + #'c12_c12', + #'center_gamma', + #'avg_c_in_c_core', + #'surf_avg_omega', + 'surf_avg_omega_div_omega_crit', + #'total_moment_of_inertia', + #'log_total_angular_momentum', + 'spin', + #'conv_env_top_mass', + #'conv_env_bot_mass', + #'conv_env_top_radius', + #'conv_env_bot_radius', + #'conv_env_turnover_time_g', + #'conv_env_turnover_time_l_b', + #'conv_env_turnover_time_l_t', + #'envelope_binding_energy', + #'mass_conv_reg_fortides', + #'thickness_conv_reg_fortides', + #'radius_conv_reg_fortides', + #'lambda_CE_1cent', + #'lambda_CE_10cent', + #'lambda_CE_30cent', + #'lambda_CE_pure_He_star_10cent', + #'profile', + #'total_mass_h1', + #'total_mass_he4', + ] + scalar_names=[ + 'natal_kick_array', + 'SN_type', + 'f_fb', + 'spin_orbit_tilt_first_SN', + 'spin_orbit_tilt_second_SN', + ] + +[SingleStar_2_output] + # LIST STAR PROPERTIES TO SAVE + include_S2 = True + # True, False + only_select_columns = [ + 'state', + #'metallicity', + 'mass', + 'log_R', + 'log_L', + 'lg_mdot', + #'lg_system_mdot', + #'lg_wind_mdot', + 'he_core_mass', + 'he_core_radius', + #'c_core_mass', + #'c_core_radius', + #'o_core_mass', + #'o_core_radius', + 'co_core_mass', + 'co_core_radius', + 'center_h1', + 'center_he4', + #'center_c12', + #'center_n14', + #'center_o16', + 'surface_h1', + 'surface_he4', + #'surface_c12', + #'surface_n14', + #'surface_o16', + #'log_LH', + #'log_LHe', + #'log_LZ', + #'log_Lnuc', + #'c12_c12', + #'center_gamma', + #'avg_c_in_c_core', + #'surf_avg_omega', + 'surf_avg_omega_div_omega_crit', + #'total_moment_of_inertia', + #'log_total_angular_momentum', + 'spin', + #'conv_env_top_mass', + #'conv_env_bot_mass', + #'conv_env_top_radius', + #'conv_env_bot_radius', + #'conv_env_turnover_time_g', + #'conv_env_turnover_time_l_b', + #'conv_env_turnover_time_l_t', + #'envelope_binding_energy', + #'mass_conv_reg_fortides', + #'thickness_conv_reg_fortides', + #'radius_conv_reg_fortides', + #'lambda_CE_1cent', + #'lambda_CE_10cent', + #'lambda_CE_30cent', + #'lambda_CE_pure_He_star_10cent', + #'profile', + #'total_mass_h1', + #'total_mass_he4', + ] + scalar_names=[ + 'natal_kick_array', + 'SN_type', + 'f_fb', + 'spin_orbit_tilt_first_SN', + 'spin_orbit_tilt_second_SN', + ] diff --git a/dev-tools/script_data/inlists/population_test_params.ini b/dev-tools/script_data/inlists/population_test_params.ini new file mode 100644 index 0000000000..2b47b6aa90 --- /dev/null +++ b/dev-tools/script_data/inlists/population_test_params.ini @@ -0,0 +1,668 @@ +# POSYDON default BinaryPopulation inifile, use ConfigParser syntax + +[environment_variables] + PATH_TO_POSYDON = '' + + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;; SimulationProperties ;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +[flow] + import = ['posydon.binary_evol.flow_chart', 'flow_chart'] + # builtin posydon flow + absolute_import = None + # if given, use an absolute filepath to user defined flow: + # ['', ''] + +[step_HMS_HMS] + import = ['posydon.binary_evol.MESA.step_mesa', 'MS_MS_step'] + # builtin posydon step + absolute_import = None + # if given, use an absolute filepath to user defined step: + # ['', ''] + interpolation_path = None + # str or None (found by default) + interpolation_filename = None + # str or None (found by default) + interpolation_method = 'linear3c_kNN' + # 'nearest_neighbour', 'linear3c_kNN', '1NN_1NN' + save_initial_conditions = True + # True, False (only for interpolation_method='nearest_neighbour') + track_interpolation = False + # True, False + stop_method = 'stop_at_max_time' + # 'stop_at_end', 'stop_at_max_time', 'stop_at_condition' + stop_star = 'star_1' + # 'star_1', 'star_2' (only for stop_method='stop_at_condition') + stop_var_name = None + # str or None (only for stop_method='stop_at_condition') + stop_value = None + # float or None (only for stop_method='stop_at_condition') + stop_interpolate = True + # True, False + verbose = False + # True, False + + +[step_CO_HeMS] + import = ['posydon.binary_evol.MESA.step_mesa', 'CO_HeMS_step'] + # builtin posydon step + absolute_import = None + # if given, use an absolute filepath to user defined step: + # ['', ''] + interpolation_path = None + # str or None (found by default) + interpolation_filename = None + # str or None (found by default) + interpolation_method = 'linear3c_kNN' + # 'nearest_neighbour', 'linear3c_kNN', '1NN_1NN' + save_initial_conditions = True + # True, False (only for interpolation_method='nearest_neighbour') + track_interpolation = False + # True, False + stop_method = 'stop_at_max_time' + # 'stop_at_end', 'stop_at_max_time', 'stop_at_condition' + stop_star = 'star_1' + # 'star_1', 'star_2' (only for stop_method='stop_at_condition') + stop_var_name = None + # str or None (only for stop_method='stop_at_condition') + stop_value = None + # float or None (only for stop_method='stop_at_condition') + stop_interpolate = True + # True, False + verbose = False + # True, False + +[step_CO_HMS_RLO] + import = ['posydon.binary_evol.MESA.step_mesa', 'CO_HMS_RLO_step'] + # builtin posydon step + absolute_import = None + # if given, use an absolute filepath to user defined step: + # ['', ''] + interpolation_path = None + # str or None (found by default) + interpolation_filename = None + # str or None (found by default) + interpolation_method = 'linear3c_kNN' + # 'nearest_neighbour', 'linear3c_kNN', '1NN_1NN' + save_initial_conditions = True + # True, False (only for interpolation_method='nearest_neighbour') + track_interpolation = False + # True, False + stop_method = 'stop_at_max_time' + # 'stop_at_end' 'stop_at_max_time' 'stop_at_condition' + stop_star = 'star_1' + # 'star_1', 'star_2' (only for stop_method='stop_at_condition') + stop_var_name = None + # str or None (only for stop_method='stop_at_condition') + stop_value = None + # float or None (only for stop_method='stop_at_condition') + stop_interpolate = True + # True, False + verbose = False + # True, False + +[step_CO_HeMS_RLO] + import = ['posydon.binary_evol.MESA.step_mesa', 'CO_HeMS_RLO_step'] + # builtin posydon step + absolute_import = None + # if given, use an absolute filepath to user defined step: + # ['', ''] + interpolation_path = None + # str or None (found by default) + interpolation_filename = None + # str or None (found by default) + interpolation_method = 'linear3c_kNN' + # 'nearest_neighbour', 'linear3c_kNN', '1NN_1NN' + save_initial_conditions = True + # True, False (only for interpolation_method='nearest_neighbour') + track_interpolation = False + # True, False + stop_method = 'stop_at_max_time' + # 'stop_at_end', 'stop_at_max_time', 'stop_at_condition' + stop_star = 'star_1' + # 'star_1', 'star_2' (only for stop_method='stop_at_condition') + stop_var_name = None + # str or None (only for stop_method='stop_at_condition') + stop_value = None + # float or None (only for stop_method='stop_at_condition') + stop_interpolate = True + # True, False + verbose = False + # True, False + + +[step_detached] + import = ['posydon.binary_evol.DT.step_detached', 'detached_step'] + # builtin posydon step + absolute_import = None + # if given, use an absolute filepath to user defined step: + # ['', ''] + matching_method = 'minimize' + # 'minimize', 'root' + matching_tolerance = 1e-2 + # float, DEF: 1e-2 + matching_tolerance_hard = 1e-1 + # float, DEF: 1e-1 + do_wind_loss = True + # True, False + do_tides = True + # True, False + do_gravitational_radiation = True + # True, False + do_magnetic_braking = True + # True, False + magnetic_braking_mode = 'RVJ83' + # 'RVJ83', 'M15', 'G18', 'CARB' + do_stellar_evolution_and_spin_from_winds = True + # True, False + RLO_orbit_at_orbit_with_same_am = False + # True, False + record_matching = False + # True, False + verbose = False + # True, False + +[step_disrupted] + import = ['posydon.binary_evol.DT.step_disrupted','DisruptedStep'] + # builtin posydon step + absolute_import = None + # if given, use an absolute filepath to user defined step: + # ['', ''] + matching_method = 'minimize' + # 'minimize', 'root' + matching_tolerance = 1e-2 + # float, DEF: 1e-2 + matching_tolerance_hard = 1e-1 + # float, DEF: 1e-1 + record_matching = False + # True, False + verbose = False + # True, False + +[step_merged] + import = ['posydon.binary_evol.DT.step_merged','MergedStep'] + # builtin posydon step + absolute_import = None + # if given, use an absolute filepath to user defined step: + # ['', ''] + record_matching = False + # True, False + verbose = False + # True, False + + +[step_initially_single] + import = ['posydon.binary_evol.DT.step_initially_single','InitiallySingleStep'] + # builtin posydon step + absolute_import = None + # if given, use an absolute filepath to user defined step: + # ['', ''] + matching_method = 'minimize' + # 'minimize', 'root' + matching_tolerance = 1e-2 + # float, DEF: 1e-2 + matching_tolerance_hard = 1e-1 + # float, DEF: 1e-1 + record_matching = False + # True, False + verbose = False + # True, False + +[step_CE] + import = ['posydon.binary_evol.CE.step_CEE', 'StepCEE'] + # builtin posydon step + absolute_import = None + # if given, use an absolute filepath to user defined step: + # ['', ''] + prescription = 'alpha-lambda' + # 'alpha-lambda' + common_envelope_efficiency = 1.0 + # float in (0, inf) + # values >1 are discouraged (consider changing lambda or post CE + # interactions) + common_envelope_option_for_lambda = 'lambda_from_grid_final_values' + # (1) 'default_lambda' (uses common_envelope_lambda_default), + # (2) 'lambda_from_grid_final_values', + # (3) 'lambda_from_profile_gravitational' (needs available profiles), + # (4) 'lambda_from_profile_gravitational_plus_internal' (needs available + # profiles), + # (5) 'lambda_from_profile_gravitational_plus_internal_minus_recombination' + # (needs available profiles) + common_envelope_lambda_default = 0.5 + # float in (0, inf) (only for common_envelope_option_for_lambda option 1) + common_envelope_option_for_HG_star = "optimistic" + # 'optimistic', 'pessimistic' + common_envelope_alpha_thermal = 1.0 + # float in (0, inf) (only for common_envelope_option_for_lambda options 4 + # and 5) + core_definition_H_fraction = 0.3 + # 0.01, 0.1, 0.3 + core_definition_He_fraction = 0.1 + # 0.1 + CEE_tolerance_err = 0.001 + # float (0, inf) (numerical tolerance on floats) + common_envelope_option_after_succ_CEE = 'two_phases_stableMT' + # 'two_phases_stableMT' 'one_phase_variable_core_definition' + # 'two_phases_windloss' + record_matching = False + # True, False + verbose = False + # True, False + +[step_SN] + import = ['posydon.binary_evol.SN.step_SN', 'StepSN'] + # builtin posydon step + absolute_import = None + # 'package' kwarg for importlib.import_module + mechanism = 'Fryer+12-delayed' + # v2 interpolators support: 'Fryer+12-rapid', 'Fryer+12-delayed', + # 'Sukhbold+16-engine', 'Patton&Sukhbold20-engine' + # need profiles: 'direct' + engine = '' + # 'N20' or 'W20' for 'Sukhbold+16-engine', 'Patton&Sukhbold20-engine' + # '' for the others + PISN = "Hendriks+23" + # v2 interpolators support: "Hendriks+23" + # other options: None, "Marchant+19" + PISN_CO_shift = 0.0 + # Only when using Hendriks+23 + # float (-inf,inf) + # v2 interpolators support: 0.0 + PPI_extra_mass_loss = -20.0 + # Only when using Hendriks+23 + # float (-inf,inf) + # v2 interpolators support: 0.0 or -20.0 + ECSN = "Tauris+15" + # "Tauris+15", "Podsiadlowski+04" + conserve_hydrogen_envelope = False + # True, False + conserve_hydrogen_PPI = False + # Only when using Hendriks+23 + # True, False + max_neutrino_mass_loss = 0.5 + # float (0,inf) + # v2 interpolators support: 0.5 + max_NS_mass = 2.5 + # float (0,inf) + # v2 interpolators support: 2.5 + use_interp_values = True + # True, False + use_profiles = True + # True, False + use_core_masses = True + # True, False + allow_spin_None = False + # True, False + approx_at_he_depletion = False + # True, False + kick = True + # True, False + kick_normalisation = 'one_over_mass' + # "one_minus_fallback", "one_over_mass", "NS_one_minus_fallback_BH_one", + # "one", "zero" + kick_prescription = 'maxwellian' + # "maxwellian", "log_normal", "asym_ej", "linear" + sigma_kick_CCSN_NS = 265.0 + # float (0,inf) + mean_kick_CCSN_NS = None + # float or None + sigma_kick_CCSN_BH = 265.0 + # float (0,inf) + mean_kick_CCSN_BH = None + # float or None + sigma_kick_ECSN = 20.0 + # float (0,inf) + mean_kick_ECSN = None + # float or None + verbose = False + # True, False + +[step_dco] + import = ['posydon.binary_evol.DT.double_CO', 'DoubleCO'] + # builtin posydon step + absolute_import = None + # if given, use an absolute filepath to user defined step: + # ['', ''] + n_o_steps_history = None + # None or int (0, inf) + +[step_end] + import = ['posydon.binary_evol.step_end', 'step_end'] + # builtin posydon step + absolute_import = None + # if given, use an absolute filepath to user defined step: + # ['', ''] + +[extra_hooks] + import_1 = ['posydon.binary_evol.simulationproperties', 'TimingHooks'] + # builtin posydon hook + absolute_import_1 = None + # if given, use an absolute filepath to user defined step: + # ['', ''] + kwargs_1 = {} + # dict + + import_2 = ['posydon.binary_evol.simulationproperties', 'StepNamesHooks'] + # builtin posydon hook + absolute_import_2 = None + # if given, use an absolute filepath to user defined step: + # ['', ''] + kwargs_2 = {} + # dict + + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;; BinaryPopulation ;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +[BinaryPopulation_options] + optimize_ram = True + # save population in batches: True, False + ram_per_cpu = None + # set maximum ram per cpu before batch saving (GB); None or float (0, inf) + dump_rate = 2000 + # batch save after evolving N binaries: int (0, inf) + # this should be at least 500 for populations of 100,000 binaries or more + temp_directory = 'batches' + # temporary folder for keeping batch files: str + tqdm = False + # progress bar: True, False + breakdown_to_df = True + # convert BinaryStars into DataFrames after evolution: True, False + use_MPI = False + # use only for local MPI runs: True, False + metallicities = [1.] + # in units of solar metallicity: list of float + # e.g. [2., 1., 0.45, 0.2, 0.1, 0.01, 0.001, 0.0001] + error_checking_verbose = False + # if True, write all POSYDON errors to stderr at runtime, default=False + warnings_verbose = False + # if True, write all POSYDON warnings to stderr at runtime, default=False + history_verbose = False + # if True, record extra functional steps in the output DataFrames + # (These steps represent internal workings of POSYDON rather than physical + # phases of evolution) + entropy = 0 + # if None uses system entropy (recommended): None or int + number_of_binaries = 10 + # int (0, inf) + binary_fraction_scheme = 'const' + # 'const', 'Moe+17-massdependent' + binary_fraction_const = 1.0 + # float [0, 1] + star_formation = 'burst' + # 'constant', 'burst', 'custom_linear', 'custom_log10', + # 'custom_linear_histogram', 'custom_log10_histogram' + max_simulation_time = 13.8e9 + # float (0, inf) + + read_samples_from_file = '' + # path to file to read initial parameters from (if empty string get random + # samples) + primary_mass_scheme = 'Kroupa2001' + # 'Salpeter', 'Kroupa1993', 'Kroupa2001' + primary_mass_min = 7.0 + # float (0, inf) + # value should be within the mass range given by the used grids + primary_mass_max = 150.0 + # float (primary_mass_min, inf) + # value should be within the mass range given by the used grids + secondary_mass_scheme = 'flat_mass_ratio' + # 'flat_mass_ratio', 'q=1', 'Moe+17-PsandQs' (will enforce + # orbital_period_scheme='Moe+17-PsandQs') + secondary_mass_min = 0.5 + # float (0,130) + # value should be within the mass range given by the used grids + secondary_mass_max = 150.0 + # float (secondary_mass_min, inf) + # value should be within the mass range given by the used grids + orbital_scheme = 'period' + # 'separation', 'period' + orbital_period_scheme = 'Sana+12_period_extended' + # (used only for orbital_scheme = 'period') 'Sana+12_period_extended', + # 'Moe+17-PsandQs' (will enforce secondary_mass_scheme='Moe+17-PsandQs') + orbital_period_min = 0.75 + # float (0, inf) (used only for orbital_scheme = 'period') + # value should be within the period range given by the used grids + orbital_period_max = 6000.0 + # float (0, inf) (used only for orbital_scheme = 'period') + # value should be within the period range given by the used grids +# orbital_separation_scheme = 'log_uniform' + # 'log_uniform', 'log_normal' (used only for orbital_scheme = 'separation') +# orbital_separation_min = 5.0 + # float (0, inf) (used only for orbital_scheme = 'separation') + # value should be within the separation range given by the used grids +# orbital_separation_max = 1e5 + # float (0, inf) (used only for orbital_scheme = 'separation') + # value should be within the separation range given by the used grids +# log_orbital_separation_mean = None + # float (0, inf) (used only for orbital_separation_scheme ='log_normal') + # value should be within the separation range given above +# log_orbital_separation_sigma = None + # float (0, inf) (used only for orbital_separation_scheme ='log_normal') + # value should respect the separation range given above + eccentricity_scheme = 'zero' + # 'zero', 'thermal', 'uniform', 'Moe+17-PsandQs' (will enforce + # secondary_mass_scheme='Moe+17-PsandQs' and + # orbital_period_scheme='Moe+17-PsandQs') + + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;; Saving Output ;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +[BinaryStar_output] + extra_columns = {'step_names': 'string', 'step_times': 'float64'} + # columns usually provided by hooks + # e.g. 'step_times' from TimingHooks, 'step_names' from StepNamesHooks + + # LIST BINARY PROPERTIES + only_select_columns = [ + 'state', + 'event', + 'time', + #'separation', + 'orbital_period', + 'eccentricity', + #'V_sys', + #'rl_relative_overflow_1', + #'rl_relative_overflow_2', + 'lg_mtransfer_rate', + #'mass_transfer_case', + #'trap_radius', + #'acc_radius', + #'t_sync_rad_1', + #'t_sync_conv_1', + #'t_sync_rad_2', + #'t_sync_conv_2', + #'nearest_neighbour_distance', + ] + scalar_names = [ + 'interp_class_HMS_HMS', + 'interp_class_CO_HMS_RLO', + 'interp_class_CO_HeMS', + 'interp_class_CO_HeMS_RLO', + 'mt_history_HMS_HMS', + 'mt_history_CO_HMS_RLO', + 'mt_history_CO_HeMS', + 'mt_history_CO_HeMS_RLO', + ] + +[SingleStar_1_output] + # LIST STAR PROPERTIES TO SAVE + include_S1 = True + # True, False + only_select_columns = [ + 'state', + #'metallicity', + 'mass', + 'log_R', + 'log_L', + 'lg_mdot', + #'lg_system_mdot', + #'lg_wind_mdot', + 'he_core_mass', + 'he_core_radius', + #'c_core_mass', + #'c_core_radius', + #'o_core_mass', + #'o_core_radius', + 'co_core_mass', + 'co_core_radius', + 'center_h1', + 'center_he4', + #'center_c12', + #'center_n14', + #'center_o16', + 'surface_h1', + 'surface_he4', + #'surface_c12', + #'surface_n14', + #'surface_o16', + #'log_LH', + #'log_LHe', + #'log_LZ', + #'log_Lnuc', + #'c12_c12', + #'center_gamma', + #'avg_c_in_c_core', + #'surf_avg_omega', + 'surf_avg_omega_div_omega_crit', + #'total_moment_of_inertia', + #'log_total_angular_momentum', + 'spin', + #'conv_env_top_mass', + #'conv_env_bot_mass', + #'conv_env_top_radius', + #'conv_env_bot_radius', + #'conv_env_turnover_time_g', + #'conv_env_turnover_time_l_b', + #'conv_env_turnover_time_l_t', + #'envelope_binding_energy', + #'mass_conv_reg_fortides', + #'thickness_conv_reg_fortides', + #'radius_conv_reg_fortides', + #'lambda_CE_1cent', + #'lambda_CE_10cent', + #'lambda_CE_30cent', + #'lambda_CE_pure_He_star_10cent', + #'profile', + #'total_mass_h1', + #'total_mass_he4', + ] + scalar_names = [ + 'natal_kick_velocity', + 'natal_kick_azimuthal_angle', + 'natal_kick_polar_angle', + 'natal_kick_mean_anomaly' + 'spin_orbit_tilt_first_SN', + 'spin_orbit_tilt_second_SN', + 'f_fb', + 'SN_type', + #'m_disk_accreted', + #'m_disk_radiated', + 'h1_mass_ej', + 'he4_mass_ej', + #'M4', + #'mu4', + 'avg_c_in_c_core_at_He_depletion', + 'co_core_mass_at_He_depletion', + #'m_core_CE_1cent', + #'m_core_CE_10cent', + #'m_core_CE_30cent', + #'m_core_CE_pure_He_star_10cent', + #'r_core_CE_1cent', + #'r_core_CE_10cent', + #'r_core_CE_30cent', + #'r_core_CE_pure_He_star_10cent' + ] + +[SingleStar_2_output] + # LIST STAR PROPERTIES TO SAVE + include_S2 = True + # True, False + only_select_columns = [ + 'state', + #'metallicity', + 'mass', + 'log_R', + 'log_L', + 'lg_mdot', + #'lg_system_mdot', + #'lg_wind_mdot', + 'he_core_mass', + 'he_core_radius', + #'c_core_mass', + #'c_core_radius', + #'o_core_mass', + #'o_core_radius', + 'co_core_mass', + 'co_core_radius', + 'center_h1', + 'center_he4', + #'center_c12', + #'center_n14', + #'center_o16', + 'surface_h1', + 'surface_he4', + #'surface_c12', + #'surface_n14', + #'surface_o16', + #'log_LH', + #'log_LHe', + #'log_LZ', + #'log_Lnuc', + #'c12_c12', + #'center_gamma', + #'avg_c_in_c_core', + #'surf_avg_omega', + 'surf_avg_omega_div_omega_crit', + #'total_moment_of_inertia', + #'log_total_angular_momentum', + 'spin', + #'conv_env_top_mass', + #'conv_env_bot_mass', + #'conv_env_top_radius', + #'conv_env_bot_radius', + #'conv_env_turnover_time_g', + #'conv_env_turnover_time_l_b', + #'conv_env_turnover_time_l_t', + #'envelope_binding_energy', + #'mass_conv_reg_fortides', + #'thickness_conv_reg_fortides', + #'radius_conv_reg_fortides', + #'lambda_CE_1cent', + #'lambda_CE_10cent', + #'lambda_CE_30cent', + #'lambda_CE_pure_He_star_10cent', + #'profile', + #'total_mass_h1', + #'total_mass_he4', + ] + scalar_names = ['natal_kick_velocity', + 'natal_kick_azimuthal_angle', + 'natal_kick_polar_angle', + 'natal_kick_mean_anomaly', + 'spin_orbit_tilt_first_SN', + 'spin_orbit_tilt_second_SN', + 'f_fb', + 'SN_type', + #'m_disk_accreted', + #'m_disk_radiated', + 'h1_mass_ej', + 'he4_mass_ej', + #'M4', + #'mu4', + 'avg_c_in_c_core_at_He_depletion', + 'co_core_mass_at_He_depletion', + #'m_core_CE_1cent', + #'m_core_CE_10cent', + #'m_core_CE_30cent', + #'m_core_CE_pure_He_star_10cent', + #'r_core_CE_1cent', + #'r_core_CE_10cent', + #'r_core_CE_30cent', + #'r_core_CE_pure_He_star_10cent' + ] diff --git a/dev-tools/script_data/inlists/test_multiZ_population_params.ini b/dev-tools/script_data/inlists/test_multiZ_population_params.ini new file mode 100644 index 0000000000..62cdfbd966 --- /dev/null +++ b/dev-tools/script_data/inlists/test_multiZ_population_params.ini @@ -0,0 +1,668 @@ +# POSYDON default BinaryPopulation inifile, use ConfigParser syntax + +[environment_variables] + PATH_TO_POSYDON = '' + + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;; SimulationProperties ;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +[flow] + import = ['posydon.binary_evol.flow_chart', 'flow_chart'] + # builtin posydon flow + absolute_import = None + # if given, use an absolute filepath to user defined flow: + # ['', ''] + +[step_HMS_HMS] + import = ['posydon.binary_evol.MESA.step_mesa', 'MS_MS_step'] + # builtin posydon step + absolute_import = None + # if given, use an absolute filepath to user defined step: + # ['', ''] + interpolation_path = None + # str or None (found by default) + interpolation_filename = None + # str or None (found by default) + interpolation_method = 'linear3c_kNN' + # 'nearest_neighbour', 'linear3c_kNN', '1NN_1NN' + save_initial_conditions = True + # True, False (only for interpolation_method='nearest_neighbour') + track_interpolation = False + # True, False + stop_method = 'stop_at_max_time' + # 'stop_at_end', 'stop_at_max_time', 'stop_at_condition' + stop_star = 'star_1' + # 'star_1', 'star_2' (only for stop_method='stop_at_condition') + stop_var_name = None + # str or None (only for stop_method='stop_at_condition') + stop_value = None + # float or None (only for stop_method='stop_at_condition') + stop_interpolate = True + # True, False + verbose = False + # True, False + + +[step_CO_HeMS] + import = ['posydon.binary_evol.MESA.step_mesa', 'CO_HeMS_step'] + # builtin posydon step + absolute_import = None + # if given, use an absolute filepath to user defined step: + # ['', ''] + interpolation_path = None + # str or None (found by default) + interpolation_filename = None + # str or None (found by default) + interpolation_method = 'linear3c_kNN' + # 'nearest_neighbour', 'linear3c_kNN', '1NN_1NN' + save_initial_conditions = True + # True, False (only for interpolation_method='nearest_neighbour') + track_interpolation = False + # True, False + stop_method = 'stop_at_max_time' + # 'stop_at_end', 'stop_at_max_time', 'stop_at_condition' + stop_star = 'star_1' + # 'star_1', 'star_2' (only for stop_method='stop_at_condition') + stop_var_name = None + # str or None (only for stop_method='stop_at_condition') + stop_value = None + # float or None (only for stop_method='stop_at_condition') + stop_interpolate = True + # True, False + verbose = False + # True, False + +[step_CO_HMS_RLO] + import = ['posydon.binary_evol.MESA.step_mesa', 'CO_HMS_RLO_step'] + # builtin posydon step + absolute_import = None + # if given, use an absolute filepath to user defined step: + # ['', ''] + interpolation_path = None + # str or None (found by default) + interpolation_filename = None + # str or None (found by default) + interpolation_method = 'linear3c_kNN' + # 'nearest_neighbour', 'linear3c_kNN', '1NN_1NN' + save_initial_conditions = True + # True, False (only for interpolation_method='nearest_neighbour') + track_interpolation = False + # True, False + stop_method = 'stop_at_max_time' + # 'stop_at_end' 'stop_at_max_time' 'stop_at_condition' + stop_star = 'star_1' + # 'star_1', 'star_2' (only for stop_method='stop_at_condition') + stop_var_name = None + # str or None (only for stop_method='stop_at_condition') + stop_value = None + # float or None (only for stop_method='stop_at_condition') + stop_interpolate = True + # True, False + verbose = False + # True, False + +[step_CO_HeMS_RLO] + import = ['posydon.binary_evol.MESA.step_mesa', 'CO_HeMS_RLO_step'] + # builtin posydon step + absolute_import = None + # if given, use an absolute filepath to user defined step: + # ['', ''] + interpolation_path = None + # str or None (found by default) + interpolation_filename = None + # str or None (found by default) + interpolation_method = 'linear3c_kNN' + # 'nearest_neighbour', 'linear3c_kNN', '1NN_1NN' + save_initial_conditions = True + # True, False (only for interpolation_method='nearest_neighbour') + track_interpolation = False + # True, False + stop_method = 'stop_at_max_time' + # 'stop_at_end', 'stop_at_max_time', 'stop_at_condition' + stop_star = 'star_1' + # 'star_1', 'star_2' (only for stop_method='stop_at_condition') + stop_var_name = None + # str or None (only for stop_method='stop_at_condition') + stop_value = None + # float or None (only for stop_method='stop_at_condition') + stop_interpolate = True + # True, False + verbose = False + # True, False + + +[step_detached] + import = ['posydon.binary_evol.DT.step_detached', 'detached_step'] + # builtin posydon step + absolute_import = None + # if given, use an absolute filepath to user defined step: + # ['', ''] + matching_method = 'minimize' + # 'minimize', 'root' + matching_tolerance = 1e-2 + # float, DEF: 1e-2 + matching_tolerance_hard = 1e-1 + # float, DEF: 1e-1 + do_wind_loss = True + # True, False + do_tides = True + # True, False + do_gravitational_radiation = True + # True, False + do_magnetic_braking = True + # True, False + magnetic_braking_mode = 'RVJ83' + # 'RVJ83', 'M15', 'G18', 'CARB' + do_stellar_evolution_and_spin_from_winds = True + # True, False + RLO_orbit_at_orbit_with_same_am = False + # True, False + record_matching = False + # True, False + verbose = False + # True, False + +[step_disrupted] + import = ['posydon.binary_evol.DT.step_disrupted','DisruptedStep'] + # builtin posydon step + absolute_import = None + # if given, use an absolute filepath to user defined step: + # ['', ''] + matching_method = 'minimize' + # 'minimize', 'root' + matching_tolerance = 1e-2 + # float, DEF: 1e-2 + matching_tolerance_hard = 1e-1 + # float, DEF: 1e-1 + record_matching = False + # True, False + verbose = False + # True, False + +[step_merged] + import = ['posydon.binary_evol.DT.step_merged','MergedStep'] + # builtin posydon step + absolute_import = None + # if given, use an absolute filepath to user defined step: + # ['', ''] + record_matching = False + # True, False + verbose = False + # True, False + + +[step_initially_single] + import = ['posydon.binary_evol.DT.step_initially_single','InitiallySingleStep'] + # builtin posydon step + absolute_import = None + # if given, use an absolute filepath to user defined step: + # ['', ''] + matching_method = 'minimize' + # 'minimize', 'root' + matching_tolerance = 1e-2 + # float, DEF: 1e-2 + matching_tolerance_hard = 1e-1 + # float, DEF: 1e-1 + record_matching = False + # True, False + verbose = False + # True, False + +[step_CE] + import = ['posydon.binary_evol.CE.step_CEE', 'StepCEE'] + # builtin posydon step + absolute_import = None + # if given, use an absolute filepath to user defined step: + # ['', ''] + prescription = 'alpha-lambda' + # 'alpha-lambda' + common_envelope_efficiency = 1.0 + # float in (0, inf) + # values >1 are discouraged (consider changing lambda or post CE + # interactions) + common_envelope_option_for_lambda = 'lambda_from_grid_final_values' + # (1) 'default_lambda' (uses common_envelope_lambda_default), + # (2) 'lambda_from_grid_final_values', + # (3) 'lambda_from_profile_gravitational' (needs available profiles), + # (4) 'lambda_from_profile_gravitational_plus_internal' (needs available + # profiles), + # (5) 'lambda_from_profile_gravitational_plus_internal_minus_recombination' + # (needs available profiles) + common_envelope_lambda_default = 0.5 + # float in (0, inf) (only for common_envelope_option_for_lambda option 1) + common_envelope_option_for_HG_star = "optimistic" + # 'optimistic', 'pessimistic' + common_envelope_alpha_thermal = 1.0 + # float in (0, inf) (only for common_envelope_option_for_lambda options 4 + # and 5) + core_definition_H_fraction = 0.3 + # 0.01, 0.1, 0.3 + core_definition_He_fraction = 0.1 + # 0.1 + CEE_tolerance_err = 0.001 + # float (0, inf) (numerical tolerance on floats) + common_envelope_option_after_succ_CEE = 'two_phases_stableMT' + # 'two_phases_stableMT' 'one_phase_variable_core_definition' + # 'two_phases_windloss' + record_matching = False + # True, False + verbose = False + # True, False + +[step_SN] + import = ['posydon.binary_evol.SN.step_SN', 'StepSN'] + # builtin posydon step + absolute_import = None + # 'package' kwarg for importlib.import_module + mechanism = 'Fryer+12-delayed' + # v2 interpolators support: 'Fryer+12-rapid', 'Fryer+12-delayed', + # 'Sukhbold+16-engine', 'Patton&Sukhbold20-engine' + # need profiles: 'direct' + engine = '' + # 'N20' or 'W20' for 'Sukhbold+16-engine', 'Patton&Sukhbold20-engine' + # '' for the others + PISN = "Hendriks+23" + # v2 interpolators support: "Hendriks+23" + # other options: None, "Marchant+19" + PISN_CO_shift = 0.0 + # Only when using Hendriks+23 + # float (-inf,inf) + # v2 interpolators support: 0.0 + PPI_extra_mass_loss = -20.0 + # Only when using Hendriks+23 + # float (-inf,inf) + # v2 interpolators support: 0.0 or -20.0 + ECSN = "Tauris+15" + # "Tauris+15", "Podsiadlowski+04" + conserve_hydrogen_envelope = False + # True, False + conserve_hydrogen_PPI = False + # Only when using Hendriks+23 + # True, False + max_neutrino_mass_loss = 0.5 + # float (0,inf) + # v2 interpolators support: 0.5 + max_NS_mass = 2.5 + # float (0,inf) + # v2 interpolators support: 2.5 + use_interp_values = True + # True, False + use_profiles = True + # True, False + use_core_masses = True + # True, False + allow_spin_None = False + # True, False + approx_at_he_depletion = False + # True, False + kick = False + # True, False + kick_normalisation = 'one_over_mass' + # "one_minus_fallback", "one_over_mass", "NS_one_minus_fallback_BH_one", + # "one", "zero" + kick_prescription = 'maxwellian' + # "maxwellian", "log_normal", "asym_ej", "linear" + sigma_kick_CCSN_NS = 265.0 + # float (0,inf) + mean_kick_CCSN_NS = None + # float or None + sigma_kick_CCSN_BH = 265.0 + # float (0,inf) + mean_kick_CCSN_BH = None + # float or None + sigma_kick_ECSN = 20.0 + # float (0,inf) + mean_kick_ECSN = None + # float or None + verbose = False + # True, False + +[step_dco] + import = ['posydon.binary_evol.DT.double_CO', 'DoubleCO'] + # builtin posydon step + absolute_import = None + # if given, use an absolute filepath to user defined step: + # ['', ''] + n_o_steps_history = None + # None or int (0, inf) + +[step_end] + import = ['posydon.binary_evol.step_end', 'step_end'] + # builtin posydon step + absolute_import = None + # if given, use an absolute filepath to user defined step: + # ['', ''] + +[extra_hooks] + import_1 = ['posydon.binary_evol.simulationproperties', 'TimingHooks'] + # builtin posydon hook + absolute_import_1 = None + # if given, use an absolute filepath to user defined step: + # ['', ''] + kwargs_1 = {} + # dict + + import_2 = ['posydon.binary_evol.simulationproperties', 'StepNamesHooks'] + # builtin posydon hook + absolute_import_2 = None + # if given, use an absolute filepath to user defined step: + # ['', ''] + kwargs_2 = {} + # dict + + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;; BinaryPopulation ;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +[BinaryPopulation_options] + optimize_ram = True + # save population in batches: True, False + ram_per_cpu = None + # set maximum ram per cpu before batch saving (GB); None or float (0, inf) + dump_rate = 2000 + # batch save after evolving N binaries: int (0, inf) + # this should be at least 500 for populations of 100,000 binaries or more + temp_directory = 'batches' + # temporary folder for keeping batch files: str + tqdm = False + # progress bar: True, False + breakdown_to_df = True + # convert BinaryStars into DataFrames after evolution: True, False + use_MPI = False + # use only for local MPI runs: True, False + metallicities = [1., 0.1] + # in units of solar metallicity: list of float + # e.g. [2., 1., 0.45, 0.2, 0.1, 0.01, 0.001, 0.0001] + error_checking_verbose = False + # if True, write all POSYDON errors to stderr at runtime, default=False + warnings_verbose = False + # if True, write all POSYDON warnings to stderr at runtime, default=False + history_verbose = False + # if True, record extra functional steps in the output DataFrames + # (These steps represent internal workings of POSYDON rather than physical + # phases of evolution) + entropy = 0 + # if None uses system entropy (recommended): None or int + number_of_binaries = 2 + # int (0, inf) + binary_fraction_scheme = 'const' + # 'const', 'Moe+17-massdependent' + binary_fraction_const = 1.0 + # float [0, 1] + star_formation = 'burst' + # 'constant', 'burst', 'custom_linear', 'custom_log10', + # 'custom_linear_histogram', 'custom_log10_histogram' + max_simulation_time = 13.8e9 + # float (0, inf) + + read_samples_from_file = '' + # path to file to read initial parameters from (if empty string get random + # samples) + primary_mass_scheme = 'Kroupa2001' + # 'Salpeter', 'Kroupa1993', 'Kroupa2001' + primary_mass_min = 7.0 + # float (0, inf) + # value should be within the mass range given by the used grids + primary_mass_max = 150.0 + # float (primary_mass_min, inf) + # value should be within the mass range given by the used grids + secondary_mass_scheme = 'flat_mass_ratio' + # 'flat_mass_ratio', 'q=1', 'Moe+17-PsandQs' (will enforce + # orbital_period_scheme='Moe+17-PsandQs') + secondary_mass_min = 0.5 + # float (0,130) + # value should be within the mass range given by the used grids + secondary_mass_max = 150.0 + # float (secondary_mass_min, inf) + # value should be within the mass range given by the used grids + orbital_scheme = 'period' + # 'separation', 'period' + orbital_period_scheme = 'Sana+12_period_extended' + # (used only for orbital_scheme = 'period') 'Sana+12_period_extended', + # 'Moe+17-PsandQs' (will enforce secondary_mass_scheme='Moe+17-PsandQs') + orbital_period_min = 0.75 + # float (0, inf) (used only for orbital_scheme = 'period') + # value should be within the period range given by the used grids + orbital_period_max = 6000.0 + # float (0, inf) (used only for orbital_scheme = 'period') + # value should be within the period range given by the used grids +# orbital_separation_scheme = 'log_uniform' + # 'log_uniform', 'log_normal' (used only for orbital_scheme = 'separation') +# orbital_separation_min = 5.0 + # float (0, inf) (used only for orbital_scheme = 'separation') + # value should be within the separation range given by the used grids +# orbital_separation_max = 1e5 + # float (0, inf) (used only for orbital_scheme = 'separation') + # value should be within the separation range given by the used grids +# log_orbital_separation_mean = None + # float (0, inf) (used only for orbital_separation_scheme ='log_normal') + # value should be within the separation range given above +# log_orbital_separation_sigma = None + # float (0, inf) (used only for orbital_separation_scheme ='log_normal') + # value should respect the separation range given above + eccentricity_scheme = 'zero' + # 'zero', 'thermal', 'uniform', 'Moe+17-PsandQs' (will enforce + # secondary_mass_scheme='Moe+17-PsandQs' and + # orbital_period_scheme='Moe+17-PsandQs') + + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;; Saving Output ;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +[BinaryStar_output] + extra_columns = {'step_names': 'string', 'step_times': 'float64'} + # columns usually provided by hooks + # e.g. 'step_times' from TimingHooks, 'step_names' from StepNamesHooks + + # LIST BINARY PROPERTIES + only_select_columns = [ + 'state', + 'event', + 'time', + #'separation', + 'orbital_period', + 'eccentricity', + #'V_sys', + #'rl_relative_overflow_1', + #'rl_relative_overflow_2', + 'lg_mtransfer_rate', + #'mass_transfer_case', + #'trap_radius', + #'acc_radius', + #'t_sync_rad_1', + #'t_sync_conv_1', + #'t_sync_rad_2', + #'t_sync_conv_2', + #'nearest_neighbour_distance', + ] + scalar_names = [ + 'interp_class_HMS_HMS', + 'interp_class_CO_HMS_RLO', + 'interp_class_CO_HeMS', + 'interp_class_CO_HeMS_RLO', + 'mt_history_HMS_HMS', + 'mt_history_CO_HMS_RLO', + 'mt_history_CO_HeMS', + 'mt_history_CO_HeMS_RLO', + ] + +[SingleStar_1_output] + # LIST STAR PROPERTIES TO SAVE + include_S1 = True + # True, False + only_select_columns = [ + 'state', + #'metallicity', + 'mass', + 'log_R', + 'log_L', + 'lg_mdot', + #'lg_system_mdot', + #'lg_wind_mdot', + 'he_core_mass', + 'he_core_radius', + #'c_core_mass', + #'c_core_radius', + #'o_core_mass', + #'o_core_radius', + 'co_core_mass', + 'co_core_radius', + 'center_h1', + 'center_he4', + #'center_c12', + #'center_n14', + #'center_o16', + 'surface_h1', + 'surface_he4', + #'surface_c12', + #'surface_n14', + #'surface_o16', + #'log_LH', + #'log_LHe', + #'log_LZ', + #'log_Lnuc', + #'c12_c12', + #'center_gamma', + #'avg_c_in_c_core', + #'surf_avg_omega', + 'surf_avg_omega_div_omega_crit', + #'total_moment_of_inertia', + #'log_total_angular_momentum', + 'spin', + #'conv_env_top_mass', + #'conv_env_bot_mass', + #'conv_env_top_radius', + #'conv_env_bot_radius', + #'conv_env_turnover_time_g', + #'conv_env_turnover_time_l_b', + #'conv_env_turnover_time_l_t', + #'envelope_binding_energy', + #'mass_conv_reg_fortides', + #'thickness_conv_reg_fortides', + #'radius_conv_reg_fortides', + #'lambda_CE_1cent', + #'lambda_CE_10cent', + #'lambda_CE_30cent', + #'lambda_CE_pure_He_star_10cent', + #'profile', + #'total_mass_h1', + #'total_mass_he4', + ] + scalar_names = [ + 'natal_kick_velocity', + 'natal_kick_azimuthal_angle', + 'natal_kick_polar_angle', + 'natal_kick_mean_anomaly' + 'spin_orbit_tilt_first_SN', + 'spin_orbit_tilt_second_SN', + 'f_fb', + 'SN_type', + #'m_disk_accreted', + #'m_disk_radiated', + 'h1_mass_ej', + 'he4_mass_ej', + #'M4', + #'mu4', + 'avg_c_in_c_core_at_He_depletion', + 'co_core_mass_at_He_depletion', + #'m_core_CE_1cent', + #'m_core_CE_10cent', + #'m_core_CE_30cent', + #'m_core_CE_pure_He_star_10cent', + #'r_core_CE_1cent', + #'r_core_CE_10cent', + #'r_core_CE_30cent', + #'r_core_CE_pure_He_star_10cent' + ] + +[SingleStar_2_output] + # LIST STAR PROPERTIES TO SAVE + include_S2 = True + # True, False + only_select_columns = [ + 'state', + #'metallicity', + 'mass', + 'log_R', + 'log_L', + 'lg_mdot', + #'lg_system_mdot', + #'lg_wind_mdot', + 'he_core_mass', + 'he_core_radius', + #'c_core_mass', + #'c_core_radius', + #'o_core_mass', + #'o_core_radius', + 'co_core_mass', + 'co_core_radius', + 'center_h1', + 'center_he4', + #'center_c12', + #'center_n14', + #'center_o16', + 'surface_h1', + 'surface_he4', + #'surface_c12', + #'surface_n14', + #'surface_o16', + #'log_LH', + #'log_LHe', + #'log_LZ', + #'log_Lnuc', + #'c12_c12', + #'center_gamma', + #'avg_c_in_c_core', + #'surf_avg_omega', + 'surf_avg_omega_div_omega_crit', + #'total_moment_of_inertia', + #'log_total_angular_momentum', + 'spin', + #'conv_env_top_mass', + #'conv_env_bot_mass', + #'conv_env_top_radius', + #'conv_env_bot_radius', + #'conv_env_turnover_time_g', + #'conv_env_turnover_time_l_b', + #'conv_env_turnover_time_l_t', + #'envelope_binding_energy', + #'mass_conv_reg_fortides', + #'thickness_conv_reg_fortides', + #'radius_conv_reg_fortides', + #'lambda_CE_1cent', + #'lambda_CE_10cent', + #'lambda_CE_30cent', + #'lambda_CE_pure_He_star_10cent', + #'profile', + #'total_mass_h1', + #'total_mass_he4', + ] + scalar_names = ['natal_kick_velocity', + 'natal_kick_azimuthal_angle', + 'natal_kick_polar_angle', + 'natal_kick_mean_anomaly', + 'spin_orbit_tilt_first_SN', + 'spin_orbit_tilt_second_SN', + 'f_fb', + 'SN_type', + #'m_disk_accreted', + #'m_disk_radiated', + 'h1_mass_ej', + 'he4_mass_ej', + #'M4', + #'mu4', + 'avg_c_in_c_core_at_He_depletion', + 'co_core_mass_at_He_depletion', + #'m_core_CE_1cent', + #'m_core_CE_10cent', + #'m_core_CE_30cent', + #'m_core_CE_pure_He_star_10cent', + #'r_core_CE_1cent', + #'r_core_CE_10cent', + #'r_core_CE_30cent', + #'r_core_CE_pure_He_star_10cent' + ] diff --git a/dev-tools/script_data/src/1Zsun_binaries_suite.py b/dev-tools/script_data/src/1Zsun_binaries_suite.py new file mode 100644 index 0000000000..5b2c416c3c --- /dev/null +++ b/dev-tools/script_data/src/1Zsun_binaries_suite.py @@ -0,0 +1,768 @@ +#!/usr/bin/env python3 +""" +Script to evolve a few binaries. +Used for validation of the branch. + +Author: Max Briel +""" + +import argparse +import os +import signal +import sys +import warnings + +from posydon.binary_evol.binarystar import BinaryStar, SingleStar +from posydon.binary_evol.simulationproperties import SimulationProperties +from posydon.popsyn.io import simprop_kwargs_from_ini +from posydon.utils.common_functions import orbital_separation_from_period + +target_rows = 12 +line_length = 140 +columns_to_show = ['step_names', 'state', 'event', 'S1_state', 'S1_mass', 'S2_state', 'S2_mass', 'orbital_period'] + +def load_inlist(verbose): + + sim_kwargs = simprop_kwargs_from_ini('script_data/1Zsun_binaries_params.ini', verbose=verbose) + metallicity = {'metallicity':1, 'verbose':verbose} + + sim_kwargs['step_HMS_HMS'][1].update(metallicity) + sim_kwargs['step_CO_HeMS'][1].update(metallicity) + sim_kwargs['step_CO_HMS_RLO'][1].update(metallicity) + sim_kwargs['step_CO_HeMS_RLO'][1].update(metallicity) + sim_kwargs['step_detached'][1].update(metallicity) + sim_kwargs['step_disrupted'][1].update(metallicity) + sim_kwargs['step_merged'][1].update(metallicity) + sim_kwargs['step_initially_single'][1].update(metallicity) + + sim_prop = SimulationProperties(**sim_kwargs) + + sim_prop.load_steps(verbose=verbose) + return sim_prop + +def write_binary_to_screen(binary): + """Writes a binary DataFrame prettily to the screen + + Args: + binary: BinaryStar object with evolved data + """ + df = binary.to_df(**{'extra_columns':{'step_names':'str'}}) + + # Filter to only existing columns + available_columns = [col for col in columns_to_show if col in df.columns] + df_filtered = df[available_columns] + + # Reset index to use a counter instead of NaN + df_filtered = df_filtered.reset_index(drop=True) + + print("=" * line_length) + + # Print the DataFrame + df_string = df_filtered.to_string(index=True, float_format='%.3f') + print(df_string) + + # Add empty lines to reach exactly 10 rows of output + current_rows = len(df_filtered) + 1 # add one for header + + if current_rows < target_rows: + # Calculate the width of the output to print empty lines of the same width + lines = df_string.split('\n') + if len(lines) > 1: + # Use the width of the data lines (skip header) + empty_lines_needed = target_rows - current_rows + for i in range(empty_lines_needed): + print("") + + print("-" * line_length) + + +def print_failed_binary(binary,e, max_error_lines=3): + + print("=" * line_length) + print(f"šŸšØ Binary Evolution Failed!") + print(f"Exception: {type(e).__name__}") + print(f"Message: {e}") + + # Get the binary's current state and limit output + try: + df = binary.to_df(**{'extra_columns':{'step_names':'str'}}) + if len(df) > 0: + # Select only the desired columns + + available_columns = [col for col in columns_to_show if col in df.columns] + df_filtered = df[available_columns] + + # Reset index to use a counter instead of NaN + df_filtered = df_filtered.reset_index(drop=True) + + # Limit to max_error_lines + if len(df_filtered) > max_error_lines: + df_filtered = df_filtered.tail(max_error_lines) + print(f"\nShowing last {max_error_lines} evolution steps before failure:") + else: + print(f"\nEvolution steps before failure ({len(df_filtered)} steps):") + + df_string = df_filtered.to_string(index=True, float_format='%.3f') + print(df_string) + + current_rows = len(df_filtered) + 1 + 5 # add one for header + empty_lines_needed = target_rows - current_rows + for i in range(empty_lines_needed): + print("") + else: + print("\nNo evolution steps recorded before failure.") + except Exception as inner_e: + print(f"\nCould not retrieve binary state: {inner_e}") + + print("-" * line_length) + +def evolve_binary(binary): + + # Capture warnings during evolution + captured_warnings = [] + + def warning_handler(message, category, filename, lineno, file=None, line=None): + captured_warnings.append({ + 'message': str(message), + 'category': category.__name__, + 'filename': filename, + 'lineno': lineno + }) + + # Set up warning capture + old_showwarning = warnings.showwarning + warnings.showwarning = warning_handler + + try: + binary.evolve() + # Display the evolution summary for successful evolution + write_binary_to_screen(binary) + + # Show warnings if any were captured + if captured_warnings: + print(f"āš ļø {len(captured_warnings)} warning(s) raised during evolution:") + for i, warning in enumerate(captured_warnings[:3], 1): # Show max 3 warnings + print(f" {i}. {warning['category']}: {warning['message']}") + if len(captured_warnings) > 3: + print(f" ... and {len(captured_warnings) - 3} more warning(s)") + elif len(captured_warnings) <= 3: + for i in range(4-len(captured_warnings)): + print("") + else: + print(f"No warning(s) raised during evolution\n\n\n\n") + print("=" * line_length) + + except Exception as e: + + # turn off binary alarm in case of exception + signal.alarm(0) + + print_failed_binary(binary, e) + + # Show warnings if any were captured before the exception + if captured_warnings: + print(f"\nāš ļø {len(captured_warnings)} warning(s) raised before failure:") + for i, warning in enumerate(captured_warnings[:3], 1): # Show max 3 warnings + print(f" {i}. {warning['category']}: {warning['message']}") + if len(captured_warnings) > 3: + print(f" ... and {len(captured_warnings) - 3} more warning(s)") + else: + print(f"No warning(s) raised during evolution\n\n\n\n") + + print("=" * line_length) + finally: + # Always turn off binary alarm and restore warning handler + signal.alarm(0) + warnings.showwarning = old_showwarning + + +def evolve_binaries(verbose): + """Evolves a few binaries to validate their output + """ + sim_prop = load_inlist(verbose) + + ######################################## + # Failing binary in matching + ######################################## + star_1 = SingleStar(**{'mass': 11.948472796094759, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [231.97383621190582, 5.927334890264575, 1.5990566013567014, 6.137994236518587]}) + star_2 = SingleStar(**{'mass': 7.636958434479617, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 190925.99636740884,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary) + ######################################## + # Failing binary in matching + ######################################## + star_1 = SingleStar(**{'mass': 30.169861921689556, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [77.96834852144123, 0.05021460132555987, 2.3146518208348152, 1.733054979982291]}) + star_2 = SingleStar(**{'mass': 10.972734402996027, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 20479.71919353725,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary) + ######################################## + # flipped S1 and S2 ? + ######################################## + star_1 = SingleStar(**{'mass': 9.474917413943635, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [133.5713935237759, 4.398754864537542, 2.703102872841114, 1.4633904612711142]}) + star_2 = SingleStar(**{'mass': 9.311073918196263, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 18.605997832086413,'eccentricity': 0.0}, properties = sim_prop) + + evolve_binary(binary) + ######################################## + # flipped S1 and S2 + ######################################## + star_1 = SingleStar(**{'mass': 10.438541, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + star_2 = SingleStar(**{'mass': 1.400713, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 9.824025,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary) + ######################################## + # flipped S1 and S2 + ######################################## + star_1= SingleStar(**{'mass': 9.845907 , 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) + star_2 = SingleStar(**{'mass': 9.611029, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 3.820571,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary) + ######################################## + # Normal binary evolution + ######################################## + star_1= SingleStar(**{'mass': 30.845907 , 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) + star_2 = SingleStar(**{'mass': 30.611029, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 30.820571,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary) + ######################################## + # Normal binary + ######################################## + star_1= SingleStar(**{'mass': 9.213534679594247 , 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [327.5906384501521, 1.7707176050073297, 1.573225822966838, 1.6757313876001914]}) + star_2 = SingleStar(**{'mass': 7.209878522799272, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 63123.74544474666,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary) + ######################################## + # Normal binary + ######################################## + star_1= SingleStar(**{'mass': 9.561158487732602 , 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [317.5423844462847, 2.9095984678057603, 1.754121288652108, 2.3693917842468784]}) + star_2 = SingleStar(**{'mass': 9.382732464319286, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 27.77657038557851,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary) + ######################################## + # Normal binary + ######################################## + star1 = SingleStar(**{'mass': 7.552858,#29829485, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [40.91509926587841, 2.6295454150818256, 1.6718337470964977, 6.0408769315244895]}) + star2 = SingleStar(**{'mass': 6.742063, #481560266, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 17.957531550841225, 'eccentricity': 0.0,}, + properties=sim_prop) + evolve_binary(binary) + ######################################## + # High BH spin options + ######################################## + star_1 = SingleStar(**{'mass': 31.616785, 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [10, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) + star_2 = SingleStar(**{'mass': 26.874267, 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 501.99252706449792,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary) + ######################################## + # Original a>1 spin error + ######################################## + star_1 = SingleStar(**{'mass': 18.107506844123645, 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [528.2970725443025, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) + star_2 = SingleStar(**{'mass': 15.641392951875442, 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 151.99252706449792,'eccentricity': 0.0}, properties = sim_prop) + ######################################## + # FIXED disrupted crash + ######################################## + STAR1 = SingleStar(**{'mass': 52.967313, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + STAR2 = SingleStar(**{'mass': 36.306444, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + BINARY = BinaryStar(STAR1, STAR2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':12.877004, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(BINARY) + ######################################## + # FIXED error with SN type + ######################################## + STAR1 = SingleStar(**{'mass': 17.782576, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + STAR2 = SingleStar(**{'mass':3.273864, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + BINARY = BinaryStar(STAR1, STAR2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(BINARY) + ######################################## + # FIXED oRLO2 looping + ######################################## + STAR1 = SingleStar(**{'mass': 170.638207, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [4.921294, 4.31745, 1.777768, 3.509656]}) + STAR2 = SingleStar(**{'mass':37.917852, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + + BINARY = BinaryStar(STAR1, STAR2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':113.352736, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(BINARY) + ######################################## + # Redirect to step_CO_HeMS (H-rich non-burning?) + ######################################## + star_1 = SingleStar(**{'mass': 8.333579, 'state': 'H-rich_Core_H_burning',\ + 'natal_kick_array': [17.125568, 4.101834, 0.917541, 3.961291]}) + star_2 = SingleStar(**{'mass' : 8.208376, 'state' : 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 66.870417, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary) + ######################################## + # FIXED oRLO2 looping + ######################################## + star_1 = SingleStar(**{'mass': 16.921378, 'state': 'H-rich_Core_H_burning',\ + 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}) + star_2 = SingleStar(**{'mass' : 16.286318, 'state' : 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 37.958768, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary) + ######################################## + # FIXED? step_detached failure + ######################################## + STAR1 = SingleStar(**{'mass': 19.787769, 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [24.464803, 0.666314, 1.954698, 5.598975]}) + STAR2 = SingleStar(**{'mass': 7.638741, 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + BINARY = BinaryStar(STAR1, STAR2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3007.865561, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(BINARY) + ######################################## + # Disrupted binary + ######################################## + star_1 = SingleStar(**{'mass': 16.921378, 'state': 'H-rich_Core_H_burning',\ + 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}) + star_2 = SingleStar(**{'mass' : 16.286318, 'state' : 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + BINARY = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3007.865561, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(BINARY) + ######################################## + # FIXED Detached binary failure (low mass) + ######################################## + STAR1 = SingleStar(**{'mass': 9, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + STAR2 = SingleStar(**{'mass':0.8, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + BINARY = BinaryStar(STAR1, STAR2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(BINARY) + ######################################## + # FIXED SN_TYPE = None crash + ######################################## + STAR1 = SingleStar(**{'mass': 17.782576, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + STAR2 = SingleStar(**{'mass':3.273864, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + BINARY = BinaryStar(STAR1, STAR2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(BINARY) + ######################################## + # FIXED SN_TYPE errors + ######################################## + STAR1 = SingleStar(**{'mass': 6.782576, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + STAR2 = SingleStar(**{'mass':3.273864, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + BINARY = BinaryStar(STAR1, STAR2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(BINARY) + ######################################## + # FIXED SN_TYPE errors + ######################################## + STAR1 = SingleStar(**{'mass': 40.638207, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [30.921294, 4.31745, 1.777768, 3.509656]}) + STAR2 = SingleStar(**{'mass':37.917852, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + BINARY = BinaryStar(STAR1, STAR2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':2113.352736, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(BINARY) + ######################################## + # FIXED ECSN errors? + ######################################## + STAR1 = SingleStar(**{'mass': 12.376778, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [80, 4.31745, 1.777768, 3.509656]}) + STAR2 = SingleStar(**{'mass': 9.711216, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + + BINARY = BinaryStar(STAR1, STAR2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':79.83702, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(BINARY) + ######################################## + # Interpolator masses?? + ######################################## + STAR1 = SingleStar(**{'mass': 7.592921, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + STAR2 = SingleStar(**{'mass':5.038679 , + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + BINARY = BinaryStar(STAR1, STAR2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.537807, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(BINARY) + ######################################## + # Interpolator masses? + ######################################## + star_1 = SingleStar(**{'mass': 38.741115, + 'state': 'H-rich_Core_H_burning',\ + 'natal_kick_array': [21.113771, 2.060135, 2.224789, 4.089729]}) + star_2 = SingleStar(**{'mass': 27.776178, + 'state': 'H-rich_Core_H_burning',\ + 'natal_kick_array': [282.712103, 0.296252, 1.628433, 5.623812]}) + + BINARY = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 93.387072, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(BINARY) + ######################################## + # FIXED NaN spin + ######################################## + STAR1 = SingleStar(**{'mass': 70.066924, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0], + 'metallicity':1}) + STAR2 = SingleStar(**{'mass': 34.183110, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0], + 'metallicity':1}) + BINARY = BinaryStar(STAR1, STAR2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.931492e+03, + 'separation': orbital_separation_from_period(5.931492e+03, STAR1.mass, STAR2.mass), + 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(BINARY) + ######################################## + # FIXED NaN spin + ######################################## + STAR1 = SingleStar(**{'mass': 28.837286, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + STAR2 = SingleStar(**{'mass': 6.874867, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + BINARY = BinaryStar(STAR1, STAR2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':35.609894, + 'separation': orbital_separation_from_period(35.609894, STAR1.mass, STAR2.mass), + 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(BINARY) + ######################################## + # oRLO2 issue + ######################################## + STAR1 = SingleStar(**{'mass':29.580210, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + STAR2 = SingleStar(**{'mass': 28.814626, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + BINARY = BinaryStar(STAR1, STAR2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':40.437993, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(BINARY) + + ######################################## + # oRLO2 issue + ######################################## + STAR1 = SingleStar(**{'mass':67.126795, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + STAR2 = SingleStar(**{'mass': 19.622908, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + BINARY = BinaryStar(STAR1, STAR2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':1484.768582, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(BINARY) + + ######################################## + # oRLO2 issue + ######################################## + STAR1 = SingleStar(**{'mass': 58.947503, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + STAR2 = SingleStar(**{'mass': 56.660506, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + BINARY = BinaryStar(STAR1, STAR2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':2011.300659, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(BINARY) + + ######################################## + # oRLO2 issue + ######################################## + STAR1 = SingleStar(**{'mass': 170.638207, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[47.979957374424956, 5.317304576107798, 2.7259013166068145, 4.700929589520818]}) + STAR2 = SingleStar(**{'mass': 37.917852, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + BINARY = BinaryStar(STAR1, STAR2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':113.352736, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(BINARY) + + ######################################## + # oRLO2 issue + ######################################## + STAR1 = SingleStar(**{'mass': 109.540207, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + STAR2 = SingleStar(**{'mass': 84.344530, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + BINARY = BinaryStar(STAR1, STAR2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.651896, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(BINARY) + + ######################################## + # redirect + ######################################## + STAR1 = SingleStar(**{'mass': 13.889634, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + STAR2 = SingleStar(**{'mass':0.490231, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + BINARY = BinaryStar(STAR1, STAR2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':14513.150157, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(BINARY) + ######################################## + # redirect + ######################################## + STAR1 = SingleStar(**{'mass': 9, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + STAR2 = SingleStar(**{'mass':0.8, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + BINARY = BinaryStar(STAR1, STAR2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(BINARY) + ######################################## + # Max time + ######################################## + star_1 = SingleStar(**{'mass': 103.07996766780799, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.2965418610971261, 2.0789170290719117, 3.207488023705968]}) + star_2 = SingleStar(**{'mass': 83.66522615073987, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 1449.1101985875678,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary) + ######################################## + # Max time + ######################################## + star_1 = SingleStar(**{'mass': 8.860934140643465, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [11.818027275431337, 2.812412688633058, 0.4998731824233789, 2.9272630485628643]}) + star_2 = SingleStar(**{'mass': 8.584716012668551, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 20.82030114750744,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary) + ######################################## + # PR421 + ######################################## + STAR1 = SingleStar(**{'mass': 24.035366, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + STAR2 = SingleStar(**{'mass': 23.187355, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + BINARY = BinaryStar(STAR1, STAR2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':18.865029, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(BINARY) + + ######################################## + # CE class + ######################################## + STAR1 = SingleStar(**{'mass':33.964274, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + STAR2 = SingleStar(**{'mass': 28.98149, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + BINARY = BinaryStar(STAR1, STAR2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':82.370989, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(BINARY) + + ######################################## + # PR574 - stepCE fix + ######################################## + STAR1 = SingleStar(**{'mass':29.580210, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + STAR2 = SingleStar(**{'mass': 28.814626*0.4, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + BINARY = BinaryStar(STAR1, STAR2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':300.437993, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(BINARY) + + ######################################## + # e_ZAMS error + ######################################## + star1 = SingleStar(**{'mass': 8.161885721822461, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 3.5907829421526154, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 36.873457164644144, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary) + + ######################################## + # e_ZAMS error + ######################################## + star1 = SingleStar(**{'mass': 35.24755025317775, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [19.755993125895806, 0.37149222852233904, 1.6588846085306563, + 1.434617029858906]}) + star2 = SingleStar(**{'mass': 30.000450298072902, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 24060.02101364665, 'eccentricity': 0.8085077857996965}, + properties = sim_prop) + evolve_binary(binary) + + ######################################## + # e_ZAMS error + ######################################## + star1 = SingleStar(**{'mass': 11.862930493162692, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 1.4739109294156703, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 4111.083887312003, 'eccentricity':0.0}, + properties = sim_prop) + evolve_binary(binary) + + ######################################## + # e_ZAMS error + ######################################## + star1 = SingleStar(**{'mass': 8.527361341212108, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 0.7061748406821822, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 2521.1927287891444, 'eccentricity':0.0}, + properties = sim_prop) + evolve_binary(binary) + + ######################################## + # e_ZAMS error + ######################################## + star1 = SingleStar(**{'mass': 13.661942533447398 ,#29829485, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 4.466151109802313 , #481560266, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3110.1346707516914, 'eccentricity':0.0}, + properties = sim_prop) + evolve_binary(binary) + +if __name__ == "__main__": + parser = argparse.ArgumentParser(description='Evolve binaries for validation.') + parser.add_argument('--verbose', '-v', action='store_true', default=False, + help='Enable verbose output (default: False)') + args = parser.parse_args() + + evolve_binaries(verbose=args.verbose) diff --git a/dev-tools/script_data/src/binaries_suite.py b/dev-tools/script_data/src/binaries_suite.py new file mode 100644 index 0000000000..2abd4b81fc --- /dev/null +++ b/dev-tools/script_data/src/binaries_suite.py @@ -0,0 +1,87 @@ +#!/usr/bin/env python3 +""" +Script to evolve a few binaries. +Used for validation of the branch. + +Author: Max Briel +""" + +import argparse +import os +import signal +import warnings + +from posydon.binary_evol.simulationproperties import SimulationProperties +from utils import print_warnings, write_binary_to_screen, print_failed_binary +from binary_test_cases import get_test_binaries +from posydon.config import PATH_TO_POSYDON +from formatting import line_length + +path_to_default_params = os.path.join(PATH_TO_POSYDON, "dev-tools/script_data/1Zsun_binaries_params.ini") + +def load_inlist(verbose): + + sim_prop = SimulationProperties.from_ini(path_to_default_params) + sim_prop.load_steps(verbose=verbose, metallicity=1.0) + + return sim_prop + +def evolve_binary(binary): + + # Capture warnings during evolution + captured_warnings = [] + + def warning_handler(message, category, filename, lineno, file=None, line=None): + captured_warnings.append({ + 'message': str(message), + 'category': category.__name__, + 'filename': filename, + 'lineno': lineno + }) + + # Set up warning capture + old_showwarning = warnings.showwarning + warnings.showwarning = warning_handler + + try: + binary.evolve() + # Display the evolution summary for successful evolution + write_binary_to_screen(binary) + + # Show warnings if any were captured + print_warnings(captured_warnings) + print("=" * line_length) + + except Exception as e: + + # turn off binary alarm in case of exception + signal.alarm(0) + + print_failed_binary(binary, e) + + # Show warnings if any were captured before the exception + print_warnings(captured_warnings) + + print("=" * line_length) + finally: + # Always turn off binary alarm and restore warning handler + signal.alarm(0) + warnings.showwarning = old_showwarning + + +def evolve_binaries(verbose): + """Evolves a few binaries to validate their output + """ + sim_prop = load_inlist(verbose) + test_binaries = get_test_binaries(sim_prop) + + for binary in test_binaries: + evolve_binary(binary) + +if __name__ == "__main__": + parser = argparse.ArgumentParser(description='Evolve binaries for validation.') + parser.add_argument('--verbose', '-v', action='store_true', default=False, + help='Enable verbose output (default: False)') + args = parser.parse_args() + + evolve_binaries(verbose=args.verbose) diff --git a/dev-tools/script_data/src/binary_test_cases.py b/dev-tools/script_data/src/binary_test_cases.py new file mode 100644 index 0000000000..bb5830d1c0 --- /dev/null +++ b/dev-tools/script_data/src/binary_test_cases.py @@ -0,0 +1,616 @@ +from posydon.binary_evol.binarystar import BinaryStar, SingleStar +from posydon.utils.common_functions import orbital_separation_from_period + +def get_test_binaries(sim_prop): + + test_binaries = [] + + ######################################## + # Failing binary in matching + ######################################## + star_1 = SingleStar(**{'mass': 11.948472796094759, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [231.97383621190582, 5.927334890264575, 1.5990566013567014, 6.137994236518587]}) + star_2 = SingleStar(**{'mass': 7.636958434479617, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 190925.99636740884,'eccentricity': 0.0}, properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # Failing binary in matching + ######################################## + star_1 = SingleStar(**{'mass': 30.169861921689556, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [77.96834852144123, 0.05021460132555987, 2.3146518208348152, 1.733054979982291]}) + star_2 = SingleStar(**{'mass': 10.972734402996027, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 20479.71919353725,'eccentricity': 0.0}, properties = sim_prop) + + ######################################## + # flipped S1 and S2 ? + ######################################## + star_1 = SingleStar(**{'mass': 9.474917413943635, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [133.5713935237759, 4.398754864537542, 2.703102872841114, 1.4633904612711142]}) + star_2 = SingleStar(**{'mass': 9.311073918196263, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 18.605997832086413,'eccentricity': 0.0}, properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # flipped S1 and S2 + ######################################## + star_1 = SingleStar(**{'mass': 10.438541, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + star_2 = SingleStar(**{'mass': 1.400713, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 9.824025,'eccentricity': 0.0}, properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # flipped S1 and S2 + ######################################## + star_1= SingleStar(**{'mass': 9.845907 , 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) + star_2 = SingleStar(**{'mass': 9.611029, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 3.820571,'eccentricity': 0.0}, properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # Normal binary evolution + ######################################## + star_1= SingleStar(**{'mass': 30.845907 , 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) + star_2 = SingleStar(**{'mass': 30.611029, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 30.820571,'eccentricity': 0.0}, properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # Normal binary + ######################################## + star_1= SingleStar(**{'mass': 9.213534679594247 , 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [327.5906384501521, 1.7707176050073297, 1.573225822966838, 1.6757313876001914]}) + star_2 = SingleStar(**{'mass': 7.209878522799272, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 63123.74544474666,'eccentricity': 0.0}, properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # Normal binary + ######################################## + star_1= SingleStar(**{'mass': 9.561158487732602 , 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [317.5423844462847, 2.9095984678057603, 1.754121288652108, 2.3693917842468784]}) + star_2 = SingleStar(**{'mass': 9.382732464319286, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 27.77657038557851,'eccentricity': 0.0}, properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # Normal binary + ######################################## + star_1 = SingleStar(**{'mass': 7.552858,#29829485, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [40.91509926587841, 2.6295454150818256, 1.6718337470964977, 6.0408769315244895]}) + star_2 = SingleStar(**{'mass': 6.742063, #481560266, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 17.957531550841225, 'eccentricity': 0.0,}, + properties=sim_prop) + test_binaries.append(binary) + + ######################################## + # High BH spin options + ######################################## + star_1 = SingleStar(**{'mass': 31.616785, 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [10, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) + star_2 = SingleStar(**{'mass': 26.874267, 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 501.99252706449792,'eccentricity': 0.0}, properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # Original a>1 spin error + ######################################## + star_1 = SingleStar(**{'mass': 18.107506844123645, 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [528.2970725443025, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) + star_2 = SingleStar(**{'mass': 15.641392951875442, 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 151.99252706449792,'eccentricity': 0.0}, properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # FIXED disrupted crash + ######################################## + star_1 = SingleStar(**{'mass': 52.967313, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + star_2 = SingleStar(**{'mass': 36.306444, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':12.877004, 'eccentricity': 0.0}, + properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # FIXED error with SN type + ######################################## + star_1 = SingleStar(**{'mass': 17.782576, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + star_2 = SingleStar(**{'mass':3.273864, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, + properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # FIXED oRLO2 looping + ######################################## + star_1 = SingleStar(**{'mass': 170.638207, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [4.921294, 4.31745, 1.777768, 3.509656]}) + star_2 = SingleStar(**{'mass':37.917852, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':113.352736, 'eccentricity': 0.0}, + properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # Redirect to step_CO_HeMS (H-rich non-burning?) + ######################################## + star_1 = SingleStar(**{'mass': 8.333579, 'state': 'H-rich_Core_H_burning',\ + 'natal_kick_array': [17.125568, 4.101834, 0.917541, 3.961291]}) + star_2 = SingleStar(**{'mass' : 8.208376, 'state' : 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 66.870417, 'eccentricity': 0.0}, + properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # FIXED oRLO2 looping + ######################################## + star_1 = SingleStar(**{'mass': 16.921378, 'state': 'H-rich_Core_H_burning',\ + 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}) + star_2 = SingleStar(**{'mass' : 16.286318, 'state' : 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 37.958768, 'eccentricity': 0.0}, + properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # FIXED? step_detached failure + ######################################## + star_1 = SingleStar(**{'mass': 19.787769, 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [24.464803, 0.666314, 1.954698, 5.598975]}) + star_2 = SingleStar(**{'mass': 7.638741, 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3007.865561, 'eccentricity': 0.0}, + properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # Disrupted binary + ######################################## + star_1 = SingleStar(**{'mass': 16.921378, 'state': 'H-rich_Core_H_burning',\ + 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}) + star_2 = SingleStar(**{'mass' : 16.286318, 'state' : 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3007.865561, 'eccentricity': 0.0}, + properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # FIXED Detached binary failure (low mass) + ######################################## + star_1 = SingleStar(**{'mass': 9, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star_2 = SingleStar(**{'mass':0.8, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, + properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # FIXED SN_TYPE = None crash + ######################################## + star_1 = SingleStar(**{'mass': 17.782576, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star_2 = SingleStar(**{'mass':3.273864, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, + properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # FIXED SN_TYPE errors + ######################################## + star_1 = SingleStar(**{'mass': 6.782576, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star_2 = SingleStar(**{'mass':3.273864, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, + properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # FIXED SN_TYPE errors + ######################################## + star_1 = SingleStar(**{'mass': 40.638207, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [30.921294, 4.31745, 1.777768, 3.509656]}) + star_2 = SingleStar(**{'mass':37.917852, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':2113.352736, 'eccentricity': 0.0}, + properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # FIXED ECSN errors? + ######################################## + star_1 = SingleStar(**{'mass': 12.376778, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [80, 4.31745, 1.777768, 3.509656]}) + star_2 = SingleStar(**{'mass': 9.711216, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':79.83702, 'eccentricity': 0.0}, + properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # Interpolator masses?? + ######################################## + star_1 = SingleStar(**{'mass': 7.592921, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star_2 = SingleStar(**{'mass':5.038679 , + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.537807, 'eccentricity': 0.0}, + properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # Interpolator masses? + ######################################## + star_1 = SingleStar(**{'mass': 38.741115, + 'state': 'H-rich_Core_H_burning',\ + 'natal_kick_array': [21.113771, 2.060135, 2.224789, 4.089729]}) + star_2 = SingleStar(**{'mass': 27.776178, + 'state': 'H-rich_Core_H_burning',\ + 'natal_kick_array': [282.712103, 0.296252, 1.628433, 5.623812]}) + + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 93.387072, 'eccentricity': 0.0}, + properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # FIXED NaN spin + ######################################## + star_1 = SingleStar(**{'mass': 70.066924, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0], + 'metallicity':1}) + star_2 = SingleStar(**{'mass': 34.183110, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0], + 'metallicity':1}) + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.931492e+03, + 'separation': orbital_separation_from_period(5.931492e+03, star_1.mass, star_2.mass), + 'eccentricity': 0.0}, + properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # FIXED NaN spin + ######################################## + star_1 = SingleStar(**{'mass': 28.837286, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star_2 = SingleStar(**{'mass': 6.874867, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':35.609894, + 'separation': orbital_separation_from_period(35.609894, star_1.mass, star_2.mass), + 'eccentricity': 0.0}, + properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # oRLO2 issue + ######################################## + star_1 = SingleStar(**{'mass':29.580210, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star_2 = SingleStar(**{'mass': 28.814626, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':40.437993, 'eccentricity': 0.0}, + properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # oRLO2 issue + ######################################## + star_1 = SingleStar(**{'mass':67.126795, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star_2 = SingleStar(**{'mass': 19.622908, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':1484.768582, 'eccentricity': 0.0}, + properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # oRLO2 issue + ######################################## + star_1 = SingleStar(**{'mass': 58.947503, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star_2 = SingleStar(**{'mass': 56.660506, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':2011.300659, 'eccentricity': 0.0}, + properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # oRLO2 issue + ######################################## + star_1 = SingleStar(**{'mass': 170.638207, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[47.979957374424956, 5.317304576107798, 2.7259013166068145, 4.700929589520818]}) + star_2 = SingleStar(**{'mass': 37.917852, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':113.352736, 'eccentricity': 0.0}, + properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # oRLO2 issue + ######################################## + star_1 = SingleStar(**{'mass': 109.540207, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star_2 = SingleStar(**{'mass': 84.344530, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.651896, 'eccentricity': 0.0}, + properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # redirect + ######################################## + star_1 = SingleStar(**{'mass': 13.889634, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star_2 = SingleStar(**{'mass':0.490231, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':14513.150157, 'eccentricity': 0.0}, + properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # redirect + ######################################## + star_1 = SingleStar(**{'mass': 9, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star_2 = SingleStar(**{'mass':0.8, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, + properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # Max time + ######################################## + star_1 = SingleStar(**{'mass': 103.07996766780799, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.2965418610971261, 2.0789170290719117, 3.207488023705968]}) + star_2 = SingleStar(**{'mass': 83.66522615073987, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 1449.1101985875678,'eccentricity': 0.0}, properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # Max time + ######################################## + star_1 = SingleStar(**{'mass': 8.860934140643465, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [11.818027275431337, 2.812412688633058, 0.4998731824233789, 2.9272630485628643]}) + star_2 = SingleStar(**{'mass': 8.584716012668551, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 20.82030114750744,'eccentricity': 0.0}, properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # PR421 + ######################################## + star_1 = SingleStar(**{'mass': 24.035366, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star_2 = SingleStar(**{'mass': 23.187355, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':18.865029, 'eccentricity': 0.0}, + properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # CE class + ######################################## + star_1 = SingleStar(**{'mass':33.964274, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star_2 = SingleStar(**{'mass': 28.98149, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':82.370989, 'eccentricity': 0.0}, + properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # PR574 - stepCE fix + ######################################## + star_1 = SingleStar(**{'mass':29.580210, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star_2 = SingleStar(**{'mass': 28.814626*0.4, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':300.437993, 'eccentricity': 0.0}, + properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # e_ZAMS error + ######################################## + star_1 = SingleStar(**{'mass': 8.161885721822461, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + star_2 = SingleStar(**{'mass': 3.5907829421526154, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 36.873457164644144, 'eccentricity': 0.0}, + properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # e_ZAMS error + ######################################## + star_1 = SingleStar(**{'mass': 35.24755025317775, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [19.755993125895806, 0.37149222852233904, 1.6588846085306563, + 1.434617029858906]}) + star_2 = SingleStar(**{'mass': 30.000450298072902, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 24060.02101364665, 'eccentricity': 0.8085077857996965}, + properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # e_ZAMS error + ######################################## + star_1 = SingleStar(**{'mass': 11.862930493162692, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + star_2 = SingleStar(**{'mass': 1.4739109294156703, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 4111.083887312003, 'eccentricity':0.0}, + properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # e_ZAMS error + ######################################## + star_1 = SingleStar(**{'mass': 8.527361341212108, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + star_2 = SingleStar(**{'mass': 0.7061748406821822, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 2521.1927287891444, 'eccentricity':0.0}, + properties = sim_prop) + test_binaries.append(binary) + + ######################################## + # e_ZAMS error + ######################################## + star_1 = SingleStar(**{'mass': 13.661942533447398 ,#29829485, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + star_2 = SingleStar(**{'mass': 4.466151109802313 , #481560266, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3110.1346707516914, 'eccentricity':0.0}, + properties = sim_prop) + test_binaries.append(binary) + + return test_binaries \ No newline at end of file diff --git a/dev-tools/script_data/src/formatting.py b/dev-tools/script_data/src/formatting.py new file mode 100644 index 0000000000..7a8078d559 --- /dev/null +++ b/dev-tools/script_data/src/formatting.py @@ -0,0 +1,3 @@ +target_rows = 12 +line_length = 140 +columns_to_show = ['step_names', 'state', 'event', 'S1_state', 'S1_mass', 'S2_state', 'S2_mass', 'orbital_period'] \ No newline at end of file diff --git a/dev-tools/script_data/src/test_pops.py b/dev-tools/script_data/src/test_pops.py new file mode 100644 index 0000000000..1b9a2c9973 --- /dev/null +++ b/dev-tools/script_data/src/test_pops.py @@ -0,0 +1,112 @@ +import os +import traceback +import warnings +from pandas.testing import assert_frame_equal + +from posydon.config import PATH_TO_POSYDON +from posydon.popsyn.binarypopulation import BinaryPopulation +from posydon.popsyn.synthetic_population import Population, PopulationRunner +from utils import print_warnings, print_pop_settings +from formatting import line_length + +path_to_default_params = os.path.join(PATH_TO_POSYDON, "dev-tools/script_data/test_population_params.ini") +path_to_multiZ_params = os.path.join(PATH_TO_POSYDON, "dev-tools/script_data/test_multiZ_population_params.ini") + +def test_binpop_evolve(population, popevo_kwargs, verbose=False): + + # Capture warnings during evolution + captured_warnings = [] + + def warning_handler(message, category, filename, lineno, file=None, line=None): + captured_warnings.append({ + 'message': str(message), + 'category': category.__name__, + 'filename': filename, + 'lineno': lineno + }) + + # Set up warning capture + old_showwarning = warnings.showwarning + warnings.showwarning = warning_handler + + try: + + print("Running BinaryPopulation.evolve() with settings:") + for key, val in popevo_kwargs.items(): + print(f"\t {key} : {val}") + + print("\nEvolving BinaryPopulation...\n") + population.evolve(**popevo_kwargs) + + print_warnings(captured_warnings) + print("āœ… Population evolved successfully.") + print("=" * line_length) + + except Exception as e: + print_warnings(captured_warnings) + print(f"šŸšØ Binary Population Evolution Failed!\n") + traceback.print_exc(limit=3) + print("\n") + print("=" * line_length) + + return population + +def test_popruns(): + + print("Performing population run tests...") + + pop = BinaryPopulation.from_ini(path_to_default_params, verbose=False) + print_pop_settings(pop) + + # test simple run, stays in RAM + print("šŸš€ Evolving a population and storing binaries in RAM.") + kwargs = {"optimize_ram":False, "breakdown_to_df":False, "tqdm":True} + pop_in_ram = test_binpop_evolve(pop, kwargs, verbose=True) + + # test same but w/ saving/loading binaries + print("šŸš€ Evolving a population and saving binaries to a hdf5 file.") + kwargs = {"optimize_ram":False, "breakdown_to_df":True, "tqdm":True} + pop_io = test_binpop_evolve(pop, kwargs, verbose=False) + loaded_pop = Population("batches/evolution.combined.h5") + + # check that binaries match between pop runs w/ fixed entropy + # and that saved/loaded binaries match those from a memory loaded run + df_from_ram = pop_in_ram.to_df() + ram_dflist = [df_from_ram.loc[i] for i in range(10)] + print("āš”ļø Checking that binaries in RAM match those retrieved from I/O...") + for i, ram_df in enumerate(ram_dflist): + io_df = loaded_pop.history[i] + cols = ['time', 'step_names', 'state', 'event', 'S1_state', 'S2_state', 'S1_mass', 'S2_mass', 'orbital_period'] + ram_df = ram_df[cols] + io_df = io_df[cols] + try: + assert_frame_equal(ram_df, io_df) + except AssertionError as e: + print("šŸšØ A binary from I/O does not equal the same binary stored in RAM:") + print(e) + print("Binary in RAM: ", ram_df) + print("Binary from I/O", io_df) + return + if i == len(loaded_pop.history): + break + + print("āœ… Binaries from I/O match those in RAM.") + print("=" * line_length) + + # TEST POPRUNNER + # This is RAM heavy and may fail on personal computers + + # ================================================================================ + print("Test PopulationRunner with multiple metallicities...") + poprun = PopulationRunner(path_to_multiZ_params, verbose=True) + print('Number of binary populations:',len(poprun.binary_populations)) + print('Metallicities:', poprun.solar_metallicities) + print('Number of binaries (per pop):', poprun.binary_populations[0].number_of_binaries) + print("šŸš€ Evolving PopulationRunner...") + poprun.evolve(overwrite=True) + #print("Done!") + + +if __name__ == "__main__": + + test_popruns() diff --git a/dev-tools/script_data/src/utils.py b/dev-tools/script_data/src/utils.py new file mode 100644 index 0000000000..e73e86f637 --- /dev/null +++ b/dev-tools/script_data/src/utils.py @@ -0,0 +1,111 @@ +from formatting import line_length, columns_to_show, target_rows + +def print_warnings(captured_warnings): + # Show warnings if any were captured + if captured_warnings: + print(f"āš ļø {len(captured_warnings)} warning(s) raised during evolution:") + for i, warning in enumerate(captured_warnings[:3], 1): # Show max 3 warnings + print(f" {i}. {warning['category']}: {warning['message']}") + if len(captured_warnings) > 3: + print(f" ... and {len(captured_warnings) - 3} more warning(s)") + elif len(captured_warnings) <= 3: + for i in range(4-len(captured_warnings)): + print("") + else: + print(f"No warning(s) raised during evolution\n\n") + +def print_pop_settings(population): + + print("\nPopulation settings:") + + ignore_kwargs = ["extra_columns", "only_select_columns", "scalar_names", + "include_S1", "S1_kwargs", "include_S2", "S2_kwargs", + "population_properties", "warnings_verbose", "history_verbose", + "error_checking_verbose", "use_MPI", "read_samples_from_file", + "RANK", "size", "optimize_ram", "ram_per_cpu", + "dump_rate", "tqdm", "temp_directory", "breakdown_to_df"] + + for key, val in population.kwargs.items(): + if key in ignore_kwargs: + continue + else: + print(f"\t {key} : {val}") + + print("\n") + + +def write_binary_to_screen(binary): + """Writes a binary DataFrame prettily to the screen + + Args: + binary: BinaryStar object with evolved data + """ + df = binary.to_df(**{'extra_columns':{'step_names':'str'}}) + + # Filter to only existing columns + available_columns = [col for col in columns_to_show if col in df.columns] + df_filtered = df[available_columns] + + # Reset index to use a counter instead of NaN + df_filtered = df_filtered.reset_index(drop=True) + + print("=" * line_length) + + # Print the DataFrame + df_string = df_filtered.to_string(index=True, float_format='%.3f') + print(df_string) + + # Add empty lines to reach exactly 10 rows of output + current_rows = len(df_filtered) + 1 # add one for header + + if current_rows < target_rows: + # Calculate the width of the output to print empty lines of the same width + lines = df_string.split('\n') + if len(lines) > 1: + # Use the width of the data lines (skip header) + empty_lines_needed = target_rows - current_rows + for i in range(empty_lines_needed): + print("") + + print("-" * line_length) + + +def print_failed_binary(binary, e, max_error_lines=3): + + print("=" * line_length) + print(f"šŸšØ Binary Evolution Failed!") + print(f"Exception: {type(e).__name__}") + print(f"Message: {e}") + + # Get the binary's current state and limit output + try: + df = binary.to_df(**{'extra_columns':{'step_names':'str'}}) + if len(df) > 0: + # Select only the desired columns + + available_columns = [col for col in columns_to_show if col in df.columns] + df_filtered = df[available_columns] + + # Reset index to use a counter instead of NaN + df_filtered = df_filtered.reset_index(drop=True) + + # Limit to max_error_lines + if len(df_filtered) > max_error_lines: + df_filtered = df_filtered.tail(max_error_lines) + print(f"\nShowing last {max_error_lines} evolution steps before failure:") + else: + print(f"\nEvolution steps before failure ({len(df_filtered)} steps):") + + df_string = df_filtered.to_string(index=True, float_format='%.3f') + print(df_string) + + current_rows = len(df_filtered) + 1 + 5 # add one for header + empty_lines_needed = target_rows - current_rows + for i in range(empty_lines_needed): + print("") + else: + print("\nNo evolution steps recorded before failure.") + except Exception as inner_e: + print(f"\nCould not retrieve binary state: {inner_e}") + + print("-" * line_length) \ No newline at end of file From 4b0abadb99ba4ea0dd6f21159444d3f89e3483af Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 8 Mar 2026 05:37:19 +0000 Subject: [PATCH 058/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/script_data/src/binaries_suite.py | 7 ++++--- dev-tools/script_data/src/binary_test_cases.py | 3 ++- dev-tools/script_data/src/formatting.py | 2 +- dev-tools/script_data/src/test_pops.py | 7 ++++--- dev-tools/script_data/src/utils.py | 5 +++-- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dev-tools/script_data/src/binaries_suite.py b/dev-tools/script_data/src/binaries_suite.py index 2abd4b81fc..12501efafe 100644 --- a/dev-tools/script_data/src/binaries_suite.py +++ b/dev-tools/script_data/src/binaries_suite.py @@ -11,11 +11,12 @@ import signal import warnings -from posydon.binary_evol.simulationproperties import SimulationProperties -from utils import print_warnings, write_binary_to_screen, print_failed_binary from binary_test_cases import get_test_binaries -from posydon.config import PATH_TO_POSYDON from formatting import line_length +from utils import print_failed_binary, print_warnings, write_binary_to_screen + +from posydon.binary_evol.simulationproperties import SimulationProperties +from posydon.config import PATH_TO_POSYDON path_to_default_params = os.path.join(PATH_TO_POSYDON, "dev-tools/script_data/1Zsun_binaries_params.ini") diff --git a/dev-tools/script_data/src/binary_test_cases.py b/dev-tools/script_data/src/binary_test_cases.py index bb5830d1c0..d4b1e5118e 100644 --- a/dev-tools/script_data/src/binary_test_cases.py +++ b/dev-tools/script_data/src/binary_test_cases.py @@ -1,6 +1,7 @@ from posydon.binary_evol.binarystar import BinaryStar, SingleStar from posydon.utils.common_functions import orbital_separation_from_period + def get_test_binaries(sim_prop): test_binaries = [] @@ -613,4 +614,4 @@ def get_test_binaries(sim_prop): properties = sim_prop) test_binaries.append(binary) - return test_binaries \ No newline at end of file + return test_binaries diff --git a/dev-tools/script_data/src/formatting.py b/dev-tools/script_data/src/formatting.py index 7a8078d559..699d5ca8c3 100644 --- a/dev-tools/script_data/src/formatting.py +++ b/dev-tools/script_data/src/formatting.py @@ -1,3 +1,3 @@ target_rows = 12 line_length = 140 -columns_to_show = ['step_names', 'state', 'event', 'S1_state', 'S1_mass', 'S2_state', 'S2_mass', 'orbital_period'] \ No newline at end of file +columns_to_show = ['step_names', 'state', 'event', 'S1_state', 'S1_mass', 'S2_state', 'S2_mass', 'orbital_period'] diff --git a/dev-tools/script_data/src/test_pops.py b/dev-tools/script_data/src/test_pops.py index 1b9a2c9973..698a4924a4 100644 --- a/dev-tools/script_data/src/test_pops.py +++ b/dev-tools/script_data/src/test_pops.py @@ -1,13 +1,14 @@ import os import traceback import warnings + +from formatting import line_length from pandas.testing import assert_frame_equal +from utils import print_pop_settings, print_warnings from posydon.config import PATH_TO_POSYDON from posydon.popsyn.binarypopulation import BinaryPopulation from posydon.popsyn.synthetic_population import Population, PopulationRunner -from utils import print_warnings, print_pop_settings -from formatting import line_length path_to_default_params = os.path.join(PATH_TO_POSYDON, "dev-tools/script_data/test_population_params.ini") path_to_multiZ_params = os.path.join(PATH_TO_POSYDON, "dev-tools/script_data/test_multiZ_population_params.ini") @@ -30,7 +31,7 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): warnings.showwarning = warning_handler try: - + print("Running BinaryPopulation.evolve() with settings:") for key, val in popevo_kwargs.items(): print(f"\t {key} : {val}") diff --git a/dev-tools/script_data/src/utils.py b/dev-tools/script_data/src/utils.py index e73e86f637..cab0d7d658 100644 --- a/dev-tools/script_data/src/utils.py +++ b/dev-tools/script_data/src/utils.py @@ -1,4 +1,5 @@ -from formatting import line_length, columns_to_show, target_rows +from formatting import columns_to_show, line_length, target_rows + def print_warnings(captured_warnings): # Show warnings if any were captured @@ -108,4 +109,4 @@ def print_failed_binary(binary, e, max_error_lines=3): except Exception as inner_e: print(f"\nCould not retrieve binary state: {inner_e}") - print("-" * line_length) \ No newline at end of file + print("-" * line_length) From 4f570635eedced7aa6f8527aea30f009907ec8d9 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sat, 7 Mar 2026 23:38:54 -0600 Subject: [PATCH 059/389] Delete dev-tools/script_data/1Zsun_* files --- dev-tools/script_data/1Zsun_binaries_suite.py | 838 ------------------ 1 file changed, 838 deletions(-) delete mode 100644 dev-tools/script_data/1Zsun_binaries_suite.py diff --git a/dev-tools/script_data/1Zsun_binaries_suite.py b/dev-tools/script_data/1Zsun_binaries_suite.py deleted file mode 100644 index a896df8fe9..0000000000 --- a/dev-tools/script_data/1Zsun_binaries_suite.py +++ /dev/null @@ -1,838 +0,0 @@ -#!/usr/bin/env python3 -""" -Script to evolve a few binaries. -Used for validation of the branch. - -Author: Max Briel -""" - -import argparse -import os -import signal -import sys -import warnings - -from posydon.binary_evol.binarystar import BinaryStar, SingleStar -from posydon.binary_evol.simulationproperties import SimulationProperties -from posydon.popsyn.io import simprop_kwargs_from_ini -from posydon.utils.common_functions import orbital_separation_from_period - -target_rows = 12 -line_length = 140 -columns_to_show = ['step_names', 'state', 'event', 'S1_state', 'S1_mass', 'S2_state', 'S2_mass', 'orbital_period', 'time'] - -def load_inlist(verbose): - - sim_kwargs = simprop_kwargs_from_ini('script_data/1Zsun_binaries_params.ini', verbose=verbose) - metallicity = {'metallicity':1, 'verbose':verbose} - - sim_kwargs['step_HMS_HMS'][1].update(metallicity) - sim_kwargs['step_CO_HeMS'][1].update(metallicity) - sim_kwargs['step_CO_HMS_RLO'][1].update(metallicity) - sim_kwargs['step_CO_HeMS_RLO'][1].update(metallicity) - sim_kwargs['step_detached'][1].update(metallicity) - sim_kwargs['step_disrupted'][1].update(metallicity) - sim_kwargs['step_merged'][1].update(metallicity) - sim_kwargs['step_initially_single'][1].update(metallicity) - - sim_prop = SimulationProperties(**sim_kwargs) - - sim_prop.load_steps(verbose=verbose) - return sim_prop - -def write_binary_to_screen(binary): - """Writes a binary DataFrame prettily to the screen - - Args: - binary: BinaryStar object with evolved data - """ - df = binary.to_df(**{'extra_columns':{'step_names':'str'}}) - - # Filter to only existing columns - available_columns = [col for col in columns_to_show if col in df.columns] - df_filtered = df[available_columns] - - # Reset index to use a counter instead of NaN - df_filtered = df_filtered.reset_index(drop=True) - - print("=" * line_length) - - # Print the DataFrame - df_string = df_filtered.to_string(index=True, float_format='%.3f') - print(df_string) - - # Add empty lines to reach exactly 10 rows of output - current_rows = len(df_filtered) + 1 # add one for header - - if current_rows < target_rows: - # Calculate the width of the output to print empty lines of the same width - lines = df_string.split('\n') - if len(lines) > 1: - # Use the width of the data lines (skip header) - empty_lines_needed = target_rows - current_rows - for i in range(empty_lines_needed): - print("") - - print("-" * line_length) - - -def print_failed_binary(binary,e, max_error_lines=3): - - print("=" * line_length) - print(f"šŸšØ Binary Evolution Failed!") - print(f"Exception: {type(e).__name__}") - print(f"Message: {e}") - - # Get the binary's current state and limit output - try: - df = binary.to_df(**{'extra_columns':{'step_names':'str'}}) - if len(df) > 0: - # Select only the desired columns - - available_columns = [col for col in columns_to_show if col in df.columns] - df_filtered = df[available_columns] - - # Reset index to use a counter instead of NaN - df_filtered = df_filtered.reset_index(drop=True) - - # Limit to max_error_lines - if len(df_filtered) > max_error_lines: - df_filtered = df_filtered.tail(max_error_lines) - print(f"\nShowing last {max_error_lines} evolution steps before failure:") - else: - print(f"\nEvolution steps before failure ({len(df_filtered)} steps):") - - df_string = df_filtered.to_string(index=True, float_format='%.3f') - print(df_string) - - current_rows = len(df_filtered) + 1 + 5 # add one for header - empty_lines_needed = target_rows - current_rows - for i in range(empty_lines_needed): - print("") - else: - print("\nNo evolution steps recorded before failure.") - except Exception as inner_e: - print(f"\nCould not retrieve binary state: {inner_e}") - - print("-" * line_length) - -def evolve_binary(binary): - - # Capture warnings during evolution - captured_warnings = [] - - def warning_handler(message, category, filename, lineno, file=None, line=None): - captured_warnings.append({ - 'message': str(message), - 'category': category.__name__, - 'filename': filename, - 'lineno': lineno - }) - - # Set up warning capture - old_showwarning = warnings.showwarning - warnings.showwarning = warning_handler - - try: - binary.evolve() - # Display the evolution summary for successful evolution - write_binary_to_screen(binary) - - # Show warnings if any were captured - if captured_warnings: - print(f"āš ļø {len(captured_warnings)} warning(s) raised during evolution:") - for i, warning in enumerate(captured_warnings[:3], 1): # Show max 3 warnings - print(f" {i}. {warning['category']}: {warning['message']}") - if len(captured_warnings) > 3: - print(f" ... and {len(captured_warnings) - 3} more warning(s)") - elif len(captured_warnings) <= 3: - for i in range(4-len(captured_warnings)): - print("") - else: - print(f"No warning(s) raised during evolution\n\n\n\n") - print("=" * line_length) - - except Exception as e: - - # turn off binary alarm in case of exception - signal.alarm(0) - - print_failed_binary(binary, e) - - # Show warnings if any were captured before the exception - if captured_warnings: - print(f"\nāš ļø {len(captured_warnings)} warning(s) raised before failure:") - for i, warning in enumerate(captured_warnings[:3], 1): # Show max 3 warnings - print(f" {i}. {warning['category']}: {warning['message']}") - if len(captured_warnings) > 3: - print(f" ... and {len(captured_warnings) - 3} more warning(s)") - else: - print(f"No warning(s) raised during evolution\n\n\n\n") - - print("=" * line_length) - finally: - # Always turn off binary alarm and restore warning handler - signal.alarm(0) - warnings.showwarning = old_showwarning - - -def evolve_binaries(verbose): - """Evolves a few binaries to validate their output - """ - sim_prop = load_inlist(verbose) - - ######################################## - # Failing binary in matching - ######################################## - star_1 = SingleStar(**{'mass': 11.948472796094759, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [231.97383621190582, 5.927334890264575, 1.5990566013567014, 6.137994236518587]}) - star_2 = SingleStar(**{'mass': 7.636958434479617, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 190925.99636740884,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # Failing binary in matching - ######################################## - star_1 = SingleStar(**{'mass': 30.169861921689556, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [77.96834852144123, 0.05021460132555987, 2.3146518208348152, 1.733054979982291]}) - star_2 = SingleStar(**{'mass': 10.972734402996027, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 20479.71919353725,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # flipped S1 and S2 ? - ######################################## - star_1 = SingleStar(**{'mass': 9.474917413943635, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [133.5713935237759, 4.398754864537542, 2.703102872841114, 1.4633904612711142]}) - star_2 = SingleStar(**{'mass': 9.311073918196263, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 18.605997832086413,'eccentricity': 0.0}, properties = sim_prop) - - evolve_binary(binary) - ######################################## - # flipped S1 and S2 - ######################################## - star_1 = SingleStar(**{'mass': 10.438541, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star_2 = SingleStar(**{'mass': 1.400713, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 9.824025,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # flipped S1 and S2 - ######################################## - star_1= SingleStar(**{'mass': 9.845907 , 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - star_2 = SingleStar(**{'mass': 9.611029, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 3.820571,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # Normal binary evolution - ######################################## - star_1= SingleStar(**{'mass': 30.845907 , 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - star_2 = SingleStar(**{'mass': 30.611029, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 30.820571,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # Normal binary - ######################################## - star_1= SingleStar(**{'mass': 9.213534679594247 , 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [327.5906384501521, 1.7707176050073297, 1.573225822966838, 1.6757313876001914]}) - star_2 = SingleStar(**{'mass': 7.209878522799272, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 63123.74544474666,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # Normal binary - ######################################## - star_1= SingleStar(**{'mass': 9.561158487732602 , 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [317.5423844462847, 2.9095984678057603, 1.754121288652108, 2.3693917842468784]}) - star_2 = SingleStar(**{'mass': 9.382732464319286, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 27.77657038557851,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # Normal binary - ######################################## - star1 = SingleStar(**{'mass': 7.552858,#29829485, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [40.91509926587841, 2.6295454150818256, 1.6718337470964977, 6.0408769315244895]}) - star2 = SingleStar(**{'mass': 6.742063, #481560266, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 17.957531550841225, 'eccentricity': 0.0,}, - properties=sim_prop) - evolve_binary(binary) - ######################################## - # High BH spin options - ######################################## - star_1 = SingleStar(**{'mass': 31.616785, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [10, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - star_2 = SingleStar(**{'mass': 26.874267, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 501.99252706449792,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # Original a>1 spin error - ######################################## - star_1 = SingleStar(**{'mass': 18.107506844123645, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [528.2970725443025, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - star_2 = SingleStar(**{'mass': 15.641392951875442, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 151.99252706449792,'eccentricity': 0.0}, properties = sim_prop) - ######################################## - # FIXED disrupted crash - ######################################## - STAR1 = SingleStar(**{'mass': 52.967313, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 36.306444, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':12.877004, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED error with SN type - ######################################## - STAR1 = SingleStar(**{'mass': 17.782576, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass':3.273864, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED oRLO2 looping - ######################################## - STAR1 = SingleStar(**{'mass': 170.638207, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [4.921294, 4.31745, 1.777768, 3.509656]}) - STAR2 = SingleStar(**{'mass':37.917852, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':113.352736, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # Redirect to step_CO_HeMS (H-rich non-burning?) - ######################################## - star_1 = SingleStar(**{'mass': 8.333579, 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [17.125568, 4.101834, 0.917541, 3.961291]}) - star_2 = SingleStar(**{'mass' : 8.208376, 'state' : 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 66.870417, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary) - ######################################## - # FIXED oRLO2 looping - ######################################## - star_1 = SingleStar(**{'mass': 16.921378, 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}) - star_2 = SingleStar(**{'mass' : 16.286318, 'state' : 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 37.958768, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary) - ######################################## - # FIXED? step_detached failure - ######################################## - STAR1 = SingleStar(**{'mass': 19.787769, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [24.464803, 0.666314, 1.954698, 5.598975]}) - STAR2 = SingleStar(**{'mass': 7.638741, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3007.865561, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # Disrupted binary - ######################################## - star_1 = SingleStar(**{'mass': 16.921378, 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}) - star_2 = SingleStar(**{'mass' : 16.286318, 'state' : 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3007.865561, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED Detached binary failure (low mass) - ######################################## - STAR1 = SingleStar(**{'mass': 9, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass':0.8, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED SN_TYPE = None crash - ######################################## - STAR1 = SingleStar(**{'mass': 17.782576, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass':3.273864, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED SN_TYPE errors - ######################################## - STAR1 = SingleStar(**{'mass': 6.782576, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass':3.273864, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED SN_TYPE errors - ######################################## - STAR1 = SingleStar(**{'mass': 40.638207, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [30.921294, 4.31745, 1.777768, 3.509656]}) - STAR2 = SingleStar(**{'mass':37.917852, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':2113.352736, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED ECSN errors? - ######################################## - STAR1 = SingleStar(**{'mass': 12.376778, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [80, 4.31745, 1.777768, 3.509656]}) - STAR2 = SingleStar(**{'mass': 9.711216, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':79.83702, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # Interpolator masses?? - ######################################## - STAR1 = SingleStar(**{'mass': 7.592921, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass':5.038679 , - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.537807, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # Interpolator masses? - ######################################## - star_1 = SingleStar(**{'mass': 38.741115, - 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [21.113771, 2.060135, 2.224789, 4.089729]}) - star_2 = SingleStar(**{'mass': 27.776178, - 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [282.712103, 0.296252, 1.628433, 5.623812]}) - - BINARY = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 93.387072, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED NaN spin - ######################################## - STAR1 = SingleStar(**{'mass': 70.066924, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0], - 'metallicity':1}) - STAR2 = SingleStar(**{'mass': 34.183110, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0], - 'metallicity':1}) - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.931492e+03, - 'separation': orbital_separation_from_period(5.931492e+03, STAR1.mass, STAR2.mass), - 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED NaN spin - ######################################## - STAR1 = SingleStar(**{'mass': 28.837286, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 6.874867, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':35.609894, - 'separation': orbital_separation_from_period(35.609894, STAR1.mass, STAR2.mass), - 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # oRLO2 issue - ######################################## - STAR1 = SingleStar(**{'mass':29.580210, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 28.814626, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':40.437993, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # oRLO2 issue - ######################################## - STAR1 = SingleStar(**{'mass':67.126795, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 19.622908, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':1484.768582, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # oRLO2 issue - ######################################## - STAR1 = SingleStar(**{'mass': 58.947503, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 56.660506, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':2011.300659, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # oRLO2 issue - ######################################## - STAR1 = SingleStar(**{'mass': 170.638207, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[47.979957374424956, 5.317304576107798, 2.7259013166068145, 4.700929589520818]}) - STAR2 = SingleStar(**{'mass': 37.917852, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':113.352736, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # oRLO2 issue - ######################################## - STAR1 = SingleStar(**{'mass': 109.540207, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 84.344530, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.651896, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # redirect - ######################################## - STAR1 = SingleStar(**{'mass': 13.889634, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass':0.490231, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':14513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # redirect - ######################################## - STAR1 = SingleStar(**{'mass': 9, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass':0.8, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # Max time - ######################################## - star_1 = SingleStar(**{'mass': 103.07996766780799, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.2965418610971261, 2.0789170290719117, 3.207488023705968]}) - star_2 = SingleStar(**{'mass': 83.66522615073987, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 1449.1101985875678,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # Max time - ######################################## - star_1 = SingleStar(**{'mass': 8.860934140643465, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [11.818027275431337, 2.812412688633058, 0.4998731824233789, 2.9272630485628643]}) - star_2 = SingleStar(**{'mass': 8.584716012668551, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 20.82030114750744,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # PR421 - ######################################## - STAR1 = SingleStar(**{'mass': 24.035366, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 23.187355, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':18.865029, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # CE class - ######################################## - STAR1 = SingleStar(**{'mass':33.964274, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 28.98149, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':82.370989, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # PR574 - stepCE fix - ######################################## - STAR1 = SingleStar(**{'mass':29.580210, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 28.814626*0.4, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':300.437993, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # e_ZAMS error - ######################################## - star1 = SingleStar(**{'mass': 8.161885721822461, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 3.5907829421526154, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 36.873457164644144, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary) - - ######################################## - # e_ZAMS error - ######################################## - star1 = SingleStar(**{'mass': 35.24755025317775, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [19.755993125895806, 0.37149222852233904, 1.6588846085306563, - 1.434617029858906]}) - star2 = SingleStar(**{'mass': 30.000450298072902, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 24060.02101364665, 'eccentricity': 0.8085077857996965}, - properties = sim_prop) - evolve_binary(binary) - - ######################################## - # e_ZAMS error - ######################################## - star1 = SingleStar(**{'mass': 11.862930493162692, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 1.4739109294156703, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 4111.083887312003, 'eccentricity':0.0}, - properties = sim_prop) - evolve_binary(binary) - - ######################################## - # e_ZAMS error - ######################################## - star1 = SingleStar(**{'mass': 8.527361341212108, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 0.7061748406821822, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 2521.1927287891444, 'eccentricity':0.0}, - properties = sim_prop) - evolve_binary(binary) - - ######################################## - # e_ZAMS error - ######################################## - star1 = SingleStar(**{'mass': 13.661942533447398 ,#29829485, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 4.466151109802313 , #481560266, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3110.1346707516914, 'eccentricity':0.0}, - properties = sim_prop) - evolve_binary(binary) - - ######################################## - # double CO step - ######################################## - # NS + WD example - star1 = SingleStar(**{'mass': 7.939736047577677, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star1 = SingleStar(**{'mass': 6.661421823348241, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 28.576933942881404, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary) - # BH + NS example - star1 = SingleStar(**{'mass': 22.69609546427504, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 2.051704135150374, 1.73468853754093, 3.299716078528058]}) - star2 = SingleStar(**{'mass': 16.39690317352072, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 5.934599002039066, 2.4331072903106974, 1.9933166215820504]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 70.37960820393167, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary) - # WD + WD example - star1 = SingleStar(**{'mass': 6.661421823348241, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 6.661421823348241, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 28.576933942881404, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary) - # NS + NS example - star1 = SingleStar(**{'mass': 16.458995075687447, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 3.661376360771944, 0.7219969332243381, 4.919284439555057]}) - star2 = SingleStar(**{'mass': 12.580980419413521, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 4.944467687452352, 1.2845384190953326, 1.6806849171480245]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 247.4244399689946, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary) - - # BH + BH - star1 = SingleStar(**{'mass': 31.077951593283725, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 1.9047595342945016, 0.7097181927314352, 2.892753852818733]}) - star2 = SingleStar(**{'mass': 27.8239810278115, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 4.004970175991886, 2.2544428565691472, 3.420828590003044]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 27.429155057946318, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary) - -if __name__ == "__main__": - parser = argparse.ArgumentParser(description='Evolve binaries for validation.') - parser.add_argument('--verbose', '-v', action='store_true', default=False, - help='Enable verbose output (default: False)') - args = parser.parse_args() - - evolve_binaries(verbose=args.verbose) From 409bd15eabe24f7eed0c96dd20751bc6e098a609 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sat, 7 Mar 2026 23:39:05 -0600 Subject: [PATCH 060/389] Delete dev-tools/script_data/1Zsun_binaries_params.ini --- .../script_data/1Zsun_binaries_params.ini | 548 ------------------ 1 file changed, 548 deletions(-) delete mode 100644 dev-tools/script_data/1Zsun_binaries_params.ini diff --git a/dev-tools/script_data/1Zsun_binaries_params.ini b/dev-tools/script_data/1Zsun_binaries_params.ini deleted file mode 100644 index f5400f3117..0000000000 --- a/dev-tools/script_data/1Zsun_binaries_params.ini +++ /dev/null @@ -1,548 +0,0 @@ -# POSYDON default BinaryPopulation inifile, use ConfigParser syntax - -[environment_variables] - PATH_TO_POSYDON = '' - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;;;;;;; SimulationProperties ;;;;;;;;;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -[flow] - import = ['posydon.binary_evol.flow_chart', 'flow_chart'] - # builtin posydon flow - absolute_import = None - # If given, use an absolute filepath to user defined flow: ['', ''] - -[step_HMS_HMS] - import = ['posydon.binary_evol.MESA.step_mesa', 'MS_MS_step'] - # builtin posydon step - absolute_import = None - # If given, use an absolute filepath to user defined step: ['', ''] - interpolation_path = None - # found by default - interpolation_filename = None - # found by default - interpolation_method = 'linear3c_kNN' - # 'nearest_neighbour' 'linear3c_kNN' '1NN_1NN' - save_initial_conditions = True - # only for interpolation_method='nearest_neighbour' - track_interpolation = False - # True False - stop_method = 'stop_at_max_time' - # 'stop_at_end' 'stop_at_max_time' 'stop_at_condition' - stop_star = 'star_1' - # only for stop_method='stop_at_condition' 'star_1' 'star_2' - stop_var_name = None - # only for stop_method='stop_at_condition' str - stop_value = None - # only for stop_method='stop_at_condition' float - stop_interpolate = True - # True False - verbose = False - # True False - - -[step_CO_HeMS] - import = ['posydon.binary_evol.MESA.step_mesa', 'CO_HeMS_step'] - # builtin posydon step - absolute_import = None - # If given, use an absolute filepath to user defined step: ['', ''] - interpolation_path = None - # found by default - interpolation_filename = None - # found by default - interpolation_method = 'linear3c_kNN' - # 'nearest_neighbour' 'linear3c_kNN' '1NN_1NN' - save_initial_conditions = True - # only for interpolation_method='nearest_neighbour' - track_interpolation = False - # True False - stop_method = 'stop_at_max_time' - # 'stop_at_end' 'stop_at_max_time' 'stop_at_condition' - stop_star = 'star_1' - # only for stop_method='stop_at_condition' 'star_1' 'star_2' - stop_var_name = None - # only for stop_method='stop_at_condition' str - stop_value = None - # only for stop_method='stop_at_condition' float - stop_interpolate = True - # True False - verbose = False - # True False - -[step_CO_HMS_RLO] - import = ['posydon.binary_evol.MESA.step_mesa', 'CO_HMS_RLO_step'] - # builtin posydon step - absolute_import = None - # If given, use an absolute filepath to user defined step: ['', ''] - interpolation_path = None - # found by default - interpolation_filename = None - # found by default - interpolation_method = 'linear3c_kNN' - # 'nearest_neighbour' 'linear3c_kNN' '1NN_1NN' - save_initial_conditions = True - # only for interpolation_method='nearest_neighbour' - track_interpolation = False - # True False - stop_method = 'stop_at_max_time' - # 'stop_at_end' 'stop_at_max_time' 'stop_at_condition' - stop_star = 'star_1' - # only for stop_method='stop_at_condition' 'star_1' 'star_2' - stop_var_name = None - # only for stop_method='stop_at_condition' str - stop_value = None - # only for stop_method='stop_at_condition' float - stop_interpolate = True - # True False - verbose = False - # True False - -[step_CO_HeMS_RLO] - import = ['posydon.binary_evol.MESA.step_mesa', 'CO_HeMS_RLO_step'] - # builtin posydon step - absolute_import = None - # If given, use an absolute filepath to user defined step: ['', ''] - interpolation_path = None - # found by default - interpolation_filename = None - # found by default - interpolation_method = 'linear3c_kNN' - # 'nearest_neighbour' 'linear3c_kNN' '1NN_1NN' - save_initial_conditions = True - # only for interpolation_method='nearest_neighbour' - track_interpolation = False - # True False - stop_method = 'stop_at_max_time' - # 'stop_at_end' 'stop_at_max_time' 'stop_at_condition' - stop_star = 'star_1' - # only for stop_method='stop_at_condition' 'star_1' 'star_2' - stop_var_name = None - # only for stop_method='stop_at_condition' str - stop_value = None - # only for stop_method='stop_at_condition' float - stop_interpolate = True - # True False - verbose = False - # True False - - -[step_detached] - import = ['posydon.binary_evol.DT.step_detached', 'detached_step'] - # builtin posydon step - absolute_import = None - # If given, use an absolute filepath to user defined step: ['', ''] - matching_method = 'minimize' - #'minimize' 'root' - do_wind_loss = True - # True, False - do_tides = True - # True, False - do_gravitational_radiation = True - # True, False - do_magnetic_braking = True - # True, False - do_stellar_evolution_and_spin_from_winds = True - # True, False - RLO_orbit_at_orbit_with_same_am = False - # True, False - #record_matching = False - # True, False - verbose = False - # True, False - -[step_disrupted] - import = ['posydon.binary_evol.DT.step_disrupted','DisruptedStep'] - # builtin posydon step - absolute_import = None - # If given, use an absolute filepath to user defined step: ['', ''] - -[step_merged] - import = ['posydon.binary_evol.DT.step_merged','MergedStep'] - # builtin posydon step - absolute_import = None - # If given, use an absolute filepath to user defined step: ['', ''] - -[step_initially_single] - import = ['posydon.binary_evol.DT.step_initially_single','InitiallySingleStep'] - # builtin posydon step - absolute_import = None - # If given, use an absolute filepath to user defined step: ['', ''] - -[step_CE] - import = ['posydon.binary_evol.CE.step_CEE', 'StepCEE'] - # builtin posydon step - absolute_import = None - # If given, use an absolute filepath to user defined step: ['', ''] - prescription='alpha-lambda' - # 'alpha-lambda' - common_envelope_efficiency=1.0 - # float in (0, inf) - common_envelope_option_for_lambda='lambda_from_grid_final_values' - # (1) 'default_lambda', (2) 'lambda_from_grid_final_values', - # (3) 'lambda_from_profile_gravitational', - # (4) 'lambda_from_profile_gravitational_plus_internal', - # (5) 'lambda_from_profile_gravitational_plus_internal_minus_recombination' - common_envelope_lambda_default=0.5 - # float in (0, inf) used only for option (1) - common_envelope_option_for_HG_star="optimistic" - # 'optimistic', 'pessimistic' - common_envelope_alpha_thermal=1.0 - # float in (0, inf) used only for option for (4), (5) - core_definition_H_fraction=0.3 - # 0.01, 0.1, 0.3 - core_definition_He_fraction=0.1 - # 0.1 - CEE_tolerance_err = 0.001 - # float (0, inf) - common_envelope_option_after_succ_CEE = 'two_phases_stableMT' - # 'two_phases_stableMT' 'one_phase_variable_core_definition' - # 'two_phases_windloss' - verbose = False - # True False - -[step_SN] - import = ['posydon.binary_evol.SN.step_SN', 'StepSN'] - # builtin posydon step - absolute_import = None - # 'package' kwarg for importlib.import_module - mechanism = 'Fryer+12-delayed' - # v2 interpolators support: 'Fryer+12-rapid', 'Fryer+12-delayed', - # 'Sukhbold+16-engine', 'Patton&Sukhbold20-engine' - # need profiles: 'direct' - engine = '' - # 'N20' or 'W20' for 'Sukhbold+16-engine', 'Patton&Sukhbold20-engine' - # '' for the others - PISN = "Hendriks+23" - # v2 interpolators support: "Hendriks+23" - # other options: None, "Marchant+19" - PISN_CO_shift = 0.0 - # Only when using Hendriks+23 - # float (-inf,inf) - # v2 interpolators support: 0.0 - PPI_extra_mass_loss = -20.0 - # Only when using Hendriks+23 - # float (-inf,inf) - # v2 interpolators support: 0.0 or -20.0 - ECSN = "Tauris+15" - # "Tauris+15", "Podsiadlowski+04" - conserve_hydrogen_envelope = False - # True, False - conserve_hydrogen_PPI = False - # Only when using Hendriks+23 - # True, False - max_neutrino_mass_loss = 0.5 - # float (0,inf) - # v2 interpolators support: 0.5 - max_NS_mass = 2.5 - # float (0,inf) - # v2 interpolators support: 2.5 - use_interp_values = True - # True, False - use_profiles = True - # True, False - use_core_masses = True - # True, False - allow_spin_None = False - # True, False - approx_at_he_depletion = False - # True, False - kick = True - # True, False - kick_normalisation = 'one_over_mass' - # "one_minus_fallback", "one_over_mass", "NS_one_minus_fallback_BH_one", - # "one", "zero", "asym_ej", "linear", "log_normal" - sigma_kick_CCSN_NS = 265.0 - # float (0,inf) - sigma_kick_CCSN_BH = 265.0 - # float (0,inf) - sigma_kick_ECSN = 20.0 - # float (0,inf) - verbose = False - # True False - -[step_dco] - import = ['posydon.binary_evol.DT.double_CO', 'DoubleCO'] - # builtin posydon step - absolute_import = None - # If given, use an absolute filepath to user defined step: ['', ''] - n_o_steps_history = None - -[step_end] - import = ['posydon.binary_evol.step_end', 'step_end'] - # builtin posydon step - absolute_import = None - # If given, use an absolute filepath to user defined step: ['', ''] - -[extra_hooks] - import_1 = ['posydon.binary_evol.simulationproperties', 'TimingHooks'] - # builtin posydon hook - absolute_import_1 = None - # If given, use an absolute filepath to user defined step: ['', ''] - kwargs_1 = {} - - import_2 = ['posydon.binary_evol.simulationproperties', 'StepNamesHooks'] - # builtin posydon hook - absolute_import_2 = None - # If given, use an absolute filepath to user defined step: ['', ''] - kwargs_2 = {} - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;;;;;;; BinaryPopulation ;;;;;;;;;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -[BinaryPopulation_options] - optimize_ram = True - # save population in batches - ram_per_cpu = None - # set maximum ram per cpu before batch saving (GB) - dump_rate = 2000 - # batch save after evolving N binaries - # this should be at least 500 for populations of 100,000 binaries or more - temp_directory = 'batches' - # folder for keeping batch files - tqdm = False - # progress bar - breakdown_to_df = True - # convert BinaryStars into DataFrames after evolution - use_MPI = False - # use only for local MPI runs - metallicity = [1.] #[2., 1., 0.45, 0.2, 0.1, 0.01, 0.001, 0.0001] - # In units of solar metallicity - error_checking_verbose = False - # if True, write all POSYDON errors to stderr at runtime, default=False - warnings_verbose = False - # if True, write all POSYDON warnings to stderr at runtime, default=False - history_verbose = False - # if True, record extra functional steps in the output DataFrames - # (These steps represent internal workings of POSYDON rather than physical phases of evolution) - entropy = None - # `None` uses system entropy (recommended) - number_of_binaries = 10 - # int - binary_fraction_scheme = 'const' - #'const' 'Moe_17' - binary_fraction_const = 1.0 - # float 0< fraction <=1 - star_formation = 'burst' - # 'constant' 'burst' 'custom_linear' 'custom_log10' 'custom_linear_histogram' 'custom_log10_histogram' - max_simulation_time = 13.8e9 - # float (0,inf) - - read_samples_from_file = '' - # path to file to read initial parameters from (if empty string get random samples) - primary_mass_scheme = 'Kroupa2001' - # 'Salpeter', 'Kroupa1993', 'Kroupa2001' - primary_mass_min = 7.0 - # float (0,130) - primary_mass_max = 150.0 - # float (0,130) - secondary_mass_scheme = 'flat_mass_ratio' - # 'flat_mass_ratio', 'q=1' - secondary_mass_min = 0.5 - # float (0,130) - secondary_mass_max = 150.0 - # float (0,130) - orbital_scheme = 'period' - # 'separation', 'period' - orbital_period_scheme = 'Sana+12_period_extended' - # used only for orbital_scheme = 'period' - orbital_period_min = 0.75 - # float (0,inf) - orbital_period_max = 6000.0 - # float (0,inf) - #orbital_separation_scheme = 'log_uniform' - # used only for orbital_scheme = 'separation', 'log_uniform', 'log_normal' - #orbital_separation_min = 5.0 - # float (0,inf) - #orbital_separation_max = 1e5 - # float (0,inf) - #log_orbital_separation_mean = None - # float (0,inf) used only for orbital_separation_scheme ='log_normal' - #log_orbital_separation_sigma = None - # float (0,inf) used only for orbital_separation_scheme ='log_normal' - eccentricity_scheme = 'zero' - # 'zero' 'thermal' 'uniform' - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;;;;;;; Saving Output ;;;;;;;;;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -[BinaryStar_output] - extra_columns = {'step_names':'string', 'step_times':'float64'} - # 'step_times' with from posydon.binary_evol.simulationproperties import TimingHooks - - # LIST BINARY PROPERTIES - only_select_columns=[ - 'state', - 'event', - 'time', - #'separation', - 'orbital_period', - 'eccentricity', - #'V_sys', - #'rl_relative_overflow_1', - #'rl_relative_overflow_2', - 'lg_mtransfer_rate', - #'mass_transfer_case', - #'trap_radius', - #'acc_radius', - #'t_sync_rad_1', - #'t_sync_conv_1', - #'t_sync_rad_2', - #'t_sync_conv_2', - #'nearest_neighbour_distance', - ] - scalar_names=[ - 'interp_class_HMS_HMS', - 'interp_class_CO_HMS_RLO', - 'interp_class_CO_HeMS', - 'interp_class_CO_HeMS_RLO', - 'mt_history_HMS_HMS', - 'mt_history_CO_HMS_RLO', - 'mt_history_CO_HeMS', - 'mt_history_CO_HeMS_RLO', - ] - -[SingleStar_1_output] - # LIST STAR PROPERTIES TO SAVE - include_S1=True - # True, False - only_select_columns=[ - 'state', - #'metallicity', - 'mass', - 'log_R', - 'log_L', - 'lg_mdot', - #'lg_system_mdot', - #'lg_wind_mdot', - 'he_core_mass', - 'he_core_radius', - #'c_core_mass', - #'c_core_radius', - #'o_core_mass', - #'o_core_radius', - 'co_core_mass', - 'co_core_radius', - 'center_h1', - 'center_he4', - #'center_c12', - #'center_n14', - #'center_o16', - 'surface_h1', - 'surface_he4', - #'surface_c12', - #'surface_n14', - #'surface_o16', - #'log_LH', - #'log_LHe', - #'log_LZ', - #'log_Lnuc', - #'c12_c12', - #'center_gamma', - #'avg_c_in_c_core', - #'surf_avg_omega', - 'surf_avg_omega_div_omega_crit', - #'total_moment_of_inertia', - #'log_total_angular_momentum', - 'spin', - #'conv_env_top_mass', - #'conv_env_bot_mass', - #'conv_env_top_radius', - #'conv_env_bot_radius', - #'conv_env_turnover_time_g', - #'conv_env_turnover_time_l_b', - #'conv_env_turnover_time_l_t', - #'envelope_binding_energy', - #'mass_conv_reg_fortides', - #'thickness_conv_reg_fortides', - #'radius_conv_reg_fortides', - #'lambda_CE_1cent', - #'lambda_CE_10cent', - #'lambda_CE_30cent', - #'lambda_CE_pure_He_star_10cent', - #'profile', - #'total_mass_h1', - #'total_mass_he4', - ] - scalar_names=[ - 'natal_kick_array', - 'SN_type', - 'f_fb', - 'spin_orbit_tilt_first_SN', - 'spin_orbit_tilt_second_SN', - ] - -[SingleStar_2_output] - # LIST STAR PROPERTIES TO SAVE - include_S2 = True - # True, False - only_select_columns = [ - 'state', - #'metallicity', - 'mass', - 'log_R', - 'log_L', - 'lg_mdot', - #'lg_system_mdot', - #'lg_wind_mdot', - 'he_core_mass', - 'he_core_radius', - #'c_core_mass', - #'c_core_radius', - #'o_core_mass', - #'o_core_radius', - 'co_core_mass', - 'co_core_radius', - 'center_h1', - 'center_he4', - #'center_c12', - #'center_n14', - #'center_o16', - 'surface_h1', - 'surface_he4', - #'surface_c12', - #'surface_n14', - #'surface_o16', - #'log_LH', - #'log_LHe', - #'log_LZ', - #'log_Lnuc', - #'c12_c12', - #'center_gamma', - #'avg_c_in_c_core', - #'surf_avg_omega', - 'surf_avg_omega_div_omega_crit', - #'total_moment_of_inertia', - #'log_total_angular_momentum', - 'spin', - #'conv_env_top_mass', - #'conv_env_bot_mass', - #'conv_env_top_radius', - #'conv_env_bot_radius', - #'conv_env_turnover_time_g', - #'conv_env_turnover_time_l_b', - #'conv_env_turnover_time_l_t', - #'envelope_binding_energy', - #'mass_conv_reg_fortides', - #'thickness_conv_reg_fortides', - #'radius_conv_reg_fortides', - #'lambda_CE_1cent', - #'lambda_CE_10cent', - #'lambda_CE_30cent', - #'lambda_CE_pure_He_star_10cent', - #'profile', - #'total_mass_h1', - #'total_mass_he4', - ] - scalar_names=[ - 'natal_kick_array', - 'SN_type', - 'f_fb', - 'spin_orbit_tilt_first_SN', - 'spin_orbit_tilt_second_SN', - ] From b8bf5e61507b2b5c04085e11ef67cb4f31f08c01 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sun, 8 Mar 2026 01:05:44 -0600 Subject: [PATCH 061/389] update ini file paths --- dev-tools/script_data/src/test_pops.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-tools/script_data/src/test_pops.py b/dev-tools/script_data/src/test_pops.py index 698a4924a4..1c42dd3e19 100644 --- a/dev-tools/script_data/src/test_pops.py +++ b/dev-tools/script_data/src/test_pops.py @@ -10,8 +10,8 @@ from posydon.popsyn.binarypopulation import BinaryPopulation from posydon.popsyn.synthetic_population import Population, PopulationRunner -path_to_default_params = os.path.join(PATH_TO_POSYDON, "dev-tools/script_data/test_population_params.ini") -path_to_multiZ_params = os.path.join(PATH_TO_POSYDON, "dev-tools/script_data/test_multiZ_population_params.ini") +path_to_default_params = os.path.join(PATH_TO_POSYDON, "dev-tools/script_data/inlists/test_population_params.ini") +path_to_multiZ_params = os.path.join(PATH_TO_POSYDON, "dev-tools/script_data/inlists/test_multiZ_population_params.ini") def test_binpop_evolve(population, popevo_kwargs, verbose=False): From ac95f6a02ceb417172279bb6e5be903fd62a8758 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sun, 8 Mar 2026 01:06:32 -0600 Subject: [PATCH 062/389] Delete dev-tools/script_data/src/1Zsun_binaries_suite.py --- .../script_data/src/1Zsun_binaries_suite.py | 768 ------------------ 1 file changed, 768 deletions(-) delete mode 100644 dev-tools/script_data/src/1Zsun_binaries_suite.py diff --git a/dev-tools/script_data/src/1Zsun_binaries_suite.py b/dev-tools/script_data/src/1Zsun_binaries_suite.py deleted file mode 100644 index 5b2c416c3c..0000000000 --- a/dev-tools/script_data/src/1Zsun_binaries_suite.py +++ /dev/null @@ -1,768 +0,0 @@ -#!/usr/bin/env python3 -""" -Script to evolve a few binaries. -Used for validation of the branch. - -Author: Max Briel -""" - -import argparse -import os -import signal -import sys -import warnings - -from posydon.binary_evol.binarystar import BinaryStar, SingleStar -from posydon.binary_evol.simulationproperties import SimulationProperties -from posydon.popsyn.io import simprop_kwargs_from_ini -from posydon.utils.common_functions import orbital_separation_from_period - -target_rows = 12 -line_length = 140 -columns_to_show = ['step_names', 'state', 'event', 'S1_state', 'S1_mass', 'S2_state', 'S2_mass', 'orbital_period'] - -def load_inlist(verbose): - - sim_kwargs = simprop_kwargs_from_ini('script_data/1Zsun_binaries_params.ini', verbose=verbose) - metallicity = {'metallicity':1, 'verbose':verbose} - - sim_kwargs['step_HMS_HMS'][1].update(metallicity) - sim_kwargs['step_CO_HeMS'][1].update(metallicity) - sim_kwargs['step_CO_HMS_RLO'][1].update(metallicity) - sim_kwargs['step_CO_HeMS_RLO'][1].update(metallicity) - sim_kwargs['step_detached'][1].update(metallicity) - sim_kwargs['step_disrupted'][1].update(metallicity) - sim_kwargs['step_merged'][1].update(metallicity) - sim_kwargs['step_initially_single'][1].update(metallicity) - - sim_prop = SimulationProperties(**sim_kwargs) - - sim_prop.load_steps(verbose=verbose) - return sim_prop - -def write_binary_to_screen(binary): - """Writes a binary DataFrame prettily to the screen - - Args: - binary: BinaryStar object with evolved data - """ - df = binary.to_df(**{'extra_columns':{'step_names':'str'}}) - - # Filter to only existing columns - available_columns = [col for col in columns_to_show if col in df.columns] - df_filtered = df[available_columns] - - # Reset index to use a counter instead of NaN - df_filtered = df_filtered.reset_index(drop=True) - - print("=" * line_length) - - # Print the DataFrame - df_string = df_filtered.to_string(index=True, float_format='%.3f') - print(df_string) - - # Add empty lines to reach exactly 10 rows of output - current_rows = len(df_filtered) + 1 # add one for header - - if current_rows < target_rows: - # Calculate the width of the output to print empty lines of the same width - lines = df_string.split('\n') - if len(lines) > 1: - # Use the width of the data lines (skip header) - empty_lines_needed = target_rows - current_rows - for i in range(empty_lines_needed): - print("") - - print("-" * line_length) - - -def print_failed_binary(binary,e, max_error_lines=3): - - print("=" * line_length) - print(f"šŸšØ Binary Evolution Failed!") - print(f"Exception: {type(e).__name__}") - print(f"Message: {e}") - - # Get the binary's current state and limit output - try: - df = binary.to_df(**{'extra_columns':{'step_names':'str'}}) - if len(df) > 0: - # Select only the desired columns - - available_columns = [col for col in columns_to_show if col in df.columns] - df_filtered = df[available_columns] - - # Reset index to use a counter instead of NaN - df_filtered = df_filtered.reset_index(drop=True) - - # Limit to max_error_lines - if len(df_filtered) > max_error_lines: - df_filtered = df_filtered.tail(max_error_lines) - print(f"\nShowing last {max_error_lines} evolution steps before failure:") - else: - print(f"\nEvolution steps before failure ({len(df_filtered)} steps):") - - df_string = df_filtered.to_string(index=True, float_format='%.3f') - print(df_string) - - current_rows = len(df_filtered) + 1 + 5 # add one for header - empty_lines_needed = target_rows - current_rows - for i in range(empty_lines_needed): - print("") - else: - print("\nNo evolution steps recorded before failure.") - except Exception as inner_e: - print(f"\nCould not retrieve binary state: {inner_e}") - - print("-" * line_length) - -def evolve_binary(binary): - - # Capture warnings during evolution - captured_warnings = [] - - def warning_handler(message, category, filename, lineno, file=None, line=None): - captured_warnings.append({ - 'message': str(message), - 'category': category.__name__, - 'filename': filename, - 'lineno': lineno - }) - - # Set up warning capture - old_showwarning = warnings.showwarning - warnings.showwarning = warning_handler - - try: - binary.evolve() - # Display the evolution summary for successful evolution - write_binary_to_screen(binary) - - # Show warnings if any were captured - if captured_warnings: - print(f"āš ļø {len(captured_warnings)} warning(s) raised during evolution:") - for i, warning in enumerate(captured_warnings[:3], 1): # Show max 3 warnings - print(f" {i}. {warning['category']}: {warning['message']}") - if len(captured_warnings) > 3: - print(f" ... and {len(captured_warnings) - 3} more warning(s)") - elif len(captured_warnings) <= 3: - for i in range(4-len(captured_warnings)): - print("") - else: - print(f"No warning(s) raised during evolution\n\n\n\n") - print("=" * line_length) - - except Exception as e: - - # turn off binary alarm in case of exception - signal.alarm(0) - - print_failed_binary(binary, e) - - # Show warnings if any were captured before the exception - if captured_warnings: - print(f"\nāš ļø {len(captured_warnings)} warning(s) raised before failure:") - for i, warning in enumerate(captured_warnings[:3], 1): # Show max 3 warnings - print(f" {i}. {warning['category']}: {warning['message']}") - if len(captured_warnings) > 3: - print(f" ... and {len(captured_warnings) - 3} more warning(s)") - else: - print(f"No warning(s) raised during evolution\n\n\n\n") - - print("=" * line_length) - finally: - # Always turn off binary alarm and restore warning handler - signal.alarm(0) - warnings.showwarning = old_showwarning - - -def evolve_binaries(verbose): - """Evolves a few binaries to validate their output - """ - sim_prop = load_inlist(verbose) - - ######################################## - # Failing binary in matching - ######################################## - star_1 = SingleStar(**{'mass': 11.948472796094759, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [231.97383621190582, 5.927334890264575, 1.5990566013567014, 6.137994236518587]}) - star_2 = SingleStar(**{'mass': 7.636958434479617, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 190925.99636740884,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # Failing binary in matching - ######################################## - star_1 = SingleStar(**{'mass': 30.169861921689556, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [77.96834852144123, 0.05021460132555987, 2.3146518208348152, 1.733054979982291]}) - star_2 = SingleStar(**{'mass': 10.972734402996027, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 20479.71919353725,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # flipped S1 and S2 ? - ######################################## - star_1 = SingleStar(**{'mass': 9.474917413943635, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [133.5713935237759, 4.398754864537542, 2.703102872841114, 1.4633904612711142]}) - star_2 = SingleStar(**{'mass': 9.311073918196263, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 18.605997832086413,'eccentricity': 0.0}, properties = sim_prop) - - evolve_binary(binary) - ######################################## - # flipped S1 and S2 - ######################################## - star_1 = SingleStar(**{'mass': 10.438541, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star_2 = SingleStar(**{'mass': 1.400713, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 9.824025,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # flipped S1 and S2 - ######################################## - star_1= SingleStar(**{'mass': 9.845907 , 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - star_2 = SingleStar(**{'mass': 9.611029, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 3.820571,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # Normal binary evolution - ######################################## - star_1= SingleStar(**{'mass': 30.845907 , 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - star_2 = SingleStar(**{'mass': 30.611029, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 30.820571,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # Normal binary - ######################################## - star_1= SingleStar(**{'mass': 9.213534679594247 , 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [327.5906384501521, 1.7707176050073297, 1.573225822966838, 1.6757313876001914]}) - star_2 = SingleStar(**{'mass': 7.209878522799272, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 63123.74544474666,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # Normal binary - ######################################## - star_1= SingleStar(**{'mass': 9.561158487732602 , 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [317.5423844462847, 2.9095984678057603, 1.754121288652108, 2.3693917842468784]}) - star_2 = SingleStar(**{'mass': 9.382732464319286, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 27.77657038557851,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # Normal binary - ######################################## - star1 = SingleStar(**{'mass': 7.552858,#29829485, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [40.91509926587841, 2.6295454150818256, 1.6718337470964977, 6.0408769315244895]}) - star2 = SingleStar(**{'mass': 6.742063, #481560266, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 17.957531550841225, 'eccentricity': 0.0,}, - properties=sim_prop) - evolve_binary(binary) - ######################################## - # High BH spin options - ######################################## - star_1 = SingleStar(**{'mass': 31.616785, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [10, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - star_2 = SingleStar(**{'mass': 26.874267, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 501.99252706449792,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # Original a>1 spin error - ######################################## - star_1 = SingleStar(**{'mass': 18.107506844123645, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [528.2970725443025, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - star_2 = SingleStar(**{'mass': 15.641392951875442, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 151.99252706449792,'eccentricity': 0.0}, properties = sim_prop) - ######################################## - # FIXED disrupted crash - ######################################## - STAR1 = SingleStar(**{'mass': 52.967313, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 36.306444, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':12.877004, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED error with SN type - ######################################## - STAR1 = SingleStar(**{'mass': 17.782576, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass':3.273864, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED oRLO2 looping - ######################################## - STAR1 = SingleStar(**{'mass': 170.638207, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [4.921294, 4.31745, 1.777768, 3.509656]}) - STAR2 = SingleStar(**{'mass':37.917852, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':113.352736, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # Redirect to step_CO_HeMS (H-rich non-burning?) - ######################################## - star_1 = SingleStar(**{'mass': 8.333579, 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [17.125568, 4.101834, 0.917541, 3.961291]}) - star_2 = SingleStar(**{'mass' : 8.208376, 'state' : 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 66.870417, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary) - ######################################## - # FIXED oRLO2 looping - ######################################## - star_1 = SingleStar(**{'mass': 16.921378, 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}) - star_2 = SingleStar(**{'mass' : 16.286318, 'state' : 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 37.958768, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary) - ######################################## - # FIXED? step_detached failure - ######################################## - STAR1 = SingleStar(**{'mass': 19.787769, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [24.464803, 0.666314, 1.954698, 5.598975]}) - STAR2 = SingleStar(**{'mass': 7.638741, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3007.865561, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # Disrupted binary - ######################################## - star_1 = SingleStar(**{'mass': 16.921378, 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}) - star_2 = SingleStar(**{'mass' : 16.286318, 'state' : 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3007.865561, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED Detached binary failure (low mass) - ######################################## - STAR1 = SingleStar(**{'mass': 9, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass':0.8, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED SN_TYPE = None crash - ######################################## - STAR1 = SingleStar(**{'mass': 17.782576, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass':3.273864, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED SN_TYPE errors - ######################################## - STAR1 = SingleStar(**{'mass': 6.782576, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass':3.273864, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED SN_TYPE errors - ######################################## - STAR1 = SingleStar(**{'mass': 40.638207, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [30.921294, 4.31745, 1.777768, 3.509656]}) - STAR2 = SingleStar(**{'mass':37.917852, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':2113.352736, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED ECSN errors? - ######################################## - STAR1 = SingleStar(**{'mass': 12.376778, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [80, 4.31745, 1.777768, 3.509656]}) - STAR2 = SingleStar(**{'mass': 9.711216, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':79.83702, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # Interpolator masses?? - ######################################## - STAR1 = SingleStar(**{'mass': 7.592921, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass':5.038679 , - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.537807, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # Interpolator masses? - ######################################## - star_1 = SingleStar(**{'mass': 38.741115, - 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [21.113771, 2.060135, 2.224789, 4.089729]}) - star_2 = SingleStar(**{'mass': 27.776178, - 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [282.712103, 0.296252, 1.628433, 5.623812]}) - - BINARY = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 93.387072, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED NaN spin - ######################################## - STAR1 = SingleStar(**{'mass': 70.066924, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0], - 'metallicity':1}) - STAR2 = SingleStar(**{'mass': 34.183110, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0], - 'metallicity':1}) - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.931492e+03, - 'separation': orbital_separation_from_period(5.931492e+03, STAR1.mass, STAR2.mass), - 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED NaN spin - ######################################## - STAR1 = SingleStar(**{'mass': 28.837286, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 6.874867, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':35.609894, - 'separation': orbital_separation_from_period(35.609894, STAR1.mass, STAR2.mass), - 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # oRLO2 issue - ######################################## - STAR1 = SingleStar(**{'mass':29.580210, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 28.814626, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':40.437993, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # oRLO2 issue - ######################################## - STAR1 = SingleStar(**{'mass':67.126795, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 19.622908, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':1484.768582, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # oRLO2 issue - ######################################## - STAR1 = SingleStar(**{'mass': 58.947503, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 56.660506, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':2011.300659, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # oRLO2 issue - ######################################## - STAR1 = SingleStar(**{'mass': 170.638207, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[47.979957374424956, 5.317304576107798, 2.7259013166068145, 4.700929589520818]}) - STAR2 = SingleStar(**{'mass': 37.917852, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':113.352736, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # oRLO2 issue - ######################################## - STAR1 = SingleStar(**{'mass': 109.540207, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 84.344530, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.651896, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # redirect - ######################################## - STAR1 = SingleStar(**{'mass': 13.889634, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass':0.490231, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':14513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # redirect - ######################################## - STAR1 = SingleStar(**{'mass': 9, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass':0.8, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # Max time - ######################################## - star_1 = SingleStar(**{'mass': 103.07996766780799, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.2965418610971261, 2.0789170290719117, 3.207488023705968]}) - star_2 = SingleStar(**{'mass': 83.66522615073987, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 1449.1101985875678,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # Max time - ######################################## - star_1 = SingleStar(**{'mass': 8.860934140643465, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [11.818027275431337, 2.812412688633058, 0.4998731824233789, 2.9272630485628643]}) - star_2 = SingleStar(**{'mass': 8.584716012668551, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 20.82030114750744,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # PR421 - ######################################## - STAR1 = SingleStar(**{'mass': 24.035366, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 23.187355, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':18.865029, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # CE class - ######################################## - STAR1 = SingleStar(**{'mass':33.964274, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 28.98149, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':82.370989, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # PR574 - stepCE fix - ######################################## - STAR1 = SingleStar(**{'mass':29.580210, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 28.814626*0.4, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':300.437993, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # e_ZAMS error - ######################################## - star1 = SingleStar(**{'mass': 8.161885721822461, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 3.5907829421526154, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 36.873457164644144, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary) - - ######################################## - # e_ZAMS error - ######################################## - star1 = SingleStar(**{'mass': 35.24755025317775, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [19.755993125895806, 0.37149222852233904, 1.6588846085306563, - 1.434617029858906]}) - star2 = SingleStar(**{'mass': 30.000450298072902, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 24060.02101364665, 'eccentricity': 0.8085077857996965}, - properties = sim_prop) - evolve_binary(binary) - - ######################################## - # e_ZAMS error - ######################################## - star1 = SingleStar(**{'mass': 11.862930493162692, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 1.4739109294156703, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 4111.083887312003, 'eccentricity':0.0}, - properties = sim_prop) - evolve_binary(binary) - - ######################################## - # e_ZAMS error - ######################################## - star1 = SingleStar(**{'mass': 8.527361341212108, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 0.7061748406821822, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 2521.1927287891444, 'eccentricity':0.0}, - properties = sim_prop) - evolve_binary(binary) - - ######################################## - # e_ZAMS error - ######################################## - star1 = SingleStar(**{'mass': 13.661942533447398 ,#29829485, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 4.466151109802313 , #481560266, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3110.1346707516914, 'eccentricity':0.0}, - properties = sim_prop) - evolve_binary(binary) - -if __name__ == "__main__": - parser = argparse.ArgumentParser(description='Evolve binaries for validation.') - parser.add_argument('--verbose', '-v', action='store_true', default=False, - help='Enable verbose output (default: False)') - args = parser.parse_args() - - evolve_binaries(verbose=args.verbose) From c15d5f3d280f4b6f76a8ad3cbe22c22ff3be439b Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sun, 8 Mar 2026 01:11:05 -0600 Subject: [PATCH 063/389] cleaning --- dev-tools/script_data/src/test_pops.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dev-tools/script_data/src/test_pops.py b/dev-tools/script_data/src/test_pops.py index 1c42dd3e19..9a8b496221 100644 --- a/dev-tools/script_data/src/test_pops.py +++ b/dev-tools/script_data/src/test_pops.py @@ -40,7 +40,7 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): population.evolve(**popevo_kwargs) print_warnings(captured_warnings) - print("āœ… Population evolved successfully.") + print("āœ… BinaryPopulation evolved successfully.") print("=" * line_length) except Exception as e: @@ -67,7 +67,7 @@ def test_popruns(): # test same but w/ saving/loading binaries print("šŸš€ Evolving a population and saving binaries to a hdf5 file.") kwargs = {"optimize_ram":False, "breakdown_to_df":True, "tqdm":True} - pop_io = test_binpop_evolve(pop, kwargs, verbose=False) + _ = test_binpop_evolve(pop, kwargs, verbose=False) loaded_pop = Population("batches/evolution.combined.h5") # check that binaries match between pop runs w/ fixed entropy @@ -96,7 +96,6 @@ def test_popruns(): # TEST POPRUNNER # This is RAM heavy and may fail on personal computers - # ================================================================================ print("Test PopulationRunner with multiple metallicities...") poprun = PopulationRunner(path_to_multiZ_params, verbose=True) @@ -105,7 +104,7 @@ def test_popruns(): print('Number of binaries (per pop):', poprun.binary_populations[0].number_of_binaries) print("šŸš€ Evolving PopulationRunner...") poprun.evolve(overwrite=True) - #print("Done!") + print("āœ… PopulationRunner evolved successfully.") if __name__ == "__main__": From fb7eff2bc97bc176461c817d06d8701b26fd5965 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sun, 8 Mar 2026 01:12:44 -0600 Subject: [PATCH 064/389] import column names for binary DataFrames --- dev-tools/script_data/src/test_pops.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dev-tools/script_data/src/test_pops.py b/dev-tools/script_data/src/test_pops.py index 9a8b496221..39a2006205 100644 --- a/dev-tools/script_data/src/test_pops.py +++ b/dev-tools/script_data/src/test_pops.py @@ -2,7 +2,7 @@ import traceback import warnings -from formatting import line_length +from formatting import line_length, columns_to_show from pandas.testing import assert_frame_equal from utils import print_pop_settings, print_warnings @@ -77,9 +77,8 @@ def test_popruns(): print("āš”ļø Checking that binaries in RAM match those retrieved from I/O...") for i, ram_df in enumerate(ram_dflist): io_df = loaded_pop.history[i] - cols = ['time', 'step_names', 'state', 'event', 'S1_state', 'S2_state', 'S1_mass', 'S2_mass', 'orbital_period'] - ram_df = ram_df[cols] - io_df = io_df[cols] + ram_df = ram_df[columns_to_show] + io_df = io_df[columns_to_show] try: assert_frame_equal(ram_df, io_df) except AssertionError as e: From 667940d54690d44f7fdafc375f27783dc5367bf1 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 8 Mar 2026 07:12:59 +0000 Subject: [PATCH 065/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/script_data/src/test_pops.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/script_data/src/test_pops.py b/dev-tools/script_data/src/test_pops.py index 39a2006205..a182706e25 100644 --- a/dev-tools/script_data/src/test_pops.py +++ b/dev-tools/script_data/src/test_pops.py @@ -2,7 +2,7 @@ import traceback import warnings -from formatting import line_length, columns_to_show +from formatting import columns_to_show, line_length from pandas.testing import assert_frame_equal from utils import print_pop_settings, print_warnings From ea48906dabf5c255fa36a326e44d88157afdb3b1 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sun, 8 Mar 2026 01:15:51 -0600 Subject: [PATCH 066/389] cleaning --- dev-tools/script_data/src/test_pops.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-tools/script_data/src/test_pops.py b/dev-tools/script_data/src/test_pops.py index 39a2006205..67ef03b8fe 100644 --- a/dev-tools/script_data/src/test_pops.py +++ b/dev-tools/script_data/src/test_pops.py @@ -84,8 +84,8 @@ def test_popruns(): except AssertionError as e: print("šŸšØ A binary from I/O does not equal the same binary stored in RAM:") print(e) - print("Binary in RAM: ", ram_df) - print("Binary from I/O", io_df) + print("Binary in RAM:\n", ram_df) + print("Binary from I/O:\n", io_df) return if i == len(loaded_pop.history): break @@ -98,7 +98,7 @@ def test_popruns(): # ================================================================================ print("Test PopulationRunner with multiple metallicities...") poprun = PopulationRunner(path_to_multiZ_params, verbose=True) - print('Number of binary populations:',len(poprun.binary_populations)) + print('Number of binary populations:', len(poprun.binary_populations)) print('Metallicities:', poprun.solar_metallicities) print('Number of binaries (per pop):', poprun.binary_populations[0].number_of_binaries) print("šŸš€ Evolving PopulationRunner...") From 8a8e1c24af03d6c4cf2d5b39bd9235dc549efe4a Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sun, 8 Mar 2026 01:18:08 -0600 Subject: [PATCH 067/389] formatting --- dev-tools/script_data/src/test_pops.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-tools/script_data/src/test_pops.py b/dev-tools/script_data/src/test_pops.py index 99aa429d1c..b288b0cdff 100644 --- a/dev-tools/script_data/src/test_pops.py +++ b/dev-tools/script_data/src/test_pops.py @@ -98,9 +98,9 @@ def test_popruns(): # ================================================================================ print("Test PopulationRunner with multiple metallicities...") poprun = PopulationRunner(path_to_multiZ_params, verbose=True) - print('Number of binary populations:', len(poprun.binary_populations)) - print('Metallicities:', poprun.solar_metallicities) - print('Number of binaries (per pop):', poprun.binary_populations[0].number_of_binaries) + print('\t Number of binary populations:', len(poprun.binary_populations)) + print('\t Metallicities:', poprun.solar_metallicities) + print('\t Number of binaries (per pop):', poprun.binary_populations[0].number_of_binaries) print("šŸš€ Evolving PopulationRunner...") poprun.evolve(overwrite=True) print("āœ… PopulationRunner evolved successfully.") From bbc9ff6a55b842edde0c0f78f0ad13fcc256dd25 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sun, 8 Mar 2026 01:22:16 -0600 Subject: [PATCH 068/389] fix ini file path --- dev-tools/script_data/src/test_pops.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/script_data/src/test_pops.py b/dev-tools/script_data/src/test_pops.py index b288b0cdff..71b6276c59 100644 --- a/dev-tools/script_data/src/test_pops.py +++ b/dev-tools/script_data/src/test_pops.py @@ -10,7 +10,7 @@ from posydon.popsyn.binarypopulation import BinaryPopulation from posydon.popsyn.synthetic_population import Population, PopulationRunner -path_to_default_params = os.path.join(PATH_TO_POSYDON, "dev-tools/script_data/inlists/test_population_params.ini") +path_to_default_params = os.path.join(PATH_TO_POSYDON, "dev-tools/script_data/inlists/population_test_params.ini") path_to_multiZ_params = os.path.join(PATH_TO_POSYDON, "dev-tools/script_data/inlists/test_multiZ_population_params.ini") def test_binpop_evolve(population, popevo_kwargs, verbose=False): From 32c4af0c5eec8fd7f7b8c7d3a165cfa3c16722ac Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sun, 8 Mar 2026 11:30:49 -0500 Subject: [PATCH 069/389] adding optimize_ram test, formatting, new directory for test output --- .../inlists/population_test_params.ini | 2 +- dev-tools/script_data/src/test_pops.py | 84 +++++++++++++------ dev-tools/script_data/src/utils.py | 2 +- 3 files changed, 62 insertions(+), 26 deletions(-) diff --git a/dev-tools/script_data/inlists/population_test_params.ini b/dev-tools/script_data/inlists/population_test_params.ini index 2b47b6aa90..8ab3a050d6 100644 --- a/dev-tools/script_data/inlists/population_test_params.ini +++ b/dev-tools/script_data/inlists/population_test_params.ini @@ -362,7 +362,7 @@ # save population in batches: True, False ram_per_cpu = None # set maximum ram per cpu before batch saving (GB); None or float (0, inf) - dump_rate = 2000 + dump_rate = 2 # batch save after evolving N binaries: int (0, inf) # this should be at least 500 for populations of 100,000 binaries or more temp_directory = 'batches' diff --git a/dev-tools/script_data/src/test_pops.py b/dev-tools/script_data/src/test_pops.py index 71b6276c59..58703ee0b6 100644 --- a/dev-tools/script_data/src/test_pops.py +++ b/dev-tools/script_data/src/test_pops.py @@ -10,8 +10,10 @@ from posydon.popsyn.binarypopulation import BinaryPopulation from posydon.popsyn.synthetic_population import Population, PopulationRunner -path_to_default_params = os.path.join(PATH_TO_POSYDON, "dev-tools/script_data/inlists/population_test_params.ini") -path_to_multiZ_params = os.path.join(PATH_TO_POSYDON, "dev-tools/script_data/inlists/test_multiZ_population_params.ini") +base_dir = os.path.join(PATH_TO_POSYDON, "dev-tools/script_data/") +path_to_default_params = os.path.join(base_dir, "inlists/population_test_params.ini") +path_to_multiZ_params = os.path.join(base_dir, "inlists/test_multiZ_population_params.ini") +path_to_popout = os.path.join(base_dir, "output/population_tests/batches") def test_binpop_evolve(population, popevo_kwargs, verbose=False): @@ -52,29 +54,13 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): return population -def test_popruns(): - - print("Performing population run tests...") - - pop = BinaryPopulation.from_ini(path_to_default_params, verbose=False) - print_pop_settings(pop) - - # test simple run, stays in RAM - print("šŸš€ Evolving a population and storing binaries in RAM.") - kwargs = {"optimize_ram":False, "breakdown_to_df":False, "tqdm":True} - pop_in_ram = test_binpop_evolve(pop, kwargs, verbose=True) - - # test same but w/ saving/loading binaries - print("šŸš€ Evolving a population and saving binaries to a hdf5 file.") - kwargs = {"optimize_ram":False, "breakdown_to_df":True, "tqdm":True} - _ = test_binpop_evolve(pop, kwargs, verbose=False) - loaded_pop = Population("batches/evolution.combined.h5") - +def compare_io_to_ram(loaded_pop, pop_in_ram): + # check that binaries match between pop runs w/ fixed entropy # and that saved/loaded binaries match those from a memory loaded run df_from_ram = pop_in_ram.to_df() ram_dflist = [df_from_ram.loc[i] for i in range(10)] - print("āš”ļø Checking that binaries in RAM match those retrieved from I/O...") + print("šŸ” Checking that binaries in RAM match those retrieved from I/O...") for i, ram_df in enumerate(ram_dflist): io_df = loaded_pop.history[i] ram_df = ram_df[columns_to_show] @@ -84,8 +70,9 @@ def test_popruns(): except AssertionError as e: print("šŸšØ A binary from I/O does not equal the same binary stored in RAM:") print(e) - print("Binary in RAM:\n", ram_df) - print("Binary from I/O:\n", io_df) + print("\nBinary in RAM:\n", ram_df) + print("\nBinary from I/O:\n", io_df) + print("=" * line_length) return if i == len(loaded_pop.history): break @@ -93,16 +80,65 @@ def test_popruns(): print("āœ… Binaries from I/O match those in RAM.") print("=" * line_length) +def test_popruns(): + + print("Performing population run tests...") + + pop = BinaryPopulation.from_ini(path_to_default_params, verbose=False) + pop.kwargs.update({"temp_directory": path_to_popout}) + print_pop_settings(pop) + + # test simple run, stays in RAM + test_str = " TEST: 01 " + numchar = (line_length - len(test_str)) // 2 + print("=" * numchar + test_str + "=" * numchar) + print(f"šŸš€ Evolving a population and storing {pop.number_of_binaries} binaries in RAM.") + kwargs = {"optimize_ram":False, "breakdown_to_df":False, "tqdm":True} + pop_in_ram = test_binpop_evolve(pop, kwargs, verbose=True) + print(f"šŸ” Checking that we have {pop.number_of_binaries} binaries in RAM...") + num_in_ram = len(pop_in_ram.manager.binaries) + assert pop.number_of_binaries == num_in_ram, \ + f"šŸšØ Number of binaries in RAM ({num_in_ram}) " \ + f"does not equal the number specified to run ({pop.number_of_binaries})." + print(f"āœ… Successfully ran and stored {num_in_ram} binaries in RAM.") + + # test same but w/ saving/loading binaries + test_str = " TEST: 02 " + numchar = (line_length - len(test_str)) // 2 + print("=" * numchar + test_str + "=" * numchar) + print("šŸš€ Evolving a population and saving binaries to a hdf5 file.") + kwargs = {"optimize_ram":False, "breakdown_to_df":True, "tqdm":True} + _ = test_binpop_evolve(pop, kwargs, verbose=False) + save_fn = os.path.join(path_to_popout, "evolution.combined.h5") + loaded_pop = Population(save_fn) + compare_io_to_ram(loaded_pop, pop_in_ram) + + # test optimize RAM run w/ batch saving + test_str = " TEST: 03 " + numchar = (line_length - len(test_str)) // 2 + print("=" * numchar + test_str + "=" * numchar) + num_batch_files = int(pop.number_of_binaries/pop.kwargs["dump_rate"]) + print(f"šŸš€ Evolving a population and saving to {num_batch_files} batch files.") + kwargs = {"optimize_ram":True, "breakdown_to_df":False, "tqdm":True} + _ = test_binpop_evolve(pop, kwargs, verbose=True) + save_fn = os.path.join(path_to_popout, "evolution.combined.h5") + loaded_pop = Population(save_fn) + # This comparison FAILS at the moment...because of ordering in combined .h5? + # compare_io_to_ram(loaded_pop, pop_in_ram) + # TEST POPRUNNER # This is RAM heavy and may fail on personal computers # ================================================================================ + test_str = " TEST: 04 " + numchar = (line_length - len(test_str)) // 2 + print("=" * numchar + test_str + "=" * numchar) print("Test PopulationRunner with multiple metallicities...") poprun = PopulationRunner(path_to_multiZ_params, verbose=True) print('\t Number of binary populations:', len(poprun.binary_populations)) print('\t Metallicities:', poprun.solar_metallicities) print('\t Number of binaries (per pop):', poprun.binary_populations[0].number_of_binaries) print("šŸš€ Evolving PopulationRunner...") - poprun.evolve(overwrite=True) + #poprun.evolve(overwrite=True) print("āœ… PopulationRunner evolved successfully.") diff --git a/dev-tools/script_data/src/utils.py b/dev-tools/script_data/src/utils.py index cab0d7d658..14b8f3f552 100644 --- a/dev-tools/script_data/src/utils.py +++ b/dev-tools/script_data/src/utils.py @@ -24,7 +24,7 @@ def print_pop_settings(population): "population_properties", "warnings_verbose", "history_verbose", "error_checking_verbose", "use_MPI", "read_samples_from_file", "RANK", "size", "optimize_ram", "ram_per_cpu", - "dump_rate", "tqdm", "temp_directory", "breakdown_to_df"] + "dump_rate", "tqdm", "breakdown_to_df"] for key, val in population.kwargs.items(): if key in ignore_kwargs: From 97fac172122ed788187eb2267de1f14dc419af2d Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sun, 8 Mar 2026 11:33:16 -0500 Subject: [PATCH 070/389] adding population_tests output directory --- dev-tools/script_data/output/population_tests/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 dev-tools/script_data/output/population_tests/README.md diff --git a/dev-tools/script_data/output/population_tests/README.md b/dev-tools/script_data/output/population_tests/README.md new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/dev-tools/script_data/output/population_tests/README.md @@ -0,0 +1 @@ + From 7525243c2a95f659fd81502992494a06b1d189bb Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sun, 8 Mar 2026 11:33:27 -0500 Subject: [PATCH 071/389] Delete dev-tools/script_data/output/population_tests/README.md --- dev-tools/script_data/output/population_tests/README.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 dev-tools/script_data/output/population_tests/README.md diff --git a/dev-tools/script_data/output/population_tests/README.md b/dev-tools/script_data/output/population_tests/README.md deleted file mode 100644 index 8b13789179..0000000000 --- a/dev-tools/script_data/output/population_tests/README.md +++ /dev/null @@ -1 +0,0 @@ - From b57ac7a2c9aaaa4ee19d2735f24420e6b17006ba Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 8 Mar 2026 16:34:43 +0000 Subject: [PATCH 072/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/script_data/src/test_pops.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/script_data/src/test_pops.py b/dev-tools/script_data/src/test_pops.py index 58703ee0b6..a2f2846bbe 100644 --- a/dev-tools/script_data/src/test_pops.py +++ b/dev-tools/script_data/src/test_pops.py @@ -55,7 +55,7 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): return population def compare_io_to_ram(loaded_pop, pop_in_ram): - + # check that binaries match between pop runs w/ fixed entropy # and that saved/loaded binaries match those from a memory loaded run df_from_ram = pop_in_ram.to_df() From be8f9d5d4f11510bc8d00dbb329c5d0e10238d67 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sun, 8 Mar 2026 11:35:15 -0500 Subject: [PATCH 073/389] Create .gitkeep --- dev-tools/script_data/output/population_tests/.gitkeep | 1 + 1 file changed, 1 insertion(+) create mode 100644 dev-tools/script_data/output/population_tests/.gitkeep diff --git a/dev-tools/script_data/output/population_tests/.gitkeep b/dev-tools/script_data/output/population_tests/.gitkeep new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/dev-tools/script_data/output/population_tests/.gitkeep @@ -0,0 +1 @@ + From 3921e6813c597935e04f66b18c2fe76da4d2825b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 8 Mar 2026 16:36:20 +0000 Subject: [PATCH 074/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/script_data/output/population_tests/.gitkeep | 1 - 1 file changed, 1 deletion(-) diff --git a/dev-tools/script_data/output/population_tests/.gitkeep b/dev-tools/script_data/output/population_tests/.gitkeep index 8b13789179..e69de29bb2 100644 --- a/dev-tools/script_data/output/population_tests/.gitkeep +++ b/dev-tools/script_data/output/population_tests/.gitkeep @@ -1 +0,0 @@ - From a875240776de265d33d91618c861f2478f6f71c9 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sun, 8 Mar 2026 11:37:05 -0500 Subject: [PATCH 075/389] Add output dir for binary evolution tests --- dev-tools/script_data/output/binary_star_tests/.gitkeep | 1 + 1 file changed, 1 insertion(+) create mode 100644 dev-tools/script_data/output/binary_star_tests/.gitkeep diff --git a/dev-tools/script_data/output/binary_star_tests/.gitkeep b/dev-tools/script_data/output/binary_star_tests/.gitkeep new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/dev-tools/script_data/output/binary_star_tests/.gitkeep @@ -0,0 +1 @@ + From 6a3a4cd05f6dcfcf23f6f7b634d6c7c0d892be6e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 8 Mar 2026 16:38:04 +0000 Subject: [PATCH 076/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/script_data/output/binary_star_tests/.gitkeep | 1 - 1 file changed, 1 deletion(-) diff --git a/dev-tools/script_data/output/binary_star_tests/.gitkeep b/dev-tools/script_data/output/binary_star_tests/.gitkeep index 8b13789179..e69de29bb2 100644 --- a/dev-tools/script_data/output/binary_star_tests/.gitkeep +++ b/dev-tools/script_data/output/binary_star_tests/.gitkeep @@ -1 +0,0 @@ - From 1162aaf4016daaac3bf3757e3a029df6d4a8acd6 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sun, 8 Mar 2026 11:50:01 -0500 Subject: [PATCH 077/389] updating ini file path --- dev-tools/script_data/src/binaries_suite.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-tools/script_data/src/binaries_suite.py b/dev-tools/script_data/src/binaries_suite.py index 12501efafe..4957420e88 100644 --- a/dev-tools/script_data/src/binaries_suite.py +++ b/dev-tools/script_data/src/binaries_suite.py @@ -18,7 +18,8 @@ from posydon.binary_evol.simulationproperties import SimulationProperties from posydon.config import PATH_TO_POSYDON -path_to_default_params = os.path.join(PATH_TO_POSYDON, "dev-tools/script_data/1Zsun_binaries_params.ini") +base_dir = os.path.join(PATH_TO_POSYDON, "dev-tools/script_data/") +path_to_default_params = os.path.join(base_dir, "inlists/binary_test_params.ini") def load_inlist(verbose): From 28beb7d6aa138608756663bff94ac1fd304ffc37 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sun, 8 Mar 2026 12:58:05 -0500 Subject: [PATCH 078/389] update shell scripts to link to new python scripts --- dev-tools/evolve_binaries.sh | 7 ++++--- dev-tools/evolve_population.sh | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dev-tools/evolve_binaries.sh b/dev-tools/evolve_binaries.sh index fc7a20fb3b..c6e8fb107f 100755 --- a/dev-tools/evolve_binaries.sh +++ b/dev-tools/evolve_binaries.sh @@ -77,8 +77,9 @@ conda activate "$FULL_PATH/conda_env" echo "šŸ“¦ Installing POSYDON" pip install -e "$CLONE_DIR" -q 2>&1 | sed 's/^/ /' -echo "šŸš€ Running evolve_binaries.py" +echo "šŸš€ Running binaries_suite.py" # # Run the Python script and capture output (stdout and stderr) -python script_data/1Zsun_binaries_suite.py > $FULL_PATH/evolve_binaries_$BRANCH.out 2>&1 +OUT_DIR=$FULL_PATH/script_data/output/binary_star_tests +python script_data/src/binaries_suite.py > $OUT_DIR/evolve_binaries_$BRANCH.out 2>&1 -echo -e "āœ… Script completed. Output saved to \n$FULL_PATH/evolve_binaries_$BRANCH.out" +echo -e "āœ… Script completed. Output saved to \n$OUT_DIR/evolve_binaries_$BRANCH.out" diff --git a/dev-tools/evolve_population.sh b/dev-tools/evolve_population.sh index fc7a20fb3b..e19f15000f 100644 --- a/dev-tools/evolve_population.sh +++ b/dev-tools/evolve_population.sh @@ -77,8 +77,9 @@ conda activate "$FULL_PATH/conda_env" echo "šŸ“¦ Installing POSYDON" pip install -e "$CLONE_DIR" -q 2>&1 | sed 's/^/ /' -echo "šŸš€ Running evolve_binaries.py" +echo "šŸš€ Running test_pops.py" # # Run the Python script and capture output (stdout and stderr) -python script_data/1Zsun_binaries_suite.py > $FULL_PATH/evolve_binaries_$BRANCH.out 2>&1 +OUT_DIR=$FULL_PATH/script_data/output/population_tests +python script_data/src/test_pops.py > $OUT_DIR/evolve_pop_$BRANCH.out 2>&1 -echo -e "āœ… Script completed. Output saved to \n$FULL_PATH/evolve_binaries_$BRANCH.out" +echo -e "āœ… Script completed. Output saved to \n$OUT_DIR/evolve_pop_$BRANCH.out" From 92d7a89386d6a9510367b7fd2b46360c5dfbfab0 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sun, 8 Mar 2026 13:49:06 -0500 Subject: [PATCH 079/389] clean and organize training and creation of scalers. They should only be trained and created once at initialization, not every call --- posydon/binary_evol/DT/track_match.py | 145 +++++++++++++++++++------- 1 file changed, 107 insertions(+), 38 deletions(-) diff --git a/posydon/binary_evol/DT/track_match.py b/posydon/binary_evol/DT/track_match.py index 07399cb708..5fbce16408 100644 --- a/posydon/binary_evol/DT/track_match.py +++ b/posydon/binary_evol/DT/track_match.py @@ -424,6 +424,110 @@ def __init__( self.record_matching = record_matching + # create and train scalers + self.create_root0_h() + self.create_root0_he() + self.train_scalers() + + def train_scalers(self): + + # ...if not, fit a new scaler, and store it for later use + + lists_for_matching = [self.list_for_matching_HMS, + self.list_for_matching_HeStar, + self.list_for_matching_HMS_alternative, + self.list_for_matching_HeStar_alternative, + self.list_for_matching_postHeMS, + self.list_for_matching_postHeMS_alternative, + self.list_for_matching_postMS, + self.list_for_matching_postMS_alternative] + + for list_for_matching in lists_for_matching: + + match_attr_names = list_for_matching[0] + rescale_facs = list_for_matching[1] + scaler_methods = list_for_matching[2] + bnds = list_for_matching[3:] + + if self.verbose: + print("Matching parameters and their normalizations:\n", + match_attr_names, rescale_facs) + for htrack in [True, False]: + grid = self.grid_Hrich if htrack else self.grid_strippedHe + self.initial_mass = grid.grid_mass + + # get (or train and get) scalers for attributes + # attributes are scaled to range (0, 1) + for attr_name, method in zip(match_attr_names, scaler_methods): + all_attributes = [] + # check that attributes are allowed as matching attributes + if attr_name not in self.root_keys: + raise AttributeError("Expected matching attribute " + f"{attr_name} not " + "added in root_keys list: " + f"{self.root_keys}") + + scaler_options = (attr_name, htrack, method) + + for mass in self.initial_mass: + for i in grid.get(attr_name, mass): + all_attributes.append(i) + + all_attributes = np.array(all_attributes) + scaler = DataScaler() + scaler.fit(all_attributes, method=method, lower=0.0, upper=1.0) + self.stored_scalers[scaler_options] = scaler + + def create_root0_h(self): + + # set which grid to search based on htrack condition + grid = self.grid_Hrich + + # initial masses within grid (defined but never used? used in scale()) + self.initial_mass = grid.grid_mass + + # search across all initial masses and get max track length + max_track_length = 0 + for mass in grid.grid_mass: + track_length = len(grid.get("age", mass)) + max_track_length = max(max_track_length, track_length) + + # intialize root matrix + # (DIM = [N(Mi), N(max_track_length), N(root_keys)]) + self.rootm_h = np.inf * np.ones((len(grid.grid_mass), + max_track_length, len(self.root_keys))) + + # for each mass, get matching metrics and store in matrix + for i, mass in enumerate(grid.grid_mass): + for j, key in enumerate(self.root_keys): + track = grid.get(key, mass) + self.rootm_h[i, : len(track), j] = track + + def create_root0_he(self): + + # set which grid to search based on htrack condition + grid = self.grid_strippedHe + + # initial masses within grid (defined but never used? used in scale()) + self.initial_mass = grid.grid_mass + + # search across all initial masses and get max track length + max_track_length = 0 + for mass in grid.grid_mass: + track_length = len(grid.get("age", mass)) + max_track_length = max(max_track_length, track_length) + + # intialize root matrix + # (DIM = [N(Mi), N(max_track_length), N(root_keys)]) + self.rootm_he = np.inf * np.ones((len(grid.grid_mass), + max_track_length, len(self.root_keys))) + + # for each mass, get matching metrics and store in matrix + for i, mass in enumerate(grid.grid_mass): + for j, key in enumerate(self.root_keys): + track = grid.get(key, mass) + self.rootm_he[i, : len(track), j] = track + def get_root0(self, attr_names, attr_vals, htrack, rescale_facs=None): """ Get the stellar evolution track in the single star grid with values @@ -462,29 +566,10 @@ def get_root0(self, attr_names, attr_vals, htrack, rescale_facs=None): """ + rootm = self.rootm_h if htrack else self.rootm_he # set which grid to search based on htrack condition grid = self.grid_Hrich if htrack else self.grid_strippedHe - # initial masses within grid (defined but never used? used in scale()) - self.initial_mass = grid.grid_mass - - # search across all initial masses and get max track length - max_track_length = 0 - for mass in grid.grid_mass: - track_length = len(grid.get("age", mass)) - max_track_length = max(max_track_length, track_length) - - # intialize root matrix - # (DIM = [N(Mi), N(max_track_length), N(root_keys)]) - self.rootm = np.inf * np.ones((len(grid.grid_mass), - max_track_length, len(self.root_keys))) - - # for each mass, get matching metrics and store in matrix - for i, mass in enumerate(grid.grid_mass): - for j, key in enumerate(self.root_keys): - track = grid.get(key, mass) - self.rootm[i, : len(track), j] = track - # rescaling factors if rescale_facs is None: rescale_facs = np.ones_like(attr_names) @@ -500,7 +585,7 @@ def get_root0(self, attr_names, attr_vals, htrack, rescale_facs=None): # Slice out just the matching metric data for all stellar tracks # grid_attr_vals now has shape # (N(Mi), N(max_track_len), N(matching_metrics)) - grid_attr_vals = self.rootm[:, :, idx] + grid_attr_vals = rootm[:, :, idx] # For all stellar tracks in grid: # Take difference btwn. grid track and given star values... @@ -521,7 +606,7 @@ def get_root0(self, attr_names, attr_vals, htrack, rescale_facs=None): # time and initial mass corresp. to track w/ minimum difference m0 = grid.grid_mass[mass_i] - t0 = self.rootm[mass_i][age_i][np.argmax("age" == self.root_keys)] + t0 = rootm[mass_i][age_i][np.argmax("age" == self.root_keys)] return m0, t0 @@ -607,22 +692,6 @@ def scale(self, attr_name, htrack, scaler_method): # find if the scaler has already been fitted and return it if so... scaler = self.stored_scalers.get(scaler_options, None) - if scaler is not None: - return scaler - - # ...if not, fit a new scaler, and store it for later use - grid = self.grid_Hrich if htrack else self.grid_strippedHe - self.initial_mass = grid.grid_mass - all_attributes = [] - - for mass in self.initial_mass: - for i in grid.get(attr_name, mass): - all_attributes.append(i) - - all_attributes = np.array(all_attributes) - scaler = DataScaler() - scaler.fit(all_attributes, method=scaler_method, lower=0.0, upper=1.0) - self.stored_scalers[scaler_options] = scaler return scaler From 81d4c5b792c9984f30cbb2d9e4c9669e8ef497f2 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sun, 8 Mar 2026 14:24:39 -0500 Subject: [PATCH 080/389] Lazy access for grid hdf5 data to save on RAM. This breaks unit tests. --- posydon/grids/psygrid.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/posydon/grids/psygrid.py b/posydon/grids/psygrid.py index 99b5c5dff8..072f00d1fe 100644 --- a/posydon/grids/psygrid.py +++ b/posydon/grids/psygrid.py @@ -1472,18 +1472,18 @@ def load(self, filepath=None): hdf5 = self.hdf5 # load initial/final_values self._say("\tLoading initial/final values...") - self.initial_values = hdf5['/grid/initial_values'][()] - self.final_values = hdf5['/grid/final_values'][()] + self.initial_values = hdf5['/grid/initial_values'] + self.final_values = hdf5['/grid/final_values'] # change ASCII to UNICODE in termination flags in `final_values` - new_dtype = [] - for dtype in self.final_values.dtype.descr: - if (dtype[0].startswith("termination_flag") or - (dtype[0] == "mt_history") or ("_type" in dtype[0]) or - ("_state" in dtype[0]) or ("_class" in dtype[0])): - dtype = (dtype[0], H5_REC_STR_DTYPE.replace("S", "U")) - new_dtype.append(dtype) - self.final_values = self.final_values.astype(new_dtype) + #new_dtype = [] + #for dtype in self.final_values.dtype.descr: + # if (dtype[0].startswith("termination_flag") or + # (dtype[0] == "mt_history") or ("_type" in dtype[0]) or + # ("_state" in dtype[0]) or ("_class" in dtype[0])): + # dtype = (dtype[0], H5_REC_STR_DTYPE.replace("S", "U")) + # new_dtype.append(dtype) + #self.final_values = self.final_values.astype(new_dtype) # load MESA dirs self._say("\tAcquiring paths to MESA directories...") From 1838cdf953742c21a36513bd8adac7ccc88fea36 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sun, 8 Mar 2026 18:03:02 -0500 Subject: [PATCH 081/389] testing wrapper for hdf5 lazy loading to fix unit tests --- posydon/grids/psygrid.py | 47 ++++++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/posydon/grids/psygrid.py b/posydon/grids/psygrid.py index 072f00d1fe..117f71e7bf 100644 --- a/posydon/grids/psygrid.py +++ b/posydon/grids/psygrid.py @@ -382,6 +382,36 @@ "accept_missing_profile": False, } +class LazyHDF5: + def __init__(self, dataset, dtype_set=None): + self._dataset = dataset + self._dtype_set = dtype_set + + def __getitem__(self, name): + data = self._dataset[name] + if self._dtype_set is not None: + data = data.astype(self._dtype_set[name]) + return data + + def __array__(self): + data = self._dataset[()] + if self._dtype_set is not None: + data = data.astype(list(self._dtype_set.items())) + return data + + @property + def dtype(self): + if self._dtype_set is not None: + return np.dtype(list(self._dtype_set.items())) + return self._dataset.dtype + + @property + def shape(self): + return self._dataset.shape + + def __len__(self): + return len(self._dataset) + class PSyGrid: """Class handling a grid of MESA runs encoded in HDF5 format.""" @@ -1476,13 +1506,16 @@ def load(self, filepath=None): self.final_values = hdf5['/grid/final_values'] # change ASCII to UNICODE in termination flags in `final_values` - #new_dtype = [] - #for dtype in self.final_values.dtype.descr: - # if (dtype[0].startswith("termination_flag") or - # (dtype[0] == "mt_history") or ("_type" in dtype[0]) or - # ("_state" in dtype[0]) or ("_class" in dtype[0])): - # dtype = (dtype[0], H5_REC_STR_DTYPE.replace("S", "U")) - # new_dtype.append(dtype) + new_dtype = {} + for dtype in self.final_values.dtype.descr: + if (dtype[0].startswith("termination_flag") or + (dtype[0] == "mt_history") or ("_type" in dtype[0]) or + ("_state" in dtype[0]) or ("_class" in dtype[0])): + dtype = (dtype[0], H5_REC_STR_DTYPE.replace("S", "U")) + new_dtype[dtype[0]] = dtype[1] + + self.initial_values = LazyHDF5(self.initial_values) + self.final_values = LazyHDF5(self.final_values, new_dtype) #self.final_values = self.final_values.astype(new_dtype) # load MESA dirs From 7ee965c16c8e0f2d88b55e9a0da8c08d618f4abd Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sun, 8 Mar 2026 18:39:01 -0500 Subject: [PATCH 082/389] fixing unit tests --- posydon/unit_tests/grids/test_psygrid.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/unit_tests/grids/test_psygrid.py b/posydon/unit_tests/grids/test_psygrid.py index d2136c1ba9..2361b7d909 100644 --- a/posydon/unit_tests/grids/test_psygrid.py +++ b/posydon/unit_tests/grids/test_psygrid.py @@ -68,7 +68,7 @@ def test_dir(self): 'PROPERTIES_ALLOWED', 'PROPERTIES_TO_BE_CONSISTENT',\ 'PROPERTIES_TO_BE_NONE', 'PROPERTIES_TO_BE_SET',\ 'PSyGrid', 'PSyGridIterator', 'PSyRunView', 'Pwarn',\ - 'TERMINATION_FLAG_COLUMNS',\ + 'LazyHDF5', 'TERMINATION_FLAG_COLUMNS',\ 'TERMINATION_FLAG_COLUMNS_SINGLE',\ 'THRESHOLD_CENTRAL_ABUNDANCE',\ 'THRESHOLD_CENTRAL_ABUNDANCE_LOOSE_C', 'TrackDownsampler',\ From 78bc5de43e64c969bb02694c742a45ef21dfed81 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sun, 8 Mar 2026 18:51:54 -0500 Subject: [PATCH 083/389] adding case for non str index to lazyhdf5 --- posydon/grids/psygrid.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/posydon/grids/psygrid.py b/posydon/grids/psygrid.py index 117f71e7bf..edda3168b4 100644 --- a/posydon/grids/psygrid.py +++ b/posydon/grids/psygrid.py @@ -386,23 +386,27 @@ class LazyHDF5: def __init__(self, dataset, dtype_set=None): self._dataset = dataset self._dtype_set = dtype_set + self._dtype_list = list(self._dtype_set.items()) - def __getitem__(self, name): - data = self._dataset[name] + def __getitem__(self, idx): + data = self._dataset[idx] if self._dtype_set is not None: - data = data.astype(self._dtype_set[name]) + if type(idx) == str: + data = data.astype(self._dtype_set[idx]) + else: + data = data.astype(self._dtype_list) return data def __array__(self): data = self._dataset[()] if self._dtype_set is not None: - data = data.astype(list(self._dtype_set.items())) + data = data.astype(self._dtype_list) return data @property def dtype(self): if self._dtype_set is not None: - return np.dtype(list(self._dtype_set.items())) + return np.dtype(self._dtype_list) return self._dataset.dtype @property From e543011d620a7e8cf6fa478eda636b5fd1307e30 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sun, 8 Mar 2026 18:56:16 -0500 Subject: [PATCH 084/389] fix dtype_list assignment in lazyhdf5 --- posydon/grids/psygrid.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/posydon/grids/psygrid.py b/posydon/grids/psygrid.py index edda3168b4..97b39258d7 100644 --- a/posydon/grids/psygrid.py +++ b/posydon/grids/psygrid.py @@ -386,7 +386,8 @@ class LazyHDF5: def __init__(self, dataset, dtype_set=None): self._dataset = dataset self._dtype_set = dtype_set - self._dtype_list = list(self._dtype_set.items()) + if self._dtype_set is not None: + self._dtype_list = list(self._dtype_set.items()) def __getitem__(self, idx): data = self._dataset[idx] From bc0caee00b4e78bdff4bc3041ce605c6c5407a8c Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sun, 8 Mar 2026 19:26:06 -0500 Subject: [PATCH 085/389] add __setitem__ method to lazyhdf5 for e.g. getattr functionality --- posydon/grids/psygrid.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/posydon/grids/psygrid.py b/posydon/grids/psygrid.py index 97b39258d7..08bb5e6bc0 100644 --- a/posydon/grids/psygrid.py +++ b/posydon/grids/psygrid.py @@ -392,11 +392,20 @@ def __init__(self, dataset, dtype_set=None): def __getitem__(self, idx): data = self._dataset[idx] if self._dtype_set is not None: - if type(idx) == str: + if isinstance(idx, str): data = data.astype(self._dtype_set[idx]) else: data = data.astype(self._dtype_list) return data + + def __setitem__(self, idx, value): + # materialize full array in memory + arr = self.__array__() + # write new value + arr[idx] = value + + self._dataset = arr + def __array__(self): data = self._dataset[()] From 076c082eec4d9daff7dc79dfa38632bc6a5f35b5 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2026 00:26:30 +0000 Subject: [PATCH 086/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/grids/psygrid.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/grids/psygrid.py b/posydon/grids/psygrid.py index 08bb5e6bc0..393402f1ae 100644 --- a/posydon/grids/psygrid.py +++ b/posydon/grids/psygrid.py @@ -397,7 +397,7 @@ def __getitem__(self, idx): else: data = data.astype(self._dtype_list) return data - + def __setitem__(self, idx, value): # materialize full array in memory arr = self.__array__() From 76f1266a1233813917cfaaac12e4c4d6ee63e8da Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sun, 8 Mar 2026 19:30:54 -0500 Subject: [PATCH 087/389] remove test coverage from shape and len methods of lazyhdf5 --- posydon/grids/psygrid.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/posydon/grids/psygrid.py b/posydon/grids/psygrid.py index 08bb5e6bc0..76ac523e4b 100644 --- a/posydon/grids/psygrid.py +++ b/posydon/grids/psygrid.py @@ -420,10 +420,10 @@ def dtype(self): return self._dataset.dtype @property - def shape(self): + def shape(self): # pragma: no cove return self._dataset.shape - def __len__(self): + def __len__(self): # pragma: no cove return len(self._dataset) From d1812e73a2aa1869854011e5836c9041ce2d2167 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sun, 8 Mar 2026 19:40:50 -0500 Subject: [PATCH 088/389] fix pragma typo --- posydon/grids/psygrid.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/posydon/grids/psygrid.py b/posydon/grids/psygrid.py index 6727a41417..b9b98d602d 100644 --- a/posydon/grids/psygrid.py +++ b/posydon/grids/psygrid.py @@ -420,10 +420,10 @@ def dtype(self): return self._dataset.dtype @property - def shape(self): # pragma: no cove + def shape(self): # pragma: no cover return self._dataset.shape - def __len__(self): # pragma: no cove + def __len__(self): # pragma: no cover return len(self._dataset) From 85febf6a50ba4cebea5ab4f61eb95d3d266d69c1 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sun, 8 Mar 2026 19:48:46 -0500 Subject: [PATCH 089/389] pre-load initial masses for i/o improvement in interpolator --- posydon/interpolation/interpolation.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/posydon/interpolation/interpolation.py b/posydon/interpolation/interpolation.py index e975033db5..dc3df95bf8 100644 --- a/posydon/interpolation/interpolation.py +++ b/posydon/interpolation/interpolation.py @@ -331,7 +331,8 @@ def __init__(self, path, verbose=False): grid_mass = [] for i in range(len(grid)): - grid_mass.append(grid[i].history1['star_mass'][0]) + minit = grid[i].history1['star_mass'][0] + grid_mass.append(minit) self.grid_mass = np.array(grid_mass) grid_age = [] @@ -502,6 +503,12 @@ def __init__(self, path, verbose=False): 'avg_charge_He' ) + # pre-load the grid data for all masses + # to reduce I/O + for i in range(len(grid)): + minit = grid[i].history1['star_mass'][0] + self.load_grid(minit) + def load_grid(self, *args): """Load the requested data to `grid_data`. From f1c1be66918909876b43ec4e37f336bb28f81143 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sun, 8 Mar 2026 20:01:30 -0500 Subject: [PATCH 090/389] add kwarg to toggle lazy load on/off --- posydon/grids/psygrid.py | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/posydon/grids/psygrid.py b/posydon/grids/psygrid.py index b9b98d602d..b8541688cb 100644 --- a/posydon/grids/psygrid.py +++ b/posydon/grids/psygrid.py @@ -1491,7 +1491,7 @@ def _reload_hdf5_file(self, writeable=False): mode = "a" if writeable else "r" self.hdf5 = h5py.File(self.filepath, mode, **driver_args) - def load(self, filepath=None): + def load(self, filepath=None, lazy=True): """Load up a previously created PSyGrid object from an HDF5 file. Parameters @@ -1500,6 +1500,11 @@ def load(self, filepath=None): Location of the HDF5 file to be loaded. If not provided, assume it was defined during the initialization (argument: `filepath`). + lazy : bool (default: True) + If True, load hdf5 files lazily. This means that MESA data + will not be loaded into RAM (which can be in the GB range). + This comes at a small cost to I/O. + """ self._say("Loading HDF5 grid...") # if not filepath defined, take it from the attribute @@ -1516,8 +1521,8 @@ def load(self, filepath=None): hdf5 = self.hdf5 # load initial/final_values self._say("\tLoading initial/final values...") - self.initial_values = hdf5['/grid/initial_values'] - self.final_values = hdf5['/grid/final_values'] + initial_values = hdf5['/grid/initial_values'] + final_values = hdf5['/grid/final_values'] # change ASCII to UNICODE in termination flags in `final_values` new_dtype = {} @@ -1528,9 +1533,14 @@ def load(self, filepath=None): dtype = (dtype[0], H5_REC_STR_DTYPE.replace("S", "U")) new_dtype[dtype[0]] = dtype[1] - self.initial_values = LazyHDF5(self.initial_values) - self.final_values = LazyHDF5(self.final_values, new_dtype) - #self.final_values = self.final_values.astype(new_dtype) + if lazy: + self.initial_values = LazyHDF5(self.initial_values) + self.final_values = LazyHDF5(self.final_values, new_dtype) + else: + self.initial_values = initial_values[()] + self.final_values = final_values[()] + new_dtype = list(new_dtype.items()) + self.final_values = self.final_values.astype(new_dtype) # load MESA dirs self._say("\tAcquiring paths to MESA directories...") From ebce83f682cc3617815bf3ffc5103fc4fae14590 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2026 01:01:59 +0000 Subject: [PATCH 091/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/grids/psygrid.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/posydon/grids/psygrid.py b/posydon/grids/psygrid.py index b8541688cb..fa608cf0c9 100644 --- a/posydon/grids/psygrid.py +++ b/posydon/grids/psygrid.py @@ -1501,8 +1501,8 @@ def load(self, filepath=None, lazy=True): it was defined during the initialization (argument: `filepath`). lazy : bool (default: True) - If True, load hdf5 files lazily. This means that MESA data - will not be loaded into RAM (which can be in the GB range). + If True, load hdf5 files lazily. This means that MESA data + will not be loaded into RAM (which can be in the GB range). This comes at a small cost to I/O. """ From e0a0de920517580bdb7d1683923066020be9fbd7 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sun, 8 Mar 2026 20:04:18 -0500 Subject: [PATCH 092/389] fix initial/final_values references --- posydon/grids/psygrid.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/posydon/grids/psygrid.py b/posydon/grids/psygrid.py index b8541688cb..3987265b61 100644 --- a/posydon/grids/psygrid.py +++ b/posydon/grids/psygrid.py @@ -1526,7 +1526,7 @@ def load(self, filepath=None, lazy=True): # change ASCII to UNICODE in termination flags in `final_values` new_dtype = {} - for dtype in self.final_values.dtype.descr: + for dtype in final_values.dtype.descr: if (dtype[0].startswith("termination_flag") or (dtype[0] == "mt_history") or ("_type" in dtype[0]) or ("_state" in dtype[0]) or ("_class" in dtype[0])): @@ -1534,8 +1534,8 @@ def load(self, filepath=None, lazy=True): new_dtype[dtype[0]] = dtype[1] if lazy: - self.initial_values = LazyHDF5(self.initial_values) - self.final_values = LazyHDF5(self.final_values, new_dtype) + self.initial_values = LazyHDF5(initial_values) + self.final_values = LazyHDF5(final_values, new_dtype) else: self.initial_values = initial_values[()] self.final_values = final_values[()] From d12ed390bc5170cc826dc12212cc234aedbfb18d Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sun, 8 Mar 2026 20:09:12 -0500 Subject: [PATCH 093/389] remove test coverage from non-lazy load --- posydon/grids/psygrid.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/grids/psygrid.py b/posydon/grids/psygrid.py index a887c1a24f..8f09f97698 100644 --- a/posydon/grids/psygrid.py +++ b/posydon/grids/psygrid.py @@ -1536,7 +1536,7 @@ def load(self, filepath=None, lazy=True): if lazy: self.initial_values = LazyHDF5(initial_values) self.final_values = LazyHDF5(final_values, new_dtype) - else: + else: # pragma: no cover self.initial_values = initial_values[()] self.final_values = final_values[()] new_dtype = list(new_dtype.items()) From eacd0c89be171fa2b09ddf8ab873de8a7058045a Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sun, 8 Mar 2026 21:10:50 -0500 Subject: [PATCH 094/389] removing per step TrackMatcher creation. Now do it in SimulationProperties when loading steps --- posydon/binary_evol/CE/step_CEE.py | 29 ++++++++++++--------- posydon/binary_evol/DT/step_detached.py | 28 +++++++++++--------- posydon/binary_evol/MESA/step_mesa.py | 3 ++- posydon/binary_evol/simulationproperties.py | 23 ++++++++++++++++ posydon/grids/psygrid.py | 13 +++++---- 5 files changed, 64 insertions(+), 32 deletions(-) diff --git a/posydon/binary_evol/CE/step_CEE.py b/posydon/binary_evol/CE/step_CEE.py index a4c899d1a5..bfd335b0a2 100644 --- a/posydon/binary_evol/CE/step_CEE.py +++ b/posydon/binary_evol/CE/step_CEE.py @@ -74,7 +74,8 @@ # assuming a final separation where the inner core RLOF starts. # "one_phase_variable_core_definition" for core_definition_H_fraction=0.01 "metallicity": None, - "record_matching": False + "record_matching": False, + "track_matcher": None } @@ -190,18 +191,20 @@ def __init__( ["log_min_max", "min_max", "min_max"], [0.1, 300], [0.0, None] ] - self.track_matcher = TrackMatcher(grid_name_Hrich = None, - grid_name_strippedHe = None, - path=PATH_TO_POSYDON_DATA, - metallicity = self.metallicity, - matching_method = "minimize", - matching_tolerance=1e-2, - matching_tolerance_hard=1e-1, - list_for_matching_HMS = list_for_matching_HMS, - list_for_matching_HeStar = None, - list_for_matching_postMS = None, - record_matching = self.record_matching, - verbose = self.verbose) + #self.track_matcher = TrackMatcher(grid_name_Hrich = None, + # grid_name_strippedHe = None, + # path=PATH_TO_POSYDON_DATA, + # metallicity = self.metallicity, + # matching_method = "minimize", + # matching_tolerance=1e-2, + # matching_tolerance_hard=1e-1, + # list_for_matching_HMS = list_for_matching_HMS, + # list_for_matching_HeStar = None, + # list_for_matching_postMS = None, + # record_matching = self.record_matching, + # verbose = self.verbose) + self.track_matcher = kwargs.get("track_matcher", None) + def __call__(self, binary): """Perform the CEE step for a BinaryStar object.""" # Determine which star is the donor and which is the companion diff --git a/posydon/binary_evol/DT/step_detached.py b/posydon/binary_evol/DT/step_detached.py index de47199265..856381b783 100644 --- a/posydon/binary_evol/DT/step_detached.py +++ b/posydon/binary_evol/DT/step_detached.py @@ -36,7 +36,7 @@ RVJ83_braking, ) from posydon.binary_evol.DT.tides.default_tides import default_tides -from posydon.binary_evol.DT.track_match import TrackMatcher +#from posydon.binary_evol.DT.track_match import TrackMatcher from posydon.binary_evol.DT.winds.default_winds import ( default_sep_from_winds, default_spin_from_winds, @@ -237,7 +237,8 @@ def __init__( matching_tolerance_hard=1e-1, list_for_matching_HMS=None, list_for_matching_postMS=None, - list_for_matching_HeStar=None + list_for_matching_HeStar=None, + **kwargs ): """Initialize the step. See class documentation for details.""" self.dt = dt @@ -272,17 +273,18 @@ def __init__( self.KEYS = DEFAULT_TRANSLATED_KEYS # creating a track matching object - self.track_matcher = TrackMatcher(grid_name_Hrich = grid_name_Hrich, - grid_name_strippedHe = grid_name_strippedHe, - path=path, metallicity = metallicity, - matching_method = matching_method, - matching_tolerance=matching_tolerance, - matching_tolerance_hard=matching_tolerance_hard, - list_for_matching_HMS = list_for_matching_HMS, - list_for_matching_HeStar = list_for_matching_HeStar, - list_for_matching_postMS = list_for_matching_postMS, - record_matching = record_matching, - verbose = self.verbose) + #self.track_matcher = TrackMatcher(grid_name_Hrich = grid_name_Hrich, + # grid_name_strippedHe = grid_name_strippedHe, + # path=path, metallicity = metallicity, + # matching_method = matching_method, + # matching_tolerance=matching_tolerance, + # matching_tolerance_hard=matching_tolerance_hard, + # list_for_matching_HMS = list_for_matching_HMS, + # list_for_matching_HeStar = list_for_matching_HeStar, + # list_for_matching_postMS = list_for_matching_postMS, + # record_matching = record_matching, + # verbose = self.verbose) + self.track_matcher = kwargs.get('track_matcher', None) # create evolution handler object self.init_evo_kwargs() diff --git a/posydon/binary_evol/MESA/step_mesa.py b/posydon/binary_evol/MESA/step_mesa.py index b6fb65343c..812570f0ae 100644 --- a/posydon/binary_evol/MESA/step_mesa.py +++ b/posydon/binary_evol/MESA/step_mesa.py @@ -141,7 +141,8 @@ def __init__( stop_var_name=None, stop_value=None, stop_interpolate=True, - verbose=False): + verbose=False, + **kwargs): """Evolve a binary object given a MESA grid or interpolation object. Parameters diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index 43495e81f9..9b7a98ad28 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -21,6 +21,8 @@ from posydon.utils.constants import age_of_universe from posydon.utils.posydonwarning import Pwarn +from posydon.binary_evol.DT.track_match import TrackMatcher +from posydon.config import PATH_TO_POSYDON_DATA class NullStep: """An evolution step that does nothing but is used to initialize.""" @@ -269,11 +271,32 @@ def load_steps(self, metallicity=None, verbose=False): if verbose: print('STEP NAME'.ljust(20) + 'STEP FUNCTION'.ljust(25) + 'KWARGS') + + self.track_matcher = None + # for every other step, give it a metallicity and load each step for name, tup in self.kwargs.items(): if isinstance(tup, tuple): step_kwargs = tup[1] metallicity = step_kwargs.get('metallicity', metallicity) + + # create track matching object + if self.track_matcher is None and metallicity is not None: + self.track_matcher = TrackMatcher(grid_name_Hrich = None, + grid_name_strippedHe = None, + path=PATH_TO_POSYDON_DATA, metallicity = metallicity, + matching_method = "minimize", + matching_tolerance=1e-2, + matching_tolerance_hard=1e-1, + list_for_matching_HMS = None, + list_for_matching_HeStar = None, + list_for_matching_postMS = None, + record_matching = False, + verbose = False) + + if name not in ["flow", "step_SN", "step_end"]: + step_kwargs['track_matcher'] = self.track_matcher + self.load_a_step(name, tup, metallicity=metallicity, verbose=verbose) # track that all steps have been loaded diff --git a/posydon/grids/psygrid.py b/posydon/grids/psygrid.py index 8f09f97698..c1d72d6def 100644 --- a/posydon/grids/psygrid.py +++ b/posydon/grids/psygrid.py @@ -1534,13 +1534,16 @@ def load(self, filepath=None, lazy=True): new_dtype[dtype[0]] = dtype[1] if lazy: - self.initial_values = LazyHDF5(initial_values) - self.final_values = LazyHDF5(final_values, new_dtype) + initial_values = LazyHDF5(initial_values) + final_values = LazyHDF5(final_values, new_dtype) else: # pragma: no cover - self.initial_values = initial_values[()] - self.final_values = final_values[()] + initial_values = initial_values[()] + final_values = final_values[()] new_dtype = list(new_dtype.items()) - self.final_values = self.final_values.astype(new_dtype) + final_values = final_values.astype(new_dtype) + + self.initial_values = initial_values + self.final_values = final_values # load MESA dirs self._say("\tAcquiring paths to MESA directories...") From a8172767a19fb541f10872610b77280aa2556cf4 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2026 02:11:39 +0000 Subject: [PATCH 095/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/binary_evol/DT/step_detached.py | 1 + posydon/binary_evol/simulationproperties.py | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/posydon/binary_evol/DT/step_detached.py b/posydon/binary_evol/DT/step_detached.py index 856381b783..1e5bb103a5 100644 --- a/posydon/binary_evol/DT/step_detached.py +++ b/posydon/binary_evol/DT/step_detached.py @@ -36,6 +36,7 @@ RVJ83_braking, ) from posydon.binary_evol.DT.tides.default_tides import default_tides + #from posydon.binary_evol.DT.track_match import TrackMatcher from posydon.binary_evol.DT.winds.default_winds import ( default_sep_from_winds, diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index 9b7a98ad28..c5676d9a51 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -17,12 +17,12 @@ import os import time +from posydon.binary_evol.DT.track_match import TrackMatcher +from posydon.config import PATH_TO_POSYDON_DATA from posydon.popsyn.io import simprop_kwargs_from_ini from posydon.utils.constants import age_of_universe from posydon.utils.posydonwarning import Pwarn -from posydon.binary_evol.DT.track_match import TrackMatcher -from posydon.config import PATH_TO_POSYDON_DATA class NullStep: """An evolution step that does nothing but is used to initialize.""" @@ -271,7 +271,7 @@ def load_steps(self, metallicity=None, verbose=False): if verbose: print('STEP NAME'.ljust(20) + 'STEP FUNCTION'.ljust(25) + 'KWARGS') - + self.track_matcher = None # for every other step, give it a metallicity and load each step @@ -279,7 +279,7 @@ def load_steps(self, metallicity=None, verbose=False): if isinstance(tup, tuple): step_kwargs = tup[1] metallicity = step_kwargs.get('metallicity', metallicity) - + # create track matching object if self.track_matcher is None and metallicity is not None: self.track_matcher = TrackMatcher(grid_name_Hrich = None, @@ -296,7 +296,7 @@ def load_steps(self, metallicity=None, verbose=False): if name not in ["flow", "step_SN", "step_end"]: step_kwargs['track_matcher'] = self.track_matcher - + self.load_a_step(name, tup, metallicity=metallicity, verbose=verbose) # track that all steps have been loaded From 6035f3c5658e046ed60021f894f6157e72bd5ccc Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Mon, 9 Mar 2026 14:47:53 -0500 Subject: [PATCH 096/389] fix TrackMatcher creation for single steps --- posydon/binary_evol/CE/step_CEE.py | 4 +++ posydon/binary_evol/simulationproperties.py | 36 ++++++++++----------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/posydon/binary_evol/CE/step_CEE.py b/posydon/binary_evol/CE/step_CEE.py index bfd335b0a2..d23b78591a 100644 --- a/posydon/binary_evol/CE/step_CEE.py +++ b/posydon/binary_evol/CE/step_CEE.py @@ -57,6 +57,7 @@ ) from posydon.utils.constants import Zsun from posydon.utils.posydonwarning import Pwarn +import copy MODEL = {"prescription": 'alpha-lambda', "common_envelope_efficiency": 1.0, @@ -204,6 +205,9 @@ def __init__( # record_matching = self.record_matching, # verbose = self.verbose) self.track_matcher = kwargs.get("track_matcher", None) + #self.track_matcher.list_for_matching_HMS = list_for_matching_HMS + #self.track_matcher.train_scalers() + #self.track_matcher = copy.deepcopy(self.track_matcher) def __call__(self, binary): """Perform the CEE step for a BinaryStar object.""" diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index 9b7a98ad28..0feef34e41 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -279,24 +279,6 @@ def load_steps(self, metallicity=None, verbose=False): if isinstance(tup, tuple): step_kwargs = tup[1] metallicity = step_kwargs.get('metallicity', metallicity) - - # create track matching object - if self.track_matcher is None and metallicity is not None: - self.track_matcher = TrackMatcher(grid_name_Hrich = None, - grid_name_strippedHe = None, - path=PATH_TO_POSYDON_DATA, metallicity = metallicity, - matching_method = "minimize", - matching_tolerance=1e-2, - matching_tolerance_hard=1e-1, - list_for_matching_HMS = None, - list_for_matching_HeStar = None, - list_for_matching_postMS = None, - record_matching = False, - verbose = False) - - if name not in ["flow", "step_SN", "step_end"]: - step_kwargs['track_matcher'] = self.track_matcher - self.load_a_step(name, tup, metallicity=metallicity, verbose=verbose) # track that all steps have been loaded @@ -351,6 +333,24 @@ def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, from "MissingValueWarning") metallicity = 1.0 + # create TrackMatcher object if needed + if self.track_matcher is None: + self.track_matcher = TrackMatcher(grid_name_Hrich = None, + grid_name_strippedHe = None, + path=PATH_TO_POSYDON_DATA, metallicity = metallicity, + matching_method = "minimize", + matching_tolerance=1e-2, + matching_tolerance_hard=1e-1, + list_for_matching_HMS = None, + list_for_matching_HeStar = None, + list_for_matching_postMS = None, + record_matching = False, + verbose = False) + + # pass TrackMatcher reference (except for flow, step_SN, step_end) + if step_name not in ["flow", "step_SN", "step_end"]: + step_kwargs['track_matcher'] = self.track_matcher + # This if should never trigger after __init__, unless the step is # entirely new and non-standard if step_name not in self.kwargs.keys(): From 8a9b6bda4016fa814a274b297e71c11107fe6468 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2026 19:50:02 +0000 Subject: [PATCH 097/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/binary_evol/CE/step_CEE.py | 3 ++- posydon/binary_evol/simulationproperties.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/posydon/binary_evol/CE/step_CEE.py b/posydon/binary_evol/CE/step_CEE.py index d23b78591a..3e1438e4d7 100644 --- a/posydon/binary_evol/CE/step_CEE.py +++ b/posydon/binary_evol/CE/step_CEE.py @@ -34,6 +34,8 @@ ] +import copy + import numpy as np import pandas as pd @@ -57,7 +59,6 @@ ) from posydon.utils.constants import Zsun from posydon.utils.posydonwarning import Pwarn -import copy MODEL = {"prescription": 'alpha-lambda', "common_envelope_efficiency": 1.0, diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index da630f18eb..34f373bf96 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -346,7 +346,7 @@ def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, from list_for_matching_postMS = None, record_matching = False, verbose = False) - + # pass TrackMatcher reference (except for flow, step_SN, step_end) if step_name not in ["flow", "step_SN", "step_end"]: step_kwargs['track_matcher'] = self.track_matcher From 200431a007281afb18ef87a7b44c00df4cc11c38 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 9 Mar 2026 16:25:24 -0500 Subject: [PATCH 098/389] adding baseline h5 file for binary evolution --- dev-tools/generate_baseline.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 dev-tools/generate_baseline.sh diff --git a/dev-tools/generate_baseline.sh b/dev-tools/generate_baseline.sh old mode 100644 new mode 100755 From 48b3ce9a5d123f6b69c6480a5ad529de6613ac3d Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 9 Mar 2026 16:26:45 -0500 Subject: [PATCH 099/389] add tolerances as CLI --- dev-tools/validate_binaries.sh | 85 ++++++++++++++++++++++++++++++++-- 1 file changed, 80 insertions(+), 5 deletions(-) mode change 100644 => 100755 dev-tools/validate_binaries.sh diff --git a/dev-tools/validate_binaries.sh b/dev-tools/validate_binaries.sh old mode 100644 new mode 100755 index 2ae354b4fa..8a312f8873 --- a/dev-tools/validate_binaries.sh +++ b/dev-tools/validate_binaries.sh @@ -1,16 +1,35 @@ #!/bin/bash # ============================================================================= -# validate_binaries.sh ā€” Run the full validation pipeline: +# validate_binaries.sh: Run the full validation pipeline: # 1. Evolve test binaries on a candidate branch # 2. Compare against baseline files # # Usage: # ./validate_binaries.sh [baseline_branch] [metallicities] +# [--loose] [--rtol VALUE] [--atol VALUE] +# +# Positional arguments: +# candidate_branch Branch or tag to validate (required) +# baseline_branch Branch or tag to compare against (default: main) +# metallicities Space-separated list of Z values, quoted +# (default: "2 1 0.45 0.2 0.1 0.01 0.001 0.0001") +# +# Tolerance flags (passed through to compare_runs.py): +# --loose Use relaxed floating-point tolerances +# (rtol=1e-12, atol=1e-15 unless overridden) +# --rtol VALUE Set explicit relative tolerance +# --atol VALUE Set explicit absolute tolerance +# +# --rtol and --atol can be combined with --loose (explicit values take +# precedence over the --loose defaults) or used on their own without --loose. # # Examples: -# ./validate_binaries.sh feature/new-SN # compare vs main baseline -# ./validate_binaries.sh feature/new-SN v2.1.0 # compare vs v2.1.0 baseline -# ./validate_binaries.sh feature/new-SN main "1 0.45" # subset of metallicities +# ./validate_binaries.sh feature/new-SN # compare vs main, exact +# ./validate_binaries.sh feature/new-SN v2.1.0 # compare vs v2.1.0, exact +# ./validate_binaries.sh feature/new-SN main "1 0.45" # subset of metallicities +# ./validate_binaries.sh feature/new-SN --loose # relaxed tolerances +# ./validate_binaries.sh feature/new-SN main --rtol 1e-8 # custom rtol, default atol +# ./validate_binaries.sh feature/new-SN main "1 0.45" --loose --atol 1e-10 # # Prerequisites: # Run generate_baseline.sh first to create baseline files. @@ -22,9 +41,37 @@ set -euo pipefail -CANDIDATE_BRANCH=${1:?Usage: ./validate_binaries.sh [baseline_branch] [metallicities]} +# ā”€ā”€ Parse arguments ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ + +CANDIDATE_BRANCH=${1:?Usage: ./validate_binaries.sh [baseline_branch] [metallicities] [--loose] [--rtol VALUE] [--atol VALUE]} BASELINE_BRANCH=${2:-main} METALLICITIES=${3:-"2 1 0.45 0.2 0.1 0.01 0.001 0.0001"} +shift $(( $# < 3 ? $# : 3 )) + +LOOSE=false +RTOL="" +ATOL="" + +while [[ $# -gt 0 ]]; do + case "$1" in + --loose) + LOOSE=true + shift + ;; + --rtol) + RTOL="${2:?--rtol requires a value}" + shift 2 + ;; + --atol) + ATOL="${2:?--atol requires a value}" + shift 2 + ;; + *) + echo "ERROR: Unknown option: $1" >&2 + exit 1 + ;; + esac +done SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" SAFE_CANDIDATE="${CANDIDATE_BRANCH//\//_}" @@ -34,6 +81,30 @@ BASELINE_DIR="$SCRIPT_DIR/baselines/${SAFE_BASELINE}" OUTPUT_DIR="$SCRIPT_DIR/outputs/${SAFE_CANDIDATE}" SUMMARY_FILE="$OUTPUT_DIR/comparison_summary.txt" +# ā”€ā”€ Build compare_runs.py flags ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ +COMPARE_FLAGS="" +if [ "$LOOSE" = "true" ]; then + COMPARE_FLAGS="$COMPARE_FLAGS --loose" +fi +if [ -n "$RTOL" ]; then + COMPARE_FLAGS="$COMPARE_FLAGS --rtol $RTOL" +fi +if [ -n "$ATOL" ]; then + COMPARE_FLAGS="$COMPARE_FLAGS --atol $ATOL" +fi + +# Build a human-readable tolerance label for the summary +if [ -n "$RTOL" ] || [ -n "$ATOL" ]; then + TOL_LABEL="rtol=${RTOL:-default}, atol=${ATOL:-default}" + if [ "$LOOSE" = "true" ]; then + TOL_LABEL="$TOL_LABEL (--loose)" + fi +elif [ "$LOOSE" = "true" ]; then + TOL_LABEL="--loose (rtol=1e-12, atol=1e-15)" +else + TOL_LABEL="EXACT (rtol=0, atol=0)" +fi + echo "============================================================" echo " POSYDON Binary Validation" echo " Candidate: $CANDIDATE_BRANCH" @@ -83,6 +154,7 @@ POSYDON Binary Validation ā€” Comparison Summary ================================================ Candidate branch: $CANDIDATE_BRANCH Baseline branch: $BASELINE_BRANCH +Tolerances: $TOL_LABEL Date: $(date -u '+%Y-%m-%d %H:%M:%S UTC') ================================================ @@ -112,7 +184,10 @@ for Z in $METALLICITIES; do continue fi + # $COMPARE_FLAGS is intentionally unquoted so it word-splits into + # separate arguments for compare_runs.py. if python "$SCRIPT_DIR/compare_runs.py" "$BASELINE_FILE" "$CANDIDATE_FILE" \ + $COMPARE_FLAGS \ 2>&1 | tee "$COMPARISON_FILE"; then echo " PASS: No differences" echo "Z = ${Z} Zsun: PASS" >> "$SUMMARY_FILE" From 9d1d0fc30d9909e7305cf78e2584424c7eb435bf Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 9 Mar 2026 16:36:42 -0500 Subject: [PATCH 100/389] separate handling of errored binaries from successful binaries into an error table --- dev-tools/compare_runs.py | 87 ++++++++++++++++--------- dev-tools/script_data/binaries_suite.py | 23 ++++--- 2 files changed, 73 insertions(+), 37 deletions(-) diff --git a/dev-tools/compare_runs.py b/dev-tools/compare_runs.py index a19c0f9ddc..d2fbab7545 100644 --- a/dev-tools/compare_runs.py +++ b/dev-tools/compare_runs.py @@ -19,12 +19,12 @@ """ import argparse -import os import sys - +import os import numpy as np import pandas as pd + # Columns that represent qualitative (categorical) evolution properties. # Any column matching these names will be compared as exact string matches # and reported under "QUALITATIVE" differences. @@ -80,30 +80,6 @@ def compare_evolution_tables(base_df, cand_df, rtol, atol): b = base_df[base_df['binary_id'] == bid].reset_index(drop=True) c = cand_df[cand_df['binary_id'] == bid].reset_index(drop=True) - # ā”€ā”€ Error status changes ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ - base_failed = 'exception_type' in b.columns and b['exception_type'].notna().any() - cand_failed = 'exception_type' in c.columns and c['exception_type'].notna().any() - - if base_failed != cand_failed: - if cand_failed: - exc = c['exception_type'].dropna().iloc[0] if 'exception_type' in c.columns else "unknown" - msg = c['exception_message'].dropna().iloc[0] if 'exception_message' in c.columns else "" - struct_diffs.append(f"Binary {bid}: NEWLY FAILING ({exc}: {msg})") - else: - struct_diffs.append(f"Binary {bid}: NEWLY PASSING (was failing in baseline)") - continue - - if base_failed and cand_failed: - b_exc = str(b['exception_type'].dropna().iloc[0]) if 'exception_type' in b.columns else "" - c_exc = str(c['exception_type'].dropna().iloc[0]) if 'exception_type' in c.columns else "" - b_msg = str(b['exception_message'].dropna().iloc[0]) if 'exception_message' in b.columns else "" - c_msg = str(c['exception_message'].dropna().iloc[0]) if 'exception_message' in c.columns else "" - if b_exc != c_exc: - struct_diffs.append(f"Binary {bid}: error type changed ('{b_exc}' -> '{c_exc}')") - if b_msg != c_msg: - struct_diffs.append(f"Binary {bid}: error message changed ('{b_msg}' -> '{c_msg}')") - continue - # ā”€ā”€ Step count ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ if len(b) != len(c): struct_diffs.append( @@ -260,6 +236,52 @@ def compare_warnings_tables(base_df, cand_df): return diffs +def compare_errors_tables(base_df, cand_df): + """Compare error tables between baseline and candidate. + + Returns list of diff strings. + """ + diffs = [] + + if base_df is None and cand_df is None: + return diffs + if base_df is None and cand_df is not None: + cand_ids = sorted(cand_df['binary_id'].unique()) if 'binary_id' in cand_df.columns else [] + diffs.append(f"Candidate has {len(cand_df)} error(s) (binaries {cand_ids}), baseline has none") + return diffs + if base_df is not None and cand_df is None: + base_ids = sorted(base_df['binary_id'].unique()) if 'binary_id' in base_df.columns else [] + diffs.append(f"Baseline has {len(base_df)} error(s) (binaries {base_ids}), candidate has none") + return diffs + + # Compare per-binary errors + if 'binary_id' in base_df.columns and 'binary_id' in cand_df.columns: + base_ids = set(base_df['binary_id'].unique()) + cand_ids = set(cand_df['binary_id'].unique()) + + for bid in sorted(cand_ids - base_ids): + row = cand_df[cand_df['binary_id'] == bid].iloc[0] + exc = row.get('exception_type', 'unknown') + diffs.append(f"Binary {bid}: NEWLY FAILING in candidate ({exc})") + + for bid in sorted(base_ids - cand_ids): + diffs.append(f"Binary {bid}: NEWLY PASSING in candidate (was failing in baseline)") + + for bid in sorted(base_ids & cand_ids): + b_row = base_df[base_df['binary_id'] == bid].iloc[0] + c_row = cand_df[cand_df['binary_id'] == bid].iloc[0] + b_exc = str(b_row.get('exception_type', '')) + c_exc = str(c_row.get('exception_type', '')) + b_msg = str(b_row.get('exception_message', '')) + c_msg = str(c_row.get('exception_message', '')) + if b_exc != c_exc: + diffs.append(f"Binary {bid}: error type changed ('{b_exc}' -> '{c_exc}')") + if b_msg != c_msg: + diffs.append(f"Binary {bid}: error message changed") + + return diffs + + def read_table_safe(store, key): """Read a table from HDFStore, returning None if it doesn't exist.""" try: @@ -347,12 +369,19 @@ def main(): cand_warn = read_table_safe(cand_store, '/warnings') warn_diffs.extend(compare_warnings_tables(base_warn, cand_warn)) + # ā”€ā”€ Errors table ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ + base_err = read_table_safe(base_store, '/errors') + cand_err = read_table_safe(cand_store, '/errors') + error_diffs = compare_errors_tables(base_err, cand_err) + struct_diffs.extend(error_diffs) + # ā”€ā”€ Extra/missing top-level keys ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ + ignored_keys = {'/evolution', '/warnings', '/errors', '/metadata'} for k in sorted(base_keys - cand_keys): - if k not in ['/evolution', '/warnings', '/metadata']: + if k not in ignored_keys: struct_diffs.append(f"Table '{k}' missing in candidate") for k in sorted(cand_keys - base_keys): - if k not in ['/evolution', '/warnings', '/metadata']: + if k not in ignored_keys: struct_diffs.append(f"Table '{k}' extra in candidate") except Exception as e: @@ -409,4 +438,4 @@ def main(): if __name__ == "__main__": - main() + main() \ No newline at end of file diff --git a/dev-tools/script_data/binaries_suite.py b/dev-tools/script_data/binaries_suite.py index 157dc0dbab..dda3824c75 100644 --- a/dev-tools/script_data/binaries_suite.py +++ b/dev-tools/script_data/binaries_suite.py @@ -43,6 +43,7 @@ def load_inlist(metallicity, verbose, ini_path=None): SimulationProperties object with loaded steps """ if ini_path is None: + # Look for ini file relative to this script's location script_dir = os.path.dirname(os.path.abspath(__file__)) ini_path = os.path.join(script_dir, 'binaries_params.ini') @@ -53,9 +54,12 @@ def load_inlist(metallicity, verbose, ini_path=None): metallicity_kwargs = {'metallicity': metallicity, 'verbose': verbose} - metallicity_steps = ['step_HMS_HMS', 'step_CO_HeMS', 'step_CO_HMS_RLO', - 'step_CO_HeMS_RLO', 'step_detached', 'step_disrupted', - 'step_merged', 'step_initially_single'] + # Apply metallicity to all steps that need it + metallicity_steps = [ + 'step_HMS_HMS', 'step_CO_HeMS', 'step_CO_HMS_RLO', + 'step_CO_HeMS_RLO', 'step_detached', 'step_disrupted', + 'step_merged', 'step_initially_single' + ] for step_name in metallicity_steps: if step_name in sim_kwargs: sim_kwargs[step_name][1].update(metallicity_kwargs) @@ -101,7 +105,6 @@ def print_failed_binary(binary,e, max_error_lines=3): df = binary.to_df(**{'extra_columns':{'step_names':'str'}}) if len(df) > 0: # Select only the desired columns - available_columns = [col for col in COLUMNS_TO_SHOW if col in df.columns] df_filtered = df[available_columns].reset_index(drop=True) @@ -163,12 +166,16 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): except Exception as e: print_failed_binary(binary, e) - # If evolution fails, create a minimal df with error info - evolution_df = pd.DataFrame([{ + # Save error to separate table (different schema from evolution) + error_df = pd.DataFrame([{ "binary_id": int(binary_id), "exception_type": type(e).__name__, "exception_message": str(e) }]) + error_string_cols = error_df.select_dtypes([object]).columns + error_min_itemsize = {col: 1000 for col in error_string_cols} + h5file.append("errors", error_df, format="table", + min_itemsize=error_min_itemsize) finally: warnings.showwarning = old_showwarning @@ -191,7 +198,7 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): # Determine min_itemsize from the dataframe we're actually saving string_cols = evolution_df.select_dtypes([object]).columns - min_itemsize = {col: 100 for col in string_cols} + min_itemsize = {col: 500 for col in string_cols} h5file.append("evolution", evolution_df, format="table", data_columns=True, min_itemsize=min_itemsize) @@ -200,7 +207,7 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): warn_df = pd.DataFrame(captured_warnings) # Ensure consistent string column sizes for warnings table warn_string_cols = warn_df.select_dtypes([object]).columns - warn_min_itemsize = {col: 200 for col in warn_string_cols} + warn_min_itemsize = {col: 1000 for col in warn_string_cols} h5file.append("warnings", warn_df, format="table", min_itemsize=warn_min_itemsize) print(f"āš ļø {len(captured_warnings)} warning(s) raised during evolution:") From d71b0ad9d291fbd8a56186b88fdc5e55f6e4b028 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2026 21:41:30 +0000 Subject: [PATCH 101/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/compare_runs.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-tools/compare_runs.py b/dev-tools/compare_runs.py index d2fbab7545..b153c5127b 100644 --- a/dev-tools/compare_runs.py +++ b/dev-tools/compare_runs.py @@ -19,12 +19,12 @@ """ import argparse -import sys import os +import sys + import numpy as np import pandas as pd - # Columns that represent qualitative (categorical) evolution properties. # Any column matching these names will be compared as exact string matches # and reported under "QUALITATIVE" differences. @@ -438,4 +438,4 @@ def main(): if __name__ == "__main__": - main() \ No newline at end of file + main() From 9f72e664a582add746f55b0f4e7b677266c7e093 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 9 Mar 2026 16:52:58 -0500 Subject: [PATCH 102/389] consolidate h5 writes for efficiency --- dev-tools/script_data/binaries_suite.py | 94 ++++++++++++++++--------- 1 file changed, 59 insertions(+), 35 deletions(-) diff --git a/dev-tools/script_data/binaries_suite.py b/dev-tools/script_data/binaries_suite.py index dda3824c75..8339adbbb4 100644 --- a/dev-tools/script_data/binaries_suite.py +++ b/dev-tools/script_data/binaries_suite.py @@ -31,6 +31,11 @@ 'S1_state', 'S1_mass', 'S2_state', 'S2_mass', 'orbital_period'] +# Suppress fragmentation warnings from POSYDON internals. +# The .copy() calls below already handle the actual performance impact; +# these warnings are just noise from to_df() building DataFrames column-by-column. +# warnings.filterwarnings("ignore", message=".*DataFrame is highly fragmented.*") + def load_inlist(metallicity, verbose, ini_path=None): """Load simulation properties from ini file and configure for given metallicity. @@ -157,6 +162,7 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): print(f"Binary {binary_id}") evolution_df = None + error_df = None try: binary.evolve() @@ -166,16 +172,11 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): except Exception as e: print_failed_binary(binary, e) - # Save error to separate table (different schema from evolution) error_df = pd.DataFrame([{ "binary_id": int(binary_id), "exception_type": type(e).__name__, "exception_message": str(e) }]) - error_string_cols = error_df.select_dtypes([object]).columns - error_min_itemsize = {col: 1000 for col in error_string_cols} - h5file.append("errors", error_df, format="table", - min_itemsize=error_min_itemsize) finally: warnings.showwarning = old_showwarning @@ -193,23 +194,11 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): if "binary_id" not in evolution_df.columns: evolution_df["binary_id"] = int(binary_id) - # Defragment + # Defragment the DataFrame from POSYDON's column-by-column construction evolution_df = evolution_df.copy() - # Determine min_itemsize from the dataframe we're actually saving - string_cols = evolution_df.select_dtypes([object]).columns - min_itemsize = {col: 500 for col in string_cols} - h5file.append("evolution", evolution_df, format="table", - data_columns=True, min_itemsize=min_itemsize) - # Save warnings if captured_warnings: - warn_df = pd.DataFrame(captured_warnings) - # Ensure consistent string column sizes for warnings table - warn_string_cols = warn_df.select_dtypes([object]).columns - warn_min_itemsize = {col: 1000 for col in warn_string_cols} - h5file.append("warnings", warn_df, format="table", - min_itemsize=warn_min_itemsize) print(f"āš ļø {len(captured_warnings)} warning(s) raised during evolution:") for i, w in enumerate(captured_warnings[:3], 1): print(f" {i}. {w['category']}: {w['message'][:80]}") @@ -221,8 +210,6 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): print(f"āœ… Finished binary {binary_id}") print("=" * LINE_LENGTH) - - def get_test_binaries(metallicity, sim_prop): """Return the list of test binaries as (star1_kwargs, star2_kwargs, binary_kwargs, description) tuples. @@ -647,7 +634,38 @@ def evolve_binaries(metallicity, verbose, output_path, ini_path=None): sim_prop = load_inlist(metallicity, verbose, ini_path) test_binaries = get_test_binaries(metallicity, sim_prop) - + + # Collect all results in memory, then write once at the end. + # This avoids repeated HDFStore.append() calls, each of which + # reconciles schemas, checks string sizing, and flushes to disk. + all_evolution_dfs = [] + all_error_dfs = [] + all_warning_dfs = [] + + for binary_id, (s1_kw, s2_kw, bin_kw, description) in enumerate(test_binaries): + print(f"\n[{binary_id}/{len(test_binaries)-1}] {description}") + + star_1 = SingleStar(**s1_kw) + star_2 = SingleStar(**s2_kw) + + # Add separation from period if not explicitly provided + if 'separation' not in bin_kw and 'orbital_period' in bin_kw: + bin_kw['separation'] = orbital_separation_from_period( + bin_kw['orbital_period'], star_1.mass, star_2.mass + ) + + binary = BinaryStar(star_1, star_2, **bin_kw, properties=sim_prop) + evo_df, err_df, warn_list = evolve_binary(binary, binary_id) + + if evo_df is not None: + all_evolution_dfs.append(evo_df) + if err_df is not None: + all_error_dfs.append(err_df) + if warn_list: + all_warning_dfs.append(pd.DataFrame(warn_list)) + + + # ā”€ā”€ Single-pass HDF5 write ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ with pd.HDFStore(output_path, mode="w") as h5file: # Save metadata meta_df = pd.DataFrame([{ @@ -656,20 +674,26 @@ def evolve_binaries(metallicity, verbose, output_path, ini_path=None): }]) h5file.put("metadata", meta_df, format="table") - for binary_id, (s1_kw, s2_kw, bin_kw, description) in enumerate(test_binaries): - print(f"\n[{binary_id}/{len(test_binaries)-1}] {description}") - - star_1 = SingleStar(**s1_kw) - star_2 = SingleStar(**s2_kw) - - # Add separation from period if not explicitly provided - if 'separation' not in bin_kw and 'orbital_period' in bin_kw: - bin_kw['separation'] = orbital_separation_from_period( - bin_kw['orbital_period'], star_1.mass, star_2.mass - ) - - binary = BinaryStar(star_1, star_2, **bin_kw, properties=sim_prop) - evolve_binary(binary, h5file, binary_id) + if all_evolution_dfs: + combined_evo = pd.concat(all_evolution_dfs, ignore_index=True) + string_cols = combined_evo.select_dtypes([object]).columns + min_itemsize = {col: 500 for col in string_cols} + h5file.put("evolution", combined_evo, format="table", + data_columns=True, min_itemsize=min_itemsize) + + if all_error_dfs: + combined_err = pd.concat(all_error_dfs, ignore_index=True) + err_string_cols = combined_err.select_dtypes([object]).columns + err_min_itemsize = {col: 1000 for col in err_string_cols} + h5file.put("errors", combined_err, format="table", + min_itemsize=err_min_itemsize) + + if all_warning_dfs: + combined_warn = pd.concat(all_warning_dfs, ignore_index=True) + warn_string_cols = combined_warn.select_dtypes([object]).columns + warn_min_itemsize = {col: 1000 for col in warn_string_cols} + h5file.put("warnings", combined_warn, format="table", + min_itemsize=warn_min_itemsize) print(f"\n{'=' * LINE_LENGTH}") print(f" All {len(test_binaries)} binaries complete. Results saved to {output_path}") From 3a3cd77d7c21bf42249f0b4f2fdce202314dc69f Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2026 21:58:35 +0000 Subject: [PATCH 103/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/script_data/binaries_suite.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-tools/script_data/binaries_suite.py b/dev-tools/script_data/binaries_suite.py index 8339adbbb4..5cd8be7147 100644 --- a/dev-tools/script_data/binaries_suite.py +++ b/dev-tools/script_data/binaries_suite.py @@ -634,14 +634,14 @@ def evolve_binaries(metallicity, verbose, output_path, ini_path=None): sim_prop = load_inlist(metallicity, verbose, ini_path) test_binaries = get_test_binaries(metallicity, sim_prop) - + # Collect all results in memory, then write once at the end. # This avoids repeated HDFStore.append() calls, each of which # reconciles schemas, checks string sizing, and flushes to disk. all_evolution_dfs = [] all_error_dfs = [] all_warning_dfs = [] - + for binary_id, (s1_kw, s2_kw, bin_kw, description) in enumerate(test_binaries): print(f"\n[{binary_id}/{len(test_binaries)-1}] {description}") From 1efad00d690c359c35b8c988e9c75e5904eb9b3f Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 9 Mar 2026 17:01:18 -0500 Subject: [PATCH 104/389] add flag to promote existing evolved branch to baseline status --- dev-tools/generate_baseline.sh | 51 +++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 10 deletions(-) diff --git a/dev-tools/generate_baseline.sh b/dev-tools/generate_baseline.sh index 845b52cf3c..3539be5c81 100755 --- a/dev-tools/generate_baseline.sh +++ b/dev-tools/generate_baseline.sh @@ -7,12 +7,15 @@ # # Usage: # ./generate_baseline.sh [sha] [metallicities] +# ./generate_baseline.sh --promote [metallicities] # # Examples: -# ./generate_baseline.sh main # baseline from main, all Z +# ./generate_baseline.sh main # evolve + save baseline, all Z # ./generate_baseline.sh v2.1.0 # baseline from a release tag # ./generate_baseline.sh main abc123f # baseline from a specific commit # ./generate_baseline.sh main "" "1 0.45" # baseline for subset of Z +# ./generate_baseline.sh --promote main # promote existing outputs to baseline +# ./generate_baseline.sh --promote main "1 0.45" # promote subset of existing outputs # # Output: # baselines//baseline_Zsun.h5 ā€” one file per metallicity @@ -21,26 +24,54 @@ set -euo pipefail +# ā”€ā”€ Parse arguments ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ +PROMOTE=false +if [ "${1:-}" = "--promote" ]; then + PROMOTE=true + shift +fi + BRANCH=${1:-main} -SHA=${2:-} -METALLICITIES=${3:-"2 1 0.45 0.2 0.1 0.01 0.001 0.0001"} +if [ "$PROMOTE" = true ]; then + SHA="" + METALLICITIES=${2:-"2 1 0.45 0.2 0.1 0.01 0.001 0.0001"} +else + SHA=${2:-} + METALLICITIES=${3:-"2 1 0.45 0.2 0.1 0.01 0.001 0.0001"} +fi SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" SAFE_BRANCH="${BRANCH//\//_}" BASELINE_DIR="$SCRIPT_DIR/baselines/${SAFE_BRANCH}" +CANDIDATE_DIR="$SCRIPT_DIR/outputs/${SAFE_BRANCH}" echo "============================================================" echo " POSYDON Binary Validation ā€” Generating Baseline" echo " Branch: $BRANCH" -echo " SHA: ${SHA:-HEAD}" +if [ "$PROMOTE" = true ]; then + echo " Mode: --promote (using existing outputs)" +else + echo " SHA: ${SHA:-HEAD}" +fi echo " Metallicities: $METALLICITIES" echo " Output dir: $BASELINE_DIR" echo "============================================================" -# ā”€ā”€ Step 1: Evolve binaries for the baseline branch ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ -echo "" -echo "Step 1: Evolving binaries on branch '$BRANCH'..." -"$SCRIPT_DIR/evolve_binaries.sh" "$BRANCH" "$SHA" "$METALLICITIES" +# ā”€ā”€ Step 1: Evolve binaries (skip if --promote) ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ +if [ "$PROMOTE" = true ]; then + echo "" + echo "Step 1: SKIPPED (--promote: using existing outputs in $CANDIDATE_DIR)" + + if [ ! -d "$CANDIDATE_DIR" ]; then + echo "ERROR: No outputs found at $CANDIDATE_DIR" >&2 + echo "Run evolve_binaries.sh first, or drop --promote to evolve from scratch." >&2 + exit 1 + fi +else + echo "" + echo "Step 1: Evolving binaries on branch '$BRANCH'..." + "$SCRIPT_DIR/evolve_binaries.sh" "$BRANCH" "$SHA" "$METALLICITIES" +fi # ā”€ā”€ Step 2: Copy results into the baselines directory ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ echo "" @@ -48,7 +79,6 @@ echo "Step 2: Copying results to baseline directory..." mkdir -p "$BASELINE_DIR" -CANDIDATE_DIR="$SCRIPT_DIR/outputs/${SAFE_BRANCH}" COPIED=0 for Z in $METALLICITIES; do @@ -78,6 +108,7 @@ POSYDON Binary Validation Baseline Branch: $BRANCH Commit SHA: ${ACTUAL_SHA:-unknown} Requested SHA: ${SHA:-HEAD} +Mode: $([ "$PROMOTE" = true ] && echo "promoted from existing outputs" || echo "evolved from scratch") Generated: $(date -u '+%Y-%m-%d %H:%M:%S UTC') Metallicities: $METALLICITIES Files: $COPIED @@ -93,4 +124,4 @@ echo "============================================================" if [ $COPIED -eq 0 ]; then echo "ERROR: No baseline files were created!" >&2 exit 1 -fi +fi \ No newline at end of file From d3d578b6133848ca8cc31bdaab61d149011369f0 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2026 22:04:58 +0000 Subject: [PATCH 105/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/generate_baseline.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/generate_baseline.sh b/dev-tools/generate_baseline.sh index 3539be5c81..fa407d0cbc 100755 --- a/dev-tools/generate_baseline.sh +++ b/dev-tools/generate_baseline.sh @@ -124,4 +124,4 @@ echo "============================================================" if [ $COPIED -eq 0 ]; then echo "ERROR: No baseline files were created!" >&2 exit 1 -fi \ No newline at end of file +fi From 7c553cdb28524211e557e1bb5a795dce5ef4ad22 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 9 Mar 2026 17:07:02 -0500 Subject: [PATCH 106/389] Move binaries_suite.py and binaries_params.ini to dev-tools root --- dev-tools/{script_data => }/binaries_params.ini | 0 dev-tools/{script_data => }/binaries_suite.py | 0 dev-tools/evolve_binaries.sh | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename dev-tools/{script_data => }/binaries_params.ini (100%) rename dev-tools/{script_data => }/binaries_suite.py (100%) diff --git a/dev-tools/script_data/binaries_params.ini b/dev-tools/binaries_params.ini similarity index 100% rename from dev-tools/script_data/binaries_params.ini rename to dev-tools/binaries_params.ini diff --git a/dev-tools/script_data/binaries_suite.py b/dev-tools/binaries_suite.py similarity index 100% rename from dev-tools/script_data/binaries_suite.py rename to dev-tools/binaries_suite.py diff --git a/dev-tools/evolve_binaries.sh b/dev-tools/evolve_binaries.sh index 30f7d7b745..e6b6a90c7e 100755 --- a/dev-tools/evolve_binaries.sh +++ b/dev-tools/evolve_binaries.sh @@ -106,7 +106,7 @@ echo "šŸ“¦ Installing POSYDON" pip install -e "$CLONE_DIR" -q 2>&1 | sed 's/^/ /' # ā”€ā”€ Run Suite for Each Metallicity ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ -SUITE_SCRIPT="$SCRIPT_DIR/script_data/binaries_suite.py" +SUITE_SCRIPT="$SCRIPT_DIR/binaries_suite.py" FAILED=0 for Z in $METALLICITIES; do From d51fbe4d4f29a9036d89f5acac54796e981edde4 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Mon, 9 Mar 2026 17:10:29 -0500 Subject: [PATCH 107/389] Delete dev-tools/outputs/baseline.h5 --- dev-tools/outputs/baseline.h5 | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 dev-tools/outputs/baseline.h5 diff --git a/dev-tools/outputs/baseline.h5 b/dev-tools/outputs/baseline.h5 deleted file mode 100644 index e69de29bb2..0000000000 From 6301581f34a5b7dd077c22c1949c41e697c9f435 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Mon, 9 Mar 2026 17:14:25 -0500 Subject: [PATCH 108/389] add readme --- dev-tools/README.md | 87 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 dev-tools/README.md diff --git a/dev-tools/README.md b/dev-tools/README.md new file mode 100644 index 0000000000..7732d50af1 --- /dev/null +++ b/dev-tools/README.md @@ -0,0 +1,87 @@ +# dev-tools + +Validation suite for POSYDON binary evolution. Evolves a fixed set of test binaries on a candidate branch and compares results against a stored baseline to catch regressions. + +## Quick Start + +```bash +# 1. Generate a baseline from the main branch (once) +./generate_baseline.sh main + +# 2. Validate a candidate branch against that baseline +./validate_binaries.sh feature/my-branch +``` + +## Scripts + +### `validate_binaries.sh` + +Top-level entry point. Evolves test binaries on a candidate branch, then compares results against a baseline. + +```bash +./validate_binaries.sh [baseline_branch] [metallicities] [--loose] [--rtol VALUE] [--atol VALUE] +``` + +By default, comparison is exact (rtol=0, atol=0). Use `--loose` for relaxed floating-point tolerances (rtol=1e-12, atol=1e-15), or set `--rtol`/`--atol` explicitly. + +### `generate_baseline.sh` + +Generates baseline HDF5 files from a designated branch or tag. Can also promote existing outputs to baseline with `--promote`. + +```bash +./generate_baseline.sh [sha] [metallicities] +./generate_baseline.sh --promote [metallicities] +``` + +### `evolve_binaries.sh` + +Clones a POSYDON branch, creates a conda environment, installs POSYDON, and runs the binary suite at all requested metallicities. Called by `validate_binaries.sh` and `generate_baseline.sh`; can also be run standalone. + +```bash +./evolve_binaries.sh [sha] [metallicities] +``` + +### `binaries_suite.py` + +Defines and evolves the set of 44 test binaries at a given metallicity. Each binary targets a specific edge case or past bug fix (e.g., matching failures, oRLO2 looping, SN type errors, NaN spins). Results are saved to an HDF5 file. + +```bash +python binaries_suite.py --output results.h5 --metallicity 1 +``` + +### `compare_runs.py` + +Compares two HDF5 files produced by `binaries_suite.py`. Reports three categories of differences: structural (missing binaries, step count changes, new errors), qualitative (state/event/step name changes), and quantitative (numeric value changes). + +```bash +python compare_runs.py baseline.h5 candidate.h5 [--loose] [--rtol VALUE] [--atol VALUE] [--verbose] +``` + +### `binaries_params.ini` + +Configuration file for `SimulationProperties`. Defines the POSYDON evolution steps, supernova prescriptions, common envelope parameters, and output column selections. Metallicity is overridden at runtime by `binaries_suite.py`. + +## Directory Structure + +``` +dev-tools/ +ā”œā”€ā”€ README.md +ā”œā”€ā”€ validate_binaries.sh # full validation pipeline +ā”œā”€ā”€ generate_baseline.sh # create or promote baselines +ā”œā”€ā”€ evolve_binaries.sh # clone, install, and run suite +ā”œā”€ā”€ binaries_suite.py # test binary definitions and evolution +ā”œā”€ā”€ binaries_params.ini # SimulationProperties configuration +ā”œā”€ā”€ compare_runs.py # diff two HDF5 result files +ā”œā”€ā”€ baselines/ # stored baseline HDF5 files (per branch) +ā”œā”€ā”€ outputs/ # candidate evolution results (per branch) +ā”œā”€ā”€ logs/ # per-metallicity evolution logs (per branch) +ā””ā”€ā”€ workdirs/ # cloned repos and conda environments (per branch) +``` + +## Available Metallicities + +The suite supports metallicities (in solar units): 2, 1, 0.45, 0.2, 0.1, 0.01, 0.001, 0.0001. All are run by default; pass a quoted subset to limit, e.g. `"1 0.45"`. + +## Authors + +Max Briel, Elizabeth Teng From 22102ea9a19af9e9ae46a29199342d8109da1558 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Mon, 9 Mar 2026 17:17:21 -0500 Subject: [PATCH 109/389] Update README.md --- dev-tools/README.md | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/dev-tools/README.md b/dev-tools/README.md index 7732d50af1..b75aa74fc0 100644 --- a/dev-tools/README.md +++ b/dev-tools/README.md @@ -1,5 +1,3 @@ -# dev-tools - Validation suite for POSYDON binary evolution. Evolves a fixed set of test binaries on a candidate branch and compares results against a stored baseline to catch regressions. ## Quick Start @@ -16,7 +14,7 @@ Validation suite for POSYDON binary evolution. Evolves a fixed set of test binar ### `validate_binaries.sh` -Top-level entry point. Evolves test binaries on a candidate branch, then compares results against a baseline. +Top-level entry point. Evolves test binaries on a candidate branch, then compares results against an existing baseline. ```bash ./validate_binaries.sh [baseline_branch] [metallicities] [--loose] [--rtol VALUE] [--atol VALUE] @@ -77,11 +75,3 @@ dev-tools/ ā”œā”€ā”€ logs/ # per-metallicity evolution logs (per branch) ā””ā”€ā”€ workdirs/ # cloned repos and conda environments (per branch) ``` - -## Available Metallicities - -The suite supports metallicities (in solar units): 2, 1, 0.45, 0.2, 0.1, 0.01, 0.001, 0.0001. All are run by default; pass a quoted subset to limit, e.g. `"1 0.45"`. - -## Authors - -Max Briel, Elizabeth Teng From d0eaf915cf9f6c5ab67263acb5537facb676c1b8 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Mon, 9 Mar 2026 17:26:14 -0500 Subject: [PATCH 110/389] Update README.md --- dev-tools/README.md | 55 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/dev-tools/README.md b/dev-tools/README.md index b75aa74fc0..4b74b1b1e5 100644 --- a/dev-tools/README.md +++ b/dev-tools/README.md @@ -10,6 +10,19 @@ Validation suite for POSYDON binary evolution. Evolves a fixed set of test binar ./validate_binaries.sh feature/my-branch ``` +Results are written to `outputs//`. After validation, check: + +- `outputs//comparison_summary.txt` for a pass/fail overview across all metallicities +- `outputs//comparison_Zsun.txt` for detailed per-metallicity diff reports +- `logs//evolve_Zsun.log` for the full evolution output of each metallicity + +By default, all eight POSYDON metallicities are run. To validate only a subset, pass a quoted space-separated list as the third argument: + +```bash +./generate_baseline.sh main "" "1 0.45" +./validate_binaries.sh feature/my-branch main "1 0.45" +``` + ## Scripts ### `validate_binaries.sh` @@ -49,7 +62,13 @@ python binaries_suite.py --output results.h5 --metallicity 1 ### `compare_runs.py` -Compares two HDF5 files produced by `binaries_suite.py`. Reports three categories of differences: structural (missing binaries, step count changes, new errors), qualitative (state/event/step name changes), and quantitative (numeric value changes). +Compares two HDF5 files produced by `binaries_suite.py` and reports differences in three categories: + +- **Structural**: missing or extra binaries, evolution step count changes, binaries that newly fail or newly pass, missing HDF5 tables. +- **Qualitative**: changes to categorical columns such as state, event, step name, SN type, interpolation class, and mass transfer history. +- **Quantitative**: changes to any numeric column. By default, comparison is exact (bitwise identical floats). Use `--loose` for slightly relaxed tolerances (rtol=1e-12, atol=1e-15), or set `--rtol`/`--atol` explicitly. + +The script also compares warning and error tables, reporting new, removed, or changed warnings per binary. ```bash python compare_runs.py baseline.h5 candidate.h5 [--loose] [--rtol VALUE] [--atol VALUE] [--verbose] @@ -59,6 +78,40 @@ python compare_runs.py baseline.h5 candidate.h5 [--loose] [--rtol VALUE] [--atol Configuration file for `SimulationProperties`. Defines the POSYDON evolution steps, supernova prescriptions, common envelope parameters, and output column selections. Metallicity is overridden at runtime by `binaries_suite.py`. +## Running Scripts Manually + +The shell scripts handle cloning, environment setup, and orchestration. If you already have POSYDON installed in your current environment, you can run the Python scripts directly. + +### Evolving binaries + +```bash +# Evolve all 44 test binaries at solar metallicity +python binaries_suite.py --output my_results.h5 --metallicity 1 + +# Evolve at a specific metallicity with verbose output +python binaries_suite.py --output my_results.h5 --metallicity 0.01 --verbose + +# Use a custom ini file +python binaries_suite.py --output my_results.h5 --metallicity 1 --ini /path/to/custom.ini +``` + +The output HDF5 contains three tables: `evolution` (per-step binary data), `errors` (binaries that failed), and `warnings` (warnings raised during evolution). + +### Comparing two result files + +```bash +# Exact comparison +python compare_runs.py file_a.h5 file_b.h5 + +# Relaxed tolerances +python compare_runs.py file_a.h5 file_b.h5 --loose + +# Custom tolerances with verbose diagnostics +python compare_runs.py file_a.h5 file_b.h5 --rtol 1e-8 --atol 1e-12 --verbose +``` + +The two files do not need to come from the shell pipeline; any pair of HDF5 files produced by `binaries_suite.py` can be compared. + ## Directory Structure ``` From 4c9643548d996bde08d6ffec5c6831e5cd468269 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Thu, 18 Dec 2025 07:52:22 -0600 Subject: [PATCH 111/389] Create validate_binaries.sh --- dev-tools/validate_binaries.sh | 1 + 1 file changed, 1 insertion(+) create mode 100644 dev-tools/validate_binaries.sh diff --git a/dev-tools/validate_binaries.sh b/dev-tools/validate_binaries.sh new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/dev-tools/validate_binaries.sh @@ -0,0 +1 @@ + From 73e14659c30a05d49f73f8a427ae4cf2f2b11f5c Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 18 Dec 2025 13:52:47 +0000 Subject: [PATCH 112/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/validate_binaries.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/dev-tools/validate_binaries.sh b/dev-tools/validate_binaries.sh index 8b13789179..e69de29bb2 100644 --- a/dev-tools/validate_binaries.sh +++ b/dev-tools/validate_binaries.sh @@ -1 +0,0 @@ - From ebc2c8681346d6044b19c3a92b5179d7febb675d Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Thu, 18 Dec 2025 08:10:24 -0600 Subject: [PATCH 113/389] Create dummy file baseline.h5 --- dev-tools/outputs/baseline.h5 | 1 + 1 file changed, 1 insertion(+) create mode 100644 dev-tools/outputs/baseline.h5 diff --git a/dev-tools/outputs/baseline.h5 b/dev-tools/outputs/baseline.h5 new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/dev-tools/outputs/baseline.h5 @@ -0,0 +1 @@ + From e416fc8585e352aa5cf7fffb6779e8f80fd668af Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 18 Dec 2025 14:10:32 +0000 Subject: [PATCH 114/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/outputs/baseline.h5 | 1 - 1 file changed, 1 deletion(-) diff --git a/dev-tools/outputs/baseline.h5 b/dev-tools/outputs/baseline.h5 index 8b13789179..e69de29bb2 100644 --- a/dev-tools/outputs/baseline.h5 +++ b/dev-tools/outputs/baseline.h5 @@ -1 +0,0 @@ - From 47a0d37f1c05d6854bdfcd8084fe9892407125cc Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Thu, 18 Dec 2025 08:20:43 -0600 Subject: [PATCH 115/389] outline script --- dev-tools/validate_binaries.sh | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dev-tools/validate_binaries.sh b/dev-tools/validate_binaries.sh index e69de29bb2..436b55647c 100644 --- a/dev-tools/validate_binaries.sh +++ b/dev-tools/validate_binaries.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +# A script for validating the outputs of 100 binaries, +# which can be compared to a baseline to monitor changes to the code. + +# script usage: ./validate_binaries.sh --branch candidate-branch + +# run candidate binaries and save to file +# ./evolve_binaries.sh +# save to file + +# evaluate tolerance for quantitative values + +# evaluate qualitative differences + +# warnings and error tracking + +# structured output + +# compare +# python compare_runs.py baseline.json candidate.json + + + + + +# outputs/baseline.h5 +# outputs/candidate_branchname.h5 +# outputs/comparison_branchname.txt From ed95ed7f006f2b7545914577e44b8e985d497fc8 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 18 Dec 2025 14:20:52 +0000 Subject: [PATCH 116/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/validate_binaries.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/validate_binaries.sh b/dev-tools/validate_binaries.sh index 436b55647c..31b7c6d72a 100644 --- a/dev-tools/validate_binaries.sh +++ b/dev-tools/validate_binaries.sh @@ -1,6 +1,6 @@ #!/bin/bash -# A script for validating the outputs of 100 binaries, +# A script for validating the outputs of 100 binaries, # which can be compared to a baseline to monitor changes to the code. # script usage: ./validate_binaries.sh --branch candidate-branch From 578cd4c8a4137c9809bec839ae8de27e0febac2e Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Thu, 18 Dec 2025 08:28:17 -0600 Subject: [PATCH 117/389] Modify evolve_binaries.sh for saved output and logs in folder outputs --- dev-tools/evolve_binaries.sh | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dev-tools/evolve_binaries.sh b/dev-tools/evolve_binaries.sh index fc7a20fb3b..051dafcd13 100755 --- a/dev-tools/evolve_binaries.sh +++ b/dev-tools/evolve_binaries.sh @@ -28,6 +28,15 @@ mkdir -p "$WORK_DIR" FULL_PATH="$(realpath "$WORK_DIR")" CLONE_DIR="$FULL_PATH/POSYDON" +OUTPUT_DIR="$FULL_PATH/outputs" +LOG_DIR="$FULL_PATH/logs" + +SAFE_BRANCH="${BRANCH//\//_}" +OUTPUT_FILE="$OUTPUT_DIR/candidate_${SAFE_BRANCH}.h5" +LOG_FILE="$LOG_DIR/evolve_${SAFE_BRANCH}.log" + +mkdir -p "$OUTPUT_DIR" "$LOG_DIR" + echo "šŸ“‹ Copying script_data folder" # copy the script_data folder cp -r "./script_data" "$WORK_DIR" @@ -79,6 +88,11 @@ pip install -e "$CLONE_DIR" -q 2>&1 | sed 's/^/ /' echo "šŸš€ Running evolve_binaries.py" # # Run the Python script and capture output (stdout and stderr) -python script_data/1Zsun_binaries_suite.py > $FULL_PATH/evolve_binaries_$BRANCH.out 2>&1 +python script_data/1Zsun_binaries_suite.py --output "$OUTPUT_FILE" > "$LOG_FILE" 2>&1 + +if [ ! -f "$OUTPUT_FILE" ]; then + echo "ERROR: Results file was not created: $OUTPUT_FILE" + exit 2 +fi -echo -e "āœ… Script completed. Output saved to \n$FULL_PATH/evolve_binaries_$BRANCH.out" +echo -e "āœ… Script completed. Output saved to \n$OUTPUT_FILE" From e4908e0c25bc9632e50c53ab09483843407fe95b Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Thu, 18 Dec 2025 08:57:20 -0600 Subject: [PATCH 118/389] Modify evolve_binary for HDF5 output and error handling --- dev-tools/script_data/1Zsun_binaries_suite.py | 63 ++++++++++++------- 1 file changed, 39 insertions(+), 24 deletions(-) diff --git a/dev-tools/script_data/1Zsun_binaries_suite.py b/dev-tools/script_data/1Zsun_binaries_suite.py index a896df8fe9..53c4010a76 100644 --- a/dev-tools/script_data/1Zsun_binaries_suite.py +++ b/dev-tools/script_data/1Zsun_binaries_suite.py @@ -116,7 +116,15 @@ def print_failed_binary(binary,e, max_error_lines=3): print("-" * line_length) -def evolve_binary(binary): +def evolve_binary(binary,h5file,binary_id): + """ + Evolves a single binary, prints its evolution, and saves to HDF5. + + Args: + binary: BinaryStar object + h5file: open h5py.File object for writing + binary_id: unique identifier for this binary + """ # Capture warnings during evolution captured_warnings = [] @@ -137,44 +145,49 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): binary.evolve() # Display the evolution summary for successful evolution write_binary_to_screen(binary) - - # Show warnings if any were captured - if captured_warnings: - print(f"āš ļø {len(captured_warnings)} warning(s) raised during evolution:") - for i, warning in enumerate(captured_warnings[:3], 1): # Show max 3 warnings - print(f" {i}. {warning['category']}: {warning['message']}") - if len(captured_warnings) > 3: - print(f" ... and {len(captured_warnings) - 3} more warning(s)") - elif len(captured_warnings) <= 3: - for i in range(4-len(captured_warnings)): - print("") - else: - print(f"No warning(s) raised during evolution\n\n\n\n") - print("=" * line_length) + + # Save to HDF5 + df = binary.to_df(**{'extra_columns':{'step_names':'str'}}) + grp = h5file.create_group(f"binary_{binary_id}") + for col in df.columns: + grp.create_dataset(col, data=df[col].values) except Exception as e: - # turn off binary alarm in case of exception signal.alarm(0) print_failed_binary(binary, e) - # Show warnings if any were captured before the exception + err_grp = h5file.require_group(f"binary_{binary_id}/errors") + err_grp.attrs['exception_type'] = type(e).__name__ + err_grp.attrs['exception_message'] = str(e) + + finally: + # Always turn off binary alarm and restore warning handler + signal.alarm(0) + warnings.showwarning = old_showwarning + + # ensure binary group exists + grp = h5file.require_group(f"binary_{binary_id}") + + # Save warnings to h5 file if captured_warnings: - print(f"\nāš ļø {len(captured_warnings)} warning(s) raised before failure:") + warn_grp = grp.create_group("warnings") + for i, warning in enumerate(captured_warnings): + warn_subgrp = warn_grp.create_group(f"warning_{i}") + warn_subgrp.attrs['category'] = warning['category'] + warn_subgrp.attrs['message'] = warning['message'] + warn_subgrp.attrs['filename'] = warning['filename'] + warn_subgrp.attrs['lineno'] = warning['lineno'] + + print(f"āš ļø {len(captured_warnings)} warning(s) raised during evolution:") for i, warning in enumerate(captured_warnings[:3], 1): # Show max 3 warnings print(f" {i}. {warning['category']}: {warning['message']}") if len(captured_warnings) > 3: print(f" ... and {len(captured_warnings) - 3} more warning(s)") else: print(f"No warning(s) raised during evolution\n\n\n\n") - print("=" * line_length) - finally: - # Always turn off binary alarm and restore warning handler - signal.alarm(0) - warnings.showwarning = old_showwarning - def evolve_binaries(verbose): """Evolves a few binaries to validate their output @@ -833,6 +846,8 @@ def evolve_binaries(verbose): parser = argparse.ArgumentParser(description='Evolve binaries for validation.') parser.add_argument('--verbose', '-v', action='store_true', default=False, help='Enable verbose output (default: False)') + parser.add_argument("--output", type=str, required=True, + help="Path to save HDF5 output") args = parser.parse_args() evolve_binaries(verbose=args.verbose) From dc65854079bc7ccdbd1a2c65606f05d6c23bf786 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 18 Dec 2025 14:57:38 +0000 Subject: [PATCH 119/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/script_data/1Zsun_binaries_suite.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dev-tools/script_data/1Zsun_binaries_suite.py b/dev-tools/script_data/1Zsun_binaries_suite.py index 53c4010a76..6e734e3352 100644 --- a/dev-tools/script_data/1Zsun_binaries_suite.py +++ b/dev-tools/script_data/1Zsun_binaries_suite.py @@ -145,7 +145,7 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): binary.evolve() # Display the evolution summary for successful evolution write_binary_to_screen(binary) - + # Save to HDF5 df = binary.to_df(**{'extra_columns':{'step_names':'str'}}) grp = h5file.create_group(f"binary_{binary_id}") @@ -166,10 +166,10 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): # Always turn off binary alarm and restore warning handler signal.alarm(0) warnings.showwarning = old_showwarning - + # ensure binary group exists grp = h5file.require_group(f"binary_{binary_id}") - + # Save warnings to h5 file if captured_warnings: warn_grp = grp.create_group("warnings") @@ -179,7 +179,7 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): warn_subgrp.attrs['message'] = warning['message'] warn_subgrp.attrs['filename'] = warning['filename'] warn_subgrp.attrs['lineno'] = warning['lineno'] - + print(f"āš ļø {len(captured_warnings)} warning(s) raised during evolution:") for i, warning in enumerate(captured_warnings[:3], 1): # Show max 3 warnings print(f" {i}. {warning['category']}: {warning['message']}") @@ -846,7 +846,7 @@ def evolve_binaries(verbose): parser = argparse.ArgumentParser(description='Evolve binaries for validation.') parser.add_argument('--verbose', '-v', action='store_true', default=False, help='Enable verbose output (default: False)') - parser.add_argument("--output", type=str, required=True, + parser.add_argument("--output", type=str, required=True, help="Path to save HDF5 output") args = parser.parse_args() From 8a0d5bae1999146aee269305559eabd8433ed582 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Thu, 18 Dec 2025 09:18:58 -0600 Subject: [PATCH 120/389] Update 1Zsun_binaries_suite.py to fix args in function calls --- dev-tools/script_data/1Zsun_binaries_suite.py | 1172 +++++++++-------- 1 file changed, 604 insertions(+), 568 deletions(-) diff --git a/dev-tools/script_data/1Zsun_binaries_suite.py b/dev-tools/script_data/1Zsun_binaries_suite.py index 6e734e3352..c18d2009fd 100644 --- a/dev-tools/script_data/1Zsun_binaries_suite.py +++ b/dev-tools/script_data/1Zsun_binaries_suite.py @@ -116,7 +116,7 @@ def print_failed_binary(binary,e, max_error_lines=3): print("-" * line_length) -def evolve_binary(binary,h5file,binary_id): +def evolve_binary(binary, h5file, binary_id): """ Evolves a single binary, prints its evolution, and saves to HDF5. @@ -189,588 +189,624 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): print(f"No warning(s) raised during evolution\n\n\n\n") print("=" * line_length) -def evolve_binaries(verbose): +def evolve_binaries(verbose,output_path): """Evolves a few binaries to validate their output """ sim_prop = load_inlist(verbose) - ######################################## - # Failing binary in matching - ######################################## - star_1 = SingleStar(**{'mass': 11.948472796094759, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [231.97383621190582, 5.927334890264575, 1.5990566013567014, 6.137994236518587]}) - star_2 = SingleStar(**{'mass': 7.636958434479617, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 190925.99636740884,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # Failing binary in matching - ######################################## - star_1 = SingleStar(**{'mass': 30.169861921689556, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [77.96834852144123, 0.05021460132555987, 2.3146518208348152, 1.733054979982291]}) - star_2 = SingleStar(**{'mass': 10.972734402996027, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 20479.71919353725,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # flipped S1 and S2 ? - ######################################## - star_1 = SingleStar(**{'mass': 9.474917413943635, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [133.5713935237759, 4.398754864537542, 2.703102872841114, 1.4633904612711142]}) - star_2 = SingleStar(**{'mass': 9.311073918196263, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 18.605997832086413,'eccentricity': 0.0}, properties = sim_prop) + with h5py.File(output_path,'w') as h5file: + binary_id=0 - evolve_binary(binary) - ######################################## - # flipped S1 and S2 - ######################################## - star_1 = SingleStar(**{'mass': 10.438541, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star_2 = SingleStar(**{'mass': 1.400713, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 9.824025,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # flipped S1 and S2 - ######################################## - star_1= SingleStar(**{'mass': 9.845907 , 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - star_2 = SingleStar(**{'mass': 9.611029, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 3.820571,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # Normal binary evolution - ######################################## - star_1= SingleStar(**{'mass': 30.845907 , 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - star_2 = SingleStar(**{'mass': 30.611029, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 30.820571,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # Normal binary - ######################################## - star_1= SingleStar(**{'mass': 9.213534679594247 , 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [327.5906384501521, 1.7707176050073297, 1.573225822966838, 1.6757313876001914]}) - star_2 = SingleStar(**{'mass': 7.209878522799272, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 63123.74544474666,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # Normal binary - ######################################## - star_1= SingleStar(**{'mass': 9.561158487732602 , 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [317.5423844462847, 2.9095984678057603, 1.754121288652108, 2.3693917842468784]}) - star_2 = SingleStar(**{'mass': 9.382732464319286, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 27.77657038557851,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # Normal binary - ######################################## - star1 = SingleStar(**{'mass': 7.552858,#29829485, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [40.91509926587841, 2.6295454150818256, 1.6718337470964977, 6.0408769315244895]}) - star2 = SingleStar(**{'mass': 6.742063, #481560266, - 'state': 'H-rich_Core_H_burning', + ######################################## + # Failing binary in matching + ######################################## + star_1 = SingleStar(**{'mass': 11.948472796094759, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [231.97383621190582, 5.927334890264575, 1.5990566013567014, 6.137994236518587]}) + star_2 = SingleStar(**{'mass': 7.636958434479617, 'state': 'H-rich_Core_H_burning','metallicity':1, 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 17.957531550841225, 'eccentricity': 0.0,}, - properties=sim_prop) - evolve_binary(binary) - ######################################## - # High BH spin options - ######################################## - star_1 = SingleStar(**{'mass': 31.616785, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [10, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - star_2 = SingleStar(**{'mass': 26.874267, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 501.99252706449792,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # Original a>1 spin error - ######################################## - star_1 = SingleStar(**{'mass': 18.107506844123645, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [528.2970725443025, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - star_2 = SingleStar(**{'mass': 15.641392951875442, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 151.99252706449792,'eccentricity': 0.0}, properties = sim_prop) - ######################################## - # FIXED disrupted crash - ######################################## - STAR1 = SingleStar(**{'mass': 52.967313, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 36.306444, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':12.877004, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED error with SN type - ######################################## - STAR1 = SingleStar(**{'mass': 17.782576, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass':3.273864, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED oRLO2 looping - ######################################## - STAR1 = SingleStar(**{'mass': 170.638207, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [4.921294, 4.31745, 1.777768, 3.509656]}) - STAR2 = SingleStar(**{'mass':37.917852, - 'state': 'H-rich_Core_H_burning', + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 190925.99636740884,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # Failing binary in matching + ######################################## + star_1 = SingleStar(**{'mass': 30.169861921689556, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [77.96834852144123, 0.05021460132555987, 2.3146518208348152, 1.733054979982291]}) + star_2 = SingleStar(**{'mass': 10.972734402996027, 'state': 'H-rich_Core_H_burning','metallicity':1, 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':113.352736, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # Redirect to step_CO_HeMS (H-rich non-burning?) - ######################################## - star_1 = SingleStar(**{'mass': 8.333579, 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [17.125568, 4.101834, 0.917541, 3.961291]}) - star_2 = SingleStar(**{'mass' : 8.208376, 'state' : 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 66.870417, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary) - ######################################## - # FIXED oRLO2 looping - ######################################## - star_1 = SingleStar(**{'mass': 16.921378, 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}) - star_2 = SingleStar(**{'mass' : 16.286318, 'state' : 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 37.958768, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary) - ######################################## - # FIXED? step_detached failure - ######################################## - STAR1 = SingleStar(**{'mass': 19.787769, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [24.464803, 0.666314, 1.954698, 5.598975]}) - STAR2 = SingleStar(**{'mass': 7.638741, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3007.865561, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # Disrupted binary - ######################################## - star_1 = SingleStar(**{'mass': 16.921378, 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}) - star_2 = SingleStar(**{'mass' : 16.286318, 'state' : 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3007.865561, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED Detached binary failure (low mass) - ######################################## - STAR1 = SingleStar(**{'mass': 9, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass':0.8, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED SN_TYPE = None crash - ######################################## - STAR1 = SingleStar(**{'mass': 17.782576, + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 20479.71919353725,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # flipped S1 and S2 ? + ######################################## + star_1 = SingleStar(**{'mass': 9.474917413943635, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [133.5713935237759, 4.398754864537542, 2.703102872841114, 1.4633904612711142]}) + star_2 = SingleStar(**{'mass': 9.311073918196263, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 18.605997832086413,'eccentricity': 0.0}, properties = sim_prop) + + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # flipped S1 and S2 + ######################################## + star_1 = SingleStar(**{'mass': 10.438541, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + star_2 = SingleStar(**{'mass': 1.400713, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 9.824025,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # flipped S1 and S2 + ######################################## + star_1= SingleStar(**{'mass': 9.845907 , 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) + star_2 = SingleStar(**{'mass': 9.611029, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 3.820571,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # Normal binary evolution + ######################################## + star_1= SingleStar(**{'mass': 30.845907 , 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) + star_2 = SingleStar(**{'mass': 30.611029, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 30.820571,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # Normal binary + ######################################## + star_1= SingleStar(**{'mass': 9.213534679594247 , 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [327.5906384501521, 1.7707176050073297, 1.573225822966838, 1.6757313876001914]}) + star_2 = SingleStar(**{'mass': 7.209878522799272, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 63123.74544474666,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # Normal binary + ######################################## + star_1= SingleStar(**{'mass': 9.561158487732602 , 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [317.5423844462847, 2.9095984678057603, 1.754121288652108, 2.3693917842468784]}) + star_2 = SingleStar(**{'mass': 9.382732464319286, 'state': 'H-rich_Core_H_burning','metallicity':1, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 27.77657038557851,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # Normal binary + ######################################## + star1 = SingleStar(**{'mass': 7.552858,#29829485, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [40.91509926587841, 2.6295454150818256, 1.6718337470964977, 6.0408769315244895]}) + star2 = SingleStar(**{'mass': 6.742063, #481560266, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 17.957531550841225, 'eccentricity': 0.0,}, + properties=sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # High BH spin options + ######################################## + star_1 = SingleStar(**{'mass': 31.616785, 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [10, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) + star_2 = SingleStar(**{'mass': 26.874267, 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 501.99252706449792,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # Original a>1 spin error + ######################################## + star_1 = SingleStar(**{'mass': 18.107506844123645, 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [528.2970725443025, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) + star_2 = SingleStar(**{'mass': 15.641392951875442, 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 151.99252706449792,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # FIXED disrupted crash + ######################################## + star1 = SingleStar(**{'mass': 52.967313, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 36.306444, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':12.877004, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # FIXED error with SN type + ######################################## + star1 = SingleStar(**{'mass': 17.782576, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass':3.273864, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass':3.273864, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED SN_TYPE errors - ######################################## - STAR1 = SingleStar(**{'mass': 6.782576, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass':3.273864, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED SN_TYPE errors - ######################################## - STAR1 = SingleStar(**{'mass': 40.638207, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [30.921294, 4.31745, 1.777768, 3.509656]}) - STAR2 = SingleStar(**{'mass':37.917852, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':2113.352736, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED ECSN errors? - ######################################## - STAR1 = SingleStar(**{'mass': 12.376778, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [80, 4.31745, 1.777768, 3.509656]}) - STAR2 = SingleStar(**{'mass': 9.711216, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':79.83702, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # Interpolator masses?? - ######################################## - STAR1 = SingleStar(**{'mass': 7.592921, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass':5.038679 , - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.537807, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # Interpolator masses? - ######################################## - star_1 = SingleStar(**{'mass': 38.741115, - 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [21.113771, 2.060135, 2.224789, 4.089729]}) - star_2 = SingleStar(**{'mass': 27.776178, - 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [282.712103, 0.296252, 1.628433, 5.623812]}) - - BINARY = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 93.387072, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED NaN spin - ######################################## - STAR1 = SingleStar(**{'mass': 70.066924, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0], - 'metallicity':1}) - STAR2 = SingleStar(**{'mass': 34.183110, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0], - 'metallicity':1}) - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.931492e+03, - 'separation': orbital_separation_from_period(5.931492e+03, STAR1.mass, STAR2.mass), - 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # FIXED NaN spin - ######################################## - STAR1 = SingleStar(**{'mass': 28.837286, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 6.874867, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':35.609894, - 'separation': orbital_separation_from_period(35.609894, STAR1.mass, STAR2.mass), - 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # oRLO2 issue - ######################################## - STAR1 = SingleStar(**{'mass':29.580210, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 28.814626, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':40.437993, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # oRLO2 issue - ######################################## - STAR1 = SingleStar(**{'mass':67.126795, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 19.622908, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':1484.768582, 'eccentricity': 0.0}, + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # FIXED oRLO2 looping + ######################################## + star1 = SingleStar(**{'mass': 170.638207, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [4.921294, 4.31745, 1.777768, 3.509656]}) + star2 = SingleStar(**{'mass':37.917852, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':113.352736, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # Redirect to step_CO_HeMS (H-rich non-burning?) + ######################################## + star_1 = SingleStar(**{'mass': 8.333579, 'state': 'H-rich_Core_H_burning',\ + 'natal_kick_array': [17.125568, 4.101834, 0.917541, 3.961291]}) + star_2 = SingleStar(**{'mass' : 8.208376, 'state' : 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 66.870417, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # FIXED oRLO2 looping + ######################################## + star_1 = SingleStar(**{'mass': 16.921378, 'state': 'H-rich_Core_H_burning',\ + 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}) + star_2 = SingleStar(**{'mass' : 16.286318, 'state' : 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 37.958768, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # FIXED? step_detached failure + ######################################## + star1 = SingleStar(**{'mass': 19.787769, 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [24.464803, 0.666314, 1.954698, 5.598975]}) + star2 = SingleStar(**{'mass': 7.638741, 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3007.865561, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # oRLO2 issue - ######################################## - STAR1 = SingleStar(**{'mass': 58.947503, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 56.660506, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':2011.300659, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # oRLO2 issue - ######################################## - STAR1 = SingleStar(**{'mass': 170.638207, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[47.979957374424956, 5.317304576107798, 2.7259013166068145, 4.700929589520818]}) - STAR2 = SingleStar(**{'mass': 37.917852, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':113.352736, 'eccentricity': 0.0}, + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # Disrupted binary + ######################################## + star_1 = SingleStar(**{'mass': 16.921378, 'state': 'H-rich_Core_H_burning',\ + 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}) + star_2 = SingleStar(**{'mass' : 16.286318, 'state' : 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3007.865561, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # oRLO2 issue - ######################################## - STAR1 = SingleStar(**{'mass': 109.540207, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 84.344530, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.651896, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # redirect - ######################################## - STAR1 = SingleStar(**{'mass': 13.889634, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass':0.490231, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':14513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # redirect - ######################################## - STAR1 = SingleStar(**{'mass': 9, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass':0.8, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # FIXED Detached binary failure (low mass) + ######################################## + star1 = SingleStar(**{'mass': 9, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass':0.8, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # FIXED SN_TYPE = None crash + ######################################## + star1 = SingleStar(**{'mass': 17.782576, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass':3.273864, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # FIXED SN_TYPE errors + ######################################## + star1 = SingleStar(**{'mass': 6.782576, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass':3.273864, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(BINARY) - ######################################## - # Max time - ######################################## - star_1 = SingleStar(**{'mass': 103.07996766780799, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.2965418610971261, 2.0789170290719117, 3.207488023705968]}) - star_2 = SingleStar(**{'mass': 83.66522615073987, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 1449.1101985875678,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # Max time - ######################################## - star_1 = SingleStar(**{'mass': 8.860934140643465, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [11.818027275431337, 2.812412688633058, 0.4998731824233789, 2.9272630485628643]}) - star_2 = SingleStar(**{'mass': 8.584716012668551, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 20.82030114750744,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary) - ######################################## - # PR421 - ######################################## - STAR1 = SingleStar(**{'mass': 24.035366, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 23.187355, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':18.865029, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # CE class - ######################################## - STAR1 = SingleStar(**{'mass':33.964274, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 28.98149, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':82.370989, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # PR574 - stepCE fix - ######################################## - STAR1 = SingleStar(**{'mass':29.580210, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - STAR2 = SingleStar(**{'mass': 28.814626*0.4, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - BINARY = BinaryStar(STAR1, STAR2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':300.437993, 'eccentricity': 0.0}, + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # FIXED SN_TYPE errors + ######################################## + star1 = SingleStar(**{'mass': 40.638207, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [30.921294, 4.31745, 1.777768, 3.509656]}) + star2 = SingleStar(**{'mass':37.917852, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':2113.352736, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # FIXED ECSN errors? + ######################################## + star1 = SingleStar(**{'mass': 12.376778, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [80, 4.31745, 1.777768, 3.509656]}) + star2 = SingleStar(**{'mass': 9.711216, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':79.83702, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # Interpolator masses?? + ######################################## + star1 = SingleStar(**{'mass': 7.592921, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass':5.038679 , + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.537807, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(BINARY) - - ######################################## - # e_ZAMS error - ######################################## - star1 = SingleStar(**{'mass': 8.161885721822461, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 3.5907829421526154, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 36.873457164644144, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary) - - ######################################## - # e_ZAMS error - ######################################## - star1 = SingleStar(**{'mass': 35.24755025317775, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [19.755993125895806, 0.37149222852233904, 1.6588846085306563, - 1.434617029858906]}) - star2 = SingleStar(**{'mass': 30.000450298072902, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 24060.02101364665, 'eccentricity': 0.8085077857996965}, - properties = sim_prop) - evolve_binary(binary) - - ######################################## - # e_ZAMS error - ######################################## - star1 = SingleStar(**{'mass': 11.862930493162692, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 1.4739109294156703, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 4111.083887312003, 'eccentricity':0.0}, - properties = sim_prop) - evolve_binary(binary) - - ######################################## - # e_ZAMS error - ######################################## - star1 = SingleStar(**{'mass': 8.527361341212108, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 0.7061748406821822, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 2521.1927287891444, 'eccentricity':0.0}, - properties = sim_prop) - evolve_binary(binary) - - ######################################## - # e_ZAMS error - ######################################## - star1 = SingleStar(**{'mass': 13.661942533447398 ,#29829485, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 4.466151109802313 , #481560266, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3110.1346707516914, 'eccentricity':0.0}, - properties = sim_prop) - evolve_binary(binary) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # Interpolator masses? + ######################################## + star_1 = SingleStar(**{'mass': 38.741115, + 'state': 'H-rich_Core_H_burning',\ + 'natal_kick_array': [21.113771, 2.060135, 2.224789, 4.089729]}) + star_2 = SingleStar(**{'mass': 27.776178, + 'state': 'H-rich_Core_H_burning',\ + 'natal_kick_array': [282.712103, 0.296252, 1.628433, 5.623812]}) + + binary = BinaryStar(star_1, star_2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 93.387072, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # FIXED NaN spin + ######################################## + star1 = SingleStar(**{'mass': 70.066924, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0], + 'metallicity':1}) + star2 = SingleStar(**{'mass': 34.183110, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0], + 'metallicity':1}) + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.931492e+03, + 'separation': orbital_separation_from_period(5.931492e+03, star1.mass, star2.mass), + 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # FIXED NaN spin + ######################################## + star1 = SingleStar(**{'mass': 28.837286, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 6.874867, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':35.609894, + 'separation': orbital_separation_from_period(35.609894, star1.mass, star2.mass), + 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # oRLO2 issue + ######################################## + star1 = SingleStar(**{'mass':29.580210, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 28.814626, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':40.437993, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # oRLO2 issue + ######################################## + star1 = SingleStar(**{'mass':67.126795, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 19.622908, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':1484.768582, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # oRLO2 issue + ######################################## + star1 = SingleStar(**{'mass': 58.947503, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 56.660506, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':2011.300659, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # oRLO2 issue + ######################################## + star1 = SingleStar(**{'mass': 170.638207, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[47.979957374424956, 5.317304576107798, 2.7259013166068145, 4.700929589520818]}) + star2 = SingleStar(**{'mass': 37.917852, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':113.352736, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # oRLO2 issue + ######################################## + star1 = SingleStar(**{'mass': 109.540207, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 84.344530, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.651896, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # redirect + ######################################## + star1 = SingleStar(**{'mass': 13.889634, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass':0.490231, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':14513.150157, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # redirect + ######################################## + star1 = SingleStar(**{'mass': 9, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass':0.8, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # Max time + ######################################## + star_1 = SingleStar(**{'mass': 103.07996766780799, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.2965418610971261, 2.0789170290719117, 3.207488023705968]}) + star_2 = SingleStar(**{'mass': 83.66522615073987, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 1449.1101985875678,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # Max time + ######################################## + star_1 = SingleStar(**{'mass': 8.860934140643465, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [11.818027275431337, 2.812412688633058, 0.4998731824233789, 2.9272630485628643]}) + star_2 = SingleStar(**{'mass': 8.584716012668551, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 20.82030114750744,'eccentricity': 0.0}, properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # PR421 + ######################################## + star1 = SingleStar(**{'mass': 24.035366, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 23.187355, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':18.865029, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # CE class + ######################################## + star1 = SingleStar(**{'mass':33.964274, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 28.98149, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':82.370989, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # PR574 - stepCE fix + ######################################## + star1 = SingleStar(**{'mass':29.580210, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 28.814626*0.4, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':300.437993, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # e_ZAMS error + ######################################## + star1 = SingleStar(**{'mass': 8.161885721822461, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 3.5907829421526154, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 36.873457164644144, 'eccentricity': 0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # e_ZAMS error + ######################################## + star1 = SingleStar(**{'mass': 35.24755025317775, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [19.755993125895806, 0.37149222852233904, 1.6588846085306563, + 1.434617029858906]}) + star2 = SingleStar(**{'mass': 30.000450298072902, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 24060.02101364665, 'eccentricity': 0.8085077857996965}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # e_ZAMS error + ######################################## + star1 = SingleStar(**{'mass': 11.862930493162692, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 1.4739109294156703, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 4111.083887312003, 'eccentricity':0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # e_ZAMS error + ######################################## + star1 = SingleStar(**{'mass': 8.527361341212108, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 0.7061748406821822, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 2521.1927287891444, 'eccentricity':0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 + ######################################## + # e_ZAMS error + ######################################## + star1 = SingleStar(**{'mass': 13.661942533447398 ,#29829485, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + star2 = SingleStar(**{'mass': 4.466151109802313 , #481560266, + 'state': 'H-rich_Core_H_burning', + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) + + binary = BinaryStar(star1, star2, + **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3110.1346707516914, 'eccentricity':0.0}, + properties = sim_prop) + evolve_binary(binary, h5file, binary_id) + binary_id+=1 ######################################## # double CO step @@ -850,4 +886,4 @@ def evolve_binaries(verbose): help="Path to save HDF5 output") args = parser.parse_args() - evolve_binaries(verbose=args.verbose) + evolve_binaries(verbose=args.verbose, args.output) From 9da430dc3f3a79245a4e3c95dcf89c8f1a0aedf4 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 18 Dec 2025 15:19:07 +0000 Subject: [PATCH 121/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/script_data/1Zsun_binaries_suite.py | 142 +++++++++--------- 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/dev-tools/script_data/1Zsun_binaries_suite.py b/dev-tools/script_data/1Zsun_binaries_suite.py index c18d2009fd..a1ba0e92ed 100644 --- a/dev-tools/script_data/1Zsun_binaries_suite.py +++ b/dev-tools/script_data/1Zsun_binaries_suite.py @@ -206,7 +206,7 @@ def evolve_binaries(verbose,output_path): 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 190925.99636740884,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # Failing binary in matching @@ -217,7 +217,7 @@ def evolve_binaries(verbose,output_path): 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 20479.71919353725,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # flipped S1 and S2 ? @@ -228,8 +228,8 @@ def evolve_binaries(verbose,output_path): 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 18.605997832086413,'eccentricity': 0.0}, properties = sim_prop) - - evolve_binary(binary, h5file, binary_id) + + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # flipped S1 and S2 @@ -240,7 +240,7 @@ def evolve_binaries(verbose,output_path): 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 9.824025,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # flipped S1 and S2 @@ -251,7 +251,7 @@ def evolve_binaries(verbose,output_path): 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 3.820571,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # Normal binary evolution @@ -262,7 +262,7 @@ def evolve_binaries(verbose,output_path): 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 30.820571,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # Normal binary @@ -273,7 +273,7 @@ def evolve_binaries(verbose,output_path): 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 63123.74544474666,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # Normal binary @@ -284,7 +284,7 @@ def evolve_binaries(verbose,output_path): 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 27.77657038557851,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # Normal binary @@ -298,7 +298,7 @@ def evolve_binaries(verbose,output_path): binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 17.957531550841225, 'eccentricity': 0.0,}, properties=sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # High BH spin options @@ -309,7 +309,7 @@ def evolve_binaries(verbose,output_path): 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 501.99252706449792,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # Original a>1 spin error @@ -320,7 +320,7 @@ def evolve_binaries(verbose,output_path): 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 151.99252706449792,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # FIXED disrupted crash @@ -334,7 +334,7 @@ def evolve_binaries(verbose,output_path): binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':12.877004, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # FIXED error with SN type @@ -348,7 +348,7 @@ def evolve_binaries(verbose,output_path): binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # FIXED oRLO2 looping @@ -359,11 +359,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass':37.917852, 'state': 'H-rich_Core_H_burning', 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':113.352736, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # Redirect to step_CO_HeMS (H-rich non-burning?) @@ -375,7 +375,7 @@ def evolve_binaries(verbose,output_path): binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 66.870417, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # FIXED oRLO2 looping @@ -387,7 +387,7 @@ def evolve_binaries(verbose,output_path): binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 37.958768, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # FIXED? step_detached failure @@ -399,7 +399,7 @@ def evolve_binaries(verbose,output_path): binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3007.865561, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # Disrupted binary @@ -408,11 +408,11 @@ def evolve_binaries(verbose,output_path): 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}) star_2 = SingleStar(**{'mass' : 16.286318, 'state' : 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3007.865561, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # FIXED Detached binary failure (low mass) @@ -423,11 +423,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass':0.8, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # FIXED SN_TYPE = None crash @@ -438,11 +438,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass':3.273864, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # FIXED SN_TYPE errors @@ -453,11 +453,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass':3.273864, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # FIXED SN_TYPE errors @@ -468,11 +468,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass':37.917852, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':2113.352736, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # FIXED ECSN errors? @@ -483,12 +483,12 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass': 9.711216, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - + + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':79.83702, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # Interpolator masses?? @@ -499,11 +499,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass':5.038679 , 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.537807, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # Interpolator masses? @@ -514,11 +514,11 @@ def evolve_binaries(verbose,output_path): star_2 = SingleStar(**{'mass': 27.776178, 'state': 'H-rich_Core_H_burning',\ 'natal_kick_array': [282.712103, 0.296252, 1.628433, 5.623812]}) - + binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 93.387072, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # FIXED NaN spin @@ -536,7 +536,7 @@ def evolve_binaries(verbose,output_path): 'separation': orbital_separation_from_period(5.931492e+03, star1.mass, star2.mass), 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # FIXED NaN spin @@ -547,13 +547,13 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass': 6.874867, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':35.609894, 'separation': orbital_separation_from_period(35.609894, star1.mass, star2.mass), 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # oRLO2 issue @@ -564,11 +564,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass': 28.814626, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':40.437993, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # oRLO2 issue @@ -579,11 +579,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass': 19.622908, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':1484.768582, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # oRLO2 issue @@ -594,11 +594,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass': 56.660506, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':2011.300659, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # oRLO2 issue @@ -609,11 +609,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass': 37.917852, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':113.352736, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # oRLO2 issue @@ -624,11 +624,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass': 84.344530, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.651896, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # redirect @@ -639,11 +639,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass':0.490231, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':14513.150157, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # redirect @@ -654,11 +654,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass':0.8, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # Max time @@ -671,7 +671,7 @@ def evolve_binaries(verbose,output_path): 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 1449.1101985875678,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # Max time @@ -684,7 +684,7 @@ def evolve_binaries(verbose,output_path): 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 20.82030114750744,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # PR421 @@ -695,11 +695,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass': 23.187355, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':18.865029, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # CE class @@ -710,11 +710,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass': 28.98149, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':82.370989, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # PR574 - stepCE fix @@ -725,11 +725,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass': 28.814626*0.4, 'state': 'H-rich_Core_H_burning', 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':300.437993, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # e_ZAMS error @@ -740,11 +740,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass': 3.5907829421526154, 'state': 'H-rich_Core_H_burning', 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 36.873457164644144, 'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # e_ZAMS error @@ -756,11 +756,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass': 30.000450298072902, 'state': 'H-rich_Core_H_burning', 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 24060.02101364665, 'eccentricity': 0.8085077857996965}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # e_ZAMS error @@ -771,11 +771,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass': 1.4739109294156703, 'state': 'H-rich_Core_H_burning', 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 4111.083887312003, 'eccentricity':0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # e_ZAMS error @@ -786,11 +786,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass': 0.7061748406821822, 'state': 'H-rich_Core_H_burning', 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 2521.1927287891444, 'eccentricity':0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## # e_ZAMS error @@ -801,11 +801,11 @@ def evolve_binaries(verbose,output_path): star2 = SingleStar(**{'mass': 4.466151109802313 , #481560266, 'state': 'H-rich_Core_H_burning', 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - + binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3110.1346707516914, 'eccentricity':0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) + evolve_binary(binary, h5file, binary_id) binary_id+=1 ######################################## From 7a3bd52bf3e2460a40763f633faebbe7e04a5406 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Thu, 18 Dec 2025 09:19:47 -0600 Subject: [PATCH 122/389] Update authors --- dev-tools/script_data/1Zsun_binaries_suite.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/script_data/1Zsun_binaries_suite.py b/dev-tools/script_data/1Zsun_binaries_suite.py index a1ba0e92ed..73834b8151 100644 --- a/dev-tools/script_data/1Zsun_binaries_suite.py +++ b/dev-tools/script_data/1Zsun_binaries_suite.py @@ -3,7 +3,7 @@ Script to evolve a few binaries. Used for validation of the branch. -Author: Max Briel +Authors: Max Briel, Elizabeth Teng """ import argparse From 02d10a2e8acb437c79da7a89f3ca2a2e14e95a07 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Thu, 18 Dec 2025 09:22:08 -0600 Subject: [PATCH 123/389] remove alarm calls that were never set Removed signal alarm handling in exception block. --- dev-tools/script_data/1Zsun_binaries_suite.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dev-tools/script_data/1Zsun_binaries_suite.py b/dev-tools/script_data/1Zsun_binaries_suite.py index 73834b8151..bb95922bb4 100644 --- a/dev-tools/script_data/1Zsun_binaries_suite.py +++ b/dev-tools/script_data/1Zsun_binaries_suite.py @@ -153,9 +153,6 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): grp.create_dataset(col, data=df[col].values) except Exception as e: - # turn off binary alarm in case of exception - signal.alarm(0) - print_failed_binary(binary, e) err_grp = h5file.require_group(f"binary_{binary_id}/errors") @@ -163,8 +160,6 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): err_grp.attrs['exception_message'] = str(e) finally: - # Always turn off binary alarm and restore warning handler - signal.alarm(0) warnings.showwarning = old_showwarning # ensure binary group exists From 5cbf4baeada023d4a2570bda305ce7011e18c4a9 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Thu, 18 Dec 2025 09:30:54 -0600 Subject: [PATCH 124/389] Enhance evolve_binaries.sh for better logging and error handling Updated the script to log output and check for errors. --- dev-tools/evolve_binaries.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dev-tools/evolve_binaries.sh b/dev-tools/evolve_binaries.sh index 051dafcd13..ee5dec4306 100755 --- a/dev-tools/evolve_binaries.sh +++ b/dev-tools/evolve_binaries.sh @@ -88,11 +88,16 @@ pip install -e "$CLONE_DIR" -q 2>&1 | sed 's/^/ /' echo "šŸš€ Running evolve_binaries.py" # # Run the Python script and capture output (stdout and stderr) -python script_data/1Zsun_binaries_suite.py --output "$OUTPUT_FILE" > "$LOG_FILE" 2>&1 +python script_data/1Zsun_binaries_suite.py --output "$OUTPUT_FILE" 2>&1 | tee "$LOG_FILE" if [ ! -f "$OUTPUT_FILE" ]; then echo "ERROR: Results file was not created: $OUTPUT_FILE" exit 2 fi +if [ $? -ne 0 ]; then + echo "ERROR: Python script exited with an error. Check $LOG_FILE for details." + exit 3 +fi + echo -e "āœ… Script completed. Output saved to \n$OUTPUT_FILE" From 621be97bb4cf9009d71129a106cef210c038b8de Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 18 Dec 2025 15:31:21 +0000 Subject: [PATCH 125/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/evolve_binaries.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/evolve_binaries.sh b/dev-tools/evolve_binaries.sh index ee5dec4306..5e8e60183f 100755 --- a/dev-tools/evolve_binaries.sh +++ b/dev-tools/evolve_binaries.sh @@ -88,7 +88,7 @@ pip install -e "$CLONE_DIR" -q 2>&1 | sed 's/^/ /' echo "šŸš€ Running evolve_binaries.py" # # Run the Python script and capture output (stdout and stderr) -python script_data/1Zsun_binaries_suite.py --output "$OUTPUT_FILE" 2>&1 | tee "$LOG_FILE" +python script_data/1Zsun_binaries_suite.py --output "$OUTPUT_FILE" 2>&1 | tee "$LOG_FILE" if [ ! -f "$OUTPUT_FILE" ]; then echo "ERROR: Results file was not created: $OUTPUT_FILE" From c3256b534aa4165fd0f11bbde745ee3fe2ca47bf Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Thu, 18 Dec 2025 09:34:36 -0600 Subject: [PATCH 126/389] Fix argument passing for evolve_binaries function --- dev-tools/script_data/1Zsun_binaries_suite.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/script_data/1Zsun_binaries_suite.py b/dev-tools/script_data/1Zsun_binaries_suite.py index bb95922bb4..c0a89cb4ad 100644 --- a/dev-tools/script_data/1Zsun_binaries_suite.py +++ b/dev-tools/script_data/1Zsun_binaries_suite.py @@ -881,4 +881,4 @@ def evolve_binaries(verbose,output_path): help="Path to save HDF5 output") args = parser.parse_args() - evolve_binaries(verbose=args.verbose, args.output) + evolve_binaries(verbose=args.verbose, output_path=args.output) From e4dedbe2ffa9889a89c523ebb984a834aea9a016 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Thu, 18 Dec 2025 09:46:05 -0600 Subject: [PATCH 127/389] fill in all code for validate_binaries.sh Updated script to accept branch and suffix as arguments, streamlined output file naming. --- dev-tools/validate_binaries.sh | 35 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/dev-tools/validate_binaries.sh b/dev-tools/validate_binaries.sh index 31b7c6d72a..04a041af06 100644 --- a/dev-tools/validate_binaries.sh +++ b/dev-tools/validate_binaries.sh @@ -3,27 +3,24 @@ # A script for validating the outputs of 100 binaries, # which can be compared to a baseline to monitor changes to the code. -# script usage: ./validate_binaries.sh --branch candidate-branch - -# run candidate binaries and save to file -# ./evolve_binaries.sh -# save to file - -# evaluate tolerance for quantitative values - -# evaluate qualitative differences - -# warnings and error tracking - -# structured output - -# compare -# python compare_runs.py baseline.json candidate.json +# script usage: ./validate_binaries.sh --branch candidate_branch +BRANCH=$1 +SUFFIX=$2 +# run candidate binaries and save to file +./evolve_binaries.sh "$BRANCH" +# compare quantitative, qualitative, warnings/errors, structured output +# create outputs/comparison_branchname.txt +SAFE_BRANCH="${BRANCH//\//_}" +CANDIDATE_FILE="outputs/candidate_${SAFE_BRANCH}.h5" +COMPARISON_FILE="outputs/comparison_${SAFE_BRANCH}${SUFFIX:+_$SUFFIX}.txt" +python compare_runs.py baseline.h5 "$CANDIDATE_FILE" > "$COMPARISON_FILE" +if [ $? -ne 0 ]; then + echo "Error: compare_runs.py failed. Check $COMPARISON_FILE" + exit 1 +fi -# outputs/baseline.h5 -# outputs/candidate_branchname.h5 -# outputs/comparison_branchname.txt +echo "Binary evolution comparison saved to $COMPARISON_FILE" From d66cf6ea6c26ab6b99bcbcd857f30df1920ac78f Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Thu, 18 Dec 2025 09:52:48 -0600 Subject: [PATCH 128/389] starting point of compare_runs.py for comparing two h5 files --- dev-tools/compare_runs.py | 73 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 dev-tools/compare_runs.py diff --git a/dev-tools/compare_runs.py b/dev-tools/compare_runs.py new file mode 100644 index 0000000000..8444d08a88 --- /dev/null +++ b/dev-tools/compare_runs.py @@ -0,0 +1,73 @@ +#!/usr/bin/env python3 + +""" +Compare evolution outcomes of set of binaries saved to file with script_data/1Zsun_binaries_suite.py +Used for validation of the branch. + +Author: Elizabeth Teng +""" + + +import sys +import h5py +import numpy as np + +def compare_datasets(base, cand, path="/"): + """ + Recursively compare HDF5 datasets. + Returns a list of strings with differences. + """ + differences = [] + + for key in base.keys(): + base_item = base[key] + if key not in cand: + differences.append(f"{path}{key} missing in candidate") + continue + + cand_item = cand[key] + + if isinstance(base_item, h5py.Dataset): + base_data = base_item[()] + cand_data = cand_item[()] + + if np.issubdtype(base_data.dtype, np.number): + if not np.allclose(base_data, cand_data, rtol=1e-5, atol=1e-8): + differences.append(f"{path}{key} numeric mismatch") + else: + if not np.array_equal(base_data, cand_data): + differences.append(f"{path}{key} non-numeric mismatch") + + elif isinstance(base_item, h5py.Group): + differences.extend(compare_datasets(base_item, cand_item, path=f"{path}{key}/")) + + # Check for extra keys in candidate + for key in cand.keys(): + if key not in base: + differences.append(f"{path}{key} extra in candidate") + + return differences + + +def main(): + if len(sys.argv) != 3: + print("Usage: compare_runs.py baseline.h5 candidate.h5") + sys.exit(1) + + baseline_file = sys.argv[1] + candidate_file = sys.argv[2] + + with h5py.File(baseline_file, 'r') as base, h5py.File(candidate_file, 'r') as cand: + diffs = compare_datasets(base, cand) + + if diffs: + print("Differences found:") + for diff in diffs: + print(" -", diff) + sys.exit(1) + else: + print("No differences detected between baseline and candidate.") + + +if __name__ == "__main__": + main() From 46cdc5a560cf860df9d13a6a7e5ade556897ec85 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 18 Dec 2025 15:52:57 +0000 Subject: [PATCH 129/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/compare_runs.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dev-tools/compare_runs.py b/dev-tools/compare_runs.py index 8444d08a88..6ff28d81e2 100644 --- a/dev-tools/compare_runs.py +++ b/dev-tools/compare_runs.py @@ -9,43 +9,45 @@ import sys + import h5py import numpy as np + def compare_datasets(base, cand, path="/"): """ Recursively compare HDF5 datasets. Returns a list of strings with differences. """ differences = [] - + for key in base.keys(): base_item = base[key] if key not in cand: differences.append(f"{path}{key} missing in candidate") continue - + cand_item = cand[key] if isinstance(base_item, h5py.Dataset): base_data = base_item[()] cand_data = cand_item[()] - + if np.issubdtype(base_data.dtype, np.number): if not np.allclose(base_data, cand_data, rtol=1e-5, atol=1e-8): differences.append(f"{path}{key} numeric mismatch") else: if not np.array_equal(base_data, cand_data): differences.append(f"{path}{key} non-numeric mismatch") - + elif isinstance(base_item, h5py.Group): differences.extend(compare_datasets(base_item, cand_item, path=f"{path}{key}/")) - + # Check for extra keys in candidate for key in cand.keys(): if key not in base: differences.append(f"{path}{key} extra in candidate") - + return differences @@ -53,7 +55,7 @@ def main(): if len(sys.argv) != 3: print("Usage: compare_runs.py baseline.h5 candidate.h5") sys.exit(1) - + baseline_file = sys.argv[1] candidate_file = sys.argv[2] From b89ff379529439d5e87c218231dee28f5a918438 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Fri, 9 Jan 2026 15:07:18 -0600 Subject: [PATCH 130/389] Add conda source detection in evolve_binaries.sh --- dev-tools/evolve_binaries.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-tools/evolve_binaries.sh b/dev-tools/evolve_binaries.sh index 5e8e60183f..2021995bff 100755 --- a/dev-tools/evolve_binaries.sh +++ b/dev-tools/evolve_binaries.sh @@ -52,6 +52,9 @@ elif [ -f "$HOME/anaconda3/etc/profile.d/conda.sh" ]; then source "$HOME/anaconda3/etc/profile.d/conda.sh" elif [ -f "/opt/homebrew/Caskroom/miniconda/base/etc/profile.d/conda.sh" ]; then source "/opt/homebrew/Caskroom/miniconda/base/etc/profile.d/conda.sh" +elif command -v conda >/dev/null 2>&1; then + CONDA_BASE=$(conda info --base) + source "${CONDA_BASE}/etc/profile.d/conda.sh" else echo -e "\033[31mError: Could not find conda installation. Please check your conda setup.\033[0m" exit 1 From 1529d76ee7638c71dffccbf867dd9f0a3f50471f Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Fri, 9 Jan 2026 15:19:30 -0600 Subject: [PATCH 131/389] Add h5py import to 1Zsun_binaries_suite.py --- dev-tools/script_data/1Zsun_binaries_suite.py | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-tools/script_data/1Zsun_binaries_suite.py b/dev-tools/script_data/1Zsun_binaries_suite.py index c0a89cb4ad..288f37890c 100644 --- a/dev-tools/script_data/1Zsun_binaries_suite.py +++ b/dev-tools/script_data/1Zsun_binaries_suite.py @@ -11,6 +11,7 @@ import signal import sys import warnings +import h5py from posydon.binary_evol.binarystar import BinaryStar, SingleStar from posydon.binary_evol.simulationproperties import SimulationProperties From 7cb3922ae4838294ba22dde63b15cd677df2a162 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Thu, 26 Feb 2026 04:09:34 -0600 Subject: [PATCH 132/389] refactor binary validation suite: multi metallicity support, bug fixes, generate baseline, add more specificity to compare_runs --- dev-tools/.gitignore | 14 + dev-tools/check_outputs.ipynb | 512 ++++++++++ dev-tools/compare_runs.py | 429 ++++++++- dev-tools/evolve_binaries.sh | 185 ++-- dev-tools/generate_baseline.sh | 96 ++ dev-tools/script_data/1Zsun_binaries_suite.py | 885 ------------------ ...inaries_params.ini => binaries_params.ini} | 2 + dev-tools/script_data/binaries_suite.py | 694 ++++++++++++++ dev-tools/validate_binaries.sh | 170 +++- 9 files changed, 1961 insertions(+), 1026 deletions(-) create mode 100644 dev-tools/.gitignore create mode 100644 dev-tools/check_outputs.ipynb create mode 100644 dev-tools/generate_baseline.sh delete mode 100644 dev-tools/script_data/1Zsun_binaries_suite.py rename dev-tools/script_data/{1Zsun_binaries_params.ini => binaries_params.ini} (99%) create mode 100644 dev-tools/script_data/binaries_suite.py diff --git a/dev-tools/.gitignore b/dev-tools/.gitignore new file mode 100644 index 0000000000..1cea72efc6 --- /dev/null +++ b/dev-tools/.gitignore @@ -0,0 +1,14 @@ +# Remove the accidentally staged clone +git rm --cached -r workdirs/ + +# Create .gitignore +cat > .gitignore << 'EOF' +workdirs/ +outputs/ +logs/ +baselines/ +test_*.h5 +EOF + +git add .gitignore + diff --git a/dev-tools/check_outputs.ipynb b/dev-tools/check_outputs.ipynb new file mode 100644 index 0000000000..c0073df835 --- /dev/null +++ b/dev-tools/check_outputs.ipynb @@ -0,0 +1,512 @@ +{ + "cells": [ + { + "cell_type": "code", + "execution_count": 1, + "id": "7e9791d3", + "metadata": {}, + "outputs": [], + "source": [ + "import argparse\n", + "import os\n", + "import signal\n", + "import sys\n", + "import warnings\n", + "import h5py\n", + "import pandas as pd\n", + "\n", + "from posydon.binary_evol.binarystar import BinaryStar, SingleStar\n", + "from posydon.binary_evol.simulationproperties import SimulationProperties\n", + "from posydon.popsyn.io import simprop_kwargs_from_ini\n", + "from posydon.utils.common_functions import orbital_separation_from_period" + ] + }, + { + "cell_type": "code", + "execution_count": 2, + "id": "327be9fe", + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "env: PATH_TO_POSYDON=/projects/b1119/eteng/software/valid/POSYDON/\n", + "env: PATH_TO_POSYDON_DATA=/projects/b1119/POSYDON_popsynth_data/v2/250520_newSNe/\n" + ] + } + ], + "source": [ + "%env PATH_TO_POSYDON=/projects/b1119/eteng/software/valid/POSYDON/\n", + "%env PATH_TO_POSYDON_DATA=/projects/b1119/POSYDON_popsynth_data/v2/250520_newSNe/" + ] + }, + { + "cell_type": "code", + "execution_count": 4, + "id": "994f6ebf", + "metadata": {}, + "outputs": [ + { + "ename": "HDF5ExtError", + "evalue": "HDF5 error back trace\n\n File \"H5F.c\", line 836, in H5Fopen\n unable to synchronously open file\n File \"H5F.c\", line 796, in H5F__open_api_common\n unable to open file\n File \"H5VLcallback.c\", line 3863, in H5VL_file_open\n open failed\n File \"H5VLcallback.c\", line 3675, in H5VL__file_open\n open failed\n File \"H5VLnative_file.c\", line 128, in H5VL__native_file_open\n unable to open file\n File \"H5Fint.c\", line 2018, in H5F_open\n unable to read superblock\n File \"H5Fsuper.c\", line 600, in H5F__super_read\n truncated file: eof = 96, sblock->base_addr = 0, stored_eof = 2048\n\nEnd of HDF5 error back trace\n\nUnable to open/create file './POSYDON_main/outputs/candidate_main.h5'", + "output_type": "error", + "traceback": [ + "\u001b[31m---------------------------------------------------------------------------\u001b[39m", + "\u001b[31mHDF5ExtError\u001b[39m Traceback (most recent call last)", + "\u001b[36mCell\u001b[39m\u001b[36m \u001b[39m\u001b[32mIn[4]\u001b[39m\u001b[32m, line 1\u001b[39m\n\u001b[32m----> \u001b[39m\u001b[32m1\u001b[39m df = \u001b[43mpd\u001b[49m\u001b[43m.\u001b[49m\u001b[43mread_hdf\u001b[49m\u001b[43m(\u001b[49m\u001b[33;43m'\u001b[39;49m\u001b[33;43m./POSYDON_main/outputs/candidate_main.h5\u001b[39;49m\u001b[33;43m'\u001b[39;49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[33;43m\"\u001b[39;49m\u001b[33;43mevolution\u001b[39;49m\u001b[33;43m\"\u001b[39;49m\u001b[43m)\u001b[49m\n\u001b[32m 2\u001b[39m warnings = pd.read_hdf(\u001b[33m'\u001b[39m\u001b[33m./POSYDON_main/outputs/candidate_main.h5\u001b[39m\u001b[33m'\u001b[39m, \u001b[33m\"\u001b[39m\u001b[33mwarnings\u001b[39m\u001b[33m\"\u001b[39m)\n", + "\u001b[36mFile \u001b[39m\u001b[32m~/.conda/envs/valid/lib/python3.11/site-packages/pandas/io/pytables.py:426\u001b[39m, in \u001b[36mread_hdf\u001b[39m\u001b[34m(path_or_buf, key, mode, errors, where, start, stop, columns, iterator, chunksize, **kwargs)\u001b[39m\n\u001b[32m 423\u001b[39m \u001b[38;5;28;01mif\u001b[39;00m \u001b[38;5;129;01mnot\u001b[39;00m exists:\n\u001b[32m 424\u001b[39m \u001b[38;5;28;01mraise\u001b[39;00m \u001b[38;5;167;01mFileNotFoundError\u001b[39;00m(\u001b[33mf\u001b[39m\u001b[33m\"\u001b[39m\u001b[33mFile \u001b[39m\u001b[38;5;132;01m{\u001b[39;00mpath_or_buf\u001b[38;5;132;01m}\u001b[39;00m\u001b[33m does not exist\u001b[39m\u001b[33m\"\u001b[39m)\n\u001b[32m--> \u001b[39m\u001b[32m426\u001b[39m store = \u001b[43mHDFStore\u001b[49m\u001b[43m(\u001b[49m\u001b[43mpath_or_buf\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mmode\u001b[49m\u001b[43m=\u001b[49m\u001b[43mmode\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43merrors\u001b[49m\u001b[43m=\u001b[49m\u001b[43merrors\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43m*\u001b[49m\u001b[43m*\u001b[49m\u001b[43mkwargs\u001b[49m\u001b[43m)\u001b[49m\n\u001b[32m 427\u001b[39m \u001b[38;5;66;03m# can't auto open/close if we are using an iterator\u001b[39;00m\n\u001b[32m 428\u001b[39m \u001b[38;5;66;03m# so delegate to the iterator\u001b[39;00m\n\u001b[32m 429\u001b[39m auto_close = \u001b[38;5;28;01mTrue\u001b[39;00m\n", + "\u001b[36mFile \u001b[39m\u001b[32m~/.conda/envs/valid/lib/python3.11/site-packages/pandas/io/pytables.py:585\u001b[39m, in \u001b[36mHDFStore.__init__\u001b[39m\u001b[34m(self, path, mode, complevel, complib, fletcher32, **kwargs)\u001b[39m\n\u001b[32m 583\u001b[39m \u001b[38;5;28mself\u001b[39m._fletcher32 = fletcher32\n\u001b[32m 584\u001b[39m \u001b[38;5;28mself\u001b[39m._filters = \u001b[38;5;28;01mNone\u001b[39;00m\n\u001b[32m--> \u001b[39m\u001b[32m585\u001b[39m \u001b[38;5;28;43mself\u001b[39;49m\u001b[43m.\u001b[49m\u001b[43mopen\u001b[49m\u001b[43m(\u001b[49m\u001b[43mmode\u001b[49m\u001b[43m=\u001b[49m\u001b[43mmode\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43m*\u001b[49m\u001b[43m*\u001b[49m\u001b[43mkwargs\u001b[49m\u001b[43m)\u001b[49m\n", + "\u001b[36mFile \u001b[39m\u001b[32m~/.conda/envs/valid/lib/python3.11/site-packages/pandas/io/pytables.py:745\u001b[39m, in \u001b[36mHDFStore.open\u001b[39m\u001b[34m(self, mode, **kwargs)\u001b[39m\n\u001b[32m 739\u001b[39m msg = (\n\u001b[32m 740\u001b[39m \u001b[33m\"\u001b[39m\u001b[33mCannot open HDF5 file, which is already opened, \u001b[39m\u001b[33m\"\u001b[39m\n\u001b[32m 741\u001b[39m \u001b[33m\"\u001b[39m\u001b[33meven in read-only mode.\u001b[39m\u001b[33m\"\u001b[39m\n\u001b[32m 742\u001b[39m )\n\u001b[32m 743\u001b[39m \u001b[38;5;28;01mraise\u001b[39;00m \u001b[38;5;167;01mValueError\u001b[39;00m(msg)\n\u001b[32m--> \u001b[39m\u001b[32m745\u001b[39m \u001b[38;5;28mself\u001b[39m._handle = \u001b[43mtables\u001b[49m\u001b[43m.\u001b[49m\u001b[43mopen_file\u001b[49m\u001b[43m(\u001b[49m\u001b[38;5;28;43mself\u001b[39;49m\u001b[43m.\u001b[49m\u001b[43m_path\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[38;5;28;43mself\u001b[39;49m\u001b[43m.\u001b[49m\u001b[43m_mode\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43m*\u001b[49m\u001b[43m*\u001b[49m\u001b[43mkwargs\u001b[49m\u001b[43m)\u001b[49m\n", + "\u001b[36mFile \u001b[39m\u001b[32m~/.conda/envs/valid/lib/python3.11/site-packages/tables/file.py:296\u001b[39m, in \u001b[36mopen_file\u001b[39m\u001b[34m(filename, mode, title, root_uep, filters, **kwargs)\u001b[39m\n\u001b[32m 291\u001b[39m \u001b[38;5;28;01mraise\u001b[39;00m \u001b[38;5;167;01mValueError\u001b[39;00m(\n\u001b[32m 292\u001b[39m \u001b[33m\"\u001b[39m\u001b[33mThe file \u001b[39m\u001b[33m'\u001b[39m\u001b[38;5;132;01m%s\u001b[39;00m\u001b[33m'\u001b[39m\u001b[33m is already opened. Please \u001b[39m\u001b[33m\"\u001b[39m\n\u001b[32m 293\u001b[39m \u001b[33m\"\u001b[39m\u001b[33mclose it before reopening in write mode.\u001b[39m\u001b[33m\"\u001b[39m % filename)\n\u001b[32m 295\u001b[39m \u001b[38;5;66;03m# Finally, create the File instance, and return it\u001b[39;00m\n\u001b[32m--> \u001b[39m\u001b[32m296\u001b[39m \u001b[38;5;28;01mreturn\u001b[39;00m \u001b[43mFile\u001b[49m\u001b[43m(\u001b[49m\u001b[43mfilename\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mmode\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mtitle\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mroot_uep\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mfilters\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43m*\u001b[49m\u001b[43m*\u001b[49m\u001b[43mkwargs\u001b[49m\u001b[43m)\u001b[49m\n", + "\u001b[36mFile \u001b[39m\u001b[32m~/.conda/envs/valid/lib/python3.11/site-packages/tables/file.py:746\u001b[39m, in \u001b[36mFile.__init__\u001b[39m\u001b[34m(self, filename, mode, title, root_uep, filters, **kwargs)\u001b[39m\n\u001b[32m 743\u001b[39m \u001b[38;5;28mself\u001b[39m.params = params\n\u001b[32m 745\u001b[39m \u001b[38;5;66;03m# Now, it is time to initialize the File extension\u001b[39;00m\n\u001b[32m--> \u001b[39m\u001b[32m746\u001b[39m \u001b[38;5;28;43mself\u001b[39;49m\u001b[43m.\u001b[49m\u001b[43m_g_new\u001b[49m\u001b[43m(\u001b[49m\u001b[43mfilename\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mmode\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43m*\u001b[49m\u001b[43m*\u001b[49m\u001b[43mparams\u001b[49m\u001b[43m)\u001b[49m\n\u001b[32m 748\u001b[39m \u001b[38;5;66;03m# Check filters and set PyTables format version for new files.\u001b[39;00m\n\u001b[32m 749\u001b[39m new = \u001b[38;5;28mself\u001b[39m._v_new\n", + "\u001b[36mFile \u001b[39m\u001b[32m~/.conda/envs/valid/lib/python3.11/site-packages/tables/hdf5extension.pyx:514\u001b[39m, in \u001b[36mtables.hdf5extension.File._g_new\u001b[39m\u001b[34m()\u001b[39m\n", + "\u001b[31mHDF5ExtError\u001b[39m: HDF5 error back trace\n\n File \"H5F.c\", line 836, in H5Fopen\n unable to synchronously open file\n File \"H5F.c\", line 796, in H5F__open_api_common\n unable to open file\n File \"H5VLcallback.c\", line 3863, in H5VL_file_open\n open failed\n File \"H5VLcallback.c\", line 3675, in H5VL__file_open\n open failed\n File \"H5VLnative_file.c\", line 128, in H5VL__native_file_open\n unable to open file\n File \"H5Fint.c\", line 2018, in H5F_open\n unable to read superblock\n File \"H5Fsuper.c\", line 600, in H5F__super_read\n truncated file: eof = 96, sblock->base_addr = 0, stored_eof = 2048\n\nEnd of HDF5 error back trace\n\nUnable to open/create file './POSYDON_main/outputs/candidate_main.h5'" + ] + } + ], + "source": [ + "df = pd.read_hdf('./POSYDON_main/outputs/candidate_main.h5', \"evolution\")\n", + "warnings = pd.read_hdf('./POSYDON_main/outputs/candidate_main.h5', \"warnings\")" + ] + }, + { + "cell_type": "code", + "execution_count": 56, + "id": "7028a060", + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Index(['state', 'event', 'time', 'separation', 'orbital_period',\n", + " 'eccentricity', 'rl_relative_overflow_1', 'rl_relative_overflow_2',\n", + " 'lg_mtransfer_rate', 'mass_transfer_case',\n", + " ...\n", + " 'S2_mass_conv_reg_fortides', 'S2_thickness_conv_reg_fortides',\n", + " 'S2_radius_conv_reg_fortides', 'S2_lambda_CE_1cent',\n", + " 'S2_lambda_CE_10cent', 'S2_lambda_CE_30cent',\n", + " 'S2_lambda_CE_pure_He_star_10cent', 'S2_total_mass_h1',\n", + " 'S2_total_mass_he4', 'binary_id'],\n", + " dtype='object', length=134)\n" + ] + } + ], + "source": [ + "print(df.keys())" + ] + }, + { + "cell_type": "code", + "execution_count": 20, + "id": "76233b25", + "metadata": { + "collapsed": true + }, + "outputs": [ + { + "data": { + "text/html": [ + "
\n", + "\n", + "\n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + "
binary_idexception_typeexception_message
01ValueErrorTrying to store a string with len [27] in [S1_...
02ValueErrorTrying to store a string with len [12] in [sta...
03ValueErrorTrying to store a string with len [9] in [even...
04ValueErrorTrying to store a string with len [9] in [even...
05ValueErrorTrying to store a string with len [9] in [even...
07ValueErrorTrying to store a string with len [27] in [S1_...
08ValueErrorTrying to store a string with len [10] in [eve...
09ValueErrorTrying to store a string with len [7] in [even...
010ValueErrorTrying to store a string with len [27] in [S1_...
011ValueErrorTrying to store a string with len [7] in [even...
012ValueErrorTrying to store a string with len [7] in [even...
013ValueErrorTrying to store a string with len [7] in [even...
014ValueErrorTrying to store a string with len [23] in [S1_...
015ValueErrorTrying to store a string with len [9] in [even...
016ValueErrorTrying to store a string with len [9] in [even...
018ValueErrorTrying to store a string with len [7] in [even...
019ValueErrorTrying to store a string with len [7] in [even...
020ValueErrorTrying to store a string with len [7] in [even...
021ValueErrorTrying to store a string with len [7] in [even...
022ValueErrorTrying to store a string with len [9] in [even...
023ValueErrorTrying to store a string with len [9] in [even...
024ValueErrorTrying to store a string with len [9] in [even...
025ValueErrorTrying to store a string with len [7] in [even...
026ValueErrorTrying to store a string with len [9] in [even...
027ValueErrorTrying to store a string with len [7] in [even...
028ValueErrorTrying to store a string with len [7] in [even...
029ValueErrorTrying to store a string with len [7] in [even...
030ValueErrorTrying to store a string with len [7] in [even...
031ValueErrorTrying to store a string with len [7] in [even...
032ValueErrorTrying to store a string with len [7] in [even...
033ValueErrorTrying to store a string with len [7] in [even...
034ValueErrorTrying to store a string with len [7] in [even...
035ValueErrorTrying to store a string with len [9] in [even...
036ValueErrorTrying to store a string with len [7] in [even...
037ValueErrorTrying to store a string with len [10] in [eve...
038ValueErrorTrying to store a string with len [9] in [even...
039MatchingErrorGrid matching failed for merged binary. \\nseco...
040ClassificationErrorBinary is in the detached step but has stable ...
041ValueErrorTrying to store a string with len [7] in [even...
042FlowErrorEvolution of H-rich/He-rich stars in RLO onto ...
043ValueErrorTrying to store a string with len [7] in [even...
\n", + "
" + ], + "text/plain": [ + " binary_id exception_type \\\n", + "0 1 ValueError \n", + "0 2 ValueError \n", + "0 3 ValueError \n", + "0 4 ValueError \n", + "0 5 ValueError \n", + "0 7 ValueError \n", + "0 8 ValueError \n", + "0 9 ValueError \n", + "0 10 ValueError \n", + "0 11 ValueError \n", + "0 12 ValueError \n", + "0 13 ValueError \n", + "0 14 ValueError \n", + "0 15 ValueError \n", + "0 16 ValueError \n", + "0 18 ValueError \n", + "0 19 ValueError \n", + "0 20 ValueError \n", + "0 21 ValueError \n", + "0 22 ValueError \n", + "0 23 ValueError \n", + "0 24 ValueError \n", + "0 25 ValueError \n", + "0 26 ValueError \n", + "0 27 ValueError \n", + "0 28 ValueError \n", + "0 29 ValueError \n", + "0 30 ValueError \n", + "0 31 ValueError \n", + "0 32 ValueError \n", + "0 33 ValueError \n", + "0 34 ValueError \n", + "0 35 ValueError \n", + "0 36 ValueError \n", + "0 37 ValueError \n", + "0 38 ValueError \n", + "0 39 MatchingError \n", + "0 40 ClassificationError \n", + "0 41 ValueError \n", + "0 42 FlowError \n", + "0 43 ValueError \n", + "\n", + " exception_message \n", + "0 Trying to store a string with len [27] in [S1_... \n", + "0 Trying to store a string with len [12] in [sta... \n", + "0 Trying to store a string with len [9] in [even... \n", + "0 Trying to store a string with len [9] in [even... \n", + "0 Trying to store a string with len [9] in [even... \n", + "0 Trying to store a string with len [27] in [S1_... \n", + "0 Trying to store a string with len [10] in [eve... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [27] in [S1_... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [23] in [S1_... \n", + "0 Trying to store a string with len [9] in [even... \n", + "0 Trying to store a string with len [9] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [9] in [even... \n", + "0 Trying to store a string with len [9] in [even... \n", + "0 Trying to store a string with len [9] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [9] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [9] in [even... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Trying to store a string with len [10] in [eve... \n", + "0 Trying to store a string with len [9] in [even... \n", + "0 Grid matching failed for merged binary. \\nseco... \n", + "0 Binary is in the detached step but has stable ... \n", + "0 Trying to store a string with len [7] in [even... \n", + "0 Evolution of H-rich/He-rich stars in RLO onto ... \n", + "0 Trying to store a string with len [7] in [even... " + ] + }, + "execution_count": 20, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "errors" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "68d4d8a8", + "metadata": {}, + "outputs": [], + "source": [] + } + ], + "metadata": { + "kernelspec": { + "display_name": "valid", + "language": "python", + "name": "valid" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.11.14" + } + }, + "nbformat": 4, + "nbformat_minor": 5 +} diff --git a/dev-tools/compare_runs.py b/dev-tools/compare_runs.py index 6ff28d81e2..0d2fe2df7e 100644 --- a/dev-tools/compare_runs.py +++ b/dev-tools/compare_runs.py @@ -1,75 +1,412 @@ #!/usr/bin/env python3 - """ -Compare evolution outcomes of set of binaries saved to file with script_data/1Zsun_binaries_suite.py -Used for validation of the branch. +Compare evolution outcomes of test binaries saved by binaries_suite.py. -Author: Elizabeth Teng -""" +Reports three categories of differences: + 1. QUANTITATIVE: any numeric difference beyond floating-point representation + 2. QUALITATIVE: changes to categorical/string columns (states, events, step names, SN types, etc.) + 3. WARNINGS & ERRORS: changes to warnings raised or binaries that error out +By default, uses exact comparison (atol=0, rtol=0). The --loose flag enables +a small tolerance for cases where minor floating-point differences are expected. -import sys +Usage: + python compare_runs.py baseline.h5 candidate.h5 + python compare_runs.py baseline.h5 candidate.h5 --verbose + python compare_runs.py baseline.h5 candidate.h5 --loose + +Authors: Elizabeth Teng +""" -import h5py +import argparse +import sys +import os import numpy as np +import pandas as pd -def compare_datasets(base, cand, path="/"): - """ - Recursively compare HDF5 datasets. - Returns a list of strings with differences. +# Columns that represent qualitative (categorical) evolution properties. +# Any column matching these names will be compared as exact string matches +# and reported under "QUALITATIVE" differences. +QUALITATIVE_COLUMNS = { + 'state', 'event', 'step_names', 'S1_state', 'S2_state', + 'SN_type', 'S1_SN_type', 'S2_SN_type', + 'interp_class_HMS_HMS', 'interp_class_CO_HMS_RLO', + 'interp_class_CO_HeMS', 'interp_class_CO_HeMS_RLO', + 'mt_history_HMS_HMS', 'mt_history_CO_HMS_RLO', + 'mt_history_CO_HeMS', 'mt_history_CO_HeMS_RLO', + 'mass_transfer_case', +} + + +def classify_column(col, dtype): + """Classify a column as 'qualitative' or 'quantitative'.""" + if col in QUALITATIVE_COLUMNS: + return 'qualitative' + if pd.api.types.is_numeric_dtype(dtype): + return 'quantitative' + # Catch-all: treat remaining object/string columns as qualitative + return 'qualitative' + + +def compare_evolution_tables(base_df, cand_df, rtol, atol): + """Compare two evolution DataFrames, reporting per-binary diffs. + + Returns: + dict with keys 'quantitative', 'qualitative', 'structural' + each mapping to a list of diff strings. """ - differences = [] + quant_diffs = [] + qual_diffs = [] + struct_diffs = [] + + # Check that binary_id columns exist + if 'binary_id' not in base_df.columns or 'binary_id' not in cand_df.columns: + struct_diffs.append("'binary_id' column missing; cannot do per-binary comparison") + return {'quantitative': quant_diffs, 'qualitative': qual_diffs, 'structural': struct_diffs} + + base_ids = set(base_df['binary_id'].unique()) + cand_ids = set(cand_df['binary_id'].unique()) + + # Missing/extra binaries + for bid in sorted(base_ids - cand_ids): + struct_diffs.append(f"Binary {bid}: MISSING in candidate") + for bid in sorted(cand_ids - base_ids): + struct_diffs.append(f"Binary {bid}: EXTRA in candidate") + + common_ids = sorted(base_ids & cand_ids) - for key in base.keys(): - base_item = base[key] - if key not in cand: - differences.append(f"{path}{key} missing in candidate") + for bid in common_ids: + b = base_df[base_df['binary_id'] == bid].reset_index(drop=True) + c = cand_df[cand_df['binary_id'] == bid].reset_index(drop=True) + + # ā”€ā”€ Error status changes ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ + base_failed = 'exception_type' in b.columns and b['exception_type'].notna().any() + cand_failed = 'exception_type' in c.columns and c['exception_type'].notna().any() + + if base_failed != cand_failed: + if cand_failed: + exc = c['exception_type'].dropna().iloc[0] if 'exception_type' in c.columns else "unknown" + msg = c['exception_message'].dropna().iloc[0] if 'exception_message' in c.columns else "" + struct_diffs.append(f"Binary {bid}: NEWLY FAILING ({exc}: {msg})") + else: + struct_diffs.append(f"Binary {bid}: NEWLY PASSING (was failing in baseline)") + continue + + if base_failed and cand_failed: + b_exc = str(b['exception_type'].dropna().iloc[0]) if 'exception_type' in b.columns else "" + c_exc = str(c['exception_type'].dropna().iloc[0]) if 'exception_type' in c.columns else "" + b_msg = str(b['exception_message'].dropna().iloc[0]) if 'exception_message' in b.columns else "" + c_msg = str(c['exception_message'].dropna().iloc[0]) if 'exception_message' in c.columns else "" + if b_exc != c_exc: + struct_diffs.append(f"Binary {bid}: error type changed ('{b_exc}' -> '{c_exc}')") + if b_msg != c_msg: + struct_diffs.append(f"Binary {bid}: error message changed ('{b_msg}' -> '{c_msg}')") continue - cand_item = cand[key] + # ā”€ā”€ Step count ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ + if len(b) != len(c): + struct_diffs.append( + f"Binary {bid}: evolution step count differs " + f"(baseline={len(b)}, candidate={len(c)})" + ) + + # ā”€ā”€ Column presence ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ + base_only_cols = set(b.columns) - set(c.columns) - {'binary_id'} + cand_only_cols = set(c.columns) - set(b.columns) - {'binary_id'} + if base_only_cols: + struct_diffs.append(f"Binary {bid}: columns only in baseline: {sorted(base_only_cols)}") + if cand_only_cols: + struct_diffs.append(f"Binary {bid}: columns only in candidate: {sorted(cand_only_cols)}") + + # ā”€ā”€ Per-column comparison ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ + common_cols = sorted(set(b.columns) & set(c.columns) - {'binary_id'}) + min_rows = min(len(b), len(c)) + + for col in common_cols: + b_col = b[col].iloc[:min_rows] + c_col = c[col].iloc[:min_rows] + col_type = classify_column(col, b_col.dtype) - if isinstance(base_item, h5py.Dataset): - base_data = base_item[()] - cand_data = cand_item[()] + if col_type == 'quantitative': + b_arr = b_col.to_numpy(dtype=float) + c_arr = c_col.to_numpy(dtype=float) + + # NaN handling: both NaN = match, one NaN = mismatch + both_nan = np.isnan(b_arr) & np.isnan(c_arr) + one_nan = np.isnan(b_arr) ^ np.isnan(c_arr) + + if one_nan.any(): + nan_steps = np.where(one_nan)[0].tolist() + direction = [] + for s in nan_steps[:5]: + bv = "NaN" if np.isnan(b_arr[s]) else f"{b_arr[s]:.6g}" + cv = "NaN" if np.isnan(c_arr[s]) else f"{c_arr[s]:.6g}" + direction.append(f"step {s}: {bv} -> {cv}") + quant_diffs.append( + f"Binary {bid}, '{col}': NaN mismatch at {len(nan_steps)} step(s): " + + "; ".join(direction) + ) + + # Compare non-NaN values + valid = ~(np.isnan(b_arr) | np.isnan(c_arr)) + if valid.any(): + b_valid = b_arr[valid] + c_valid = c_arr[valid] + not_equal = b_valid != c_valid + + if rtol == 0 and atol == 0: + # Exact comparison + if not_equal.any(): + diff_indices = np.where(valid)[0][not_equal] + abs_diff = np.abs(b_valid[not_equal] - c_valid[not_equal]) + worst = np.argmax(abs_diff) + worst_step = diff_indices[worst] + quant_diffs.append( + f"Binary {bid}, '{col}': {not_equal.sum()} value(s) differ. " + f"Largest abs diff = {abs_diff[worst]:.6e} " + f"at step {worst_step} " + f"(baseline={b_valid[not_equal][worst]:.15g}, " + f"candidate={c_valid[not_equal][worst]:.15g})" + ) + else: + # Tolerance-based comparison + if not np.allclose(b_valid, c_valid, rtol=rtol, atol=atol): + abs_diff = np.abs(b_valid - c_valid) + with np.errstate(divide='ignore', invalid='ignore'): + denom = np.maximum(np.abs(b_valid), atol) + rel_diff = abs_diff / denom + worst = np.argmax(abs_diff) + worst_step = np.where(valid)[0][worst] + quant_diffs.append( + f"Binary {bid}, '{col}': numeric mismatch " + f"(max abs diff = {abs_diff[worst]:.6e}, " + f"max rel diff = {rel_diff[worst]:.6e}, " + f"at step {worst_step}, " + f"baseline={b_valid[worst]:.15g}, " + f"candidate={c_valid[worst]:.15g})" + ) - if np.issubdtype(base_data.dtype, np.number): - if not np.allclose(base_data, cand_data, rtol=1e-5, atol=1e-8): - differences.append(f"{path}{key} numeric mismatch") else: - if not np.array_equal(base_data, cand_data): - differences.append(f"{path}{key} non-numeric mismatch") + # Qualitative comparison: exact string match + b_str = b_col.astype(str).values + c_str = c_col.astype(str).values + mismatches = np.where(b_str != c_str)[0] + if len(mismatches) > 0: + details = [] + for s in mismatches[:5]: + details.append(f"step {s}: '{b_str[s]}' -> '{c_str[s]}'") + qual_diffs.append( + f"Binary {bid}, '{col}': {len(mismatches)} step(s) differ: " + + "; ".join(details) + ) - elif isinstance(base_item, h5py.Group): - differences.extend(compare_datasets(base_item, cand_item, path=f"{path}{key}/")) + return {'quantitative': quant_diffs, 'qualitative': qual_diffs, 'structural': struct_diffs} - # Check for extra keys in candidate - for key in cand.keys(): - if key not in base: - differences.append(f"{path}{key} extra in candidate") - return differences +def compare_warnings_tables(base_df, cand_df): + """Compare warning tables between baseline and candidate. + + Returns list of diff strings. + """ + diffs = [] + + if base_df is None and cand_df is None: + return diffs + if base_df is None: + diffs.append(f"Candidate has {len(cand_df)} warning(s), baseline has none") + return diffs + if cand_df is None: + diffs.append(f"Baseline has {len(base_df)} warning(s), candidate has none") + return diffs + + if len(base_df) != len(cand_df): + diffs.append(f"Total warning count differs (baseline={len(base_df)}, candidate={len(cand_df)})") + + # Per-binary warning comparison + if 'binary_id' in base_df.columns and 'binary_id' in cand_df.columns: + base_grouped = base_df.groupby('binary_id') + cand_grouped = cand_df.groupby('binary_id') + all_ids = sorted(set(base_df['binary_id'].unique()) | set(cand_df['binary_id'].unique())) + + for bid in all_ids: + b_warnings = base_grouped.get_group(bid) if bid in base_grouped.groups else pd.DataFrame() + c_warnings = cand_grouped.get_group(bid) if bid in cand_grouped.groups else pd.DataFrame() + + b_count = len(b_warnings) + c_count = len(c_warnings) + + if b_count == 0 and c_count > 0: + cats = c_warnings['category'].unique().tolist() if 'category' in c_warnings.columns else ['unknown'] + diffs.append(f"Binary {bid}: {c_count} NEW warning(s) in candidate ({', '.join(str(c) for c in cats)})") + elif b_count > 0 and c_count == 0: + diffs.append(f"Binary {bid}: {b_count} warning(s) REMOVED in candidate") + elif b_count != c_count: + diffs.append(f"Binary {bid}: warning count changed ({b_count} -> {c_count})") + elif b_count > 0: + # Same count ā€” check if warning categories or messages changed + if 'category' in b_warnings.columns and 'category' in c_warnings.columns: + b_cats = sorted(b_warnings['category'].astype(str).tolist()) + c_cats = sorted(c_warnings['category'].astype(str).tolist()) + if b_cats != c_cats: + diffs.append(f"Binary {bid}: warning categories changed ({b_cats} -> {c_cats})") + + if 'message' in b_warnings.columns and 'message' in c_warnings.columns: + b_msgs = sorted(b_warnings['message'].astype(str).tolist()) + c_msgs = sorted(c_warnings['message'].astype(str).tolist()) + if b_msgs != c_msgs: + diffs.append(f"Binary {bid}: warning messages changed") + + return diffs + + +def read_table_safe(store, key): + """Read a table from HDFStore, returning None if it doesn't exist.""" + try: + if key in store: + return store[key] + except Exception: + pass + return None def main(): - if len(sys.argv) != 3: - print("Usage: compare_runs.py baseline.h5 candidate.h5") - sys.exit(1) + parser = argparse.ArgumentParser( + description="Compare baseline and candidate binary evolution HDF5 files.", + formatter_class=argparse.RawDescriptionHelpFormatter, + epilog=""" +By default, uses EXACT comparison (any numeric difference is reported). +Use --loose to allow small floating-point tolerances (rtol=1e-12, atol=1e-15). + """, + ) + parser.add_argument("baseline", help="Path to baseline HDF5 file") + parser.add_argument("candidate", help="Path to candidate HDF5 file") + parser.add_argument("--loose", action="store_true", + help="Allow small floating-point tolerance (rtol=1e-12, atol=1e-15)") + parser.add_argument("--rtol", type=float, default=None, + help="Override relative tolerance (default: 0, or 1e-12 with --loose)") + parser.add_argument("--atol", type=float, default=None, + help="Override absolute tolerance (default: 0, or 1e-15 with --loose)") + parser.add_argument("--verbose", "-v", action="store_true", + help="Print extra diagnostic info") + args = parser.parse_args() - baseline_file = sys.argv[1] - candidate_file = sys.argv[2] + # Set tolerances + if args.loose: + rtol = args.rtol if args.rtol is not None else 1e-12 + atol = args.atol if args.atol is not None else 1e-15 + else: + rtol = args.rtol if args.rtol is not None else 0.0 + atol = args.atol if args.atol is not None else 0.0 - with h5py.File(baseline_file, 'r') as base, h5py.File(candidate_file, 'r') as cand: - diffs = compare_datasets(base, cand) + for f in [args.baseline, args.candidate]: + if not os.path.exists(f): + print(f"ERROR: File not found: {f}", file=sys.stderr) + sys.exit(2) - if diffs: - print("Differences found:") - for diff in diffs: - print(" -", diff) - sys.exit(1) + quant_diffs = [] + qual_diffs = [] + struct_diffs = [] + warn_diffs = [] + + try: + with pd.HDFStore(args.baseline, mode='r') as base_store, \ + pd.HDFStore(args.candidate, mode='r') as cand_store: + + base_keys = set(base_store.keys()) + cand_keys = set(cand_store.keys()) + + if args.verbose: + print(f"Baseline keys: {sorted(base_keys)}") + print(f"Candidate keys: {sorted(cand_keys)}") + + # ā”€ā”€ Evolution table ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ + base_evol = read_table_safe(base_store, '/evolution') + cand_evol = read_table_safe(cand_store, '/evolution') + + if base_evol is None and cand_evol is None: + struct_diffs.append("Neither file contains an 'evolution' table") + elif base_evol is None: + struct_diffs.append("Baseline missing 'evolution' table") + elif cand_evol is None: + struct_diffs.append("Candidate missing 'evolution' table") + else: + if args.verbose: + n_base = base_evol['binary_id'].nunique() if 'binary_id' in base_evol.columns else '?' + n_cand = cand_evol['binary_id'].nunique() if 'binary_id' in cand_evol.columns else '?' + print(f"Baseline: {n_base} binaries, {len(base_evol)} total rows") + print(f"Candidate: {n_cand} binaries, {len(cand_evol)} total rows") + + evol_results = compare_evolution_tables(base_evol, cand_evol, rtol, atol) + quant_diffs.extend(evol_results['quantitative']) + qual_diffs.extend(evol_results['qualitative']) + struct_diffs.extend(evol_results['structural']) + + # ā”€ā”€ Warnings table ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ + base_warn = read_table_safe(base_store, '/warnings') + cand_warn = read_table_safe(cand_store, '/warnings') + warn_diffs.extend(compare_warnings_tables(base_warn, cand_warn)) + + # ā”€ā”€ Extra/missing top-level keys ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ + for k in sorted(base_keys - cand_keys): + if k not in ['/evolution', '/warnings', '/metadata']: + struct_diffs.append(f"Table '{k}' missing in candidate") + for k in sorted(cand_keys - base_keys): + if k not in ['/evolution', '/warnings', '/metadata']: + struct_diffs.append(f"Table '{k}' extra in candidate") + + except Exception as e: + print(f"ERROR reading HDF5 files: {e}", file=sys.stderr) + sys.exit(2) + + # ā”€ā”€ Report ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ + total_diffs = len(quant_diffs) + len(qual_diffs) + len(struct_diffs) + len(warn_diffs) + tol_label = f"rtol={rtol}, atol={atol}" if rtol > 0 or atol > 0 else "EXACT (rtol=0, atol=0)" + + print("=" * 70) + print("POSYDON Binary Validation ā€” Comparison Report") + print(f" Baseline: {args.baseline}") + print(f" Candidate: {args.candidate}") + print(f" Tolerances: {tol_label}") + print("=" * 70) + + if struct_diffs: + print(f"\n--- STRUCTURAL ({len(struct_diffs)}) ---") + print(" (missing/extra binaries, step count changes, newly failing/passing, errors)\n") + for d in struct_diffs: + print(f" - {d}") + + if qual_diffs: + print(f"\n--- QUALITATIVE ({len(qual_diffs)}) ---") + print(" (state, event, step name, SN type, interpolation class changes)\n") + for d in qual_diffs: + print(f" - {d}") + + if quant_diffs: + print(f"\n--- QUANTITATIVE ({len(quant_diffs)}) ---") + print(" (any numeric value change)\n") + for d in quant_diffs: + print(f" - {d}") + + if warn_diffs: + print(f"\n--- WARNINGS ({len(warn_diffs)}) ---") + print(" (new, removed, or changed warnings)\n") + for d in warn_diffs: + print(f" - {d}") + + print("\n" + "=" * 70) + if total_diffs == 0: + print("RESULT: IDENTICAL ā€” candidate matches baseline exactly.") + sys.exit(0) else: - print("No differences detected between baseline and candidate.") + print(f"RESULT: {total_diffs} DIFFERENCE(S) DETECTED") + print(f" Structural: {len(struct_diffs)}") + print(f" Qualitative: {len(qual_diffs)}") + print(f" Quantitative: {len(quant_diffs)}") + print(f" Warnings: {len(warn_diffs)}") + print("=" * 70) + sys.exit(1) if __name__ == "__main__": - main() + main() \ No newline at end of file diff --git a/dev-tools/evolve_binaries.sh b/dev-tools/evolve_binaries.sh index 2021995bff..8bfcceef2a 100755 --- a/dev-tools/evolve_binaries.sh +++ b/dev-tools/evolve_binaries.sh @@ -1,69 +1,86 @@ #!/bin/bash -# Script usage: ./evolve_binaries.sh -# This script clones the POSYDON repo to the specified branch (defaults to 'main'), -# copies evolve_binaries.py, runs it, and saves output to evolve_binaries.out - -# Set default branch to 'main' if not provided -BRANCH=${1:-main} -REPO_URL="https://github.com/POSYDON-code/POSYDON" - -if [[ -n "$2" ]]; then - SHA=$2 - WORK_DIR="POSYDON_${BRANCH}_${SHA}" -else - WORK_DIR="POSYDON_$BRANCH" -fi - -# Remove existing directory if it exists -if [ -d "$WORK_DIR" ]; then - echo "šŸ—‘ļø Removing existing directory: $WORK_DIR" - rm -rf "$WORK_DIR" +# ============================================================================= +# evolve_binaries.sh ā€” Clone a POSYDON branch, install it, and run the +# binary validation suite at all requested metallicities. +# +# Usage: +# ./evolve_binaries.sh [sha] [metallicities] +# +# Examples: +# ./evolve_binaries.sh main # all metallicities +# ./evolve_binaries.sh feature/my-fix abc123f # specific commit +# ./evolve_binaries.sh main "" "1 0.45 0.1" # subset of metallicities +# +# Output structure: +# outputs//candidate_Zsun.h5 ā€” evolution results per metallicity +# logs//evolve_Zsun.log ā€” log per metallicity +# workdirs/POSYDON_/ ā€” cloned repo + conda env +# ============================================================================= + +set -euo pipefail +# Load git if needed +if ! command -v git >/dev/null 2>&1; then + if command -v module >/dev/null 2>&1; then + module load git + fi fi -echo "šŸ“ Creating working directory: $WORK_DIR" -# Create the working directory -mkdir -p "$WORK_DIR" +# ā”€ā”€ Configuration ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ +ALL_METALLICITIES="2 1 0.45 0.2 0.1 0.01 0.001 0.0001" -FULL_PATH="$(realpath "$WORK_DIR")" -CLONE_DIR="$FULL_PATH/POSYDON" +BRANCH=${1:-main} +SHA=${2:-} +METALLICITIES=${3:-$ALL_METALLICITIES} -OUTPUT_DIR="$FULL_PATH/outputs" -LOG_DIR="$FULL_PATH/logs" +REPO_URL="https://github.com/POSYDON-code/POSYDON" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +# Sanitize branch name for filesystem SAFE_BRANCH="${BRANCH//\//_}" -OUTPUT_FILE="$OUTPUT_DIR/candidate_${SAFE_BRANCH}.h5" -LOG_FILE="$LOG_DIR/evolve_${SAFE_BRANCH}.log" -mkdir -p "$OUTPUT_DIR" "$LOG_DIR" -echo "šŸ“‹ Copying script_data folder" -# copy the script_data folder -cp -r "./script_data" "$WORK_DIR" +# Directories (all relative to SCRIPT_DIR, the dev-tools root) +WORK_DIR="$SCRIPT_DIR/workdirs/POSYDON_${SAFE_BRANCH}" +OUTPUT_DIR="$SCRIPT_DIR/outputs/${SAFE_BRANCH}" +LOG_DIR="$SCRIPT_DIR/logs/${SAFE_BRANCH}" +CLONE_DIR="$WORK_DIR/POSYDON" -cd "$WORK_DIR" +mkdir -p "$OUTPUT_DIR" "$LOG_DIR" -# Initialize conda for bash +# ā”€ā”€ Conda Setup ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ echo "šŸ”§ Initializing conda" -# Source conda's shell integration -if [ -f "$HOME/miniconda3/etc/profile.d/conda.sh" ]; then - source "$HOME/miniconda3/etc/profile.d/conda.sh" -elif [ -f "$HOME/anaconda3/etc/profile.d/conda.sh" ]; then - source "$HOME/anaconda3/etc/profile.d/conda.sh" -elif [ -f "/opt/homebrew/Caskroom/miniconda/base/etc/profile.d/conda.sh" ]; then - source "/opt/homebrew/Caskroom/miniconda/base/etc/profile.d/conda.sh" -elif command -v conda >/dev/null 2>&1; then - CONDA_BASE=$(conda info --base) - source "${CONDA_BASE}/etc/profile.d/conda.sh" -else - echo -e "\033[31mError: Could not find conda installation. Please check your conda setup.\033[0m" - exit 1 +CONDA_SH="" +for candidate in \ + "$HOME/miniconda3/etc/profile.d/conda.sh" \ + "$HOME/anaconda3/etc/profile.d/conda.sh" \ + "/opt/homebrew/Caskroom/miniconda/base/etc/profile.d/conda.sh"; do + if [ -f "$candidate" ]; then + CONDA_SH="$candidate" + break + fi +done + +if [ -z "$CONDA_SH" ]; then + if command -v conda >/dev/null 2>&1; then + CONDA_SH="$(conda info --base)/etc/profile.d/conda.sh" + else + echo "ERROR: Could not find conda installation." >&2 + exit 1 + fi fi +source "$CONDA_SH" + +# ā”€ā”€ Clone Repository ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ +if [ -d "$WORK_DIR" ]; then + echo "šŸ—‘ļø Removing existing work directory: $WORK_DIR" + rm -rf "$WORK_DIR" +fi +mkdir -p "$WORK_DIR" -# Clone the repository to the specified branch echo "šŸ”„ Cloning POSYDON repository (branch: $BRANCH)" -if ! git clone -b "$BRANCH" "$REPO_URL" "$CLONE_DIR" 2>&1 | sed 's/^/ /'; then - echo -e "\033[31mError: Failed to clone branch '$BRANCH'. Please check if the branch exists.\033[0m" +if ! git clone -b "$BRANCH" "$REPO_URL" "$CLONE_DIR" 2>&1 | sed 's/^/ /'; then + echo "ERROR: Failed to clone branch '$BRANCH'." >&2 exit 1 fi @@ -78,29 +95,59 @@ if [[ -n "$SHA" ]]; then cd - fi -# Create conda environment for POSYDON v2 -echo "šŸ Creating conda environment" -conda create --prefix="$FULL_PATH/conda_env" python=3.11 -y -q 2>&1 | sed 's/^/ /' +# ā”€ā”€ Create Conda Environment ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ +ENV_PREFIX="$WORK_DIR/conda_env" -echo "āš” Activating conda environment" -conda activate "$FULL_PATH/conda_env" +echo "šŸ Creating conda environment at $ENV_PREFIX" +conda create --prefix="$ENV_PREFIX" python=3.11 -y -q 2>&1 | sed 's/^/ /' +conda activate "$ENV_PREFIX" -# install POSYDON manually echo "šŸ“¦ Installing POSYDON" -pip install -e "$CLONE_DIR" -q 2>&1 | sed 's/^/ /' - -echo "šŸš€ Running evolve_binaries.py" -# # Run the Python script and capture output (stdout and stderr) -python script_data/1Zsun_binaries_suite.py --output "$OUTPUT_FILE" 2>&1 | tee "$LOG_FILE" +pip install -e "$CLONE_DIR" -q 2>&1 | sed 's/^/ /' + +# ā”€ā”€ Run Suite for Each Metallicity ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ +SUITE_SCRIPT="$SCRIPT_DIR/script_data/binaries_suite.py" +FAILED=0 + +for Z in $METALLICITIES; do + OUTPUT_FILE="$OUTPUT_DIR/candidate_${Z}Zsun.h5" + LOG_FILE="$LOG_DIR/evolve_${Z}Zsun.log" + + echo "" + echo "============================================================" + echo " šŸš€ Evolving binaries for Z = ${Z} Zsun" + echo " Output: $OUTPUT_FILE" + echo " Log: $LOG_FILE" + echo "============================================================" + + if python "$SUITE_SCRIPT" \ + --metallicity "$Z" \ + --output "$OUTPUT_FILE" \ + 2>&1 | tee "$LOG_FILE"; then + + if [ ! -f "$OUTPUT_FILE" ]; then + echo "WARNING: Output file not created for Z=${Z}" >&2 + FAILED=$((FAILED + 1)) + else + echo " Z=${Z} Zsun complete." + fi + else + echo "WARNING: Suite failed for Z=${Z}. Check $LOG_FILE" >&2 + FAILED=$((FAILED + 1)) + fi +done -if [ ! -f "$OUTPUT_FILE" ]; then - echo "ERROR: Results file was not created: $OUTPUT_FILE" - exit 2 -fi +# ā”€ā”€ Deactivate Environment ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ +conda deactivate -if [ $? -ne 0 ]; then - echo "ERROR: Python script exited with an error. Check $LOG_FILE for details." - exit 3 +echo "" +echo "============================================================" +if [ $FAILED -eq 0 ]; then + echo "āœ… All metallicities completed successfully." +else + echo "Completed with $FAILED failure(s)." fi +echo " Outputs in: $OUTPUT_DIR/" +echo "============================================================" -echo -e "āœ… Script completed. Output saved to \n$OUTPUT_FILE" +exit $FAILED \ No newline at end of file diff --git a/dev-tools/generate_baseline.sh b/dev-tools/generate_baseline.sh new file mode 100644 index 0000000000..a4e31534a7 --- /dev/null +++ b/dev-tools/generate_baseline.sh @@ -0,0 +1,96 @@ +#!/bin/bash +# ============================================================================= +# generate_baseline.sh ā€” Generate baseline HDF5 files from a designated branch. +# +# This runs the binary validation suite against a chosen branch (or commit) +# and saves the results as the baseline for future comparisons. +# +# Usage: +# ./generate_baseline.sh [sha] [metallicities] +# +# Examples: +# ./generate_baseline.sh main # baseline from main, all Z +# ./generate_baseline.sh v2.1.0 # baseline from a release tag +# ./generate_baseline.sh main abc123f # baseline from a specific commit +# ./generate_baseline.sh main "" "1 0.45" # baseline for subset of Z +# +# Output: +# baselines//baseline_Zsun.h5 ā€” one file per metallicity +# baselines//baseline_info.txt ā€” records branch, commit SHA, date +# ============================================================================= + +set -euo pipefail + +BRANCH=${1:-main} +SHA=${2:-} +METALLICITIES=${3:-"2 1 0.45 0.2 0.1 0.01 0.001 0.0001"} + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +SAFE_BRANCH="${BRANCH//\//_}" +BASELINE_DIR="$SCRIPT_DIR/baselines/${SAFE_BRANCH}" + +echo "============================================================" +echo " POSYDON Binary Validation ā€” Generating Baseline" +echo " Branch: $BRANCH" +echo " SHA: ${SHA:-HEAD}" +echo " Metallicities: $METALLICITIES" +echo " Output dir: $BASELINE_DIR" +echo "============================================================" + +# ā”€ā”€ Step 1: Evolve binaries for the baseline branch ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ +echo "" +echo "Step 1: Evolving binaries on branch '$BRANCH'..." +"$SCRIPT_DIR/evolve_binaries.sh" "$BRANCH" "$SHA" "$METALLICITIES" + +# ā”€ā”€ Step 2: Copy results into the baselines directory ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ +echo "" +echo "Step 2: Copying results to baseline directory..." + +mkdir -p "$BASELINE_DIR" + +CANDIDATE_DIR="$SCRIPT_DIR/outputs/${SAFE_BRANCH}" +COPIED=0 + +for Z in $METALLICITIES; do + SRC="$CANDIDATE_DIR/candidate_${Z}Zsun.h5" + DST="$BASELINE_DIR/baseline_${Z}Zsun.h5" + + if [ -f "$SRC" ]; then + cp "$SRC" "$DST" + echo " Saved: $DST" + COPIED=$((COPIED + 1)) + else + echo " WARNING: Missing output for Z=${Z}: $SRC" >&2 + fi +done + +# ā”€ā”€ Step 3: Record baseline metadata ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ +CLONE_DIR="$SCRIPT_DIR/workdirs/POSYDON_${SAFE_BRANCH}/POSYDON" +ACTUAL_SHA="" +if [ -d "$CLONE_DIR" ]; then + ACTUAL_SHA=$(cd "$CLONE_DIR" && git rev-parse HEAD 2>/dev/null || echo "unknown") +fi + +INFO_FILE="$BASELINE_DIR/baseline_info.txt" +cat > "$INFO_FILE" << EOF +POSYDON Binary Validation Baseline +=================================== +Branch: $BRANCH +Commit SHA: ${ACTUAL_SHA:-unknown} +Requested SHA: ${SHA:-HEAD} +Generated: $(date -u '+%Y-%m-%d %H:%M:%S UTC') +Metallicities: $METALLICITIES +Files: $COPIED +EOF + +echo "" +echo "============================================================" +echo " Baseline generated: $COPIED file(s)" +echo " Info: $INFO_FILE" +echo " Directory: $BASELINE_DIR" +echo "============================================================" + +if [ $COPIED -eq 0 ]; then + echo "ERROR: No baseline files were created!" >&2 + exit 1 +fi \ No newline at end of file diff --git a/dev-tools/script_data/1Zsun_binaries_suite.py b/dev-tools/script_data/1Zsun_binaries_suite.py deleted file mode 100644 index 288f37890c..0000000000 --- a/dev-tools/script_data/1Zsun_binaries_suite.py +++ /dev/null @@ -1,885 +0,0 @@ -#!/usr/bin/env python3 -""" -Script to evolve a few binaries. -Used for validation of the branch. - -Authors: Max Briel, Elizabeth Teng -""" - -import argparse -import os -import signal -import sys -import warnings -import h5py - -from posydon.binary_evol.binarystar import BinaryStar, SingleStar -from posydon.binary_evol.simulationproperties import SimulationProperties -from posydon.popsyn.io import simprop_kwargs_from_ini -from posydon.utils.common_functions import orbital_separation_from_period - -target_rows = 12 -line_length = 140 -columns_to_show = ['step_names', 'state', 'event', 'S1_state', 'S1_mass', 'S2_state', 'S2_mass', 'orbital_period', 'time'] - -def load_inlist(verbose): - - sim_kwargs = simprop_kwargs_from_ini('script_data/1Zsun_binaries_params.ini', verbose=verbose) - metallicity = {'metallicity':1, 'verbose':verbose} - - sim_kwargs['step_HMS_HMS'][1].update(metallicity) - sim_kwargs['step_CO_HeMS'][1].update(metallicity) - sim_kwargs['step_CO_HMS_RLO'][1].update(metallicity) - sim_kwargs['step_CO_HeMS_RLO'][1].update(metallicity) - sim_kwargs['step_detached'][1].update(metallicity) - sim_kwargs['step_disrupted'][1].update(metallicity) - sim_kwargs['step_merged'][1].update(metallicity) - sim_kwargs['step_initially_single'][1].update(metallicity) - - sim_prop = SimulationProperties(**sim_kwargs) - - sim_prop.load_steps(verbose=verbose) - return sim_prop - -def write_binary_to_screen(binary): - """Writes a binary DataFrame prettily to the screen - - Args: - binary: BinaryStar object with evolved data - """ - df = binary.to_df(**{'extra_columns':{'step_names':'str'}}) - - # Filter to only existing columns - available_columns = [col for col in columns_to_show if col in df.columns] - df_filtered = df[available_columns] - - # Reset index to use a counter instead of NaN - df_filtered = df_filtered.reset_index(drop=True) - - print("=" * line_length) - - # Print the DataFrame - df_string = df_filtered.to_string(index=True, float_format='%.3f') - print(df_string) - - # Add empty lines to reach exactly 10 rows of output - current_rows = len(df_filtered) + 1 # add one for header - - if current_rows < target_rows: - # Calculate the width of the output to print empty lines of the same width - lines = df_string.split('\n') - if len(lines) > 1: - # Use the width of the data lines (skip header) - empty_lines_needed = target_rows - current_rows - for i in range(empty_lines_needed): - print("") - - print("-" * line_length) - - -def print_failed_binary(binary,e, max_error_lines=3): - - print("=" * line_length) - print(f"šŸšØ Binary Evolution Failed!") - print(f"Exception: {type(e).__name__}") - print(f"Message: {e}") - - # Get the binary's current state and limit output - try: - df = binary.to_df(**{'extra_columns':{'step_names':'str'}}) - if len(df) > 0: - # Select only the desired columns - - available_columns = [col for col in columns_to_show if col in df.columns] - df_filtered = df[available_columns] - - # Reset index to use a counter instead of NaN - df_filtered = df_filtered.reset_index(drop=True) - - # Limit to max_error_lines - if len(df_filtered) > max_error_lines: - df_filtered = df_filtered.tail(max_error_lines) - print(f"\nShowing last {max_error_lines} evolution steps before failure:") - else: - print(f"\nEvolution steps before failure ({len(df_filtered)} steps):") - - df_string = df_filtered.to_string(index=True, float_format='%.3f') - print(df_string) - - current_rows = len(df_filtered) + 1 + 5 # add one for header - empty_lines_needed = target_rows - current_rows - for i in range(empty_lines_needed): - print("") - else: - print("\nNo evolution steps recorded before failure.") - except Exception as inner_e: - print(f"\nCould not retrieve binary state: {inner_e}") - - print("-" * line_length) - -def evolve_binary(binary, h5file, binary_id): - """ - Evolves a single binary, prints its evolution, and saves to HDF5. - - Args: - binary: BinaryStar object - h5file: open h5py.File object for writing - binary_id: unique identifier for this binary - """ - - # Capture warnings during evolution - captured_warnings = [] - - def warning_handler(message, category, filename, lineno, file=None, line=None): - captured_warnings.append({ - 'message': str(message), - 'category': category.__name__, - 'filename': filename, - 'lineno': lineno - }) - - # Set up warning capture - old_showwarning = warnings.showwarning - warnings.showwarning = warning_handler - - try: - binary.evolve() - # Display the evolution summary for successful evolution - write_binary_to_screen(binary) - - # Save to HDF5 - df = binary.to_df(**{'extra_columns':{'step_names':'str'}}) - grp = h5file.create_group(f"binary_{binary_id}") - for col in df.columns: - grp.create_dataset(col, data=df[col].values) - - except Exception as e: - print_failed_binary(binary, e) - - err_grp = h5file.require_group(f"binary_{binary_id}/errors") - err_grp.attrs['exception_type'] = type(e).__name__ - err_grp.attrs['exception_message'] = str(e) - - finally: - warnings.showwarning = old_showwarning - - # ensure binary group exists - grp = h5file.require_group(f"binary_{binary_id}") - - # Save warnings to h5 file - if captured_warnings: - warn_grp = grp.create_group("warnings") - for i, warning in enumerate(captured_warnings): - warn_subgrp = warn_grp.create_group(f"warning_{i}") - warn_subgrp.attrs['category'] = warning['category'] - warn_subgrp.attrs['message'] = warning['message'] - warn_subgrp.attrs['filename'] = warning['filename'] - warn_subgrp.attrs['lineno'] = warning['lineno'] - - print(f"āš ļø {len(captured_warnings)} warning(s) raised during evolution:") - for i, warning in enumerate(captured_warnings[:3], 1): # Show max 3 warnings - print(f" {i}. {warning['category']}: {warning['message']}") - if len(captured_warnings) > 3: - print(f" ... and {len(captured_warnings) - 3} more warning(s)") - else: - print(f"No warning(s) raised during evolution\n\n\n\n") - print("=" * line_length) - -def evolve_binaries(verbose,output_path): - """Evolves a few binaries to validate their output - """ - sim_prop = load_inlist(verbose) - - with h5py.File(output_path,'w') as h5file: - binary_id=0 - - ######################################## - # Failing binary in matching - ######################################## - star_1 = SingleStar(**{'mass': 11.948472796094759, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [231.97383621190582, 5.927334890264575, 1.5990566013567014, 6.137994236518587]}) - star_2 = SingleStar(**{'mass': 7.636958434479617, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 190925.99636740884,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # Failing binary in matching - ######################################## - star_1 = SingleStar(**{'mass': 30.169861921689556, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [77.96834852144123, 0.05021460132555987, 2.3146518208348152, 1.733054979982291]}) - star_2 = SingleStar(**{'mass': 10.972734402996027, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 20479.71919353725,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # flipped S1 and S2 ? - ######################################## - star_1 = SingleStar(**{'mass': 9.474917413943635, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [133.5713935237759, 4.398754864537542, 2.703102872841114, 1.4633904612711142]}) - star_2 = SingleStar(**{'mass': 9.311073918196263, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 18.605997832086413,'eccentricity': 0.0}, properties = sim_prop) - - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # flipped S1 and S2 - ######################################## - star_1 = SingleStar(**{'mass': 10.438541, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star_2 = SingleStar(**{'mass': 1.400713, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 9.824025,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # flipped S1 and S2 - ######################################## - star_1= SingleStar(**{'mass': 9.845907 , 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - star_2 = SingleStar(**{'mass': 9.611029, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 3.820571,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # Normal binary evolution - ######################################## - star_1= SingleStar(**{'mass': 30.845907 , 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - star_2 = SingleStar(**{'mass': 30.611029, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 30.820571,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # Normal binary - ######################################## - star_1= SingleStar(**{'mass': 9.213534679594247 , 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [327.5906384501521, 1.7707176050073297, 1.573225822966838, 1.6757313876001914]}) - star_2 = SingleStar(**{'mass': 7.209878522799272, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 63123.74544474666,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # Normal binary - ######################################## - star_1= SingleStar(**{'mass': 9.561158487732602 , 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [317.5423844462847, 2.9095984678057603, 1.754121288652108, 2.3693917842468784]}) - star_2 = SingleStar(**{'mass': 9.382732464319286, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 27.77657038557851,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # Normal binary - ######################################## - star1 = SingleStar(**{'mass': 7.552858,#29829485, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [40.91509926587841, 2.6295454150818256, 1.6718337470964977, 6.0408769315244895]}) - star2 = SingleStar(**{'mass': 6.742063, #481560266, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star1, star2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 17.957531550841225, 'eccentricity': 0.0,}, - properties=sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # High BH spin options - ######################################## - star_1 = SingleStar(**{'mass': 31.616785, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [10, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - star_2 = SingleStar(**{'mass': 26.874267, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 501.99252706449792,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # Original a>1 spin error - ######################################## - star_1 = SingleStar(**{'mass': 18.107506844123645, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [528.2970725443025, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - star_2 = SingleStar(**{'mass': 15.641392951875442, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 151.99252706449792,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # FIXED disrupted crash - ######################################## - star1 = SingleStar(**{'mass': 52.967313, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 36.306444, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':12.877004, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # FIXED error with SN type - ######################################## - star1 = SingleStar(**{'mass': 17.782576, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass':3.273864, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # FIXED oRLO2 looping - ######################################## - star1 = SingleStar(**{'mass': 170.638207, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [4.921294, 4.31745, 1.777768, 3.509656]}) - star2 = SingleStar(**{'mass':37.917852, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':113.352736, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # Redirect to step_CO_HeMS (H-rich non-burning?) - ######################################## - star_1 = SingleStar(**{'mass': 8.333579, 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [17.125568, 4.101834, 0.917541, 3.961291]}) - star_2 = SingleStar(**{'mass' : 8.208376, 'state' : 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 66.870417, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # FIXED oRLO2 looping - ######################################## - star_1 = SingleStar(**{'mass': 16.921378, 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}) - star_2 = SingleStar(**{'mass' : 16.286318, 'state' : 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 37.958768, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # FIXED? step_detached failure - ######################################## - star1 = SingleStar(**{'mass': 19.787769, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [24.464803, 0.666314, 1.954698, 5.598975]}) - star2 = SingleStar(**{'mass': 7.638741, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3007.865561, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # Disrupted binary - ######################################## - star_1 = SingleStar(**{'mass': 16.921378, 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}) - star_2 = SingleStar(**{'mass' : 16.286318, 'state' : 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3007.865561, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # FIXED Detached binary failure (low mass) - ######################################## - star1 = SingleStar(**{'mass': 9, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass':0.8, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # FIXED SN_TYPE = None crash - ######################################## - star1 = SingleStar(**{'mass': 17.782576, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass':3.273864, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # FIXED SN_TYPE errors - ######################################## - star1 = SingleStar(**{'mass': 6.782576, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass':3.273864, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # FIXED SN_TYPE errors - ######################################## - star1 = SingleStar(**{'mass': 40.638207, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [30.921294, 4.31745, 1.777768, 3.509656]}) - star2 = SingleStar(**{'mass':37.917852, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':2113.352736, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # FIXED ECSN errors? - ######################################## - star1 = SingleStar(**{'mass': 12.376778, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [80, 4.31745, 1.777768, 3.509656]}) - star2 = SingleStar(**{'mass': 9.711216, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':79.83702, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # Interpolator masses?? - ######################################## - star1 = SingleStar(**{'mass': 7.592921, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass':5.038679 , - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.537807, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # Interpolator masses? - ######################################## - star_1 = SingleStar(**{'mass': 38.741115, - 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [21.113771, 2.060135, 2.224789, 4.089729]}) - star_2 = SingleStar(**{'mass': 27.776178, - 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [282.712103, 0.296252, 1.628433, 5.623812]}) - - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 93.387072, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # FIXED NaN spin - ######################################## - star1 = SingleStar(**{'mass': 70.066924, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0], - 'metallicity':1}) - star2 = SingleStar(**{'mass': 34.183110, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0], - 'metallicity':1}) - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.931492e+03, - 'separation': orbital_separation_from_period(5.931492e+03, star1.mass, star2.mass), - 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # FIXED NaN spin - ######################################## - star1 = SingleStar(**{'mass': 28.837286, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 6.874867, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':35.609894, - 'separation': orbital_separation_from_period(35.609894, star1.mass, star2.mass), - 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # oRLO2 issue - ######################################## - star1 = SingleStar(**{'mass':29.580210, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 28.814626, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':40.437993, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # oRLO2 issue - ######################################## - star1 = SingleStar(**{'mass':67.126795, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 19.622908, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':1484.768582, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # oRLO2 issue - ######################################## - star1 = SingleStar(**{'mass': 58.947503, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 56.660506, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':2011.300659, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # oRLO2 issue - ######################################## - star1 = SingleStar(**{'mass': 170.638207, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[47.979957374424956, 5.317304576107798, 2.7259013166068145, 4.700929589520818]}) - star2 = SingleStar(**{'mass': 37.917852, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':113.352736, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # oRLO2 issue - ######################################## - star1 = SingleStar(**{'mass': 109.540207, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 84.344530, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.651896, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # redirect - ######################################## - star1 = SingleStar(**{'mass': 13.889634, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass':0.490231, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':14513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # redirect - ######################################## - star1 = SingleStar(**{'mass': 9, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass':0.8, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # Max time - ######################################## - star_1 = SingleStar(**{'mass': 103.07996766780799, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.2965418610971261, 2.0789170290719117, 3.207488023705968]}) - star_2 = SingleStar(**{'mass': 83.66522615073987, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 1449.1101985875678,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # Max time - ######################################## - star_1 = SingleStar(**{'mass': 8.860934140643465, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [11.818027275431337, 2.812412688633058, 0.4998731824233789, 2.9272630485628643]}) - star_2 = SingleStar(**{'mass': 8.584716012668551, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 20.82030114750744,'eccentricity': 0.0}, properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # PR421 - ######################################## - star1 = SingleStar(**{'mass': 24.035366, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 23.187355, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':18.865029, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # CE class - ######################################## - star1 = SingleStar(**{'mass':33.964274, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 28.98149, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':82.370989, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # PR574 - stepCE fix - ######################################## - star1 = SingleStar(**{'mass':29.580210, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 28.814626*0.4, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':300.437993, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # e_ZAMS error - ######################################## - star1 = SingleStar(**{'mass': 8.161885721822461, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 3.5907829421526154, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 36.873457164644144, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # e_ZAMS error - ######################################## - star1 = SingleStar(**{'mass': 35.24755025317775, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [19.755993125895806, 0.37149222852233904, 1.6588846085306563, - 1.434617029858906]}) - star2 = SingleStar(**{'mass': 30.000450298072902, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 24060.02101364665, 'eccentricity': 0.8085077857996965}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # e_ZAMS error - ######################################## - star1 = SingleStar(**{'mass': 11.862930493162692, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 1.4739109294156703, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 4111.083887312003, 'eccentricity':0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # e_ZAMS error - ######################################## - star1 = SingleStar(**{'mass': 8.527361341212108, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 0.7061748406821822, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 2521.1927287891444, 'eccentricity':0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - ######################################## - # e_ZAMS error - ######################################## - star1 = SingleStar(**{'mass': 13.661942533447398 ,#29829485, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 4.466151109802313 , #481560266, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3110.1346707516914, 'eccentricity':0.0}, - properties = sim_prop) - evolve_binary(binary, h5file, binary_id) - binary_id+=1 - - ######################################## - # double CO step - ######################################## - # NS + WD example - star1 = SingleStar(**{'mass': 7.939736047577677, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star1 = SingleStar(**{'mass': 6.661421823348241, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 28.576933942881404, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary) - # BH + NS example - star1 = SingleStar(**{'mass': 22.69609546427504, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 2.051704135150374, 1.73468853754093, 3.299716078528058]}) - star2 = SingleStar(**{'mass': 16.39690317352072, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 5.934599002039066, 2.4331072903106974, 1.9933166215820504]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 70.37960820393167, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary) - # WD + WD example - star1 = SingleStar(**{'mass': 6.661421823348241, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star2 = SingleStar(**{'mass': 6.661421823348241, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 28.576933942881404, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary) - # NS + NS example - star1 = SingleStar(**{'mass': 16.458995075687447, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 3.661376360771944, 0.7219969332243381, 4.919284439555057]}) - star2 = SingleStar(**{'mass': 12.580980419413521, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 4.944467687452352, 1.2845384190953326, 1.6806849171480245]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 247.4244399689946, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary) - - # BH + BH - star1 = SingleStar(**{'mass': 31.077951593283725, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 1.9047595342945016, 0.7097181927314352, 2.892753852818733]}) - star2 = SingleStar(**{'mass': 27.8239810278115, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 4.004970175991886, 2.2544428565691472, 3.420828590003044]}) - - binary = BinaryStar(star1, star2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 27.429155057946318, 'eccentricity': 0.0}, - properties = sim_prop) - evolve_binary(binary) - -if __name__ == "__main__": - parser = argparse.ArgumentParser(description='Evolve binaries for validation.') - parser.add_argument('--verbose', '-v', action='store_true', default=False, - help='Enable verbose output (default: False)') - parser.add_argument("--output", type=str, required=True, - help="Path to save HDF5 output") - args = parser.parse_args() - - evolve_binaries(verbose=args.verbose, output_path=args.output) diff --git a/dev-tools/script_data/1Zsun_binaries_params.ini b/dev-tools/script_data/binaries_params.ini similarity index 99% rename from dev-tools/script_data/1Zsun_binaries_params.ini rename to dev-tools/script_data/binaries_params.ini index f5400f3117..c001928c2b 100644 --- a/dev-tools/script_data/1Zsun_binaries_params.ini +++ b/dev-tools/script_data/binaries_params.ini @@ -1,4 +1,6 @@ # POSYDON default BinaryPopulation inifile, use ConfigParser syntax +# This ini is used ONLY for SimulationProperties configuration. +# Metallicity is overridden at runtime by binaries_suite.py. [environment_variables] PATH_TO_POSYDON = '' diff --git a/dev-tools/script_data/binaries_suite.py b/dev-tools/script_data/binaries_suite.py new file mode 100644 index 0000000000..08e0365dd9 --- /dev/null +++ b/dev-tools/script_data/binaries_suite.py @@ -0,0 +1,694 @@ +#!/usr/bin/env python3 +""" +Script to evolve a set of test binaries at a given metallicity. +Used for validation of POSYDON branches. + +Usage: + python binaries_suite.py --output results.h5 --metallicity 1 + python binaries_suite.py --output results.h5 --metallicity 0.45 --verbose + +Authors: Max Briel, Elizabeth Teng +""" + +import argparse +import os +import sys +import warnings +import pandas as pd + +from posydon.binary_evol.binarystar import BinaryStar, SingleStar +from posydon.binary_evol.simulationproperties import SimulationProperties +from posydon.popsyn.io import simprop_kwargs_from_ini +from posydon.utils.common_functions import orbital_separation_from_period + +AVAILABLE_METALLICITIES = [2., 1., 0.45, 0.2, 0.1, 0.01, 0.001, 0.0001] + +# Display settings +TARGET_ROWS = 12 +LINE_LENGTH = 80 +COLUMNS_TO_SHOW = ['step_names', 'state', 'event', + 'S1_state', 'S1_mass', + 'S2_state', 'S2_mass', 'orbital_period'] + +def load_inlist(metallicity, verbose, ini_path=None): + """Load simulation properties from ini file and configure for given metallicity. + + Args: + metallicity: float, metallicity in solar units + verbose: bool + ini_path: str, path to ini file (auto-detected if None) + + Returns: + SimulationProperties object with loaded steps + """ + if ini_path is None: + script_dir = os.path.dirname(os.path.abspath(__file__)) + ini_path = os.path.join(script_dir, 'binaries_params.ini') + + if not os.path.exists(ini_path): + raise FileNotFoundError(f"INI file not found: {ini_path}") + + sim_kwargs = simprop_kwargs_from_ini(ini_path, verbose=verbose) + + metallicity_kwargs = {'metallicity': metallicity, 'verbose': verbose} + + metallicity_steps = ['step_HMS_HMS', 'step_CO_HeMS', 'step_CO_HMS_RLO', + 'step_CO_HeMS_RLO', 'step_detached', 'step_disrupted', + 'step_merged', 'step_initially_single'] + for step_name in metallicity_steps: + if step_name in sim_kwargs: + sim_kwargs[step_name][1].update(metallicity_kwargs) + + sim_prop = SimulationProperties(**sim_kwargs) + sim_prop.load_steps(verbose=verbose) + return sim_prop + +def write_binary_to_screen(binary): + """Writes a binary DataFrame to screen.""" + df = binary.to_df(**{'extra_columns':{'step_names':'str'}}) + + # Filter to only existing columns + available_columns = [col for col in COLUMNS_TO_SHOW if col in df.columns] + df_filtered = df[available_columns].reset_index(drop=True) + + print("=" * LINE_LENGTH) + + # Print the DataFrame + df_string = df_filtered.to_string(index=True, float_format='%.3f') + print(df_string) + + # Add empty lines to reach exactly 10 rows of output + current_rows = len(df_filtered) + 1 # add one for header + + if current_rows < TARGET_ROWS: + for _ in range(TARGET_ROWS - current_rows): + print("") + + print("-" * LINE_LENGTH) + + +def print_failed_binary(binary,e, max_error_lines=3): + """Print information about a binary that failed to evolve.""" + + print("=" * LINE_LENGTH) + print(f"šŸšØ Binary Evolution Failed!") + print(f"Exception: {type(e).__name__}") + print(f"Message: {e}") + + # Get the binary's current state and limit output + try: + df = binary.to_df(**{'extra_columns':{'step_names':'str'}}) + if len(df) > 0: + # Select only the desired columns + + available_columns = [col for col in COLUMNS_TO_SHOW if col in df.columns] + df_filtered = df[available_columns].reset_index(drop=True) + + # Limit to max_error_lines + if len(df_filtered) > max_error_lines: + df_filtered = df_filtered.tail(max_error_lines) + print(f"\nShowing last {max_error_lines} evolution steps before failure:") + else: + print(f"\nEvolution steps before failure ({len(df_filtered)} steps):") + + df_string = df_filtered.to_string(index=True, float_format='%.3f') + print(df_string) + + current_rows = len(df_filtered) + 1 + 5 # add one for header + empty_lines_needed = TARGET_ROWS - current_rows + for _ in range(max(0, empty_lines_needed)): + print("") + else: + print("\nNo evolution steps recorded before failure.") + except Exception as inner_e: + print(f"\nCould not retrieve binary state: {inner_e}") + + print("-" * LINE_LENGTH) + +def evolve_binary(binary, h5file, binary_id): + """ + Evolves a single binary, prints its evolution, and saves to HDF5. + + Args: + binary: BinaryStar object + h5file: open pd.HDFStore object for writing + binary_id: unique identifier for this binary + """ + + # Capture warnings during evolution + captured_warnings = [] + + def warning_handler(message, category, filename, lineno, file=None, line=None): + captured_warnings.append({ + "binary_id": int(binary_id), + "category": category.__name__, + "message": str(message), + "filename": filename, + "lineno": lineno + }) + + # Set up warning capture + old_showwarning = warnings.showwarning + warnings.showwarning = warning_handler + + print(f"Binary {binary_id}") + evolution_df = None + + try: + binary.evolve() + write_binary_to_screen(binary) + evolution_df = binary.to_df(extra_columns={'step_names':'str'}) + + except Exception as e: + print_failed_binary(binary, e) + + # If evolution fails, create a minimal df with error info + evolution_df = pd.DataFrame([{ + "binary_id": int(binary_id), + "exception_type": type(e).__name__, + "exception_message": str(e) + }]) + + finally: + warnings.showwarning = old_showwarning + + # Ensure we always have a dataframe + if evolution_df is not None: + # Decode bytes columns if needed + for col in evolution_df.select_dtypes([object]): + if evolution_df[col].apply(lambda x: isinstance(x, bytes)).any(): + evolution_df[col] = evolution_df[col].apply( + lambda x: x.decode('utf-8') if isinstance(x, bytes) else x + ) + + # Always ensure binary_id exists + if "binary_id" not in evolution_df.columns: + evolution_df["binary_id"] = int(binary_id) + + # Defragment + evolution_df = evolution_df.copy() + + # Determine min_itemsize from the dataframe we're actually saving + string_cols = evolution_df.select_dtypes([object]).columns + min_itemsize = {col: 100 for col in string_cols} + h5file.append("evolution", evolution_df, format="table", + data_columns=True, min_itemsize=min_itemsize) + + # Save warnings + if captured_warnings: + warn_df = pd.DataFrame(captured_warnings) + # Ensure consistent string column sizes for warnings table + warn_string_cols = warn_df.select_dtypes([object]).columns + warn_min_itemsize = {col: 200 for col in warn_string_cols} + h5file.append("warnings", warn_df, format="table", + min_itemsize=warn_min_itemsize) + print(f"āš ļø {len(captured_warnings)} warning(s) raised during evolution:") + for i, w in enumerate(captured_warnings[:3], 1): + print(f" {i}. {w['category']}: {w['message'][:80]}") + if len(captured_warnings) > 3: + print(f" ... and {len(captured_warnings) - 3} more warning(s)") + else: + print(f" No warning(s) raised during evolution") + + print(f"āœ… Finished binary {binary_id}") + print("=" * LINE_LENGTH) + + + +def get_test_binaries(metallicity, sim_prop): + """Return the list of test binaries as (star1_kwargs, star2_kwargs, binary_kwargs, description) tuples. + + All binaries use the specified metallicity. + """ + Z = metallicity + + binaries = [ + # 0: Failing binary in matching + ({'mass': 11.948472796094759, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [231.97383621190582, 5.927334890264575, 1.5990566013567014, 6.137994236518587]}, + {'mass': 7.636958434479617, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 190925.99636740884, 'eccentricity': 0.0}, + "Failing binary in matching"), + + # 1: Failing binary in matching + ({'mass': 30.169861921689556, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [77.96834852144123, 0.05021460132555987, 2.3146518208348152, 1.733054979982291]}, + {'mass': 10.972734402996027, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 20479.71919353725, 'eccentricity': 0.0}, + "Failing binary in matching"), + + # 2: Flipped S1 and S2 (near-equal mass) + ({'mass': 9.474917413943635, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [133.5713935237759, 4.398754864537542, 2.703102872841114, 1.4633904612711142]}, + {'mass': 9.311073918196263, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 18.605997832086413, 'eccentricity': 0.0}, + "Flipped S1 and S2 (near-equal mass)"), + + # 3: Flipped S1 and S2 (high mass ratio) + ({'mass': 10.438541, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 1.400713, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 9.824025, 'eccentricity': 0.0}, + "Flipped S1 and S2 (high mass ratio)"), + + # 4: Flipped S1 and S2 + ({'mass': 9.845907, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}, + {'mass': 9.611029, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 3.820571, 'eccentricity': 0.0}, + "Flipped S1 and S2"), + + # 5: Normal binary evolution (high mass) + ({'mass': 30.845907, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}, + {'mass': 30.611029, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 30.820571, 'eccentricity': 0.0}, + "Normal binary evolution (high mass)"), + + # 6: Normal binary (wide orbit) + ({'mass': 9.213534679594247, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [327.5906384501521, 1.7707176050073297, 1.573225822966838, 1.6757313876001914]}, + {'mass': 7.209878522799272, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 63123.74544474666, 'eccentricity': 0.0}, + "Normal binary (wide orbit)"), + + # 7: Normal binary (near-equal mass, close) + ({'mass': 9.561158487732602, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [317.5423844462847, 2.9095984678057603, 1.754121288652108, 2.3693917842468784]}, + {'mass': 9.382732464319286, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 27.77657038557851, 'eccentricity': 0.0}, + "Normal binary (near-equal mass, close)"), + + # 8: Normal binary + ({'mass': 7.552858, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [40.91509926587841, 2.6295454150818256, 1.6718337470964977, 6.0408769315244895]}, + {'mass': 6.742063, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 17.957531550841225, 'eccentricity': 0.0}, + "Normal binary"), + + # 9: High BH spin options + ({'mass': 31.616785, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [10, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}, + {'mass': 26.874267, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 501.99252706449792, 'eccentricity': 0.0}, + "High BH spin options"), + + # 10: Original a>1 spin error + ({'mass': 18.107506844123645, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [528.2970725443025, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}, + {'mass': 15.641392951875442, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 151.99252706449792, 'eccentricity': 0.0}, + "Original a>1 spin error"), + + # 11: FIXED disrupted crash + ({'mass': 52.967313, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 36.306444, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 12.877004, 'eccentricity': 0.0}, + "FIXED disrupted crash"), + + # 12: FIXED error with SN type + ({'mass': 17.782576, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 3.273864, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 4513.150157, 'eccentricity': 0.0}, + "FIXED error with SN type"), + + # 13: FIXED oRLO2 looping + ({'mass': 170.638207, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [4.921294, 4.31745, 1.777768, 3.509656]}, + {'mass': 37.917852, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 113.352736, 'eccentricity': 0.0}, + "FIXED oRLO2 looping"), + + # 14: Redirect to step_CO_HeMS + ({'mass': 8.333579, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [17.125568, 4.101834, 0.917541, 3.961291]}, + {'mass': 8.208376, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 66.870417, 'eccentricity': 0.0}, + "Redirect to step_CO_HeMS"), + + # 15: FIXED oRLO2 looping + ({'mass': 16.921378, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}, + {'mass': 16.286318, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 37.958768, 'eccentricity': 0.0}, + "FIXED oRLO2 looping"), + + # 16: FIXED step_detached failure + ({'mass': 19.787769, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [24.464803, 0.666314, 1.954698, 5.598975]}, + {'mass': 7.638741, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 3007.865561, 'eccentricity': 0.0}, + "FIXED step_detached failure"), + + # 17: Disrupted binary + ({'mass': 16.921378, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}, + {'mass': 16.286318, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 3007.865561, 'eccentricity': 0.0}, + "Disrupted binary"), + + # 18: FIXED Detached binary failure (low mass) + ({'mass': 9, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 0.8, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 4513.150157, 'eccentricity': 0.0}, + "FIXED Detached binary failure (low mass)"), + + # 19: FIXED SN_TYPE = None crash + ({'mass': 17.782576, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 3.273864, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 4513.150157, 'eccentricity': 0.0}, + "FIXED SN_TYPE = None crash"), + + # 20: FIXED SN_TYPE errors (low mass primary) + ({'mass': 6.782576, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 3.273864, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 4513.150157, 'eccentricity': 0.0}, + "FIXED SN_TYPE errors (low mass primary)"), + + # 21: FIXED SN_TYPE errors (high mass) + ({'mass': 40.638207, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [30.921294, 4.31745, 1.777768, 3.509656]}, + {'mass': 37.917852, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 2113.352736, 'eccentricity': 0.0}, + "FIXED SN_TYPE errors (high mass)"), + + # 22: FIXED ECSN errors + ({'mass': 12.376778, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [80, 4.31745, 1.777768, 3.509656]}, + {'mass': 9.711216, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 79.83702, 'eccentricity': 0.0}, + "FIXED ECSN errors"), + + # 23: Interpolator masses (close) + ({'mass': 7.592921, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 5.038679, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 5.537807, 'eccentricity': 0.0}, + "Interpolator masses (close)"), + + # 24: Interpolator masses (both kicked) + ({'mass': 38.741115, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [21.113771, 2.060135, 2.224789, 4.089729]}, + {'mass': 27.776178, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [282.712103, 0.296252, 1.628433, 5.623812]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 93.387072, 'eccentricity': 0.0}, + "Interpolator masses (both kicked)"), + + # 25: FIXED NaN spin (very high mass, wide) + ({'mass': 70.066924, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 34.183110, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 5.931492e+03, 'eccentricity': 0.0}, + "FIXED NaN spin (very high mass, wide)"), + + # 26: FIXED NaN spin + ({'mass': 28.837286, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 6.874867, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 35.609894, 'eccentricity': 0.0}, + "FIXED NaN spin"), + + # 27: oRLO2 issue (near-equal mass) + ({'mass': 29.580210, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 28.814626, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 40.437993, 'eccentricity': 0.0}, + "oRLO2 issue (near-equal mass)"), + + # 28: oRLO2 issue (high mass ratio) + ({'mass': 67.126795, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 19.622908, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 1484.768582, 'eccentricity': 0.0}, + "oRLO2 issue (high mass ratio)"), + + # 29: oRLO2 issue (very high mass, near-equal) + ({'mass': 58.947503, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 56.660506, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 2011.300659, 'eccentricity': 0.0}, + "oRLO2 issue (very high mass, near-equal)"), + + # 30: oRLO2 issue (extreme mass, kicked) + ({'mass': 170.638207, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [47.979957374424956, 5.317304576107798, 2.7259013166068145, 4.700929589520818]}, + {'mass': 37.917852, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 113.352736, 'eccentricity': 0.0}, + "oRLO2 issue (extreme mass, kicked)"), + + # 31: oRLO2 issue (very high mass, close) + ({'mass': 109.540207, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 84.344530, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 5.651896, 'eccentricity': 0.0}, + "oRLO2 issue (very high mass, close)"), + + # 32: Redirect (extreme mass ratio) + ({'mass': 13.889634, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 0.490231, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 14513.150157, 'eccentricity': 0.0}, + "Redirect (extreme mass ratio)"), + + # 33: Redirect (low mass secondary) + ({'mass': 9, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 0.8, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 4513.150157, 'eccentricity': 0.0}, + "Redirect (low mass secondary)"), + + # 34: Max time (very high mass, wide) + ({'mass': 103.07996766780799, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.2965418610971261, 2.0789170290719117, 3.207488023705968]}, + {'mass': 83.66522615073987, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 1449.1101985875678, 'eccentricity': 0.0}, + "Max time (very high mass, wide)"), + + # 35: Max time + ({'mass': 8.860934140643465, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [11.818027275431337, 2.812412688633058, 0.4998731824233789, 2.9272630485628643]}, + {'mass': 8.584716012668551, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 20.82030114750744, 'eccentricity': 0.0}, + "Max time"), + + # 36: PR421 + ({'mass': 24.035366, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 23.187355, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 18.865029, 'eccentricity': 0.0}, + "PR421"), + + # 37: CE class + ({'mass': 33.964274, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 28.98149, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 82.370989, 'eccentricity': 0.0}, + "CE class"), + + # 38: PR574 - stepCE fix + ({'mass': 29.580210, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 28.814626 * 0.4, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 300.437993, 'eccentricity': 0.0}, + "PR574 - stepCE fix"), + + # 39: e_ZAMS error + ({'mass': 8.161885721822461, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 3.5907829421526154, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 36.873457164644144, 'eccentricity': 0.0}, + "e_ZAMS error"), + + # 40: e_ZAMS error (eccentric) + ({'mass': 35.24755025317775, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [19.755993125895806, 0.37149222852233904, 1.6588846085306563, 1.434617029858906]}, + {'mass': 30.000450298072902, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 24060.02101364665, 'eccentricity': 0.8085077857996965}, + "e_ZAMS error (eccentric)"), + + # 41: e_ZAMS error (high mass ratio) + ({'mass': 11.862930493162692, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 1.4739109294156703, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 4111.083887312003, 'eccentricity': 0.0}, + "e_ZAMS error (high mass ratio)"), + + # 42: e_ZAMS error (extreme mass ratio) + ({'mass': 8.527361341212108, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 0.7061748406821822, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 2521.1927287891444, 'eccentricity': 0.0}, + "e_ZAMS error (extreme mass ratio)"), + + # 43: e_ZAMS error + ({'mass': 13.661942533447398, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 4.466151109802313, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 3110.1346707516914, 'eccentricity': 0.0}, + "e_ZAMS error"), + ] + + return binaries + + +def evolve_binaries(metallicity, verbose, output_path, ini_path=None): + """Evolves the test binary suite at the given metallicity and saves results. + + Args: + metallicity: float, metallicity in solar units + verbose: bool + output_path: str, path to save HDF5 output + ini_path: str, path to ini file (auto-detected if None) + """ + print(f"{'=' * LINE_LENGTH}") + print(f" Evolving test binaries at Z = {metallicity} Zsun") + print(f" Output: {output_path}") + print(f"{'=' * LINE_LENGTH}\n") + + sim_prop = load_inlist(metallicity, verbose, ini_path) + test_binaries = get_test_binaries(metallicity, sim_prop) + + with pd.HDFStore(output_path, mode="w") as h5file: + # Save metadata + meta_df = pd.DataFrame([{ + 'metallicity': metallicity, + 'n_binaries': len(test_binaries), + }]) + h5file.put("metadata", meta_df, format="table") + + for binary_id, (s1_kw, s2_kw, bin_kw, description) in enumerate(test_binaries): + print(f"\n[{binary_id}/{len(test_binaries)-1}] {description}") + + star_1 = SingleStar(**s1_kw) + star_2 = SingleStar(**s2_kw) + + # Add separation from period if not explicitly provided + if 'separation' not in bin_kw and 'orbital_period' in bin_kw: + bin_kw['separation'] = orbital_separation_from_period( + bin_kw['orbital_period'], star_1.mass, star_2.mass + ) + + binary = BinaryStar(star_1, star_2, **bin_kw, properties=sim_prop) + evolve_binary(binary, h5file, binary_id) + + print(f"\n{'=' * LINE_LENGTH}") + print(f" All {len(test_binaries)} binaries complete. Results saved to {output_path}") + print(f"{'=' * LINE_LENGTH}") + +if __name__ == "__main__": + parser = argparse.ArgumentParser( + description='Evolve test binaries for POSYDON branch validation.', + formatter_class=argparse.ArgumentDefaultsHelpFormatter + ) + parser.add_argument('--verbose', '-v', action='store_true', default=False, + help='Enable verbose output') + parser.add_argument('--output', type=str, required=True, + help='Path to save HDF5 output') + parser.add_argument('--metallicity', '-Z', type=float, default=1.0, + help=f'Metallicity in solar units. Available: {AVAILABLE_METALLICITIES}') + parser.add_argument('--ini', type=str, default=None, + help='Path to params ini file (auto-detected if not given)') + args = parser.parse_args() + + if args.metallicity not in AVAILABLE_METALLICITIES: + print(f"WARNING: Metallicity {args.metallicity} not in standard set {AVAILABLE_METALLICITIES}.") + print(f"Proceeding anyway, but POSYDON grids may not exist for this value.") + + evolve_binaries( + metallicity=args.metallicity, + verbose=args.verbose, + output_path=args.output, + ini_path=args.ini, + ) \ No newline at end of file diff --git a/dev-tools/validate_binaries.sh b/dev-tools/validate_binaries.sh index 04a041af06..2ae354b4fa 100644 --- a/dev-tools/validate_binaries.sh +++ b/dev-tools/validate_binaries.sh @@ -1,26 +1,144 @@ -#!/bin/bash - -# A script for validating the outputs of 100 binaries, -# which can be compared to a baseline to monitor changes to the code. - -# script usage: ./validate_binaries.sh --branch candidate_branch - -BRANCH=$1 -SUFFIX=$2 - -# run candidate binaries and save to file -./evolve_binaries.sh "$BRANCH" - -# compare quantitative, qualitative, warnings/errors, structured output -# create outputs/comparison_branchname.txt -SAFE_BRANCH="${BRANCH//\//_}" -CANDIDATE_FILE="outputs/candidate_${SAFE_BRANCH}.h5" -COMPARISON_FILE="outputs/comparison_${SAFE_BRANCH}${SUFFIX:+_$SUFFIX}.txt" -python compare_runs.py baseline.h5 "$CANDIDATE_FILE" > "$COMPARISON_FILE" - -if [ $? -ne 0 ]; then - echo "Error: compare_runs.py failed. Check $COMPARISON_FILE" - exit 1 -fi - -echo "Binary evolution comparison saved to $COMPARISON_FILE" +#!/bin/bash +# ============================================================================= +# validate_binaries.sh ā€” Run the full validation pipeline: +# 1. Evolve test binaries on a candidate branch +# 2. Compare against baseline files +# +# Usage: +# ./validate_binaries.sh [baseline_branch] [metallicities] +# +# Examples: +# ./validate_binaries.sh feature/new-SN # compare vs main baseline +# ./validate_binaries.sh feature/new-SN v2.1.0 # compare vs v2.1.0 baseline +# ./validate_binaries.sh feature/new-SN main "1 0.45" # subset of metallicities +# +# Prerequisites: +# Run generate_baseline.sh first to create baseline files. +# +# Output: +# outputs//comparison_Zsun.txt ā€” per-metallicity comparison reports +# outputs//comparison_summary.txt ā€” overall summary +# ============================================================================= + +set -euo pipefail + +CANDIDATE_BRANCH=${1:?Usage: ./validate_binaries.sh [baseline_branch] [metallicities]} +BASELINE_BRANCH=${2:-main} +METALLICITIES=${3:-"2 1 0.45 0.2 0.1 0.01 0.001 0.0001"} + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +SAFE_CANDIDATE="${CANDIDATE_BRANCH//\//_}" +SAFE_BASELINE="${BASELINE_BRANCH//\//_}" + +BASELINE_DIR="$SCRIPT_DIR/baselines/${SAFE_BASELINE}" +OUTPUT_DIR="$SCRIPT_DIR/outputs/${SAFE_CANDIDATE}" +SUMMARY_FILE="$OUTPUT_DIR/comparison_summary.txt" + +echo "============================================================" +echo " POSYDON Binary Validation" +echo " Candidate: $CANDIDATE_BRANCH" +echo " Baseline: $BASELINE_BRANCH" +echo " Metallicities: $METALLICITIES" +echo "============================================================" + +# ā”€ā”€ Verify baseline exists ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ +if [ ! -d "$BASELINE_DIR" ]; then + echo "ERROR: Baseline directory not found: $BASELINE_DIR" >&2 + echo "Run generate_baseline.sh first:" >&2 + echo " ./generate_baseline.sh $BASELINE_BRANCH" >&2 + exit 1 +fi + +# Check that at least one baseline file exists +BASELINE_COUNT=0 +for Z in $METALLICITIES; do + if [ -f "$BASELINE_DIR/baseline_${Z}Zsun.h5" ]; then + BASELINE_COUNT=$((BASELINE_COUNT + 1)) + fi +done +if [ $BASELINE_COUNT -eq 0 ]; then + echo "ERROR: No baseline files found in $BASELINE_DIR for requested metallicities." >&2 + exit 1 +fi +echo " Found $BASELINE_COUNT baseline file(s)." + +# ā”€ā”€ Step 1: Evolve binaries on candidate branch ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ +echo "" +echo "Step 1: Evolving binaries on candidate branch '$CANDIDATE_BRANCH'..." +"$SCRIPT_DIR/evolve_binaries.sh" "$CANDIDATE_BRANCH" "" "$METALLICITIES" + +# ā”€ā”€ Step 2: Compare each metallicity ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ +echo "" +echo "Step 2: Comparing results..." + +TOTAL=0 +PASS=0 +FAIL=0 +SKIP=0 + +# Initialize summary +mkdir -p "$OUTPUT_DIR" +cat > "$SUMMARY_FILE" << EOF +POSYDON Binary Validation ā€” Comparison Summary +================================================ +Candidate branch: $CANDIDATE_BRANCH +Baseline branch: $BASELINE_BRANCH +Date: $(date -u '+%Y-%m-%d %H:%M:%S UTC') +================================================ + +EOF + +for Z in $METALLICITIES; do + TOTAL=$((TOTAL + 1)) + + BASELINE_FILE="$BASELINE_DIR/baseline_${Z}Zsun.h5" + CANDIDATE_FILE="$OUTPUT_DIR/candidate_${Z}Zsun.h5" + COMPARISON_FILE="$OUTPUT_DIR/comparison_${Z}Zsun.txt" + + echo "" + echo "--- Z = ${Z} Zsun ---" + + if [ ! -f "$BASELINE_FILE" ]; then + echo " SKIP: No baseline file for Z=${Z}" + echo "Z = ${Z} Zsun: SKIPPED (no baseline)" >> "$SUMMARY_FILE" + SKIP=$((SKIP + 1)) + continue + fi + + if [ ! -f "$CANDIDATE_FILE" ]; then + echo " FAIL: No candidate file for Z=${Z}" + echo "Z = ${Z} Zsun: FAIL (no candidate output)" >> "$SUMMARY_FILE" + FAIL=$((FAIL + 1)) + continue + fi + + if python "$SCRIPT_DIR/compare_runs.py" "$BASELINE_FILE" "$CANDIDATE_FILE" \ + 2>&1 | tee "$COMPARISON_FILE"; then + echo " PASS: No differences" + echo "Z = ${Z} Zsun: PASS" >> "$SUMMARY_FILE" + PASS=$((PASS + 1)) + else + echo " DIFFERENCES DETECTED ā€” see $COMPARISON_FILE" + echo "Z = ${Z} Zsun: DIFFERENCES DETECTED (see comparison_${Z}Zsun.txt)" >> "$SUMMARY_FILE" + FAIL=$((FAIL + 1)) + fi +done + +# ā”€ā”€ Final Summary ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ +cat >> "$SUMMARY_FILE" << EOF + +================================================ +TOTAL: $TOTAL | PASS: $PASS | FAIL: $FAIL | SKIP: $SKIP +EOF + +echo "" +echo "============================================================" +echo " Validation Summary" +echo " TOTAL: $TOTAL | PASS: $PASS | FAIL: $FAIL | SKIP: $SKIP" +echo " Full summary: $SUMMARY_FILE" +echo "============================================================" + +if [ $FAIL -gt 0 ]; then + exit 1 +fi +exit 0 \ No newline at end of file From 06abf4b4e7bd67b8f83743fbd452e61261ef190a Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Thu, 26 Feb 2026 04:15:34 -0600 Subject: [PATCH 133/389] gitignore --- dev-tools/.gitignore | 9 - dev-tools/check_outputs.ipynb | 512 ---------------------------------- 2 files changed, 521 deletions(-) delete mode 100644 dev-tools/check_outputs.ipynb diff --git a/dev-tools/.gitignore b/dev-tools/.gitignore index 1cea72efc6..bec9d97e5a 100644 --- a/dev-tools/.gitignore +++ b/dev-tools/.gitignore @@ -1,14 +1,5 @@ -# Remove the accidentally staged clone -git rm --cached -r workdirs/ - -# Create .gitignore -cat > .gitignore << 'EOF' workdirs/ outputs/ logs/ baselines/ test_*.h5 -EOF - -git add .gitignore - diff --git a/dev-tools/check_outputs.ipynb b/dev-tools/check_outputs.ipynb deleted file mode 100644 index c0073df835..0000000000 --- a/dev-tools/check_outputs.ipynb +++ /dev/null @@ -1,512 +0,0 @@ -{ - "cells": [ - { - "cell_type": "code", - "execution_count": 1, - "id": "7e9791d3", - "metadata": {}, - "outputs": [], - "source": [ - "import argparse\n", - "import os\n", - "import signal\n", - "import sys\n", - "import warnings\n", - "import h5py\n", - "import pandas as pd\n", - "\n", - "from posydon.binary_evol.binarystar import BinaryStar, SingleStar\n", - "from posydon.binary_evol.simulationproperties import SimulationProperties\n", - "from posydon.popsyn.io import simprop_kwargs_from_ini\n", - "from posydon.utils.common_functions import orbital_separation_from_period" - ] - }, - { - "cell_type": "code", - "execution_count": 2, - "id": "327be9fe", - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "env: PATH_TO_POSYDON=/projects/b1119/eteng/software/valid/POSYDON/\n", - "env: PATH_TO_POSYDON_DATA=/projects/b1119/POSYDON_popsynth_data/v2/250520_newSNe/\n" - ] - } - ], - "source": [ - "%env PATH_TO_POSYDON=/projects/b1119/eteng/software/valid/POSYDON/\n", - "%env PATH_TO_POSYDON_DATA=/projects/b1119/POSYDON_popsynth_data/v2/250520_newSNe/" - ] - }, - { - "cell_type": "code", - "execution_count": 4, - "id": "994f6ebf", - "metadata": {}, - "outputs": [ - { - "ename": "HDF5ExtError", - "evalue": "HDF5 error back trace\n\n File \"H5F.c\", line 836, in H5Fopen\n unable to synchronously open file\n File \"H5F.c\", line 796, in H5F__open_api_common\n unable to open file\n File \"H5VLcallback.c\", line 3863, in H5VL_file_open\n open failed\n File \"H5VLcallback.c\", line 3675, in H5VL__file_open\n open failed\n File \"H5VLnative_file.c\", line 128, in H5VL__native_file_open\n unable to open file\n File \"H5Fint.c\", line 2018, in H5F_open\n unable to read superblock\n File \"H5Fsuper.c\", line 600, in H5F__super_read\n truncated file: eof = 96, sblock->base_addr = 0, stored_eof = 2048\n\nEnd of HDF5 error back trace\n\nUnable to open/create file './POSYDON_main/outputs/candidate_main.h5'", - "output_type": "error", - "traceback": [ - "\u001b[31m---------------------------------------------------------------------------\u001b[39m", - "\u001b[31mHDF5ExtError\u001b[39m Traceback (most recent call last)", - "\u001b[36mCell\u001b[39m\u001b[36m \u001b[39m\u001b[32mIn[4]\u001b[39m\u001b[32m, line 1\u001b[39m\n\u001b[32m----> \u001b[39m\u001b[32m1\u001b[39m df = \u001b[43mpd\u001b[49m\u001b[43m.\u001b[49m\u001b[43mread_hdf\u001b[49m\u001b[43m(\u001b[49m\u001b[33;43m'\u001b[39;49m\u001b[33;43m./POSYDON_main/outputs/candidate_main.h5\u001b[39;49m\u001b[33;43m'\u001b[39;49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[33;43m\"\u001b[39;49m\u001b[33;43mevolution\u001b[39;49m\u001b[33;43m\"\u001b[39;49m\u001b[43m)\u001b[49m\n\u001b[32m 2\u001b[39m warnings = pd.read_hdf(\u001b[33m'\u001b[39m\u001b[33m./POSYDON_main/outputs/candidate_main.h5\u001b[39m\u001b[33m'\u001b[39m, \u001b[33m\"\u001b[39m\u001b[33mwarnings\u001b[39m\u001b[33m\"\u001b[39m)\n", - "\u001b[36mFile \u001b[39m\u001b[32m~/.conda/envs/valid/lib/python3.11/site-packages/pandas/io/pytables.py:426\u001b[39m, in \u001b[36mread_hdf\u001b[39m\u001b[34m(path_or_buf, key, mode, errors, where, start, stop, columns, iterator, chunksize, **kwargs)\u001b[39m\n\u001b[32m 423\u001b[39m \u001b[38;5;28;01mif\u001b[39;00m \u001b[38;5;129;01mnot\u001b[39;00m exists:\n\u001b[32m 424\u001b[39m \u001b[38;5;28;01mraise\u001b[39;00m \u001b[38;5;167;01mFileNotFoundError\u001b[39;00m(\u001b[33mf\u001b[39m\u001b[33m\"\u001b[39m\u001b[33mFile \u001b[39m\u001b[38;5;132;01m{\u001b[39;00mpath_or_buf\u001b[38;5;132;01m}\u001b[39;00m\u001b[33m does not exist\u001b[39m\u001b[33m\"\u001b[39m)\n\u001b[32m--> \u001b[39m\u001b[32m426\u001b[39m store = \u001b[43mHDFStore\u001b[49m\u001b[43m(\u001b[49m\u001b[43mpath_or_buf\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mmode\u001b[49m\u001b[43m=\u001b[49m\u001b[43mmode\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43merrors\u001b[49m\u001b[43m=\u001b[49m\u001b[43merrors\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43m*\u001b[49m\u001b[43m*\u001b[49m\u001b[43mkwargs\u001b[49m\u001b[43m)\u001b[49m\n\u001b[32m 427\u001b[39m \u001b[38;5;66;03m# can't auto open/close if we are using an iterator\u001b[39;00m\n\u001b[32m 428\u001b[39m \u001b[38;5;66;03m# so delegate to the iterator\u001b[39;00m\n\u001b[32m 429\u001b[39m auto_close = \u001b[38;5;28;01mTrue\u001b[39;00m\n", - "\u001b[36mFile \u001b[39m\u001b[32m~/.conda/envs/valid/lib/python3.11/site-packages/pandas/io/pytables.py:585\u001b[39m, in \u001b[36mHDFStore.__init__\u001b[39m\u001b[34m(self, path, mode, complevel, complib, fletcher32, **kwargs)\u001b[39m\n\u001b[32m 583\u001b[39m \u001b[38;5;28mself\u001b[39m._fletcher32 = fletcher32\n\u001b[32m 584\u001b[39m \u001b[38;5;28mself\u001b[39m._filters = \u001b[38;5;28;01mNone\u001b[39;00m\n\u001b[32m--> \u001b[39m\u001b[32m585\u001b[39m \u001b[38;5;28;43mself\u001b[39;49m\u001b[43m.\u001b[49m\u001b[43mopen\u001b[49m\u001b[43m(\u001b[49m\u001b[43mmode\u001b[49m\u001b[43m=\u001b[49m\u001b[43mmode\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43m*\u001b[49m\u001b[43m*\u001b[49m\u001b[43mkwargs\u001b[49m\u001b[43m)\u001b[49m\n", - "\u001b[36mFile \u001b[39m\u001b[32m~/.conda/envs/valid/lib/python3.11/site-packages/pandas/io/pytables.py:745\u001b[39m, in \u001b[36mHDFStore.open\u001b[39m\u001b[34m(self, mode, **kwargs)\u001b[39m\n\u001b[32m 739\u001b[39m msg = (\n\u001b[32m 740\u001b[39m \u001b[33m\"\u001b[39m\u001b[33mCannot open HDF5 file, which is already opened, \u001b[39m\u001b[33m\"\u001b[39m\n\u001b[32m 741\u001b[39m \u001b[33m\"\u001b[39m\u001b[33meven in read-only mode.\u001b[39m\u001b[33m\"\u001b[39m\n\u001b[32m 742\u001b[39m )\n\u001b[32m 743\u001b[39m \u001b[38;5;28;01mraise\u001b[39;00m \u001b[38;5;167;01mValueError\u001b[39;00m(msg)\n\u001b[32m--> \u001b[39m\u001b[32m745\u001b[39m \u001b[38;5;28mself\u001b[39m._handle = \u001b[43mtables\u001b[49m\u001b[43m.\u001b[49m\u001b[43mopen_file\u001b[49m\u001b[43m(\u001b[49m\u001b[38;5;28;43mself\u001b[39;49m\u001b[43m.\u001b[49m\u001b[43m_path\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[38;5;28;43mself\u001b[39;49m\u001b[43m.\u001b[49m\u001b[43m_mode\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43m*\u001b[49m\u001b[43m*\u001b[49m\u001b[43mkwargs\u001b[49m\u001b[43m)\u001b[49m\n", - "\u001b[36mFile \u001b[39m\u001b[32m~/.conda/envs/valid/lib/python3.11/site-packages/tables/file.py:296\u001b[39m, in \u001b[36mopen_file\u001b[39m\u001b[34m(filename, mode, title, root_uep, filters, **kwargs)\u001b[39m\n\u001b[32m 291\u001b[39m \u001b[38;5;28;01mraise\u001b[39;00m \u001b[38;5;167;01mValueError\u001b[39;00m(\n\u001b[32m 292\u001b[39m \u001b[33m\"\u001b[39m\u001b[33mThe file \u001b[39m\u001b[33m'\u001b[39m\u001b[38;5;132;01m%s\u001b[39;00m\u001b[33m'\u001b[39m\u001b[33m is already opened. Please \u001b[39m\u001b[33m\"\u001b[39m\n\u001b[32m 293\u001b[39m \u001b[33m\"\u001b[39m\u001b[33mclose it before reopening in write mode.\u001b[39m\u001b[33m\"\u001b[39m % filename)\n\u001b[32m 295\u001b[39m \u001b[38;5;66;03m# Finally, create the File instance, and return it\u001b[39;00m\n\u001b[32m--> \u001b[39m\u001b[32m296\u001b[39m \u001b[38;5;28;01mreturn\u001b[39;00m \u001b[43mFile\u001b[49m\u001b[43m(\u001b[49m\u001b[43mfilename\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mmode\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mtitle\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mroot_uep\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mfilters\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43m*\u001b[49m\u001b[43m*\u001b[49m\u001b[43mkwargs\u001b[49m\u001b[43m)\u001b[49m\n", - "\u001b[36mFile \u001b[39m\u001b[32m~/.conda/envs/valid/lib/python3.11/site-packages/tables/file.py:746\u001b[39m, in \u001b[36mFile.__init__\u001b[39m\u001b[34m(self, filename, mode, title, root_uep, filters, **kwargs)\u001b[39m\n\u001b[32m 743\u001b[39m \u001b[38;5;28mself\u001b[39m.params = params\n\u001b[32m 745\u001b[39m \u001b[38;5;66;03m# Now, it is time to initialize the File extension\u001b[39;00m\n\u001b[32m--> \u001b[39m\u001b[32m746\u001b[39m \u001b[38;5;28;43mself\u001b[39;49m\u001b[43m.\u001b[49m\u001b[43m_g_new\u001b[49m\u001b[43m(\u001b[49m\u001b[43mfilename\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mmode\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43m*\u001b[49m\u001b[43m*\u001b[49m\u001b[43mparams\u001b[49m\u001b[43m)\u001b[49m\n\u001b[32m 748\u001b[39m \u001b[38;5;66;03m# Check filters and set PyTables format version for new files.\u001b[39;00m\n\u001b[32m 749\u001b[39m new = \u001b[38;5;28mself\u001b[39m._v_new\n", - "\u001b[36mFile \u001b[39m\u001b[32m~/.conda/envs/valid/lib/python3.11/site-packages/tables/hdf5extension.pyx:514\u001b[39m, in \u001b[36mtables.hdf5extension.File._g_new\u001b[39m\u001b[34m()\u001b[39m\n", - "\u001b[31mHDF5ExtError\u001b[39m: HDF5 error back trace\n\n File \"H5F.c\", line 836, in H5Fopen\n unable to synchronously open file\n File \"H5F.c\", line 796, in H5F__open_api_common\n unable to open file\n File \"H5VLcallback.c\", line 3863, in H5VL_file_open\n open failed\n File \"H5VLcallback.c\", line 3675, in H5VL__file_open\n open failed\n File \"H5VLnative_file.c\", line 128, in H5VL__native_file_open\n unable to open file\n File \"H5Fint.c\", line 2018, in H5F_open\n unable to read superblock\n File \"H5Fsuper.c\", line 600, in H5F__super_read\n truncated file: eof = 96, sblock->base_addr = 0, stored_eof = 2048\n\nEnd of HDF5 error back trace\n\nUnable to open/create file './POSYDON_main/outputs/candidate_main.h5'" - ] - } - ], - "source": [ - "df = pd.read_hdf('./POSYDON_main/outputs/candidate_main.h5', \"evolution\")\n", - "warnings = pd.read_hdf('./POSYDON_main/outputs/candidate_main.h5', \"warnings\")" - ] - }, - { - "cell_type": "code", - "execution_count": 56, - "id": "7028a060", - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "Index(['state', 'event', 'time', 'separation', 'orbital_period',\n", - " 'eccentricity', 'rl_relative_overflow_1', 'rl_relative_overflow_2',\n", - " 'lg_mtransfer_rate', 'mass_transfer_case',\n", - " ...\n", - " 'S2_mass_conv_reg_fortides', 'S2_thickness_conv_reg_fortides',\n", - " 'S2_radius_conv_reg_fortides', 'S2_lambda_CE_1cent',\n", - " 'S2_lambda_CE_10cent', 'S2_lambda_CE_30cent',\n", - " 'S2_lambda_CE_pure_He_star_10cent', 'S2_total_mass_h1',\n", - " 'S2_total_mass_he4', 'binary_id'],\n", - " dtype='object', length=134)\n" - ] - } - ], - "source": [ - "print(df.keys())" - ] - }, - { - "cell_type": "code", - "execution_count": 20, - "id": "76233b25", - "metadata": { - "collapsed": true - }, - "outputs": [ - { - "data": { - "text/html": [ - "
\n", - "\n", - "\n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - "
binary_idexception_typeexception_message
01ValueErrorTrying to store a string with len [27] in [S1_...
02ValueErrorTrying to store a string with len [12] in [sta...
03ValueErrorTrying to store a string with len [9] in [even...
04ValueErrorTrying to store a string with len [9] in [even...
05ValueErrorTrying to store a string with len [9] in [even...
07ValueErrorTrying to store a string with len [27] in [S1_...
08ValueErrorTrying to store a string with len [10] in [eve...
09ValueErrorTrying to store a string with len [7] in [even...
010ValueErrorTrying to store a string with len [27] in [S1_...
011ValueErrorTrying to store a string with len [7] in [even...
012ValueErrorTrying to store a string with len [7] in [even...
013ValueErrorTrying to store a string with len [7] in [even...
014ValueErrorTrying to store a string with len [23] in [S1_...
015ValueErrorTrying to store a string with len [9] in [even...
016ValueErrorTrying to store a string with len [9] in [even...
018ValueErrorTrying to store a string with len [7] in [even...
019ValueErrorTrying to store a string with len [7] in [even...
020ValueErrorTrying to store a string with len [7] in [even...
021ValueErrorTrying to store a string with len [7] in [even...
022ValueErrorTrying to store a string with len [9] in [even...
023ValueErrorTrying to store a string with len [9] in [even...
024ValueErrorTrying to store a string with len [9] in [even...
025ValueErrorTrying to store a string with len [7] in [even...
026ValueErrorTrying to store a string with len [9] in [even...
027ValueErrorTrying to store a string with len [7] in [even...
028ValueErrorTrying to store a string with len [7] in [even...
029ValueErrorTrying to store a string with len [7] in [even...
030ValueErrorTrying to store a string with len [7] in [even...
031ValueErrorTrying to store a string with len [7] in [even...
032ValueErrorTrying to store a string with len [7] in [even...
033ValueErrorTrying to store a string with len [7] in [even...
034ValueErrorTrying to store a string with len [7] in [even...
035ValueErrorTrying to store a string with len [9] in [even...
036ValueErrorTrying to store a string with len [7] in [even...
037ValueErrorTrying to store a string with len [10] in [eve...
038ValueErrorTrying to store a string with len [9] in [even...
039MatchingErrorGrid matching failed for merged binary. \\nseco...
040ClassificationErrorBinary is in the detached step but has stable ...
041ValueErrorTrying to store a string with len [7] in [even...
042FlowErrorEvolution of H-rich/He-rich stars in RLO onto ...
043ValueErrorTrying to store a string with len [7] in [even...
\n", - "
" - ], - "text/plain": [ - " binary_id exception_type \\\n", - "0 1 ValueError \n", - "0 2 ValueError \n", - "0 3 ValueError \n", - "0 4 ValueError \n", - "0 5 ValueError \n", - "0 7 ValueError \n", - "0 8 ValueError \n", - "0 9 ValueError \n", - "0 10 ValueError \n", - "0 11 ValueError \n", - "0 12 ValueError \n", - "0 13 ValueError \n", - "0 14 ValueError \n", - "0 15 ValueError \n", - "0 16 ValueError \n", - "0 18 ValueError \n", - "0 19 ValueError \n", - "0 20 ValueError \n", - "0 21 ValueError \n", - "0 22 ValueError \n", - "0 23 ValueError \n", - "0 24 ValueError \n", - "0 25 ValueError \n", - "0 26 ValueError \n", - "0 27 ValueError \n", - "0 28 ValueError \n", - "0 29 ValueError \n", - "0 30 ValueError \n", - "0 31 ValueError \n", - "0 32 ValueError \n", - "0 33 ValueError \n", - "0 34 ValueError \n", - "0 35 ValueError \n", - "0 36 ValueError \n", - "0 37 ValueError \n", - "0 38 ValueError \n", - "0 39 MatchingError \n", - "0 40 ClassificationError \n", - "0 41 ValueError \n", - "0 42 FlowError \n", - "0 43 ValueError \n", - "\n", - " exception_message \n", - "0 Trying to store a string with len [27] in [S1_... \n", - "0 Trying to store a string with len [12] in [sta... \n", - "0 Trying to store a string with len [9] in [even... \n", - "0 Trying to store a string with len [9] in [even... \n", - "0 Trying to store a string with len [9] in [even... \n", - "0 Trying to store a string with len [27] in [S1_... \n", - "0 Trying to store a string with len [10] in [eve... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [27] in [S1_... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [23] in [S1_... \n", - "0 Trying to store a string with len [9] in [even... \n", - "0 Trying to store a string with len [9] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [9] in [even... \n", - "0 Trying to store a string with len [9] in [even... \n", - "0 Trying to store a string with len [9] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [9] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [9] in [even... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Trying to store a string with len [10] in [eve... \n", - "0 Trying to store a string with len [9] in [even... \n", - "0 Grid matching failed for merged binary. \\nseco... \n", - "0 Binary is in the detached step but has stable ... \n", - "0 Trying to store a string with len [7] in [even... \n", - "0 Evolution of H-rich/He-rich stars in RLO onto ... \n", - "0 Trying to store a string with len [7] in [even... " - ] - }, - "execution_count": 20, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "errors" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "id": "68d4d8a8", - "metadata": {}, - "outputs": [], - "source": [] - } - ], - "metadata": { - "kernelspec": { - "display_name": "valid", - "language": "python", - "name": "valid" - }, - "language_info": { - "codemirror_mode": { - "name": "ipython", - "version": 3 - }, - "file_extension": ".py", - "mimetype": "text/x-python", - "name": "python", - "nbconvert_exporter": "python", - "pygments_lexer": "ipython3", - "version": "3.11.14" - } - }, - "nbformat": 4, - "nbformat_minor": 5 -} From d80800b6e822c2f0f587ee41b8686ba429e94c5d Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 9 Mar 2026 16:25:24 -0500 Subject: [PATCH 134/389] adding baseline h5 file for binary evolution --- dev-tools/generate_baseline.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 dev-tools/generate_baseline.sh diff --git a/dev-tools/generate_baseline.sh b/dev-tools/generate_baseline.sh old mode 100644 new mode 100755 From 4fadb6f3530ee7dde3e817e48cf541e90da4d5fa Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 9 Mar 2026 16:26:45 -0500 Subject: [PATCH 135/389] add tolerances as CLI --- dev-tools/validate_binaries.sh | 85 ++++++++++++++++++++++++++++++++-- 1 file changed, 80 insertions(+), 5 deletions(-) mode change 100644 => 100755 dev-tools/validate_binaries.sh diff --git a/dev-tools/validate_binaries.sh b/dev-tools/validate_binaries.sh old mode 100644 new mode 100755 index 2ae354b4fa..8a312f8873 --- a/dev-tools/validate_binaries.sh +++ b/dev-tools/validate_binaries.sh @@ -1,16 +1,35 @@ #!/bin/bash # ============================================================================= -# validate_binaries.sh ā€” Run the full validation pipeline: +# validate_binaries.sh: Run the full validation pipeline: # 1. Evolve test binaries on a candidate branch # 2. Compare against baseline files # # Usage: # ./validate_binaries.sh [baseline_branch] [metallicities] +# [--loose] [--rtol VALUE] [--atol VALUE] +# +# Positional arguments: +# candidate_branch Branch or tag to validate (required) +# baseline_branch Branch or tag to compare against (default: main) +# metallicities Space-separated list of Z values, quoted +# (default: "2 1 0.45 0.2 0.1 0.01 0.001 0.0001") +# +# Tolerance flags (passed through to compare_runs.py): +# --loose Use relaxed floating-point tolerances +# (rtol=1e-12, atol=1e-15 unless overridden) +# --rtol VALUE Set explicit relative tolerance +# --atol VALUE Set explicit absolute tolerance +# +# --rtol and --atol can be combined with --loose (explicit values take +# precedence over the --loose defaults) or used on their own without --loose. # # Examples: -# ./validate_binaries.sh feature/new-SN # compare vs main baseline -# ./validate_binaries.sh feature/new-SN v2.1.0 # compare vs v2.1.0 baseline -# ./validate_binaries.sh feature/new-SN main "1 0.45" # subset of metallicities +# ./validate_binaries.sh feature/new-SN # compare vs main, exact +# ./validate_binaries.sh feature/new-SN v2.1.0 # compare vs v2.1.0, exact +# ./validate_binaries.sh feature/new-SN main "1 0.45" # subset of metallicities +# ./validate_binaries.sh feature/new-SN --loose # relaxed tolerances +# ./validate_binaries.sh feature/new-SN main --rtol 1e-8 # custom rtol, default atol +# ./validate_binaries.sh feature/new-SN main "1 0.45" --loose --atol 1e-10 # # Prerequisites: # Run generate_baseline.sh first to create baseline files. @@ -22,9 +41,37 @@ set -euo pipefail -CANDIDATE_BRANCH=${1:?Usage: ./validate_binaries.sh [baseline_branch] [metallicities]} +# ā”€ā”€ Parse arguments ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ + +CANDIDATE_BRANCH=${1:?Usage: ./validate_binaries.sh [baseline_branch] [metallicities] [--loose] [--rtol VALUE] [--atol VALUE]} BASELINE_BRANCH=${2:-main} METALLICITIES=${3:-"2 1 0.45 0.2 0.1 0.01 0.001 0.0001"} +shift $(( $# < 3 ? $# : 3 )) + +LOOSE=false +RTOL="" +ATOL="" + +while [[ $# -gt 0 ]]; do + case "$1" in + --loose) + LOOSE=true + shift + ;; + --rtol) + RTOL="${2:?--rtol requires a value}" + shift 2 + ;; + --atol) + ATOL="${2:?--atol requires a value}" + shift 2 + ;; + *) + echo "ERROR: Unknown option: $1" >&2 + exit 1 + ;; + esac +done SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" SAFE_CANDIDATE="${CANDIDATE_BRANCH//\//_}" @@ -34,6 +81,30 @@ BASELINE_DIR="$SCRIPT_DIR/baselines/${SAFE_BASELINE}" OUTPUT_DIR="$SCRIPT_DIR/outputs/${SAFE_CANDIDATE}" SUMMARY_FILE="$OUTPUT_DIR/comparison_summary.txt" +# ā”€ā”€ Build compare_runs.py flags ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ +COMPARE_FLAGS="" +if [ "$LOOSE" = "true" ]; then + COMPARE_FLAGS="$COMPARE_FLAGS --loose" +fi +if [ -n "$RTOL" ]; then + COMPARE_FLAGS="$COMPARE_FLAGS --rtol $RTOL" +fi +if [ -n "$ATOL" ]; then + COMPARE_FLAGS="$COMPARE_FLAGS --atol $ATOL" +fi + +# Build a human-readable tolerance label for the summary +if [ -n "$RTOL" ] || [ -n "$ATOL" ]; then + TOL_LABEL="rtol=${RTOL:-default}, atol=${ATOL:-default}" + if [ "$LOOSE" = "true" ]; then + TOL_LABEL="$TOL_LABEL (--loose)" + fi +elif [ "$LOOSE" = "true" ]; then + TOL_LABEL="--loose (rtol=1e-12, atol=1e-15)" +else + TOL_LABEL="EXACT (rtol=0, atol=0)" +fi + echo "============================================================" echo " POSYDON Binary Validation" echo " Candidate: $CANDIDATE_BRANCH" @@ -83,6 +154,7 @@ POSYDON Binary Validation ā€” Comparison Summary ================================================ Candidate branch: $CANDIDATE_BRANCH Baseline branch: $BASELINE_BRANCH +Tolerances: $TOL_LABEL Date: $(date -u '+%Y-%m-%d %H:%M:%S UTC') ================================================ @@ -112,7 +184,10 @@ for Z in $METALLICITIES; do continue fi + # $COMPARE_FLAGS is intentionally unquoted so it word-splits into + # separate arguments for compare_runs.py. if python "$SCRIPT_DIR/compare_runs.py" "$BASELINE_FILE" "$CANDIDATE_FILE" \ + $COMPARE_FLAGS \ 2>&1 | tee "$COMPARISON_FILE"; then echo " PASS: No differences" echo "Z = ${Z} Zsun: PASS" >> "$SUMMARY_FILE" From d3d29c5f717a850fd1eb1392d71fba5d3c5d305c Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 26 Feb 2026 10:17:22 +0000 Subject: [PATCH 136/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/compare_runs.py | 6 +++--- dev-tools/evolve_binaries.sh | 2 +- dev-tools/generate_baseline.sh | 2 +- dev-tools/script_data/binaries_suite.py | 17 +++++++++-------- dev-tools/validate_binaries.sh | 2 +- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dev-tools/compare_runs.py b/dev-tools/compare_runs.py index 0d2fe2df7e..a19c0f9ddc 100644 --- a/dev-tools/compare_runs.py +++ b/dev-tools/compare_runs.py @@ -19,12 +19,12 @@ """ import argparse -import sys import os +import sys + import numpy as np import pandas as pd - # Columns that represent qualitative (categorical) evolution properties. # Any column matching these names will be compared as exact string matches # and reported under "QUALITATIVE" differences. @@ -409,4 +409,4 @@ def main(): if __name__ == "__main__": - main() \ No newline at end of file + main() diff --git a/dev-tools/evolve_binaries.sh b/dev-tools/evolve_binaries.sh index 8bfcceef2a..30f7d7b745 100755 --- a/dev-tools/evolve_binaries.sh +++ b/dev-tools/evolve_binaries.sh @@ -150,4 +150,4 @@ fi echo " Outputs in: $OUTPUT_DIR/" echo "============================================================" -exit $FAILED \ No newline at end of file +exit $FAILED diff --git a/dev-tools/generate_baseline.sh b/dev-tools/generate_baseline.sh index a4e31534a7..845b52cf3c 100755 --- a/dev-tools/generate_baseline.sh +++ b/dev-tools/generate_baseline.sh @@ -93,4 +93,4 @@ echo "============================================================" if [ $COPIED -eq 0 ]; then echo "ERROR: No baseline files were created!" >&2 exit 1 -fi \ No newline at end of file +fi diff --git a/dev-tools/script_data/binaries_suite.py b/dev-tools/script_data/binaries_suite.py index 08e0365dd9..157dc0dbab 100644 --- a/dev-tools/script_data/binaries_suite.py +++ b/dev-tools/script_data/binaries_suite.py @@ -14,6 +14,7 @@ import os import sys import warnings + import pandas as pd from posydon.binary_evol.binarystar import BinaryStar, SingleStar @@ -26,7 +27,7 @@ # Display settings TARGET_ROWS = 12 LINE_LENGTH = 80 -COLUMNS_TO_SHOW = ['step_names', 'state', 'event', +COLUMNS_TO_SHOW = ['step_names', 'state', 'event', 'S1_state', 'S1_mass', 'S2_state', 'S2_mass', 'orbital_period'] @@ -150,9 +151,9 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): # Set up warning capture old_showwarning = warnings.showwarning warnings.showwarning = warning_handler - + print(f"Binary {binary_id}") - evolution_df = None + evolution_df = None try: binary.evolve() @@ -171,7 +172,7 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): finally: warnings.showwarning = old_showwarning - + # Ensure we always have a dataframe if evolution_df is not None: # Decode bytes columns if needed @@ -212,9 +213,9 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): print(f"āœ… Finished binary {binary_id}") print("=" * LINE_LENGTH) - - - + + + def get_test_binaries(metallicity, sim_prop): """Return the list of test binaries as (star1_kwargs, star2_kwargs, binary_kwargs, description) tuples. @@ -691,4 +692,4 @@ def evolve_binaries(metallicity, verbose, output_path, ini_path=None): verbose=args.verbose, output_path=args.output, ini_path=args.ini, - ) \ No newline at end of file + ) diff --git a/dev-tools/validate_binaries.sh b/dev-tools/validate_binaries.sh index 8a312f8873..ef60c3e59c 100755 --- a/dev-tools/validate_binaries.sh +++ b/dev-tools/validate_binaries.sh @@ -216,4 +216,4 @@ echo "============================================================" if [ $FAIL -gt 0 ]; then exit 1 fi -exit 0 \ No newline at end of file +exit 0 From 57e13ed198cc107f5fcc53ac4989916d2a652e23 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 9 Mar 2026 16:36:42 -0500 Subject: [PATCH 137/389] separate handling of errored binaries from successful binaries into an error table --- dev-tools/compare_runs.py | 87 ++++++++++++++++--------- dev-tools/script_data/binaries_suite.py | 23 ++++--- 2 files changed, 73 insertions(+), 37 deletions(-) diff --git a/dev-tools/compare_runs.py b/dev-tools/compare_runs.py index a19c0f9ddc..d2fbab7545 100644 --- a/dev-tools/compare_runs.py +++ b/dev-tools/compare_runs.py @@ -19,12 +19,12 @@ """ import argparse -import os import sys - +import os import numpy as np import pandas as pd + # Columns that represent qualitative (categorical) evolution properties. # Any column matching these names will be compared as exact string matches # and reported under "QUALITATIVE" differences. @@ -80,30 +80,6 @@ def compare_evolution_tables(base_df, cand_df, rtol, atol): b = base_df[base_df['binary_id'] == bid].reset_index(drop=True) c = cand_df[cand_df['binary_id'] == bid].reset_index(drop=True) - # ā”€ā”€ Error status changes ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ - base_failed = 'exception_type' in b.columns and b['exception_type'].notna().any() - cand_failed = 'exception_type' in c.columns and c['exception_type'].notna().any() - - if base_failed != cand_failed: - if cand_failed: - exc = c['exception_type'].dropna().iloc[0] if 'exception_type' in c.columns else "unknown" - msg = c['exception_message'].dropna().iloc[0] if 'exception_message' in c.columns else "" - struct_diffs.append(f"Binary {bid}: NEWLY FAILING ({exc}: {msg})") - else: - struct_diffs.append(f"Binary {bid}: NEWLY PASSING (was failing in baseline)") - continue - - if base_failed and cand_failed: - b_exc = str(b['exception_type'].dropna().iloc[0]) if 'exception_type' in b.columns else "" - c_exc = str(c['exception_type'].dropna().iloc[0]) if 'exception_type' in c.columns else "" - b_msg = str(b['exception_message'].dropna().iloc[0]) if 'exception_message' in b.columns else "" - c_msg = str(c['exception_message'].dropna().iloc[0]) if 'exception_message' in c.columns else "" - if b_exc != c_exc: - struct_diffs.append(f"Binary {bid}: error type changed ('{b_exc}' -> '{c_exc}')") - if b_msg != c_msg: - struct_diffs.append(f"Binary {bid}: error message changed ('{b_msg}' -> '{c_msg}')") - continue - # ā”€ā”€ Step count ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ if len(b) != len(c): struct_diffs.append( @@ -260,6 +236,52 @@ def compare_warnings_tables(base_df, cand_df): return diffs +def compare_errors_tables(base_df, cand_df): + """Compare error tables between baseline and candidate. + + Returns list of diff strings. + """ + diffs = [] + + if base_df is None and cand_df is None: + return diffs + if base_df is None and cand_df is not None: + cand_ids = sorted(cand_df['binary_id'].unique()) if 'binary_id' in cand_df.columns else [] + diffs.append(f"Candidate has {len(cand_df)} error(s) (binaries {cand_ids}), baseline has none") + return diffs + if base_df is not None and cand_df is None: + base_ids = sorted(base_df['binary_id'].unique()) if 'binary_id' in base_df.columns else [] + diffs.append(f"Baseline has {len(base_df)} error(s) (binaries {base_ids}), candidate has none") + return diffs + + # Compare per-binary errors + if 'binary_id' in base_df.columns and 'binary_id' in cand_df.columns: + base_ids = set(base_df['binary_id'].unique()) + cand_ids = set(cand_df['binary_id'].unique()) + + for bid in sorted(cand_ids - base_ids): + row = cand_df[cand_df['binary_id'] == bid].iloc[0] + exc = row.get('exception_type', 'unknown') + diffs.append(f"Binary {bid}: NEWLY FAILING in candidate ({exc})") + + for bid in sorted(base_ids - cand_ids): + diffs.append(f"Binary {bid}: NEWLY PASSING in candidate (was failing in baseline)") + + for bid in sorted(base_ids & cand_ids): + b_row = base_df[base_df['binary_id'] == bid].iloc[0] + c_row = cand_df[cand_df['binary_id'] == bid].iloc[0] + b_exc = str(b_row.get('exception_type', '')) + c_exc = str(c_row.get('exception_type', '')) + b_msg = str(b_row.get('exception_message', '')) + c_msg = str(c_row.get('exception_message', '')) + if b_exc != c_exc: + diffs.append(f"Binary {bid}: error type changed ('{b_exc}' -> '{c_exc}')") + if b_msg != c_msg: + diffs.append(f"Binary {bid}: error message changed") + + return diffs + + def read_table_safe(store, key): """Read a table from HDFStore, returning None if it doesn't exist.""" try: @@ -347,12 +369,19 @@ def main(): cand_warn = read_table_safe(cand_store, '/warnings') warn_diffs.extend(compare_warnings_tables(base_warn, cand_warn)) + # ā”€ā”€ Errors table ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ + base_err = read_table_safe(base_store, '/errors') + cand_err = read_table_safe(cand_store, '/errors') + error_diffs = compare_errors_tables(base_err, cand_err) + struct_diffs.extend(error_diffs) + # ā”€ā”€ Extra/missing top-level keys ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ + ignored_keys = {'/evolution', '/warnings', '/errors', '/metadata'} for k in sorted(base_keys - cand_keys): - if k not in ['/evolution', '/warnings', '/metadata']: + if k not in ignored_keys: struct_diffs.append(f"Table '{k}' missing in candidate") for k in sorted(cand_keys - base_keys): - if k not in ['/evolution', '/warnings', '/metadata']: + if k not in ignored_keys: struct_diffs.append(f"Table '{k}' extra in candidate") except Exception as e: @@ -409,4 +438,4 @@ def main(): if __name__ == "__main__": - main() + main() \ No newline at end of file diff --git a/dev-tools/script_data/binaries_suite.py b/dev-tools/script_data/binaries_suite.py index 157dc0dbab..dda3824c75 100644 --- a/dev-tools/script_data/binaries_suite.py +++ b/dev-tools/script_data/binaries_suite.py @@ -43,6 +43,7 @@ def load_inlist(metallicity, verbose, ini_path=None): SimulationProperties object with loaded steps """ if ini_path is None: + # Look for ini file relative to this script's location script_dir = os.path.dirname(os.path.abspath(__file__)) ini_path = os.path.join(script_dir, 'binaries_params.ini') @@ -53,9 +54,12 @@ def load_inlist(metallicity, verbose, ini_path=None): metallicity_kwargs = {'metallicity': metallicity, 'verbose': verbose} - metallicity_steps = ['step_HMS_HMS', 'step_CO_HeMS', 'step_CO_HMS_RLO', - 'step_CO_HeMS_RLO', 'step_detached', 'step_disrupted', - 'step_merged', 'step_initially_single'] + # Apply metallicity to all steps that need it + metallicity_steps = [ + 'step_HMS_HMS', 'step_CO_HeMS', 'step_CO_HMS_RLO', + 'step_CO_HeMS_RLO', 'step_detached', 'step_disrupted', + 'step_merged', 'step_initially_single' + ] for step_name in metallicity_steps: if step_name in sim_kwargs: sim_kwargs[step_name][1].update(metallicity_kwargs) @@ -101,7 +105,6 @@ def print_failed_binary(binary,e, max_error_lines=3): df = binary.to_df(**{'extra_columns':{'step_names':'str'}}) if len(df) > 0: # Select only the desired columns - available_columns = [col for col in COLUMNS_TO_SHOW if col in df.columns] df_filtered = df[available_columns].reset_index(drop=True) @@ -163,12 +166,16 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): except Exception as e: print_failed_binary(binary, e) - # If evolution fails, create a minimal df with error info - evolution_df = pd.DataFrame([{ + # Save error to separate table (different schema from evolution) + error_df = pd.DataFrame([{ "binary_id": int(binary_id), "exception_type": type(e).__name__, "exception_message": str(e) }]) + error_string_cols = error_df.select_dtypes([object]).columns + error_min_itemsize = {col: 1000 for col in error_string_cols} + h5file.append("errors", error_df, format="table", + min_itemsize=error_min_itemsize) finally: warnings.showwarning = old_showwarning @@ -191,7 +198,7 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): # Determine min_itemsize from the dataframe we're actually saving string_cols = evolution_df.select_dtypes([object]).columns - min_itemsize = {col: 100 for col in string_cols} + min_itemsize = {col: 500 for col in string_cols} h5file.append("evolution", evolution_df, format="table", data_columns=True, min_itemsize=min_itemsize) @@ -200,7 +207,7 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): warn_df = pd.DataFrame(captured_warnings) # Ensure consistent string column sizes for warnings table warn_string_cols = warn_df.select_dtypes([object]).columns - warn_min_itemsize = {col: 200 for col in warn_string_cols} + warn_min_itemsize = {col: 1000 for col in warn_string_cols} h5file.append("warnings", warn_df, format="table", min_itemsize=warn_min_itemsize) print(f"āš ļø {len(captured_warnings)} warning(s) raised during evolution:") From ea435933340ab7916fe237dc41ad90204c167215 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 9 Mar 2026 16:52:58 -0500 Subject: [PATCH 138/389] consolidate h5 writes for efficiency --- dev-tools/script_data/binaries_suite.py | 94 ++++++++++++++++--------- 1 file changed, 59 insertions(+), 35 deletions(-) diff --git a/dev-tools/script_data/binaries_suite.py b/dev-tools/script_data/binaries_suite.py index dda3824c75..8339adbbb4 100644 --- a/dev-tools/script_data/binaries_suite.py +++ b/dev-tools/script_data/binaries_suite.py @@ -31,6 +31,11 @@ 'S1_state', 'S1_mass', 'S2_state', 'S2_mass', 'orbital_period'] +# Suppress fragmentation warnings from POSYDON internals. +# The .copy() calls below already handle the actual performance impact; +# these warnings are just noise from to_df() building DataFrames column-by-column. +# warnings.filterwarnings("ignore", message=".*DataFrame is highly fragmented.*") + def load_inlist(metallicity, verbose, ini_path=None): """Load simulation properties from ini file and configure for given metallicity. @@ -157,6 +162,7 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): print(f"Binary {binary_id}") evolution_df = None + error_df = None try: binary.evolve() @@ -166,16 +172,11 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): except Exception as e: print_failed_binary(binary, e) - # Save error to separate table (different schema from evolution) error_df = pd.DataFrame([{ "binary_id": int(binary_id), "exception_type": type(e).__name__, "exception_message": str(e) }]) - error_string_cols = error_df.select_dtypes([object]).columns - error_min_itemsize = {col: 1000 for col in error_string_cols} - h5file.append("errors", error_df, format="table", - min_itemsize=error_min_itemsize) finally: warnings.showwarning = old_showwarning @@ -193,23 +194,11 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): if "binary_id" not in evolution_df.columns: evolution_df["binary_id"] = int(binary_id) - # Defragment + # Defragment the DataFrame from POSYDON's column-by-column construction evolution_df = evolution_df.copy() - # Determine min_itemsize from the dataframe we're actually saving - string_cols = evolution_df.select_dtypes([object]).columns - min_itemsize = {col: 500 for col in string_cols} - h5file.append("evolution", evolution_df, format="table", - data_columns=True, min_itemsize=min_itemsize) - # Save warnings if captured_warnings: - warn_df = pd.DataFrame(captured_warnings) - # Ensure consistent string column sizes for warnings table - warn_string_cols = warn_df.select_dtypes([object]).columns - warn_min_itemsize = {col: 1000 for col in warn_string_cols} - h5file.append("warnings", warn_df, format="table", - min_itemsize=warn_min_itemsize) print(f"āš ļø {len(captured_warnings)} warning(s) raised during evolution:") for i, w in enumerate(captured_warnings[:3], 1): print(f" {i}. {w['category']}: {w['message'][:80]}") @@ -221,8 +210,6 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): print(f"āœ… Finished binary {binary_id}") print("=" * LINE_LENGTH) - - def get_test_binaries(metallicity, sim_prop): """Return the list of test binaries as (star1_kwargs, star2_kwargs, binary_kwargs, description) tuples. @@ -647,7 +634,38 @@ def evolve_binaries(metallicity, verbose, output_path, ini_path=None): sim_prop = load_inlist(metallicity, verbose, ini_path) test_binaries = get_test_binaries(metallicity, sim_prop) - + + # Collect all results in memory, then write once at the end. + # This avoids repeated HDFStore.append() calls, each of which + # reconciles schemas, checks string sizing, and flushes to disk. + all_evolution_dfs = [] + all_error_dfs = [] + all_warning_dfs = [] + + for binary_id, (s1_kw, s2_kw, bin_kw, description) in enumerate(test_binaries): + print(f"\n[{binary_id}/{len(test_binaries)-1}] {description}") + + star_1 = SingleStar(**s1_kw) + star_2 = SingleStar(**s2_kw) + + # Add separation from period if not explicitly provided + if 'separation' not in bin_kw and 'orbital_period' in bin_kw: + bin_kw['separation'] = orbital_separation_from_period( + bin_kw['orbital_period'], star_1.mass, star_2.mass + ) + + binary = BinaryStar(star_1, star_2, **bin_kw, properties=sim_prop) + evo_df, err_df, warn_list = evolve_binary(binary, binary_id) + + if evo_df is not None: + all_evolution_dfs.append(evo_df) + if err_df is not None: + all_error_dfs.append(err_df) + if warn_list: + all_warning_dfs.append(pd.DataFrame(warn_list)) + + + # ā”€ā”€ Single-pass HDF5 write ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ with pd.HDFStore(output_path, mode="w") as h5file: # Save metadata meta_df = pd.DataFrame([{ @@ -656,20 +674,26 @@ def evolve_binaries(metallicity, verbose, output_path, ini_path=None): }]) h5file.put("metadata", meta_df, format="table") - for binary_id, (s1_kw, s2_kw, bin_kw, description) in enumerate(test_binaries): - print(f"\n[{binary_id}/{len(test_binaries)-1}] {description}") - - star_1 = SingleStar(**s1_kw) - star_2 = SingleStar(**s2_kw) - - # Add separation from period if not explicitly provided - if 'separation' not in bin_kw and 'orbital_period' in bin_kw: - bin_kw['separation'] = orbital_separation_from_period( - bin_kw['orbital_period'], star_1.mass, star_2.mass - ) - - binary = BinaryStar(star_1, star_2, **bin_kw, properties=sim_prop) - evolve_binary(binary, h5file, binary_id) + if all_evolution_dfs: + combined_evo = pd.concat(all_evolution_dfs, ignore_index=True) + string_cols = combined_evo.select_dtypes([object]).columns + min_itemsize = {col: 500 for col in string_cols} + h5file.put("evolution", combined_evo, format="table", + data_columns=True, min_itemsize=min_itemsize) + + if all_error_dfs: + combined_err = pd.concat(all_error_dfs, ignore_index=True) + err_string_cols = combined_err.select_dtypes([object]).columns + err_min_itemsize = {col: 1000 for col in err_string_cols} + h5file.put("errors", combined_err, format="table", + min_itemsize=err_min_itemsize) + + if all_warning_dfs: + combined_warn = pd.concat(all_warning_dfs, ignore_index=True) + warn_string_cols = combined_warn.select_dtypes([object]).columns + warn_min_itemsize = {col: 1000 for col in warn_string_cols} + h5file.put("warnings", combined_warn, format="table", + min_itemsize=warn_min_itemsize) print(f"\n{'=' * LINE_LENGTH}") print(f" All {len(test_binaries)} binaries complete. Results saved to {output_path}") From f0807706904e680c5ef0638402aef894d51877d1 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2026 21:41:30 +0000 Subject: [PATCH 139/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/compare_runs.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-tools/compare_runs.py b/dev-tools/compare_runs.py index d2fbab7545..b153c5127b 100644 --- a/dev-tools/compare_runs.py +++ b/dev-tools/compare_runs.py @@ -19,12 +19,12 @@ """ import argparse -import sys import os +import sys + import numpy as np import pandas as pd - # Columns that represent qualitative (categorical) evolution properties. # Any column matching these names will be compared as exact string matches # and reported under "QUALITATIVE" differences. @@ -438,4 +438,4 @@ def main(): if __name__ == "__main__": - main() \ No newline at end of file + main() From 435013f45dbee54946b9f55fec621c560e1f5274 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 9 Mar 2026 17:01:18 -0500 Subject: [PATCH 140/389] add flag to promote existing evolved branch to baseline status --- dev-tools/generate_baseline.sh | 51 +++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 10 deletions(-) diff --git a/dev-tools/generate_baseline.sh b/dev-tools/generate_baseline.sh index 845b52cf3c..3539be5c81 100755 --- a/dev-tools/generate_baseline.sh +++ b/dev-tools/generate_baseline.sh @@ -7,12 +7,15 @@ # # Usage: # ./generate_baseline.sh [sha] [metallicities] +# ./generate_baseline.sh --promote [metallicities] # # Examples: -# ./generate_baseline.sh main # baseline from main, all Z +# ./generate_baseline.sh main # evolve + save baseline, all Z # ./generate_baseline.sh v2.1.0 # baseline from a release tag # ./generate_baseline.sh main abc123f # baseline from a specific commit # ./generate_baseline.sh main "" "1 0.45" # baseline for subset of Z +# ./generate_baseline.sh --promote main # promote existing outputs to baseline +# ./generate_baseline.sh --promote main "1 0.45" # promote subset of existing outputs # # Output: # baselines//baseline_Zsun.h5 ā€” one file per metallicity @@ -21,26 +24,54 @@ set -euo pipefail +# ā”€ā”€ Parse arguments ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ +PROMOTE=false +if [ "${1:-}" = "--promote" ]; then + PROMOTE=true + shift +fi + BRANCH=${1:-main} -SHA=${2:-} -METALLICITIES=${3:-"2 1 0.45 0.2 0.1 0.01 0.001 0.0001"} +if [ "$PROMOTE" = true ]; then + SHA="" + METALLICITIES=${2:-"2 1 0.45 0.2 0.1 0.01 0.001 0.0001"} +else + SHA=${2:-} + METALLICITIES=${3:-"2 1 0.45 0.2 0.1 0.01 0.001 0.0001"} +fi SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" SAFE_BRANCH="${BRANCH//\//_}" BASELINE_DIR="$SCRIPT_DIR/baselines/${SAFE_BRANCH}" +CANDIDATE_DIR="$SCRIPT_DIR/outputs/${SAFE_BRANCH}" echo "============================================================" echo " POSYDON Binary Validation ā€” Generating Baseline" echo " Branch: $BRANCH" -echo " SHA: ${SHA:-HEAD}" +if [ "$PROMOTE" = true ]; then + echo " Mode: --promote (using existing outputs)" +else + echo " SHA: ${SHA:-HEAD}" +fi echo " Metallicities: $METALLICITIES" echo " Output dir: $BASELINE_DIR" echo "============================================================" -# ā”€ā”€ Step 1: Evolve binaries for the baseline branch ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ -echo "" -echo "Step 1: Evolving binaries on branch '$BRANCH'..." -"$SCRIPT_DIR/evolve_binaries.sh" "$BRANCH" "$SHA" "$METALLICITIES" +# ā”€ā”€ Step 1: Evolve binaries (skip if --promote) ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ +if [ "$PROMOTE" = true ]; then + echo "" + echo "Step 1: SKIPPED (--promote: using existing outputs in $CANDIDATE_DIR)" + + if [ ! -d "$CANDIDATE_DIR" ]; then + echo "ERROR: No outputs found at $CANDIDATE_DIR" >&2 + echo "Run evolve_binaries.sh first, or drop --promote to evolve from scratch." >&2 + exit 1 + fi +else + echo "" + echo "Step 1: Evolving binaries on branch '$BRANCH'..." + "$SCRIPT_DIR/evolve_binaries.sh" "$BRANCH" "$SHA" "$METALLICITIES" +fi # ā”€ā”€ Step 2: Copy results into the baselines directory ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ echo "" @@ -48,7 +79,6 @@ echo "Step 2: Copying results to baseline directory..." mkdir -p "$BASELINE_DIR" -CANDIDATE_DIR="$SCRIPT_DIR/outputs/${SAFE_BRANCH}" COPIED=0 for Z in $METALLICITIES; do @@ -78,6 +108,7 @@ POSYDON Binary Validation Baseline Branch: $BRANCH Commit SHA: ${ACTUAL_SHA:-unknown} Requested SHA: ${SHA:-HEAD} +Mode: $([ "$PROMOTE" = true ] && echo "promoted from existing outputs" || echo "evolved from scratch") Generated: $(date -u '+%Y-%m-%d %H:%M:%S UTC') Metallicities: $METALLICITIES Files: $COPIED @@ -93,4 +124,4 @@ echo "============================================================" if [ $COPIED -eq 0 ]; then echo "ERROR: No baseline files were created!" >&2 exit 1 -fi +fi \ No newline at end of file From 6474dead6eb311e37770fd1129a2642d026c7f31 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2026 21:58:35 +0000 Subject: [PATCH 141/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/script_data/binaries_suite.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-tools/script_data/binaries_suite.py b/dev-tools/script_data/binaries_suite.py index 8339adbbb4..5cd8be7147 100644 --- a/dev-tools/script_data/binaries_suite.py +++ b/dev-tools/script_data/binaries_suite.py @@ -634,14 +634,14 @@ def evolve_binaries(metallicity, verbose, output_path, ini_path=None): sim_prop = load_inlist(metallicity, verbose, ini_path) test_binaries = get_test_binaries(metallicity, sim_prop) - + # Collect all results in memory, then write once at the end. # This avoids repeated HDFStore.append() calls, each of which # reconciles schemas, checks string sizing, and flushes to disk. all_evolution_dfs = [] all_error_dfs = [] all_warning_dfs = [] - + for binary_id, (s1_kw, s2_kw, bin_kw, description) in enumerate(test_binaries): print(f"\n[{binary_id}/{len(test_binaries)-1}] {description}") From e157c0119c71aa21a85c1834b2907d0bbaa28703 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 9 Mar 2026 17:07:02 -0500 Subject: [PATCH 142/389] Move binaries_suite.py and binaries_params.ini to dev-tools root --- dev-tools/{script_data => }/binaries_params.ini | 0 dev-tools/{script_data => }/binaries_suite.py | 0 dev-tools/evolve_binaries.sh | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename dev-tools/{script_data => }/binaries_params.ini (100%) rename dev-tools/{script_data => }/binaries_suite.py (100%) diff --git a/dev-tools/script_data/binaries_params.ini b/dev-tools/binaries_params.ini similarity index 100% rename from dev-tools/script_data/binaries_params.ini rename to dev-tools/binaries_params.ini diff --git a/dev-tools/script_data/binaries_suite.py b/dev-tools/binaries_suite.py similarity index 100% rename from dev-tools/script_data/binaries_suite.py rename to dev-tools/binaries_suite.py diff --git a/dev-tools/evolve_binaries.sh b/dev-tools/evolve_binaries.sh index 30f7d7b745..e6b6a90c7e 100755 --- a/dev-tools/evolve_binaries.sh +++ b/dev-tools/evolve_binaries.sh @@ -106,7 +106,7 @@ echo "šŸ“¦ Installing POSYDON" pip install -e "$CLONE_DIR" -q 2>&1 | sed 's/^/ /' # ā”€ā”€ Run Suite for Each Metallicity ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ -SUITE_SCRIPT="$SCRIPT_DIR/script_data/binaries_suite.py" +SUITE_SCRIPT="$SCRIPT_DIR/binaries_suite.py" FAILED=0 for Z in $METALLICITIES; do From 5357e0b93fd2f3c31e969620a062291947bd3a84 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2026 22:04:58 +0000 Subject: [PATCH 143/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/generate_baseline.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/generate_baseline.sh b/dev-tools/generate_baseline.sh index 3539be5c81..fa407d0cbc 100755 --- a/dev-tools/generate_baseline.sh +++ b/dev-tools/generate_baseline.sh @@ -124,4 +124,4 @@ echo "============================================================" if [ $COPIED -eq 0 ]; then echo "ERROR: No baseline files were created!" >&2 exit 1 -fi \ No newline at end of file +fi From 545db6c880b2d5469ee143b4147b99d071a920b8 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Mon, 9 Mar 2026 17:10:29 -0500 Subject: [PATCH 144/389] Delete dev-tools/outputs/baseline.h5 --- dev-tools/outputs/baseline.h5 | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 dev-tools/outputs/baseline.h5 diff --git a/dev-tools/outputs/baseline.h5 b/dev-tools/outputs/baseline.h5 deleted file mode 100644 index e69de29bb2..0000000000 From 17b9839bb63284651ad223214ddcf9b0fcaa8040 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Mon, 9 Mar 2026 17:14:25 -0500 Subject: [PATCH 145/389] add readme --- dev-tools/README.md | 87 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 dev-tools/README.md diff --git a/dev-tools/README.md b/dev-tools/README.md new file mode 100644 index 0000000000..7732d50af1 --- /dev/null +++ b/dev-tools/README.md @@ -0,0 +1,87 @@ +# dev-tools + +Validation suite for POSYDON binary evolution. Evolves a fixed set of test binaries on a candidate branch and compares results against a stored baseline to catch regressions. + +## Quick Start + +```bash +# 1. Generate a baseline from the main branch (once) +./generate_baseline.sh main + +# 2. Validate a candidate branch against that baseline +./validate_binaries.sh feature/my-branch +``` + +## Scripts + +### `validate_binaries.sh` + +Top-level entry point. Evolves test binaries on a candidate branch, then compares results against a baseline. + +```bash +./validate_binaries.sh [baseline_branch] [metallicities] [--loose] [--rtol VALUE] [--atol VALUE] +``` + +By default, comparison is exact (rtol=0, atol=0). Use `--loose` for relaxed floating-point tolerances (rtol=1e-12, atol=1e-15), or set `--rtol`/`--atol` explicitly. + +### `generate_baseline.sh` + +Generates baseline HDF5 files from a designated branch or tag. Can also promote existing outputs to baseline with `--promote`. + +```bash +./generate_baseline.sh [sha] [metallicities] +./generate_baseline.sh --promote [metallicities] +``` + +### `evolve_binaries.sh` + +Clones a POSYDON branch, creates a conda environment, installs POSYDON, and runs the binary suite at all requested metallicities. Called by `validate_binaries.sh` and `generate_baseline.sh`; can also be run standalone. + +```bash +./evolve_binaries.sh [sha] [metallicities] +``` + +### `binaries_suite.py` + +Defines and evolves the set of 44 test binaries at a given metallicity. Each binary targets a specific edge case or past bug fix (e.g., matching failures, oRLO2 looping, SN type errors, NaN spins). Results are saved to an HDF5 file. + +```bash +python binaries_suite.py --output results.h5 --metallicity 1 +``` + +### `compare_runs.py` + +Compares two HDF5 files produced by `binaries_suite.py`. Reports three categories of differences: structural (missing binaries, step count changes, new errors), qualitative (state/event/step name changes), and quantitative (numeric value changes). + +```bash +python compare_runs.py baseline.h5 candidate.h5 [--loose] [--rtol VALUE] [--atol VALUE] [--verbose] +``` + +### `binaries_params.ini` + +Configuration file for `SimulationProperties`. Defines the POSYDON evolution steps, supernova prescriptions, common envelope parameters, and output column selections. Metallicity is overridden at runtime by `binaries_suite.py`. + +## Directory Structure + +``` +dev-tools/ +ā”œā”€ā”€ README.md +ā”œā”€ā”€ validate_binaries.sh # full validation pipeline +ā”œā”€ā”€ generate_baseline.sh # create or promote baselines +ā”œā”€ā”€ evolve_binaries.sh # clone, install, and run suite +ā”œā”€ā”€ binaries_suite.py # test binary definitions and evolution +ā”œā”€ā”€ binaries_params.ini # SimulationProperties configuration +ā”œā”€ā”€ compare_runs.py # diff two HDF5 result files +ā”œā”€ā”€ baselines/ # stored baseline HDF5 files (per branch) +ā”œā”€ā”€ outputs/ # candidate evolution results (per branch) +ā”œā”€ā”€ logs/ # per-metallicity evolution logs (per branch) +ā””ā”€ā”€ workdirs/ # cloned repos and conda environments (per branch) +``` + +## Available Metallicities + +The suite supports metallicities (in solar units): 2, 1, 0.45, 0.2, 0.1, 0.01, 0.001, 0.0001. All are run by default; pass a quoted subset to limit, e.g. `"1 0.45"`. + +## Authors + +Max Briel, Elizabeth Teng From 2ee28f968267ebb8cbfdfb30ac5ad2c53e410225 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Mon, 9 Mar 2026 17:17:21 -0500 Subject: [PATCH 146/389] Update README.md --- dev-tools/README.md | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/dev-tools/README.md b/dev-tools/README.md index 7732d50af1..b75aa74fc0 100644 --- a/dev-tools/README.md +++ b/dev-tools/README.md @@ -1,5 +1,3 @@ -# dev-tools - Validation suite for POSYDON binary evolution. Evolves a fixed set of test binaries on a candidate branch and compares results against a stored baseline to catch regressions. ## Quick Start @@ -16,7 +14,7 @@ Validation suite for POSYDON binary evolution. Evolves a fixed set of test binar ### `validate_binaries.sh` -Top-level entry point. Evolves test binaries on a candidate branch, then compares results against a baseline. +Top-level entry point. Evolves test binaries on a candidate branch, then compares results against an existing baseline. ```bash ./validate_binaries.sh [baseline_branch] [metallicities] [--loose] [--rtol VALUE] [--atol VALUE] @@ -77,11 +75,3 @@ dev-tools/ ā”œā”€ā”€ logs/ # per-metallicity evolution logs (per branch) ā””ā”€ā”€ workdirs/ # cloned repos and conda environments (per branch) ``` - -## Available Metallicities - -The suite supports metallicities (in solar units): 2, 1, 0.45, 0.2, 0.1, 0.01, 0.001, 0.0001. All are run by default; pass a quoted subset to limit, e.g. `"1 0.45"`. - -## Authors - -Max Briel, Elizabeth Teng From 74ae017b2790a85f7551c2b4448b44b2770d860b Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Mon, 9 Mar 2026 17:26:14 -0500 Subject: [PATCH 147/389] Update README.md --- dev-tools/README.md | 55 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/dev-tools/README.md b/dev-tools/README.md index b75aa74fc0..4b74b1b1e5 100644 --- a/dev-tools/README.md +++ b/dev-tools/README.md @@ -10,6 +10,19 @@ Validation suite for POSYDON binary evolution. Evolves a fixed set of test binar ./validate_binaries.sh feature/my-branch ``` +Results are written to `outputs//`. After validation, check: + +- `outputs//comparison_summary.txt` for a pass/fail overview across all metallicities +- `outputs//comparison_Zsun.txt` for detailed per-metallicity diff reports +- `logs//evolve_Zsun.log` for the full evolution output of each metallicity + +By default, all eight POSYDON metallicities are run. To validate only a subset, pass a quoted space-separated list as the third argument: + +```bash +./generate_baseline.sh main "" "1 0.45" +./validate_binaries.sh feature/my-branch main "1 0.45" +``` + ## Scripts ### `validate_binaries.sh` @@ -49,7 +62,13 @@ python binaries_suite.py --output results.h5 --metallicity 1 ### `compare_runs.py` -Compares two HDF5 files produced by `binaries_suite.py`. Reports three categories of differences: structural (missing binaries, step count changes, new errors), qualitative (state/event/step name changes), and quantitative (numeric value changes). +Compares two HDF5 files produced by `binaries_suite.py` and reports differences in three categories: + +- **Structural**: missing or extra binaries, evolution step count changes, binaries that newly fail or newly pass, missing HDF5 tables. +- **Qualitative**: changes to categorical columns such as state, event, step name, SN type, interpolation class, and mass transfer history. +- **Quantitative**: changes to any numeric column. By default, comparison is exact (bitwise identical floats). Use `--loose` for slightly relaxed tolerances (rtol=1e-12, atol=1e-15), or set `--rtol`/`--atol` explicitly. + +The script also compares warning and error tables, reporting new, removed, or changed warnings per binary. ```bash python compare_runs.py baseline.h5 candidate.h5 [--loose] [--rtol VALUE] [--atol VALUE] [--verbose] @@ -59,6 +78,40 @@ python compare_runs.py baseline.h5 candidate.h5 [--loose] [--rtol VALUE] [--atol Configuration file for `SimulationProperties`. Defines the POSYDON evolution steps, supernova prescriptions, common envelope parameters, and output column selections. Metallicity is overridden at runtime by `binaries_suite.py`. +## Running Scripts Manually + +The shell scripts handle cloning, environment setup, and orchestration. If you already have POSYDON installed in your current environment, you can run the Python scripts directly. + +### Evolving binaries + +```bash +# Evolve all 44 test binaries at solar metallicity +python binaries_suite.py --output my_results.h5 --metallicity 1 + +# Evolve at a specific metallicity with verbose output +python binaries_suite.py --output my_results.h5 --metallicity 0.01 --verbose + +# Use a custom ini file +python binaries_suite.py --output my_results.h5 --metallicity 1 --ini /path/to/custom.ini +``` + +The output HDF5 contains three tables: `evolution` (per-step binary data), `errors` (binaries that failed), and `warnings` (warnings raised during evolution). + +### Comparing two result files + +```bash +# Exact comparison +python compare_runs.py file_a.h5 file_b.h5 + +# Relaxed tolerances +python compare_runs.py file_a.h5 file_b.h5 --loose + +# Custom tolerances with verbose diagnostics +python compare_runs.py file_a.h5 file_b.h5 --rtol 1e-8 --atol 1e-12 --verbose +``` + +The two files do not need to come from the shell pipeline; any pair of HDF5 files produced by `binaries_suite.py` can be compared. + ## Directory Structure ``` From a254306eda45353d554895afeef92d80776808e7 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 9 Mar 2026 17:42:31 -0500 Subject: [PATCH 148/389] minor change --- dev-tools/compare_runs.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-tools/compare_runs.py b/dev-tools/compare_runs.py index b153c5127b..d2fbab7545 100644 --- a/dev-tools/compare_runs.py +++ b/dev-tools/compare_runs.py @@ -19,12 +19,12 @@ """ import argparse -import os import sys - +import os import numpy as np import pandas as pd + # Columns that represent qualitative (categorical) evolution properties. # Any column matching these names will be compared as exact string matches # and reported under "QUALITATIVE" differences. @@ -438,4 +438,4 @@ def main(): if __name__ == "__main__": - main() + main() \ No newline at end of file From c9b265ceb7835344a39c59ef616aa4c2a0ec6912 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2026 22:46:48 +0000 Subject: [PATCH 149/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/compare_runs.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dev-tools/compare_runs.py b/dev-tools/compare_runs.py index 7da74f0859..da206e3d55 100644 --- a/dev-tools/compare_runs.py +++ b/dev-tools/compare_runs.py @@ -19,13 +19,14 @@ """ import argparse + <<<<<<< HEAD -import sys import os +import sys + import numpy as np import pandas as pd - ======= import os import sys From d95c17a655390404dfdca5887ff66333f54e2762 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 9 Mar 2026 17:48:49 -0500 Subject: [PATCH 150/389] remove rebase artifacts --- dev-tools/compare_runs.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/dev-tools/compare_runs.py b/dev-tools/compare_runs.py index 7da74f0859..48708d3110 100644 --- a/dev-tools/compare_runs.py +++ b/dev-tools/compare_runs.py @@ -19,21 +19,11 @@ """ import argparse -<<<<<<< HEAD import sys import os import numpy as np import pandas as pd - -======= -import os -import sys - -import numpy as np -import pandas as pd - ->>>>>>> d0eaf915cf9f6c5ab67263acb5537facb676c1b8 # Columns that represent qualitative (categorical) evolution properties. # Any column matching these names will be compared as exact string matches # and reported under "QUALITATIVE" differences. @@ -447,8 +437,4 @@ def main(): if __name__ == "__main__": -<<<<<<< HEAD - main() -======= main() ->>>>>>> d0eaf915cf9f6c5ab67263acb5537facb676c1b8 From 108e34ca789604c1d15a628b0c1b3a04b2af394e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2026 22:51:32 +0000 Subject: [PATCH 151/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/compare_runs.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-tools/compare_runs.py b/dev-tools/compare_runs.py index 48708d3110..b153c5127b 100644 --- a/dev-tools/compare_runs.py +++ b/dev-tools/compare_runs.py @@ -19,8 +19,9 @@ """ import argparse -import sys import os +import sys + import numpy as np import pandas as pd From 033123298b5fcf2306fe4770b6d9f70e0e7b1a7b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2026 23:04:46 +0000 Subject: [PATCH 152/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/binaries_suite.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/binaries_suite.py b/dev-tools/binaries_suite.py index 594ecac570..f58d82a2f6 100644 --- a/dev-tools/binaries_suite.py +++ b/dev-tools/binaries_suite.py @@ -209,7 +209,7 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): print(f"āœ… Finished binary {binary_id}") print("=" * LINE_LENGTH) - + return evolution_df, error_df, captured_warnings def get_test_binaries(metallicity, sim_prop): From 003530a89ea96ac46b1c26f35b06a76a5e0527c2 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Mon, 9 Mar 2026 19:54:58 -0500 Subject: [PATCH 153/389] create GRIDInterpolators once in SimulationProperties when loading steps and pass these to instances of TrackMatcher as needed. --- posydon/binary_evol/CE/step_CEE.py | 34 +------ posydon/binary_evol/DT/step_detached.py | 27 +----- posydon/binary_evol/DT/track_match.py | 68 +++++--------- posydon/binary_evol/simulationproperties.py | 96 ++++++++++++++------ posydon/popsyn/population_params_default.ini | 18 +++- 5 files changed, 116 insertions(+), 127 deletions(-) diff --git a/posydon/binary_evol/CE/step_CEE.py b/posydon/binary_evol/CE/step_CEE.py index d23b78591a..e4b491e820 100644 --- a/posydon/binary_evol/CE/step_CEE.py +++ b/posydon/binary_evol/CE/step_CEE.py @@ -75,7 +75,6 @@ # assuming a final separation where the inner core RLOF starts. # "one_phase_variable_core_definition" for core_definition_H_fraction=0.01 "metallicity": None, - "record_matching": False, "track_matcher": None } @@ -153,14 +152,13 @@ def __init__( mass_loss_during_CEE_merged=MODEL['mass_loss_during_CEE_merged'], verbose=MODEL['verbose'], metallicity = MODEL['metallicity'], - record_matching = MODEL['record_matching'], **kwargs): """Initialize a StepCEE instance.""" # read kwargs to initialize the class if kwargs: - for key in kwargs: - if key not in MODEL: - raise ValueError(key + " is not a valid parameter name!") + #for key in kwargs: + # if key not in MODEL: + # raise ValueError(key + " is not a valid parameter name!") for varname in MODEL: default_value = MODEL[varname] setattr(self, varname, kwargs.get(varname, default_value)) @@ -181,33 +179,11 @@ def __init__( common_envelope_option_after_succ_CEE self.mass_loss_during_CEE_merged = mass_loss_during_CEE_merged self.metallicity = metallicity - self.record_matching = record_matching self.verbose = verbose self.path_to_posydon = PATH_TO_POSYDON - - - list_for_matching_HMS = [ - ["mass", "center_h1", "he_core_mass"], - [20.0, 1.0, 10.0], - ["log_min_max", "min_max", "min_max"], - [0.1, 300], [0.0, None] - ] - #self.track_matcher = TrackMatcher(grid_name_Hrich = None, - # grid_name_strippedHe = None, - # path=PATH_TO_POSYDON_DATA, - # metallicity = self.metallicity, - # matching_method = "minimize", - # matching_tolerance=1e-2, - # matching_tolerance_hard=1e-1, - # list_for_matching_HMS = list_for_matching_HMS, - # list_for_matching_HeStar = None, - # list_for_matching_postMS = None, - # record_matching = self.record_matching, - # verbose = self.verbose) + + # set TrackMatcher reference self.track_matcher = kwargs.get("track_matcher", None) - #self.track_matcher.list_for_matching_HMS = list_for_matching_HMS - #self.track_matcher.train_scalers() - #self.track_matcher = copy.deepcopy(self.track_matcher) def __call__(self, binary): """Perform the CEE step for a BinaryStar object.""" diff --git a/posydon/binary_evol/DT/step_detached.py b/posydon/binary_evol/DT/step_detached.py index 1e5bb103a5..a701460333 100644 --- a/posydon/binary_evol/DT/step_detached.py +++ b/posydon/binary_evol/DT/step_detached.py @@ -227,20 +227,10 @@ def __init__( magnetic_braking_mode="RVJ83", do_stellar_evolution_and_spin_from_winds=True, RLO_orbit_at_orbit_with_same_am=False, - record_matching=False, verbose=False, - grid_name_Hrich=None, - grid_name_strippedHe=None, - metallicity=None, - path=PATH_TO_POSYDON_DATA, matching_method="minimize", - matching_tolerance=1e-2, - matching_tolerance_hard=1e-1, - list_for_matching_HMS=None, - list_for_matching_postMS=None, - list_for_matching_HeStar=None, - **kwargs - ): + **kwargs): + """Initialize the step. See class documentation for details.""" self.dt = dt self.n_o_steps_history = n_o_steps_history @@ -273,18 +263,7 @@ def __init__( # them to the appropriate columns) self.KEYS = DEFAULT_TRANSLATED_KEYS - # creating a track matching object - #self.track_matcher = TrackMatcher(grid_name_Hrich = grid_name_Hrich, - # grid_name_strippedHe = grid_name_strippedHe, - # path=path, metallicity = metallicity, - # matching_method = matching_method, - # matching_tolerance=matching_tolerance, - # matching_tolerance_hard=matching_tolerance_hard, - # list_for_matching_HMS = list_for_matching_HMS, - # list_for_matching_HeStar = list_for_matching_HeStar, - # list_for_matching_postMS = list_for_matching_postMS, - # record_matching = record_matching, - # verbose = self.verbose) + # Set TrackMatcher reference self.track_matcher = kwargs.get('track_matcher', None) # create evolution handler object diff --git a/posydon/binary_evol/DT/track_match.py b/posydon/binary_evol/DT/track_match.py index 5fbce16408..1cc8a527da 100644 --- a/posydon/binary_evol/DT/track_match.py +++ b/posydon/binary_evol/DT/track_match.py @@ -38,7 +38,6 @@ ) from posydon.config import PATH_TO_POSYDON_DATA from posydon.interpolation.data_scaling import DataScaler -from posydon.interpolation.interpolation import GRIDInterpolator from posydon.utils.common_functions import ( convert_metallicity_to_string, set_binary_to_failed, @@ -49,7 +48,6 @@ MATCHING_WITH_RELATIVE_DIFFERENCE = ["center_he4"] - val_names = [" ", "mass", "log_R", "center_h1", "surface_h1", "he_core_mass", "center_he4", "surface_he4", "center_c12"] @@ -61,6 +59,20 @@ # MAJOR.MINOR version of imported scipy package SCIPY_VER = float('.'.join(scipy.__version__.split('.')[:2])) +DEFAULT_MATCH_SETTINGS = {"grid_Hrich":None, + "grid_strippedHe":None, + "path":PATH_TO_POSYDON_DATA, + "metallicity":None, + "matching_method":"minimize", + "matching_tolerance":1e-2, + "matching_tolerance_hard":1e-1, + "list_for_matching_HMS":None, + "list_for_matching_HeStar":None, + "list_for_matching_postMS":None, + "list_for_matching_postHeMS":None, + "record_matching":False, + "verbose":False} + class TrackMatcher: """ This class contains the functionality to match binary star components @@ -253,22 +265,7 @@ class TrackMatcher: """ - def __init__( - self, - grid_name_Hrich, - grid_name_strippedHe, - path=PATH_TO_POSYDON_DATA, - metallicity=None, - matching_method="minimize", - matching_tolerance=1e-2, - matching_tolerance_hard=1e-1, - list_for_matching_HMS=None, - list_for_matching_postMS=None, - list_for_matching_HeStar=None, - list_for_matching_postHeMS=None, - record_matching=False, - verbose=False - ): + def __init__(self, **kwargs): # MESA history column names used as matching metrics # TODO: should this be singlestar.STARPROPERTIES? An @@ -291,19 +288,19 @@ def __init__( # ===================================================================== - self.metallicity = convert_metallicity_to_string(metallicity) - self.matching_method = matching_method - self.matching_tolerance = matching_tolerance # DEFAULT: 1e-2 - self.matching_tolerance_hard = matching_tolerance_hard # DEFAULT: 1e-1 + for kwarg in kwargs: + if kwarg not in DEFAULT_MATCH_SETTINGS.keys(): + raise POSYDONError(f"Unexpected keyword argument {kwarg} " + "passed to TrackMatcher. Expected " + f"kwargs: {DEFAULT_MATCH_SETTINGS.keys()}") + else: + # set attributes for all kwargs, using defaults if not specified + setattr(self, kwarg, kwargs.get(kwarg, DEFAULT_MATCH_SETTINGS[kwarg])) + + self.metallicity = convert_metallicity_to_string(self.metallicity) self.initial_mass = None self.rootm = None - self.verbose = verbose - - self.list_for_matching_HMS = list_for_matching_HMS - self.list_for_matching_postMS = list_for_matching_postMS - self.list_for_matching_HeStar = list_for_matching_HeStar - self.list_for_matching_postHeMS = list_for_matching_postHeMS # mapping a combination of (key, htrack, method) to a pre-trained # DataScaler instance, created the first time it is requested @@ -331,19 +328,6 @@ def __init__( # keys for the star profile interpolation self.profile_keys = DEFAULT_PROFILE_KEYS - # should grids just get passed to this? - if grid_name_Hrich is None: - grid_name_Hrich = os.path.join('single_HMS', - self.metallicity+'_Zsun.h5') - grid_path_Hrich = os.path.join(path, grid_name_Hrich) - self.grid_Hrich = GRIDInterpolator(grid_path_Hrich) - - if grid_name_strippedHe is None: - grid_name_strippedHe = os.path.join('single_HeMS', - self.metallicity+'_Zsun.h5') - grid_path_strippedHe = os.path.join(path, grid_name_strippedHe) - self.grid_strippedHe = GRIDInterpolator(grid_path_strippedHe) - # ===================================================================== # Initialize the matching lists: @@ -422,8 +406,6 @@ def __init__( [m_min_He, m_max_He], [t_min_He, t_max_He] ] - self.record_matching = record_matching - # create and train scalers self.create_root0_h() self.create_root0_he() diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index da630f18eb..14abaf05cc 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -17,11 +17,13 @@ import os import time -from posydon.binary_evol.DT.track_match import TrackMatcher +from posydon.binary_evol.DT.track_match import TrackMatcher, DEFAULT_MATCH_SETTINGS +from posydon.interpolation.interpolation import GRIDInterpolator from posydon.config import PATH_TO_POSYDON_DATA from posydon.popsyn.io import simprop_kwargs_from_ini from posydon.utils.constants import age_of_universe from posydon.utils.posydonwarning import Pwarn +from posydon.utils.common_functions import convert_metallicity_to_string class NullStep: @@ -194,6 +196,15 @@ def __init__(self, flow=({}, {}), self.preload_imports() + # To hold TrackMatcher objects per step, if needed. + self.track_matchers = {} + + self.grid_path = PATH_TO_POSYDON_DATA + self.grid_name_Hrich = None + self.grid_Hrich = None + self.grid_name_strippedHe = None + self.grid_strippedHe = None + def preload_imports(self): """ Preload the imports of detached_step and MesaGridStep to avoid @@ -205,9 +216,11 @@ def preload_imports(self): """ from posydon.binary_evol.DT.step_detached import detached_step + from posydon.binary_evol.CE.step_CEE import StepCEE from posydon.binary_evol.MESA.step_mesa import MesaGridStep self._detached_step = detached_step + self._step_CE = StepCEE self._MesaGridStep = MesaGridStep @classmethod @@ -317,13 +330,18 @@ def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, from # these steps and the flow do not require a metallicity ignore_for_met = ["flow", "step_SN", "step_end"] + steps_with_matching = ["step_detached", "step_CE", + "step_isolated", "step_dco", + "step_merged", "step_disrupted"] # grab kwargs from ini file for given step if os.path.isfile(from_ini): step_tup = simprop_kwargs_from_ini(from_ini, only=step_name)[step_name] + step_func = step_tup[0] + step_kwargs = step_tup[1] + if (metallicity is None) and (step_name not in ignore_for_met): - step_kwargs = step_tup[1] metallicity = step_kwargs.get('metallicity', metallicity) if metallicity is not None: pass @@ -332,43 +350,60 @@ def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, from Pwarn(f"{step_name} not assigned a metallicity. Defaulting to Z = Zsun (solar).", "MissingValueWarning") metallicity = 1.0 - - # create TrackMatcher object if needed - if self.track_matcher is None: - self.track_matcher = TrackMatcher(grid_name_Hrich = None, - grid_name_strippedHe = None, - path=PATH_TO_POSYDON_DATA, metallicity = metallicity, - matching_method = "minimize", - matching_tolerance=1e-2, - matching_tolerance_hard=1e-1, - list_for_matching_HMS = None, - list_for_matching_HeStar = None, - list_for_matching_postMS = None, - record_matching = False, - verbose = False) - - # pass TrackMatcher reference (except for flow, step_SN, step_end) - if step_name not in ["flow", "step_SN", "step_end"]: - step_kwargs['track_matcher'] = self.track_matcher + # give step a metallicity and load it as a class attribute + if step_name not in ignore_for_met: + step_kwargs.update({'metallicity':float(metallicity)}) + + # create TrackMatcher object if needed + if step_name in steps_with_matching: + z_str = convert_metallicity_to_string(metallicity) + # set up GRIDInterpolator objects for all TrackMatchers + if self.grid_Hrich is None: + if self.grid_name_Hrich is None: + self.grid_name_Hrich = os.path.join('single_HMS', + z_str+'_Zsun.h5') + grid_path_Hrich = os.path.join(self.grid_path, self.grid_name_Hrich) + self.grid_Hrich = GRIDInterpolator(grid_path_Hrich) + + if self.grid_strippedHe is None: + if self.grid_name_strippedHe is None: + self.grid_name_strippedHe = os.path.join('single_HeMS', + z_str+'_Zsun.h5') + grid_path_strippedHe = os.path.join(self.grid_path, self.grid_name_strippedHe) + self.grid_strippedHe = GRIDInterpolator(grid_path_strippedHe) + + step_kwargs['grid_Hrich'] = self.grid_Hrich + step_kwargs['grid_strippedHe'] = self.grid_strippedHe + + # Create TrackMatcher object as needed, passing GRIDInterpolators + if step_name not in self.track_matchers.keys(): + # update TrackMatcher kwargs with any step specs + track_match_kwargs = DEFAULT_MATCH_SETTINGS.copy() + for key, val in step_kwargs.items(): + if key in track_match_kwargs.keys(): + track_match_kwargs.update({key: val}) + else: + pass + # peel off TrackMatcher kwargs from step_kwargs + for key in track_match_kwargs.keys(): + _ = step_kwargs.pop(key, None) + + self.track_matchers[step_name] = TrackMatcher(**track_match_kwargs) + step_kwargs['track_matcher'] = self.track_matchers[step_name] # This if should never trigger after __init__, unless the step is # entirely new and non-standard if step_name not in self.kwargs.keys(): self.kwargs[step_name] = step_tup - # give step a metallicity and load it as a class attribute - if step_name not in ignore_for_met: - step_tup[1].update({'metallicity':float(metallicity)}) if verbose: print(step_name, step_tup, end='\n') - step_func, kwargs = step_tup - # steps like step_end do not take kwargs, so try loading with # kwargs first, then without if that fails. This mostly matters # if a user has re-mapped a step to one that does not take kwargs. try: - setattr(self, step_name, step_func(**kwargs)) + setattr(self, step_name, step_func(**step_kwargs)) except TypeError as e: Pwarn(f"Error loading step {step_name}: {e}", "StepWarning") @@ -391,9 +426,12 @@ def close(self): for step_func in all_step_funcs: if isinstance(step_func, self._MesaGridStep): step_func.close() - elif isinstance(step_func, self._detached_step): - for grid_interpolator in [step_func.track_matcher.grid_Hrich, step_func.track_matcher.grid_strippedHe]: - grid_interpolator.close() + #elif isinstance(step_func, self._detached_step) or \ + # isinstance(step_func, self._step_CE): + # for grid_interpolator in [step_func.track_matcher.grid_Hrich, step_func.track_matcher.grid_strippedHe]: + # grid_interpolator.close() + self.grid_Hrich.close() + self.grid_strippedHe.close() def pre_evolve(self, binary): """Functions called before a binary evolves. diff --git a/posydon/popsyn/population_params_default.ini b/posydon/popsyn/population_params_default.ini index 2e06a9b3c4..66021a99ba 100644 --- a/posydon/popsyn/population_params_default.ini +++ b/posydon/popsyn/population_params_default.ini @@ -216,6 +216,22 @@ absolute_import = None # if given, use an absolute filepath to user defined step: # ['', ''] + matching_method = 'minimize' + # 'minimize', 'root' + matching_tolerance = 1e-2 + # float, DEF: 1e-2 + matching_tolerance_hard = 1e-1 + # float, DEF: 1e-1 + list_for_matching_HMS = [["mass", "center_h1", "he_core_mass"], + [20.0, 1.0, 10.0], + ["log_min_max", "min_max", "min_max"], + [0.1, 300], [0.0, None]] + # A list of mixed type that specifies properties of the matching + # process for HMS stars. This list has the following structure: + # list_for_matching = [[matching attr. names], [rescale_factors], + # [scaling method], [mass_bnds], [age_bnds]] + record_matching = False + # True, False prescription = 'alpha-lambda' # 'alpha-lambda' common_envelope_efficiency = 1.0 @@ -246,8 +262,6 @@ common_envelope_option_after_succ_CEE = 'two_phases_stableMT' # 'two_phases_stableMT' 'one_phase_variable_core_definition' # 'two_phases_windloss' - record_matching = False - # True, False verbose = False # True, False From 5f820e6d33506a2e3b8cfac97790afa6d91b8f8a Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2026 00:57:02 +0000 Subject: [PATCH 154/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/binary_evol/CE/step_CEE.py | 2 +- posydon/binary_evol/DT/step_detached.py | 2 +- posydon/binary_evol/simulationproperties.py | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/posydon/binary_evol/CE/step_CEE.py b/posydon/binary_evol/CE/step_CEE.py index 44a2130959..69775e91d8 100644 --- a/posydon/binary_evol/CE/step_CEE.py +++ b/posydon/binary_evol/CE/step_CEE.py @@ -182,7 +182,7 @@ def __init__( self.metallicity = metallicity self.verbose = verbose self.path_to_posydon = PATH_TO_POSYDON - + # set TrackMatcher reference self.track_matcher = kwargs.get("track_matcher", None) diff --git a/posydon/binary_evol/DT/step_detached.py b/posydon/binary_evol/DT/step_detached.py index a701460333..773c367a32 100644 --- a/posydon/binary_evol/DT/step_detached.py +++ b/posydon/binary_evol/DT/step_detached.py @@ -230,7 +230,7 @@ def __init__( verbose=False, matching_method="minimize", **kwargs): - + """Initialize the step. See class documentation for details.""" self.dt = dt self.n_o_steps_history = n_o_steps_history diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index 14abaf05cc..333df450d7 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -17,13 +17,13 @@ import os import time -from posydon.binary_evol.DT.track_match import TrackMatcher, DEFAULT_MATCH_SETTINGS -from posydon.interpolation.interpolation import GRIDInterpolator +from posydon.binary_evol.DT.track_match import DEFAULT_MATCH_SETTINGS, TrackMatcher from posydon.config import PATH_TO_POSYDON_DATA +from posydon.interpolation.interpolation import GRIDInterpolator from posydon.popsyn.io import simprop_kwargs_from_ini +from posydon.utils.common_functions import convert_metallicity_to_string from posydon.utils.constants import age_of_universe from posydon.utils.posydonwarning import Pwarn -from posydon.utils.common_functions import convert_metallicity_to_string class NullStep: @@ -215,8 +215,8 @@ def preload_imports(self): failure occurs, hence the need for something like this. """ - from posydon.binary_evol.DT.step_detached import detached_step from posydon.binary_evol.CE.step_CEE import StepCEE + from posydon.binary_evol.DT.step_detached import detached_step from posydon.binary_evol.MESA.step_mesa import MesaGridStep self._detached_step = detached_step From 12759fb13cd3e871c308b8cbbb7360ef3363ce3f Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Mon, 9 Mar 2026 20:02:44 -0500 Subject: [PATCH 155/389] cleaning --- posydon/binary_evol/simulationproperties.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index 333df450d7..a54840177e 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -17,13 +17,13 @@ import os import time -from posydon.binary_evol.DT.track_match import DEFAULT_MATCH_SETTINGS, TrackMatcher -from posydon.config import PATH_TO_POSYDON_DATA +from posydon.binary_evol.DT.track_match import TrackMatcher, DEFAULT_MATCH_SETTINGS from posydon.interpolation.interpolation import GRIDInterpolator +from posydon.config import PATH_TO_POSYDON_DATA from posydon.popsyn.io import simprop_kwargs_from_ini -from posydon.utils.common_functions import convert_metallicity_to_string from posydon.utils.constants import age_of_universe from posydon.utils.posydonwarning import Pwarn +from posydon.utils.common_functions import convert_metallicity_to_string class NullStep: @@ -197,8 +197,10 @@ def __init__(self, flow=({}, {}), self.preload_imports() # To hold TrackMatcher objects per step, if needed. + # maybe get rid of this self.track_matchers = {} + # Should possibly be a section in sim props .ini file self.grid_path = PATH_TO_POSYDON_DATA self.grid_name_Hrich = None self.grid_Hrich = None @@ -215,8 +217,8 @@ def preload_imports(self): failure occurs, hence the need for something like this. """ - from posydon.binary_evol.CE.step_CEE import StepCEE from posydon.binary_evol.DT.step_detached import detached_step + from posydon.binary_evol.CE.step_CEE import StepCEE from posydon.binary_evol.MESA.step_mesa import MesaGridStep self._detached_step = detached_step @@ -426,10 +428,7 @@ def close(self): for step_func in all_step_funcs: if isinstance(step_func, self._MesaGridStep): step_func.close() - #elif isinstance(step_func, self._detached_step) or \ - # isinstance(step_func, self._step_CE): - # for grid_interpolator in [step_func.track_matcher.grid_Hrich, step_func.track_matcher.grid_strippedHe]: - # grid_interpolator.close() + self.grid_Hrich.close() self.grid_strippedHe.close() From 62c53ec822f073fe4c03de1e23e29664b7e408fe Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2026 01:03:05 +0000 Subject: [PATCH 156/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/binary_evol/simulationproperties.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index a54840177e..f8d0c206f2 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -17,13 +17,13 @@ import os import time -from posydon.binary_evol.DT.track_match import TrackMatcher, DEFAULT_MATCH_SETTINGS -from posydon.interpolation.interpolation import GRIDInterpolator +from posydon.binary_evol.DT.track_match import DEFAULT_MATCH_SETTINGS, TrackMatcher from posydon.config import PATH_TO_POSYDON_DATA +from posydon.interpolation.interpolation import GRIDInterpolator from posydon.popsyn.io import simprop_kwargs_from_ini +from posydon.utils.common_functions import convert_metallicity_to_string from posydon.utils.constants import age_of_universe from posydon.utils.posydonwarning import Pwarn -from posydon.utils.common_functions import convert_metallicity_to_string class NullStep: @@ -217,8 +217,8 @@ def preload_imports(self): failure occurs, hence the need for something like this. """ - from posydon.binary_evol.DT.step_detached import detached_step from posydon.binary_evol.CE.step_CEE import StepCEE + from posydon.binary_evol.DT.step_detached import detached_step from posydon.binary_evol.MESA.step_mesa import MesaGridStep self._detached_step = detached_step From 4605e8a27aed9353999f503a51ed01d4441777c9 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Mon, 9 Mar 2026 20:26:01 -0500 Subject: [PATCH 157/389] only delete GRIDInterpolator objects if they exist --- posydon/binary_evol/simulationproperties.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index a54840177e..61807cc305 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -265,6 +265,7 @@ def from_ini(cls, path, metallicity = None, load_steps=False, verbose=False, **o return new_instance + @profile def load_steps(self, metallicity=None, verbose=False): """Instantiate all step classes and set as instance attributes. @@ -429,8 +430,10 @@ def close(self): if isinstance(step_func, self._MesaGridStep): step_func.close() - self.grid_Hrich.close() - self.grid_strippedHe.close() + if self.grid_Hrich is not None: + self.grid_Hrich.close() + if self.grid_name_strippedHe is not None: + self.grid_strippedHe.close() def pre_evolve(self, binary): """Functions called before a binary evolves. From 8f3fc0ee9d3e7c6a97b5cc2743b0b330eec2d87e Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Mon, 9 Mar 2026 20:57:49 -0500 Subject: [PATCH 158/389] remove @profile tag --- posydon/binary_evol/simulationproperties.py | 1 - 1 file changed, 1 deletion(-) diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index 89c272735b..b9460d67ae 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -265,7 +265,6 @@ def from_ini(cls, path, metallicity = None, load_steps=False, verbose=False, **o return new_instance - @profile def load_steps(self, metallicity=None, verbose=False): """Instantiate all step classes and set as instance attributes. From bc21fa6d71a51140ddef8cc6e636a2b48086ca43 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Tue, 10 Mar 2026 01:31:39 -0500 Subject: [PATCH 159/389] cleaning --- posydon/binary_evol/CE/step_CEE.py | 4 ---- posydon/binary_evol/DT/step_detached.py | 1 - posydon/binary_evol/DT/step_merged.py | 1 - 3 files changed, 6 deletions(-) diff --git a/posydon/binary_evol/CE/step_CEE.py b/posydon/binary_evol/CE/step_CEE.py index 69775e91d8..bbbaad638d 100644 --- a/posydon/binary_evol/CE/step_CEE.py +++ b/posydon/binary_evol/CE/step_CEE.py @@ -33,14 +33,10 @@ "Matthias Kruckow ", ] - -import copy - import numpy as np import pandas as pd from posydon.binary_evol.binarystar import BINARYPROPERTIES -from posydon.binary_evol.DT.track_match import TrackMatcher from posydon.binary_evol.flow_chart import ( STAR_STATES_CO, STAR_STATES_H_RICH, diff --git a/posydon/binary_evol/DT/step_detached.py b/posydon/binary_evol/DT/step_detached.py index 773c367a32..0434a48253 100644 --- a/posydon/binary_evol/DT/step_detached.py +++ b/posydon/binary_evol/DT/step_detached.py @@ -37,7 +37,6 @@ ) from posydon.binary_evol.DT.tides.default_tides import default_tides -#from posydon.binary_evol.DT.track_match import TrackMatcher from posydon.binary_evol.DT.winds.default_winds import ( default_sep_from_winds, default_spin_from_winds, diff --git a/posydon/binary_evol/DT/step_merged.py b/posydon/binary_evol/DT/step_merged.py index 9f48673688..06e8c9cd32 100644 --- a/posydon/binary_evol/DT/step_merged.py +++ b/posydon/binary_evol/DT/step_merged.py @@ -85,7 +85,6 @@ def __init__( *args, **kwargs) - def __call__(self,binary): merged_star_properties = self.merged_star_properties From 3fb820f13a865dc1c1668742bfd1204840b0efff Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2026 06:31:56 +0000 Subject: [PATCH 160/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/binary_evol/DT/step_detached.py | 1 - 1 file changed, 1 deletion(-) diff --git a/posydon/binary_evol/DT/step_detached.py b/posydon/binary_evol/DT/step_detached.py index 0434a48253..c0381dd7f4 100644 --- a/posydon/binary_evol/DT/step_detached.py +++ b/posydon/binary_evol/DT/step_detached.py @@ -36,7 +36,6 @@ RVJ83_braking, ) from posydon.binary_evol.DT.tides.default_tides import default_tides - from posydon.binary_evol.DT.winds.default_winds import ( default_sep_from_winds, default_spin_from_winds, From 3fe62d7a89a9c1ed01f376ab3af00ee9750fa923 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Tue, 10 Mar 2026 15:31:18 -0500 Subject: [PATCH 161/389] check/create GRIDInterpolators for each metallicity --- posydon/binary_evol/simulationproperties.py | 41 +++++++++++---------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index b9460d67ae..366e0b6a92 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -202,10 +202,10 @@ def __init__(self, flow=({}, {}), # Should possibly be a section in sim props .ini file self.grid_path = PATH_TO_POSYDON_DATA - self.grid_name_Hrich = None - self.grid_Hrich = None - self.grid_name_strippedHe = None - self.grid_strippedHe = None + self.grid_names_Hrich = {} + self.grids_Hrich = {} + self.grid_names_strippedHe = {} + self.grids_strippedHe = {} def preload_imports(self): """ @@ -360,24 +360,27 @@ def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, from if step_name in steps_with_matching: z_str = convert_metallicity_to_string(metallicity) # set up GRIDInterpolator objects for all TrackMatchers - if self.grid_Hrich is None: - if self.grid_name_Hrich is None: - self.grid_name_Hrich = os.path.join('single_HMS', + try: + _ = self.grids_Hrich[metallicity] + except KeyError: + self.grid_names_Hrich[metallicity] = os.path.join('single_HMS', z_str+'_Zsun.h5') - grid_path_Hrich = os.path.join(self.grid_path, self.grid_name_Hrich) - self.grid_Hrich = GRIDInterpolator(grid_path_Hrich) - - if self.grid_strippedHe is None: - if self.grid_name_strippedHe is None: - self.grid_name_strippedHe = os.path.join('single_HeMS', - z_str+'_Zsun.h5') - grid_path_strippedHe = os.path.join(self.grid_path, self.grid_name_strippedHe) - self.grid_strippedHe = GRIDInterpolator(grid_path_strippedHe) - - step_kwargs['grid_Hrich'] = self.grid_Hrich - step_kwargs['grid_strippedHe'] = self.grid_strippedHe + grid_path_Hrich = os.path.join(self.grid_path, + self.grid_names_Hrich[metallicity]) + self.grids_Hrich[metallicity] = GRIDInterpolator(grid_path_Hrich) + + try: + _ = self.grids_strippedHe[metallicity] + except KeyError: + self.grid_names_strippedHe[metallicity] = os.path.join('single_HeMS', + z_str+'_Zsun.h5') + grid_path_strippedHe = os.path.join(self.grid_path, + self.grid_names_strippedHe[metallicity]) + self.grids_strippedHe[metallicity] = GRIDInterpolator(grid_path_strippedHe) # Create TrackMatcher object as needed, passing GRIDInterpolators + step_kwargs['grid_Hrich'] = self.grids_Hrich[metallicity] + step_kwargs['grid_strippedHe'] = self.grids_strippedHe[metallicity] if step_name not in self.track_matchers.keys(): # update TrackMatcher kwargs with any step specs track_match_kwargs = DEFAULT_MATCH_SETTINGS.copy() From 83af345e2fd1d0868e300bb9106d8e9e813083e8 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2026 20:32:01 +0000 Subject: [PATCH 162/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/binary_evol/simulationproperties.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index 366e0b6a92..9537632303 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -360,12 +360,12 @@ def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, from if step_name in steps_with_matching: z_str = convert_metallicity_to_string(metallicity) # set up GRIDInterpolator objects for all TrackMatchers - try: + try: _ = self.grids_Hrich[metallicity] except KeyError: self.grid_names_Hrich[metallicity] = os.path.join('single_HMS', z_str+'_Zsun.h5') - grid_path_Hrich = os.path.join(self.grid_path, + grid_path_Hrich = os.path.join(self.grid_path, self.grid_names_Hrich[metallicity]) self.grids_Hrich[metallicity] = GRIDInterpolator(grid_path_Hrich) @@ -374,7 +374,7 @@ def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, from except KeyError: self.grid_names_strippedHe[metallicity] = os.path.join('single_HeMS', z_str+'_Zsun.h5') - grid_path_strippedHe = os.path.join(self.grid_path, + grid_path_strippedHe = os.path.join(self.grid_path, self.grid_names_strippedHe[metallicity]) self.grids_strippedHe[metallicity] = GRIDInterpolator(grid_path_strippedHe) From d1f7f7e776bbf0f35f7957dd705ae0956c1b5972 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Tue, 10 Mar 2026 18:24:29 -0500 Subject: [PATCH 163/389] cleaning and compartmentalizing functions in load_a_step, esp. for TrackMatcher creation --- posydon/binary_evol/simulationproperties.py | 124 ++++++++++---------- 1 file changed, 60 insertions(+), 64 deletions(-) diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index 9537632303..b6c71e2073 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -341,87 +341,83 @@ def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, from step_tup = simprop_kwargs_from_ini(from_ini, only=step_name)[step_name] step_func = step_tup[0] - step_kwargs = step_tup[1] + step_kwargs = step_tup[1].copy() - if (metallicity is None) and (step_name not in ignore_for_met): + # check/assign metallicity to the step + if step_name not in ignore_for_met: metallicity = step_kwargs.get('metallicity', metallicity) - if metallicity is not None: - pass - # if still None: - else: - Pwarn(f"{step_name} not assigned a metallicity. Defaulting to Z = Zsun (solar).", - "MissingValueWarning") + if metallicity is None: + Pwarn(f"{step_name} not assigned a metallicity. " + "Defaulting to Z = Zsun (solar).", + "MissingValueWarning") metallicity = 1.0 - # give step a metallicity and load it as a class attribute - if step_name not in ignore_for_met: - step_kwargs.update({'metallicity':float(metallicity)}) + step_kwargs['metallicity'] = float(metallicity) - # create TrackMatcher object if needed + # check/create a TrackMatcher object if needed + matcher_key = (metallicity, step_name) if step_name in steps_with_matching: - z_str = convert_metallicity_to_string(metallicity) - # set up GRIDInterpolator objects for all TrackMatchers - try: - _ = self.grids_Hrich[metallicity] - except KeyError: - self.grid_names_Hrich[metallicity] = os.path.join('single_HMS', - z_str+'_Zsun.h5') - grid_path_Hrich = os.path.join(self.grid_path, - self.grid_names_Hrich[metallicity]) - self.grids_Hrich[metallicity] = GRIDInterpolator(grid_path_Hrich) - - try: - _ = self.grids_strippedHe[metallicity] - except KeyError: - self.grid_names_strippedHe[metallicity] = os.path.join('single_HeMS', - z_str+'_Zsun.h5') - grid_path_strippedHe = os.path.join(self.grid_path, - self.grid_names_strippedHe[metallicity]) - self.grids_strippedHe[metallicity] = GRIDInterpolator(grid_path_strippedHe) - - # Create TrackMatcher object as needed, passing GRIDInterpolators - step_kwargs['grid_Hrich'] = self.grids_Hrich[metallicity] - step_kwargs['grid_strippedHe'] = self.grids_strippedHe[metallicity] - if step_name not in self.track_matchers.keys(): - # update TrackMatcher kwargs with any step specs - track_match_kwargs = DEFAULT_MATCH_SETTINGS.copy() - for key, val in step_kwargs.items(): - if key in track_match_kwargs.keys(): - track_match_kwargs.update({key: val}) - else: - pass - # peel off TrackMatcher kwargs from step_kwargs - for key in track_match_kwargs.keys(): - _ = step_kwargs.pop(key, None) - - self.track_matchers[step_name] = TrackMatcher(**track_match_kwargs) - step_kwargs['track_matcher'] = self.track_matchers[step_name] - - # This if should never trigger after __init__, unless the step is - # entirely new and non-standard - if step_name not in self.kwargs.keys(): - self.kwargs[step_name] = step_tup + matcher_needed = matcher_key not in self.track_matchers + if matcher_needed: + step_kwargs, matcher_kwargs = self._separate_matcher_kwargs(step_kwargs) + self.create_track_matcher(metallicity, step_name, matcher_kwargs) + + step_kwargs['track_matcher'] = self.track_matchers[matcher_key] if verbose: print(step_name, step_tup, end='\n') - # steps like step_end do not take kwargs, so try loading with - # kwargs first, then without if that fails. This mostly matters - # if a user has re-mapped a step to one that does not take kwargs. + # Try to load the step try: setattr(self, step_name, step_func(**step_kwargs)) - except TypeError as e: Pwarn(f"Error loading step {step_name}: {e}", "StepWarning") print(f"Loading {step_name} without arguments.") setattr(self, step_name, step_func()) # check if all steps have been loaded - for name, tup in self.kwargs.items(): - if isinstance(tup, tuple): - if hasattr(self, name): - self.steps_loaded = True - else: - self.steps_loaded = False + self.steps_loaded = all(hasattr(self, name) + for name, tup in self.kwargs.items() + if isinstance(tup, tuple) +) + + def _separate_matcher_kwargs(self, step_kwargs): + matcher_kwargs = DEFAULT_MATCH_SETTINGS.copy() + for key, val in step_kwargs.items(): + if key in matcher_kwargs: + matcher_kwargs.update({key: val}) + # peel off TrackMatcher kwargs from step_kwargs + except_keys = ["metallicity", "verbose"] + for key in matcher_kwargs: + if key in except_keys: + continue + _ = step_kwargs.pop(key, None) + + return step_kwargs, matcher_kwargs + + def create_track_matcher(self, metallicity, step_name, matcher_kwargs): + + z_str = convert_metallicity_to_string(metallicity) + # set up GRIDInterpolator objects for all TrackMatchers + # (only if one hasn't been created already for a given metallicity) + if metallicity not in self.grids_Hrich: + self.grid_names_Hrich[metallicity] = os.path.join('single_HMS', + z_str+'_Zsun.h5') + grid_path_Hrich = os.path.join(self.grid_path, + self.grid_names_Hrich[metallicity]) + self.grids_Hrich[metallicity] = GRIDInterpolator(grid_path_Hrich) + + if metallicity not in self.grids_strippedHe: + self.grid_names_strippedHe[metallicity] = os.path.join('single_HeMS', + z_str+'_Zsun.h5') + grid_path_strippedHe = os.path.join(self.grid_path, + self.grid_names_strippedHe[metallicity]) + self.grids_strippedHe[metallicity] = GRIDInterpolator(grid_path_strippedHe) + + # Create TrackMatcher object as needed, passing GRIDInterpolators + matcher_kwargs['grid_Hrich'] = self.grids_Hrich[metallicity] + matcher_kwargs['grid_strippedHe'] = self.grids_strippedHe[metallicity] + self.track_matchers[(metallicity, step_name)] = TrackMatcher(**matcher_kwargs) + def close(self): """Close hdf5 files before exiting.""" From 66725e911558a50fd591e3f626c4a2396ab0a574 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2026 23:24:50 +0000 Subject: [PATCH 164/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/binary_evol/simulationproperties.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index b6c71e2073..2e4a8036aa 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -375,8 +375,8 @@ def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, from setattr(self, step_name, step_func()) # check if all steps have been loaded - self.steps_loaded = all(hasattr(self, name) - for name, tup in self.kwargs.items() + self.steps_loaded = all(hasattr(self, name) + for name, tup in self.kwargs.items() if isinstance(tup, tuple) ) @@ -417,7 +417,7 @@ def create_track_matcher(self, metallicity, step_name, matcher_kwargs): matcher_kwargs['grid_Hrich'] = self.grids_Hrich[metallicity] matcher_kwargs['grid_strippedHe'] = self.grids_strippedHe[metallicity] self.track_matchers[(metallicity, step_name)] = TrackMatcher(**matcher_kwargs) - + def close(self): """Close hdf5 files before exiting.""" From 22b08cf1c2aa67cfb4265a92409bc4c722f5e575 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Tue, 10 Mar 2026 22:45:21 -0500 Subject: [PATCH 165/389] move track_matcher.py to binary_evol --- posydon/binary_evol/simulationproperties.py | 8 ++++---- posydon/binary_evol/{DT => }/track_match.py | 0 2 files changed, 4 insertions(+), 4 deletions(-) rename posydon/binary_evol/{DT => }/track_match.py (100%) diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index 2e4a8036aa..afce25e2a8 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -17,7 +17,7 @@ import os import time -from posydon.binary_evol.DT.track_match import DEFAULT_MATCH_SETTINGS, TrackMatcher +from posydon.binary_evol.track_match import DEFAULT_MATCH_SETTINGS, TrackMatcher from posydon.config import PATH_TO_POSYDON_DATA from posydon.interpolation.interpolation import GRIDInterpolator from posydon.popsyn.io import simprop_kwargs_from_ini @@ -375,8 +375,8 @@ def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, from setattr(self, step_name, step_func()) # check if all steps have been loaded - self.steps_loaded = all(hasattr(self, name) - for name, tup in self.kwargs.items() + self.steps_loaded = all(hasattr(self, name) + for name, tup in self.kwargs.items() if isinstance(tup, tuple) ) @@ -417,7 +417,7 @@ def create_track_matcher(self, metallicity, step_name, matcher_kwargs): matcher_kwargs['grid_Hrich'] = self.grids_Hrich[metallicity] matcher_kwargs['grid_strippedHe'] = self.grids_strippedHe[metallicity] self.track_matchers[(metallicity, step_name)] = TrackMatcher(**matcher_kwargs) - + def close(self): """Close hdf5 files before exiting.""" diff --git a/posydon/binary_evol/DT/track_match.py b/posydon/binary_evol/track_match.py similarity index 100% rename from posydon/binary_evol/DT/track_match.py rename to posydon/binary_evol/track_match.py From 6b2c499d8a338a40cff111ecfa33a30c1a4b1884 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 11 Mar 2026 03:46:54 +0000 Subject: [PATCH 166/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/binary_evol/simulationproperties.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index afce25e2a8..dcc87b6a9c 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -375,8 +375,8 @@ def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, from setattr(self, step_name, step_func()) # check if all steps have been loaded - self.steps_loaded = all(hasattr(self, name) - for name, tup in self.kwargs.items() + self.steps_loaded = all(hasattr(self, name) + for name, tup in self.kwargs.items() if isinstance(tup, tuple) ) @@ -417,7 +417,7 @@ def create_track_matcher(self, metallicity, step_name, matcher_kwargs): matcher_kwargs['grid_Hrich'] = self.grids_Hrich[metallicity] matcher_kwargs['grid_strippedHe'] = self.grids_strippedHe[metallicity] self.track_matchers[(metallicity, step_name)] = TrackMatcher(**matcher_kwargs) - + def close(self): """Close hdf5 files before exiting.""" From 50dff9901de6460870e851ed6d6843ed90817abe Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Wed, 11 Mar 2026 11:27:53 -0500 Subject: [PATCH 167/389] removing TrackMatcher kwargs from step __init__ methods. These are separated and passed to each step's TrackMatcher object during load_step in simulationproperties.py now. --- posydon/binary_evol/DT/step_detached.py | 24 +++++----- posydon/binary_evol/DT/step_disrupted.py | 14 ++---- .../binary_evol/DT/step_initially_single.py | 14 ++---- posydon/binary_evol/DT/step_isolated.py | 34 +++++--------- posydon/binary_evol/DT/step_merged.py | 46 +++---------------- 5 files changed, 36 insertions(+), 96 deletions(-) diff --git a/posydon/binary_evol/DT/step_detached.py b/posydon/binary_evol/DT/step_detached.py index c0381dd7f4..2960db1e15 100644 --- a/posydon/binary_evol/DT/step_detached.py +++ b/posydon/binary_evol/DT/step_detached.py @@ -226,7 +226,6 @@ def __init__( do_stellar_evolution_and_spin_from_winds=True, RLO_orbit_at_orbit_with_same_am=False, verbose=False, - matching_method="minimize", **kwargs): """Initialize the step. See class documentation for details.""" @@ -243,17 +242,7 @@ def __init__( self.RLO_orbit_at_orbit_with_same_am = RLO_orbit_at_orbit_with_same_am self.verbose = verbose - if self.verbose: - print( - dt, - n_o_steps_history, - matching_method, - do_wind_loss, - do_tides, - do_gravitational_radiation, - do_magnetic_braking, - magnetic_braking_mode, - do_stellar_evolution_and_spin_from_winds) + self.translate = DEFAULT_TRANSLATION @@ -268,6 +257,17 @@ def __init__( self.init_evo_kwargs() self.evo = detached_evolution(**self.evo_kwargs) + if self.verbose: + print(dt, + n_o_steps_history, + self.track_matcher.matching_method, + do_wind_loss, + do_tides, + do_gravitational_radiation, + do_magnetic_braking, + magnetic_braking_mode, + do_stellar_evolution_and_spin_from_winds) + return def init_evo_kwargs(self): diff --git a/posydon/binary_evol/DT/step_disrupted.py b/posydon/binary_evol/DT/step_disrupted.py index c3096b8d0a..99d51e8710 100644 --- a/posydon/binary_evol/DT/step_disrupted.py +++ b/posydon/binary_evol/DT/step_disrupted.py @@ -26,17 +26,9 @@ class DisruptedStep(IsolatedStep): Prepare a runaway star to do an an isolated_step) """ - def __init__(self, - grid_name_Hrich=None, - grid_name_strippedHe=None, - path=PATH_TO_POSYDON_DATA, - *args, **kwargs): - - super().__init__( - grid_name_Hrich=grid_name_Hrich, - grid_name_strippedHe=grid_name_strippedHe, - *args, - **kwargs) + def __init__(self, *args, **kwargs): + + super().__init__(*args, **kwargs) def __call__(self,binary): diff --git a/posydon/binary_evol/DT/step_initially_single.py b/posydon/binary_evol/DT/step_initially_single.py index 564f745479..3b37e6cac2 100644 --- a/posydon/binary_evol/DT/step_initially_single.py +++ b/posydon/binary_evol/DT/step_initially_single.py @@ -26,17 +26,9 @@ class InitiallySingleStep(IsolatedStep): Prepare a runaway star to do an an isolated_step) """ - def __init__(self, - grid_name_Hrich=None, - grid_name_strippedHe=None, - path=PATH_TO_POSYDON_DATA, - *args, **kwargs): - - super().__init__( - grid_name_Hrich=grid_name_Hrich, - grid_name_strippedHe=grid_name_strippedHe, - *args, - **kwargs) + def __init__(self, *args, **kwargs): + + super().__init__(*args, **kwargs) def __call__(self,binary): diff --git a/posydon/binary_evol/DT/step_isolated.py b/posydon/binary_evol/DT/step_isolated.py index ecb67f7fe9..2a8a0630bf 100644 --- a/posydon/binary_evol/DT/step_isolated.py +++ b/posydon/binary_evol/DT/step_isolated.py @@ -25,28 +25,18 @@ class IsolatedStep(detached_step): """ def __init__(self, - grid_name_Hrich=None, - grid_name_strippedHe=None, - path=PATH_TO_POSYDON_DATA, - #dt=None, - #n_o_steps_history=None, - do_wind_loss=False, - do_tides=False, - do_gravitational_radiation=False, - do_magnetic_braking=False, - *args, **kwargs): - super().__init__( - grid_name_Hrich=grid_name_Hrich, - grid_name_strippedHe=grid_name_strippedHe, - path=path, - #dt=dt, - #n_o_steps_history=n_o_steps_history, - do_wind_loss=do_wind_loss, - do_tides=do_tides, - do_gravitational_radiation=do_gravitational_radiation, - do_magnetic_braking=do_magnetic_braking, - *args, - **kwargs) + do_wind_loss=False, + do_tides=False, + do_gravitational_radiation=False, + do_magnetic_braking=False, + *args, **kwargs): + + super().__init__(do_wind_loss=do_wind_loss, + do_tides=do_tides, + do_gravitational_radiation=do_gravitational_radiation, + do_magnetic_braking=do_magnetic_braking, + *args, + **kwargs) diff --git a/posydon/binary_evol/DT/step_merged.py b/posydon/binary_evol/DT/step_merged.py index 06e8c9cd32..8a2e72b476 100644 --- a/posydon/binary_evol/DT/step_merged.py +++ b/posydon/binary_evol/DT/step_merged.py @@ -21,7 +21,6 @@ STARPROPERTIES, convert_star_to_massless_remnant, ) -from posydon.config import PATH_TO_POSYDON_DATA from posydon.utils.common_functions import check_state_of_star from posydon.utils.posydonerror import ModelError from posydon.utils.posydonwarning import Pwarn @@ -41,49 +40,16 @@ class MergedStep(IsolatedStep): Prepare a merging star to do an an IsolatedStep """ - def __init__( - self, - grid_name_Hrich=None, - grid_name_strippedHe=None, - path=PATH_TO_POSYDON_DATA, - merger_critical_rot = 0.4, - rel_mass_lost_HMS_HMS = 0.1, - list_for_matching_HMS = [ - ["mass", "center_h1", "he_core_mass"], - [20.0, 1.0, 10.0], - ["log_min_max", "min_max", "min_max"], - #[m_min_H, m_max_H], [0, None] - [None, None], [0, None] - ], - list_for_matching_postMS = [ - ["mass", "center_he4", "he_core_mass"], - [20.0, 1.0, 10.0], - ["log_min_max", "min_max", "min_max"], - #[m_min_H, m_max_H], [0, None] - [None, None], [0, None] - ], - list_for_matching_HeStar = [ - ["he_core_mass", "center_he4"], - [10.0, 1.0], - ["min_max" , "min_max"], - #[[m_min_He, m_max_He], [0, None]], - [None, None], [0, None] - ], - *args, - **kwargs - ): + def __init__(self, + merger_critical_rot = 0.4, + rel_mass_lost_HMS_HMS = 0.1, + *args, + **kwargs): self.merger_critical_rot = merger_critical_rot self.rel_mass_lost_HMS_HMS = rel_mass_lost_HMS_HMS - super().__init__( - grid_name_Hrich=grid_name_Hrich, - grid_name_strippedHe=grid_name_strippedHe, - list_for_matching_HMS = list_for_matching_HMS, - list_for_matching_postMS = list_for_matching_postMS, - list_for_matching_HeStar = list_for_matching_HeStar, - *args, - **kwargs) + super().__init__(*args, **kwargs) def __call__(self,binary): From e5186d852ea88922dc7f3fb7c52cd167fbfdb416 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Wed, 11 Mar 2026 11:30:45 -0500 Subject: [PATCH 168/389] add list_for_matching for step_merged to default ini file so that it gets passed to this steps TrackMatcher --- posydon/popsyn/population_params_default.ini | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/posydon/popsyn/population_params_default.ini b/posydon/popsyn/population_params_default.ini index 66021a99ba..68179eb432 100644 --- a/posydon/popsyn/population_params_default.ini +++ b/posydon/popsyn/population_params_default.ini @@ -187,6 +187,26 @@ absolute_import = None # if given, use an absolute filepath to user defined step: # ['', ''] + list_for_matching_HMS = [["mass", "center_h1", "he_core_mass"], + [20.0, 1.0, 10.0], + ["log_min_max", "min_max", "min_max"], + [None, None], [0, None]] + # A list of mixed type that specifies properties of the matching + # process for HMS stars. This list has the following structure: + # list_for_matching = [[matching attr. names], [rescale_factors], + # [scaling method], [mass_bnds], [age_bnds]] + list_for_matching_postMS = [["mass", "center_he4", "he_core_mass"], + [20.0, 1.0, 10.0], + ["log_min_max", "min_max", "min_max"], + [None, None], [0, None]] + # As above, a list that specifies properties of the matching + # process for post-MS stars. + list_for_matching_HeStar = [["he_core_mass", "center_he4"], + [10.0, 1.0], + ["min_max" , "min_max"], + [None, None], [0, None]] + # As above, a list that specifies properties of the matching + # process for HeMS stars. record_matching = False # True, False verbose = False From d1002a84429bcef83f6638fa1806d2abce1acb2c Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Wed, 11 Mar 2026 14:29:28 -0500 Subject: [PATCH 169/389] create .ini files from testing branch on the fly and use those --- dev-tools/evolve_binaries.sh | 8 + dev-tools/script_data/inlists/.gitkeep | 0 .../inlists/binary_test_params.ini | 548 -------------- .../inlists/population_test_params.ini | 668 ------------------ .../inlists/test_multiZ_population_params.ini | 668 ------------------ dev-tools/script_data/src/binaries_suite.py | 4 +- dev-tools/script_data/src/test_pops.py | 6 +- 7 files changed, 13 insertions(+), 1889 deletions(-) create mode 100644 dev-tools/script_data/inlists/.gitkeep delete mode 100644 dev-tools/script_data/inlists/binary_test_params.ini delete mode 100644 dev-tools/script_data/inlists/population_test_params.ini delete mode 100644 dev-tools/script_data/inlists/test_multiZ_population_params.ini diff --git a/dev-tools/evolve_binaries.sh b/dev-tools/evolve_binaries.sh index c6e8fb107f..61a4f9ef1f 100755 --- a/dev-tools/evolve_binaries.sh +++ b/dev-tools/evolve_binaries.sh @@ -80,6 +80,14 @@ pip install -e "$CLONE_DIR" -q 2>&1 | sed 's/^/ /' echo "šŸš€ Running binaries_suite.py" # # Run the Python script and capture output (stdout and stderr) OUT_DIR=$FULL_PATH/script_data/output/binary_star_tests + +# copy branch's default .ini file for testing and make one into a multi-metallicity .ini file for pop synth tests +cp $CLONE_DIR/posydon/popsyn/population_params_default.ini $FULL_PATH/script_data/inlists/default_test_params.ini +cp $CLONE_DIR/posydon/popsyn/population_params_default.ini $FULL_PATH/script_data/inlists/multiZ_test_params.ini +sed -i 's/metallicities *= *\[1\.\]/metallicities = [1., 0.1]/' $FULL_PATH/script_data/inlists/multiZ_test_params.ini + +# run binary test suite +PATH_TO_POSYDON=$FULL_PATH python script_data/src/binaries_suite.py > $OUT_DIR/evolve_binaries_$BRANCH.out 2>&1 echo -e "āœ… Script completed. Output saved to \n$OUT_DIR/evolve_binaries_$BRANCH.out" diff --git a/dev-tools/script_data/inlists/.gitkeep b/dev-tools/script_data/inlists/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/dev-tools/script_data/inlists/binary_test_params.ini b/dev-tools/script_data/inlists/binary_test_params.ini deleted file mode 100644 index f5400f3117..0000000000 --- a/dev-tools/script_data/inlists/binary_test_params.ini +++ /dev/null @@ -1,548 +0,0 @@ -# POSYDON default BinaryPopulation inifile, use ConfigParser syntax - -[environment_variables] - PATH_TO_POSYDON = '' - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;;;;;;; SimulationProperties ;;;;;;;;;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -[flow] - import = ['posydon.binary_evol.flow_chart', 'flow_chart'] - # builtin posydon flow - absolute_import = None - # If given, use an absolute filepath to user defined flow: ['', ''] - -[step_HMS_HMS] - import = ['posydon.binary_evol.MESA.step_mesa', 'MS_MS_step'] - # builtin posydon step - absolute_import = None - # If given, use an absolute filepath to user defined step: ['', ''] - interpolation_path = None - # found by default - interpolation_filename = None - # found by default - interpolation_method = 'linear3c_kNN' - # 'nearest_neighbour' 'linear3c_kNN' '1NN_1NN' - save_initial_conditions = True - # only for interpolation_method='nearest_neighbour' - track_interpolation = False - # True False - stop_method = 'stop_at_max_time' - # 'stop_at_end' 'stop_at_max_time' 'stop_at_condition' - stop_star = 'star_1' - # only for stop_method='stop_at_condition' 'star_1' 'star_2' - stop_var_name = None - # only for stop_method='stop_at_condition' str - stop_value = None - # only for stop_method='stop_at_condition' float - stop_interpolate = True - # True False - verbose = False - # True False - - -[step_CO_HeMS] - import = ['posydon.binary_evol.MESA.step_mesa', 'CO_HeMS_step'] - # builtin posydon step - absolute_import = None - # If given, use an absolute filepath to user defined step: ['', ''] - interpolation_path = None - # found by default - interpolation_filename = None - # found by default - interpolation_method = 'linear3c_kNN' - # 'nearest_neighbour' 'linear3c_kNN' '1NN_1NN' - save_initial_conditions = True - # only for interpolation_method='nearest_neighbour' - track_interpolation = False - # True False - stop_method = 'stop_at_max_time' - # 'stop_at_end' 'stop_at_max_time' 'stop_at_condition' - stop_star = 'star_1' - # only for stop_method='stop_at_condition' 'star_1' 'star_2' - stop_var_name = None - # only for stop_method='stop_at_condition' str - stop_value = None - # only for stop_method='stop_at_condition' float - stop_interpolate = True - # True False - verbose = False - # True False - -[step_CO_HMS_RLO] - import = ['posydon.binary_evol.MESA.step_mesa', 'CO_HMS_RLO_step'] - # builtin posydon step - absolute_import = None - # If given, use an absolute filepath to user defined step: ['', ''] - interpolation_path = None - # found by default - interpolation_filename = None - # found by default - interpolation_method = 'linear3c_kNN' - # 'nearest_neighbour' 'linear3c_kNN' '1NN_1NN' - save_initial_conditions = True - # only for interpolation_method='nearest_neighbour' - track_interpolation = False - # True False - stop_method = 'stop_at_max_time' - # 'stop_at_end' 'stop_at_max_time' 'stop_at_condition' - stop_star = 'star_1' - # only for stop_method='stop_at_condition' 'star_1' 'star_2' - stop_var_name = None - # only for stop_method='stop_at_condition' str - stop_value = None - # only for stop_method='stop_at_condition' float - stop_interpolate = True - # True False - verbose = False - # True False - -[step_CO_HeMS_RLO] - import = ['posydon.binary_evol.MESA.step_mesa', 'CO_HeMS_RLO_step'] - # builtin posydon step - absolute_import = None - # If given, use an absolute filepath to user defined step: ['', ''] - interpolation_path = None - # found by default - interpolation_filename = None - # found by default - interpolation_method = 'linear3c_kNN' - # 'nearest_neighbour' 'linear3c_kNN' '1NN_1NN' - save_initial_conditions = True - # only for interpolation_method='nearest_neighbour' - track_interpolation = False - # True False - stop_method = 'stop_at_max_time' - # 'stop_at_end' 'stop_at_max_time' 'stop_at_condition' - stop_star = 'star_1' - # only for stop_method='stop_at_condition' 'star_1' 'star_2' - stop_var_name = None - # only for stop_method='stop_at_condition' str - stop_value = None - # only for stop_method='stop_at_condition' float - stop_interpolate = True - # True False - verbose = False - # True False - - -[step_detached] - import = ['posydon.binary_evol.DT.step_detached', 'detached_step'] - # builtin posydon step - absolute_import = None - # If given, use an absolute filepath to user defined step: ['', ''] - matching_method = 'minimize' - #'minimize' 'root' - do_wind_loss = True - # True, False - do_tides = True - # True, False - do_gravitational_radiation = True - # True, False - do_magnetic_braking = True - # True, False - do_stellar_evolution_and_spin_from_winds = True - # True, False - RLO_orbit_at_orbit_with_same_am = False - # True, False - #record_matching = False - # True, False - verbose = False - # True, False - -[step_disrupted] - import = ['posydon.binary_evol.DT.step_disrupted','DisruptedStep'] - # builtin posydon step - absolute_import = None - # If given, use an absolute filepath to user defined step: ['', ''] - -[step_merged] - import = ['posydon.binary_evol.DT.step_merged','MergedStep'] - # builtin posydon step - absolute_import = None - # If given, use an absolute filepath to user defined step: ['', ''] - -[step_initially_single] - import = ['posydon.binary_evol.DT.step_initially_single','InitiallySingleStep'] - # builtin posydon step - absolute_import = None - # If given, use an absolute filepath to user defined step: ['', ''] - -[step_CE] - import = ['posydon.binary_evol.CE.step_CEE', 'StepCEE'] - # builtin posydon step - absolute_import = None - # If given, use an absolute filepath to user defined step: ['', ''] - prescription='alpha-lambda' - # 'alpha-lambda' - common_envelope_efficiency=1.0 - # float in (0, inf) - common_envelope_option_for_lambda='lambda_from_grid_final_values' - # (1) 'default_lambda', (2) 'lambda_from_grid_final_values', - # (3) 'lambda_from_profile_gravitational', - # (4) 'lambda_from_profile_gravitational_plus_internal', - # (5) 'lambda_from_profile_gravitational_plus_internal_minus_recombination' - common_envelope_lambda_default=0.5 - # float in (0, inf) used only for option (1) - common_envelope_option_for_HG_star="optimistic" - # 'optimistic', 'pessimistic' - common_envelope_alpha_thermal=1.0 - # float in (0, inf) used only for option for (4), (5) - core_definition_H_fraction=0.3 - # 0.01, 0.1, 0.3 - core_definition_He_fraction=0.1 - # 0.1 - CEE_tolerance_err = 0.001 - # float (0, inf) - common_envelope_option_after_succ_CEE = 'two_phases_stableMT' - # 'two_phases_stableMT' 'one_phase_variable_core_definition' - # 'two_phases_windloss' - verbose = False - # True False - -[step_SN] - import = ['posydon.binary_evol.SN.step_SN', 'StepSN'] - # builtin posydon step - absolute_import = None - # 'package' kwarg for importlib.import_module - mechanism = 'Fryer+12-delayed' - # v2 interpolators support: 'Fryer+12-rapid', 'Fryer+12-delayed', - # 'Sukhbold+16-engine', 'Patton&Sukhbold20-engine' - # need profiles: 'direct' - engine = '' - # 'N20' or 'W20' for 'Sukhbold+16-engine', 'Patton&Sukhbold20-engine' - # '' for the others - PISN = "Hendriks+23" - # v2 interpolators support: "Hendriks+23" - # other options: None, "Marchant+19" - PISN_CO_shift = 0.0 - # Only when using Hendriks+23 - # float (-inf,inf) - # v2 interpolators support: 0.0 - PPI_extra_mass_loss = -20.0 - # Only when using Hendriks+23 - # float (-inf,inf) - # v2 interpolators support: 0.0 or -20.0 - ECSN = "Tauris+15" - # "Tauris+15", "Podsiadlowski+04" - conserve_hydrogen_envelope = False - # True, False - conserve_hydrogen_PPI = False - # Only when using Hendriks+23 - # True, False - max_neutrino_mass_loss = 0.5 - # float (0,inf) - # v2 interpolators support: 0.5 - max_NS_mass = 2.5 - # float (0,inf) - # v2 interpolators support: 2.5 - use_interp_values = True - # True, False - use_profiles = True - # True, False - use_core_masses = True - # True, False - allow_spin_None = False - # True, False - approx_at_he_depletion = False - # True, False - kick = True - # True, False - kick_normalisation = 'one_over_mass' - # "one_minus_fallback", "one_over_mass", "NS_one_minus_fallback_BH_one", - # "one", "zero", "asym_ej", "linear", "log_normal" - sigma_kick_CCSN_NS = 265.0 - # float (0,inf) - sigma_kick_CCSN_BH = 265.0 - # float (0,inf) - sigma_kick_ECSN = 20.0 - # float (0,inf) - verbose = False - # True False - -[step_dco] - import = ['posydon.binary_evol.DT.double_CO', 'DoubleCO'] - # builtin posydon step - absolute_import = None - # If given, use an absolute filepath to user defined step: ['', ''] - n_o_steps_history = None - -[step_end] - import = ['posydon.binary_evol.step_end', 'step_end'] - # builtin posydon step - absolute_import = None - # If given, use an absolute filepath to user defined step: ['', ''] - -[extra_hooks] - import_1 = ['posydon.binary_evol.simulationproperties', 'TimingHooks'] - # builtin posydon hook - absolute_import_1 = None - # If given, use an absolute filepath to user defined step: ['', ''] - kwargs_1 = {} - - import_2 = ['posydon.binary_evol.simulationproperties', 'StepNamesHooks'] - # builtin posydon hook - absolute_import_2 = None - # If given, use an absolute filepath to user defined step: ['', ''] - kwargs_2 = {} - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;;;;;;; BinaryPopulation ;;;;;;;;;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -[BinaryPopulation_options] - optimize_ram = True - # save population in batches - ram_per_cpu = None - # set maximum ram per cpu before batch saving (GB) - dump_rate = 2000 - # batch save after evolving N binaries - # this should be at least 500 for populations of 100,000 binaries or more - temp_directory = 'batches' - # folder for keeping batch files - tqdm = False - # progress bar - breakdown_to_df = True - # convert BinaryStars into DataFrames after evolution - use_MPI = False - # use only for local MPI runs - metallicity = [1.] #[2., 1., 0.45, 0.2, 0.1, 0.01, 0.001, 0.0001] - # In units of solar metallicity - error_checking_verbose = False - # if True, write all POSYDON errors to stderr at runtime, default=False - warnings_verbose = False - # if True, write all POSYDON warnings to stderr at runtime, default=False - history_verbose = False - # if True, record extra functional steps in the output DataFrames - # (These steps represent internal workings of POSYDON rather than physical phases of evolution) - entropy = None - # `None` uses system entropy (recommended) - number_of_binaries = 10 - # int - binary_fraction_scheme = 'const' - #'const' 'Moe_17' - binary_fraction_const = 1.0 - # float 0< fraction <=1 - star_formation = 'burst' - # 'constant' 'burst' 'custom_linear' 'custom_log10' 'custom_linear_histogram' 'custom_log10_histogram' - max_simulation_time = 13.8e9 - # float (0,inf) - - read_samples_from_file = '' - # path to file to read initial parameters from (if empty string get random samples) - primary_mass_scheme = 'Kroupa2001' - # 'Salpeter', 'Kroupa1993', 'Kroupa2001' - primary_mass_min = 7.0 - # float (0,130) - primary_mass_max = 150.0 - # float (0,130) - secondary_mass_scheme = 'flat_mass_ratio' - # 'flat_mass_ratio', 'q=1' - secondary_mass_min = 0.5 - # float (0,130) - secondary_mass_max = 150.0 - # float (0,130) - orbital_scheme = 'period' - # 'separation', 'period' - orbital_period_scheme = 'Sana+12_period_extended' - # used only for orbital_scheme = 'period' - orbital_period_min = 0.75 - # float (0,inf) - orbital_period_max = 6000.0 - # float (0,inf) - #orbital_separation_scheme = 'log_uniform' - # used only for orbital_scheme = 'separation', 'log_uniform', 'log_normal' - #orbital_separation_min = 5.0 - # float (0,inf) - #orbital_separation_max = 1e5 - # float (0,inf) - #log_orbital_separation_mean = None - # float (0,inf) used only for orbital_separation_scheme ='log_normal' - #log_orbital_separation_sigma = None - # float (0,inf) used only for orbital_separation_scheme ='log_normal' - eccentricity_scheme = 'zero' - # 'zero' 'thermal' 'uniform' - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;;;;;;; Saving Output ;;;;;;;;;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -[BinaryStar_output] - extra_columns = {'step_names':'string', 'step_times':'float64'} - # 'step_times' with from posydon.binary_evol.simulationproperties import TimingHooks - - # LIST BINARY PROPERTIES - only_select_columns=[ - 'state', - 'event', - 'time', - #'separation', - 'orbital_period', - 'eccentricity', - #'V_sys', - #'rl_relative_overflow_1', - #'rl_relative_overflow_2', - 'lg_mtransfer_rate', - #'mass_transfer_case', - #'trap_radius', - #'acc_radius', - #'t_sync_rad_1', - #'t_sync_conv_1', - #'t_sync_rad_2', - #'t_sync_conv_2', - #'nearest_neighbour_distance', - ] - scalar_names=[ - 'interp_class_HMS_HMS', - 'interp_class_CO_HMS_RLO', - 'interp_class_CO_HeMS', - 'interp_class_CO_HeMS_RLO', - 'mt_history_HMS_HMS', - 'mt_history_CO_HMS_RLO', - 'mt_history_CO_HeMS', - 'mt_history_CO_HeMS_RLO', - ] - -[SingleStar_1_output] - # LIST STAR PROPERTIES TO SAVE - include_S1=True - # True, False - only_select_columns=[ - 'state', - #'metallicity', - 'mass', - 'log_R', - 'log_L', - 'lg_mdot', - #'lg_system_mdot', - #'lg_wind_mdot', - 'he_core_mass', - 'he_core_radius', - #'c_core_mass', - #'c_core_radius', - #'o_core_mass', - #'o_core_radius', - 'co_core_mass', - 'co_core_radius', - 'center_h1', - 'center_he4', - #'center_c12', - #'center_n14', - #'center_o16', - 'surface_h1', - 'surface_he4', - #'surface_c12', - #'surface_n14', - #'surface_o16', - #'log_LH', - #'log_LHe', - #'log_LZ', - #'log_Lnuc', - #'c12_c12', - #'center_gamma', - #'avg_c_in_c_core', - #'surf_avg_omega', - 'surf_avg_omega_div_omega_crit', - #'total_moment_of_inertia', - #'log_total_angular_momentum', - 'spin', - #'conv_env_top_mass', - #'conv_env_bot_mass', - #'conv_env_top_radius', - #'conv_env_bot_radius', - #'conv_env_turnover_time_g', - #'conv_env_turnover_time_l_b', - #'conv_env_turnover_time_l_t', - #'envelope_binding_energy', - #'mass_conv_reg_fortides', - #'thickness_conv_reg_fortides', - #'radius_conv_reg_fortides', - #'lambda_CE_1cent', - #'lambda_CE_10cent', - #'lambda_CE_30cent', - #'lambda_CE_pure_He_star_10cent', - #'profile', - #'total_mass_h1', - #'total_mass_he4', - ] - scalar_names=[ - 'natal_kick_array', - 'SN_type', - 'f_fb', - 'spin_orbit_tilt_first_SN', - 'spin_orbit_tilt_second_SN', - ] - -[SingleStar_2_output] - # LIST STAR PROPERTIES TO SAVE - include_S2 = True - # True, False - only_select_columns = [ - 'state', - #'metallicity', - 'mass', - 'log_R', - 'log_L', - 'lg_mdot', - #'lg_system_mdot', - #'lg_wind_mdot', - 'he_core_mass', - 'he_core_radius', - #'c_core_mass', - #'c_core_radius', - #'o_core_mass', - #'o_core_radius', - 'co_core_mass', - 'co_core_radius', - 'center_h1', - 'center_he4', - #'center_c12', - #'center_n14', - #'center_o16', - 'surface_h1', - 'surface_he4', - #'surface_c12', - #'surface_n14', - #'surface_o16', - #'log_LH', - #'log_LHe', - #'log_LZ', - #'log_Lnuc', - #'c12_c12', - #'center_gamma', - #'avg_c_in_c_core', - #'surf_avg_omega', - 'surf_avg_omega_div_omega_crit', - #'total_moment_of_inertia', - #'log_total_angular_momentum', - 'spin', - #'conv_env_top_mass', - #'conv_env_bot_mass', - #'conv_env_top_radius', - #'conv_env_bot_radius', - #'conv_env_turnover_time_g', - #'conv_env_turnover_time_l_b', - #'conv_env_turnover_time_l_t', - #'envelope_binding_energy', - #'mass_conv_reg_fortides', - #'thickness_conv_reg_fortides', - #'radius_conv_reg_fortides', - #'lambda_CE_1cent', - #'lambda_CE_10cent', - #'lambda_CE_30cent', - #'lambda_CE_pure_He_star_10cent', - #'profile', - #'total_mass_h1', - #'total_mass_he4', - ] - scalar_names=[ - 'natal_kick_array', - 'SN_type', - 'f_fb', - 'spin_orbit_tilt_first_SN', - 'spin_orbit_tilt_second_SN', - ] diff --git a/dev-tools/script_data/inlists/population_test_params.ini b/dev-tools/script_data/inlists/population_test_params.ini deleted file mode 100644 index 8ab3a050d6..0000000000 --- a/dev-tools/script_data/inlists/population_test_params.ini +++ /dev/null @@ -1,668 +0,0 @@ -# POSYDON default BinaryPopulation inifile, use ConfigParser syntax - -[environment_variables] - PATH_TO_POSYDON = '' - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;;;;;;; SimulationProperties ;;;;;;;;;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -[flow] - import = ['posydon.binary_evol.flow_chart', 'flow_chart'] - # builtin posydon flow - absolute_import = None - # if given, use an absolute filepath to user defined flow: - # ['', ''] - -[step_HMS_HMS] - import = ['posydon.binary_evol.MESA.step_mesa', 'MS_MS_step'] - # builtin posydon step - absolute_import = None - # if given, use an absolute filepath to user defined step: - # ['', ''] - interpolation_path = None - # str or None (found by default) - interpolation_filename = None - # str or None (found by default) - interpolation_method = 'linear3c_kNN' - # 'nearest_neighbour', 'linear3c_kNN', '1NN_1NN' - save_initial_conditions = True - # True, False (only for interpolation_method='nearest_neighbour') - track_interpolation = False - # True, False - stop_method = 'stop_at_max_time' - # 'stop_at_end', 'stop_at_max_time', 'stop_at_condition' - stop_star = 'star_1' - # 'star_1', 'star_2' (only for stop_method='stop_at_condition') - stop_var_name = None - # str or None (only for stop_method='stop_at_condition') - stop_value = None - # float or None (only for stop_method='stop_at_condition') - stop_interpolate = True - # True, False - verbose = False - # True, False - - -[step_CO_HeMS] - import = ['posydon.binary_evol.MESA.step_mesa', 'CO_HeMS_step'] - # builtin posydon step - absolute_import = None - # if given, use an absolute filepath to user defined step: - # ['', ''] - interpolation_path = None - # str or None (found by default) - interpolation_filename = None - # str or None (found by default) - interpolation_method = 'linear3c_kNN' - # 'nearest_neighbour', 'linear3c_kNN', '1NN_1NN' - save_initial_conditions = True - # True, False (only for interpolation_method='nearest_neighbour') - track_interpolation = False - # True, False - stop_method = 'stop_at_max_time' - # 'stop_at_end', 'stop_at_max_time', 'stop_at_condition' - stop_star = 'star_1' - # 'star_1', 'star_2' (only for stop_method='stop_at_condition') - stop_var_name = None - # str or None (only for stop_method='stop_at_condition') - stop_value = None - # float or None (only for stop_method='stop_at_condition') - stop_interpolate = True - # True, False - verbose = False - # True, False - -[step_CO_HMS_RLO] - import = ['posydon.binary_evol.MESA.step_mesa', 'CO_HMS_RLO_step'] - # builtin posydon step - absolute_import = None - # if given, use an absolute filepath to user defined step: - # ['', ''] - interpolation_path = None - # str or None (found by default) - interpolation_filename = None - # str or None (found by default) - interpolation_method = 'linear3c_kNN' - # 'nearest_neighbour', 'linear3c_kNN', '1NN_1NN' - save_initial_conditions = True - # True, False (only for interpolation_method='nearest_neighbour') - track_interpolation = False - # True, False - stop_method = 'stop_at_max_time' - # 'stop_at_end' 'stop_at_max_time' 'stop_at_condition' - stop_star = 'star_1' - # 'star_1', 'star_2' (only for stop_method='stop_at_condition') - stop_var_name = None - # str or None (only for stop_method='stop_at_condition') - stop_value = None - # float or None (only for stop_method='stop_at_condition') - stop_interpolate = True - # True, False - verbose = False - # True, False - -[step_CO_HeMS_RLO] - import = ['posydon.binary_evol.MESA.step_mesa', 'CO_HeMS_RLO_step'] - # builtin posydon step - absolute_import = None - # if given, use an absolute filepath to user defined step: - # ['', ''] - interpolation_path = None - # str or None (found by default) - interpolation_filename = None - # str or None (found by default) - interpolation_method = 'linear3c_kNN' - # 'nearest_neighbour', 'linear3c_kNN', '1NN_1NN' - save_initial_conditions = True - # True, False (only for interpolation_method='nearest_neighbour') - track_interpolation = False - # True, False - stop_method = 'stop_at_max_time' - # 'stop_at_end', 'stop_at_max_time', 'stop_at_condition' - stop_star = 'star_1' - # 'star_1', 'star_2' (only for stop_method='stop_at_condition') - stop_var_name = None - # str or None (only for stop_method='stop_at_condition') - stop_value = None - # float or None (only for stop_method='stop_at_condition') - stop_interpolate = True - # True, False - verbose = False - # True, False - - -[step_detached] - import = ['posydon.binary_evol.DT.step_detached', 'detached_step'] - # builtin posydon step - absolute_import = None - # if given, use an absolute filepath to user defined step: - # ['', ''] - matching_method = 'minimize' - # 'minimize', 'root' - matching_tolerance = 1e-2 - # float, DEF: 1e-2 - matching_tolerance_hard = 1e-1 - # float, DEF: 1e-1 - do_wind_loss = True - # True, False - do_tides = True - # True, False - do_gravitational_radiation = True - # True, False - do_magnetic_braking = True - # True, False - magnetic_braking_mode = 'RVJ83' - # 'RVJ83', 'M15', 'G18', 'CARB' - do_stellar_evolution_and_spin_from_winds = True - # True, False - RLO_orbit_at_orbit_with_same_am = False - # True, False - record_matching = False - # True, False - verbose = False - # True, False - -[step_disrupted] - import = ['posydon.binary_evol.DT.step_disrupted','DisruptedStep'] - # builtin posydon step - absolute_import = None - # if given, use an absolute filepath to user defined step: - # ['', ''] - matching_method = 'minimize' - # 'minimize', 'root' - matching_tolerance = 1e-2 - # float, DEF: 1e-2 - matching_tolerance_hard = 1e-1 - # float, DEF: 1e-1 - record_matching = False - # True, False - verbose = False - # True, False - -[step_merged] - import = ['posydon.binary_evol.DT.step_merged','MergedStep'] - # builtin posydon step - absolute_import = None - # if given, use an absolute filepath to user defined step: - # ['', ''] - record_matching = False - # True, False - verbose = False - # True, False - - -[step_initially_single] - import = ['posydon.binary_evol.DT.step_initially_single','InitiallySingleStep'] - # builtin posydon step - absolute_import = None - # if given, use an absolute filepath to user defined step: - # ['', ''] - matching_method = 'minimize' - # 'minimize', 'root' - matching_tolerance = 1e-2 - # float, DEF: 1e-2 - matching_tolerance_hard = 1e-1 - # float, DEF: 1e-1 - record_matching = False - # True, False - verbose = False - # True, False - -[step_CE] - import = ['posydon.binary_evol.CE.step_CEE', 'StepCEE'] - # builtin posydon step - absolute_import = None - # if given, use an absolute filepath to user defined step: - # ['', ''] - prescription = 'alpha-lambda' - # 'alpha-lambda' - common_envelope_efficiency = 1.0 - # float in (0, inf) - # values >1 are discouraged (consider changing lambda or post CE - # interactions) - common_envelope_option_for_lambda = 'lambda_from_grid_final_values' - # (1) 'default_lambda' (uses common_envelope_lambda_default), - # (2) 'lambda_from_grid_final_values', - # (3) 'lambda_from_profile_gravitational' (needs available profiles), - # (4) 'lambda_from_profile_gravitational_plus_internal' (needs available - # profiles), - # (5) 'lambda_from_profile_gravitational_plus_internal_minus_recombination' - # (needs available profiles) - common_envelope_lambda_default = 0.5 - # float in (0, inf) (only for common_envelope_option_for_lambda option 1) - common_envelope_option_for_HG_star = "optimistic" - # 'optimistic', 'pessimistic' - common_envelope_alpha_thermal = 1.0 - # float in (0, inf) (only for common_envelope_option_for_lambda options 4 - # and 5) - core_definition_H_fraction = 0.3 - # 0.01, 0.1, 0.3 - core_definition_He_fraction = 0.1 - # 0.1 - CEE_tolerance_err = 0.001 - # float (0, inf) (numerical tolerance on floats) - common_envelope_option_after_succ_CEE = 'two_phases_stableMT' - # 'two_phases_stableMT' 'one_phase_variable_core_definition' - # 'two_phases_windloss' - record_matching = False - # True, False - verbose = False - # True, False - -[step_SN] - import = ['posydon.binary_evol.SN.step_SN', 'StepSN'] - # builtin posydon step - absolute_import = None - # 'package' kwarg for importlib.import_module - mechanism = 'Fryer+12-delayed' - # v2 interpolators support: 'Fryer+12-rapid', 'Fryer+12-delayed', - # 'Sukhbold+16-engine', 'Patton&Sukhbold20-engine' - # need profiles: 'direct' - engine = '' - # 'N20' or 'W20' for 'Sukhbold+16-engine', 'Patton&Sukhbold20-engine' - # '' for the others - PISN = "Hendriks+23" - # v2 interpolators support: "Hendriks+23" - # other options: None, "Marchant+19" - PISN_CO_shift = 0.0 - # Only when using Hendriks+23 - # float (-inf,inf) - # v2 interpolators support: 0.0 - PPI_extra_mass_loss = -20.0 - # Only when using Hendriks+23 - # float (-inf,inf) - # v2 interpolators support: 0.0 or -20.0 - ECSN = "Tauris+15" - # "Tauris+15", "Podsiadlowski+04" - conserve_hydrogen_envelope = False - # True, False - conserve_hydrogen_PPI = False - # Only when using Hendriks+23 - # True, False - max_neutrino_mass_loss = 0.5 - # float (0,inf) - # v2 interpolators support: 0.5 - max_NS_mass = 2.5 - # float (0,inf) - # v2 interpolators support: 2.5 - use_interp_values = True - # True, False - use_profiles = True - # True, False - use_core_masses = True - # True, False - allow_spin_None = False - # True, False - approx_at_he_depletion = False - # True, False - kick = True - # True, False - kick_normalisation = 'one_over_mass' - # "one_minus_fallback", "one_over_mass", "NS_one_minus_fallback_BH_one", - # "one", "zero" - kick_prescription = 'maxwellian' - # "maxwellian", "log_normal", "asym_ej", "linear" - sigma_kick_CCSN_NS = 265.0 - # float (0,inf) - mean_kick_CCSN_NS = None - # float or None - sigma_kick_CCSN_BH = 265.0 - # float (0,inf) - mean_kick_CCSN_BH = None - # float or None - sigma_kick_ECSN = 20.0 - # float (0,inf) - mean_kick_ECSN = None - # float or None - verbose = False - # True, False - -[step_dco] - import = ['posydon.binary_evol.DT.double_CO', 'DoubleCO'] - # builtin posydon step - absolute_import = None - # if given, use an absolute filepath to user defined step: - # ['', ''] - n_o_steps_history = None - # None or int (0, inf) - -[step_end] - import = ['posydon.binary_evol.step_end', 'step_end'] - # builtin posydon step - absolute_import = None - # if given, use an absolute filepath to user defined step: - # ['', ''] - -[extra_hooks] - import_1 = ['posydon.binary_evol.simulationproperties', 'TimingHooks'] - # builtin posydon hook - absolute_import_1 = None - # if given, use an absolute filepath to user defined step: - # ['', ''] - kwargs_1 = {} - # dict - - import_2 = ['posydon.binary_evol.simulationproperties', 'StepNamesHooks'] - # builtin posydon hook - absolute_import_2 = None - # if given, use an absolute filepath to user defined step: - # ['', ''] - kwargs_2 = {} - # dict - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;;;;;;; BinaryPopulation ;;;;;;;;;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -[BinaryPopulation_options] - optimize_ram = True - # save population in batches: True, False - ram_per_cpu = None - # set maximum ram per cpu before batch saving (GB); None or float (0, inf) - dump_rate = 2 - # batch save after evolving N binaries: int (0, inf) - # this should be at least 500 for populations of 100,000 binaries or more - temp_directory = 'batches' - # temporary folder for keeping batch files: str - tqdm = False - # progress bar: True, False - breakdown_to_df = True - # convert BinaryStars into DataFrames after evolution: True, False - use_MPI = False - # use only for local MPI runs: True, False - metallicities = [1.] - # in units of solar metallicity: list of float - # e.g. [2., 1., 0.45, 0.2, 0.1, 0.01, 0.001, 0.0001] - error_checking_verbose = False - # if True, write all POSYDON errors to stderr at runtime, default=False - warnings_verbose = False - # if True, write all POSYDON warnings to stderr at runtime, default=False - history_verbose = False - # if True, record extra functional steps in the output DataFrames - # (These steps represent internal workings of POSYDON rather than physical - # phases of evolution) - entropy = 0 - # if None uses system entropy (recommended): None or int - number_of_binaries = 10 - # int (0, inf) - binary_fraction_scheme = 'const' - # 'const', 'Moe+17-massdependent' - binary_fraction_const = 1.0 - # float [0, 1] - star_formation = 'burst' - # 'constant', 'burst', 'custom_linear', 'custom_log10', - # 'custom_linear_histogram', 'custom_log10_histogram' - max_simulation_time = 13.8e9 - # float (0, inf) - - read_samples_from_file = '' - # path to file to read initial parameters from (if empty string get random - # samples) - primary_mass_scheme = 'Kroupa2001' - # 'Salpeter', 'Kroupa1993', 'Kroupa2001' - primary_mass_min = 7.0 - # float (0, inf) - # value should be within the mass range given by the used grids - primary_mass_max = 150.0 - # float (primary_mass_min, inf) - # value should be within the mass range given by the used grids - secondary_mass_scheme = 'flat_mass_ratio' - # 'flat_mass_ratio', 'q=1', 'Moe+17-PsandQs' (will enforce - # orbital_period_scheme='Moe+17-PsandQs') - secondary_mass_min = 0.5 - # float (0,130) - # value should be within the mass range given by the used grids - secondary_mass_max = 150.0 - # float (secondary_mass_min, inf) - # value should be within the mass range given by the used grids - orbital_scheme = 'period' - # 'separation', 'period' - orbital_period_scheme = 'Sana+12_period_extended' - # (used only for orbital_scheme = 'period') 'Sana+12_period_extended', - # 'Moe+17-PsandQs' (will enforce secondary_mass_scheme='Moe+17-PsandQs') - orbital_period_min = 0.75 - # float (0, inf) (used only for orbital_scheme = 'period') - # value should be within the period range given by the used grids - orbital_period_max = 6000.0 - # float (0, inf) (used only for orbital_scheme = 'period') - # value should be within the period range given by the used grids -# orbital_separation_scheme = 'log_uniform' - # 'log_uniform', 'log_normal' (used only for orbital_scheme = 'separation') -# orbital_separation_min = 5.0 - # float (0, inf) (used only for orbital_scheme = 'separation') - # value should be within the separation range given by the used grids -# orbital_separation_max = 1e5 - # float (0, inf) (used only for orbital_scheme = 'separation') - # value should be within the separation range given by the used grids -# log_orbital_separation_mean = None - # float (0, inf) (used only for orbital_separation_scheme ='log_normal') - # value should be within the separation range given above -# log_orbital_separation_sigma = None - # float (0, inf) (used only for orbital_separation_scheme ='log_normal') - # value should respect the separation range given above - eccentricity_scheme = 'zero' - # 'zero', 'thermal', 'uniform', 'Moe+17-PsandQs' (will enforce - # secondary_mass_scheme='Moe+17-PsandQs' and - # orbital_period_scheme='Moe+17-PsandQs') - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;;;;;;; Saving Output ;;;;;;;;;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -[BinaryStar_output] - extra_columns = {'step_names': 'string', 'step_times': 'float64'} - # columns usually provided by hooks - # e.g. 'step_times' from TimingHooks, 'step_names' from StepNamesHooks - - # LIST BINARY PROPERTIES - only_select_columns = [ - 'state', - 'event', - 'time', - #'separation', - 'orbital_period', - 'eccentricity', - #'V_sys', - #'rl_relative_overflow_1', - #'rl_relative_overflow_2', - 'lg_mtransfer_rate', - #'mass_transfer_case', - #'trap_radius', - #'acc_radius', - #'t_sync_rad_1', - #'t_sync_conv_1', - #'t_sync_rad_2', - #'t_sync_conv_2', - #'nearest_neighbour_distance', - ] - scalar_names = [ - 'interp_class_HMS_HMS', - 'interp_class_CO_HMS_RLO', - 'interp_class_CO_HeMS', - 'interp_class_CO_HeMS_RLO', - 'mt_history_HMS_HMS', - 'mt_history_CO_HMS_RLO', - 'mt_history_CO_HeMS', - 'mt_history_CO_HeMS_RLO', - ] - -[SingleStar_1_output] - # LIST STAR PROPERTIES TO SAVE - include_S1 = True - # True, False - only_select_columns = [ - 'state', - #'metallicity', - 'mass', - 'log_R', - 'log_L', - 'lg_mdot', - #'lg_system_mdot', - #'lg_wind_mdot', - 'he_core_mass', - 'he_core_radius', - #'c_core_mass', - #'c_core_radius', - #'o_core_mass', - #'o_core_radius', - 'co_core_mass', - 'co_core_radius', - 'center_h1', - 'center_he4', - #'center_c12', - #'center_n14', - #'center_o16', - 'surface_h1', - 'surface_he4', - #'surface_c12', - #'surface_n14', - #'surface_o16', - #'log_LH', - #'log_LHe', - #'log_LZ', - #'log_Lnuc', - #'c12_c12', - #'center_gamma', - #'avg_c_in_c_core', - #'surf_avg_omega', - 'surf_avg_omega_div_omega_crit', - #'total_moment_of_inertia', - #'log_total_angular_momentum', - 'spin', - #'conv_env_top_mass', - #'conv_env_bot_mass', - #'conv_env_top_radius', - #'conv_env_bot_radius', - #'conv_env_turnover_time_g', - #'conv_env_turnover_time_l_b', - #'conv_env_turnover_time_l_t', - #'envelope_binding_energy', - #'mass_conv_reg_fortides', - #'thickness_conv_reg_fortides', - #'radius_conv_reg_fortides', - #'lambda_CE_1cent', - #'lambda_CE_10cent', - #'lambda_CE_30cent', - #'lambda_CE_pure_He_star_10cent', - #'profile', - #'total_mass_h1', - #'total_mass_he4', - ] - scalar_names = [ - 'natal_kick_velocity', - 'natal_kick_azimuthal_angle', - 'natal_kick_polar_angle', - 'natal_kick_mean_anomaly' - 'spin_orbit_tilt_first_SN', - 'spin_orbit_tilt_second_SN', - 'f_fb', - 'SN_type', - #'m_disk_accreted', - #'m_disk_radiated', - 'h1_mass_ej', - 'he4_mass_ej', - #'M4', - #'mu4', - 'avg_c_in_c_core_at_He_depletion', - 'co_core_mass_at_He_depletion', - #'m_core_CE_1cent', - #'m_core_CE_10cent', - #'m_core_CE_30cent', - #'m_core_CE_pure_He_star_10cent', - #'r_core_CE_1cent', - #'r_core_CE_10cent', - #'r_core_CE_30cent', - #'r_core_CE_pure_He_star_10cent' - ] - -[SingleStar_2_output] - # LIST STAR PROPERTIES TO SAVE - include_S2 = True - # True, False - only_select_columns = [ - 'state', - #'metallicity', - 'mass', - 'log_R', - 'log_L', - 'lg_mdot', - #'lg_system_mdot', - #'lg_wind_mdot', - 'he_core_mass', - 'he_core_radius', - #'c_core_mass', - #'c_core_radius', - #'o_core_mass', - #'o_core_radius', - 'co_core_mass', - 'co_core_radius', - 'center_h1', - 'center_he4', - #'center_c12', - #'center_n14', - #'center_o16', - 'surface_h1', - 'surface_he4', - #'surface_c12', - #'surface_n14', - #'surface_o16', - #'log_LH', - #'log_LHe', - #'log_LZ', - #'log_Lnuc', - #'c12_c12', - #'center_gamma', - #'avg_c_in_c_core', - #'surf_avg_omega', - 'surf_avg_omega_div_omega_crit', - #'total_moment_of_inertia', - #'log_total_angular_momentum', - 'spin', - #'conv_env_top_mass', - #'conv_env_bot_mass', - #'conv_env_top_radius', - #'conv_env_bot_radius', - #'conv_env_turnover_time_g', - #'conv_env_turnover_time_l_b', - #'conv_env_turnover_time_l_t', - #'envelope_binding_energy', - #'mass_conv_reg_fortides', - #'thickness_conv_reg_fortides', - #'radius_conv_reg_fortides', - #'lambda_CE_1cent', - #'lambda_CE_10cent', - #'lambda_CE_30cent', - #'lambda_CE_pure_He_star_10cent', - #'profile', - #'total_mass_h1', - #'total_mass_he4', - ] - scalar_names = ['natal_kick_velocity', - 'natal_kick_azimuthal_angle', - 'natal_kick_polar_angle', - 'natal_kick_mean_anomaly', - 'spin_orbit_tilt_first_SN', - 'spin_orbit_tilt_second_SN', - 'f_fb', - 'SN_type', - #'m_disk_accreted', - #'m_disk_radiated', - 'h1_mass_ej', - 'he4_mass_ej', - #'M4', - #'mu4', - 'avg_c_in_c_core_at_He_depletion', - 'co_core_mass_at_He_depletion', - #'m_core_CE_1cent', - #'m_core_CE_10cent', - #'m_core_CE_30cent', - #'m_core_CE_pure_He_star_10cent', - #'r_core_CE_1cent', - #'r_core_CE_10cent', - #'r_core_CE_30cent', - #'r_core_CE_pure_He_star_10cent' - ] diff --git a/dev-tools/script_data/inlists/test_multiZ_population_params.ini b/dev-tools/script_data/inlists/test_multiZ_population_params.ini deleted file mode 100644 index 62cdfbd966..0000000000 --- a/dev-tools/script_data/inlists/test_multiZ_population_params.ini +++ /dev/null @@ -1,668 +0,0 @@ -# POSYDON default BinaryPopulation inifile, use ConfigParser syntax - -[environment_variables] - PATH_TO_POSYDON = '' - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;;;;;;; SimulationProperties ;;;;;;;;;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -[flow] - import = ['posydon.binary_evol.flow_chart', 'flow_chart'] - # builtin posydon flow - absolute_import = None - # if given, use an absolute filepath to user defined flow: - # ['', ''] - -[step_HMS_HMS] - import = ['posydon.binary_evol.MESA.step_mesa', 'MS_MS_step'] - # builtin posydon step - absolute_import = None - # if given, use an absolute filepath to user defined step: - # ['', ''] - interpolation_path = None - # str or None (found by default) - interpolation_filename = None - # str or None (found by default) - interpolation_method = 'linear3c_kNN' - # 'nearest_neighbour', 'linear3c_kNN', '1NN_1NN' - save_initial_conditions = True - # True, False (only for interpolation_method='nearest_neighbour') - track_interpolation = False - # True, False - stop_method = 'stop_at_max_time' - # 'stop_at_end', 'stop_at_max_time', 'stop_at_condition' - stop_star = 'star_1' - # 'star_1', 'star_2' (only for stop_method='stop_at_condition') - stop_var_name = None - # str or None (only for stop_method='stop_at_condition') - stop_value = None - # float or None (only for stop_method='stop_at_condition') - stop_interpolate = True - # True, False - verbose = False - # True, False - - -[step_CO_HeMS] - import = ['posydon.binary_evol.MESA.step_mesa', 'CO_HeMS_step'] - # builtin posydon step - absolute_import = None - # if given, use an absolute filepath to user defined step: - # ['', ''] - interpolation_path = None - # str or None (found by default) - interpolation_filename = None - # str or None (found by default) - interpolation_method = 'linear3c_kNN' - # 'nearest_neighbour', 'linear3c_kNN', '1NN_1NN' - save_initial_conditions = True - # True, False (only for interpolation_method='nearest_neighbour') - track_interpolation = False - # True, False - stop_method = 'stop_at_max_time' - # 'stop_at_end', 'stop_at_max_time', 'stop_at_condition' - stop_star = 'star_1' - # 'star_1', 'star_2' (only for stop_method='stop_at_condition') - stop_var_name = None - # str or None (only for stop_method='stop_at_condition') - stop_value = None - # float or None (only for stop_method='stop_at_condition') - stop_interpolate = True - # True, False - verbose = False - # True, False - -[step_CO_HMS_RLO] - import = ['posydon.binary_evol.MESA.step_mesa', 'CO_HMS_RLO_step'] - # builtin posydon step - absolute_import = None - # if given, use an absolute filepath to user defined step: - # ['', ''] - interpolation_path = None - # str or None (found by default) - interpolation_filename = None - # str or None (found by default) - interpolation_method = 'linear3c_kNN' - # 'nearest_neighbour', 'linear3c_kNN', '1NN_1NN' - save_initial_conditions = True - # True, False (only for interpolation_method='nearest_neighbour') - track_interpolation = False - # True, False - stop_method = 'stop_at_max_time' - # 'stop_at_end' 'stop_at_max_time' 'stop_at_condition' - stop_star = 'star_1' - # 'star_1', 'star_2' (only for stop_method='stop_at_condition') - stop_var_name = None - # str or None (only for stop_method='stop_at_condition') - stop_value = None - # float or None (only for stop_method='stop_at_condition') - stop_interpolate = True - # True, False - verbose = False - # True, False - -[step_CO_HeMS_RLO] - import = ['posydon.binary_evol.MESA.step_mesa', 'CO_HeMS_RLO_step'] - # builtin posydon step - absolute_import = None - # if given, use an absolute filepath to user defined step: - # ['', ''] - interpolation_path = None - # str or None (found by default) - interpolation_filename = None - # str or None (found by default) - interpolation_method = 'linear3c_kNN' - # 'nearest_neighbour', 'linear3c_kNN', '1NN_1NN' - save_initial_conditions = True - # True, False (only for interpolation_method='nearest_neighbour') - track_interpolation = False - # True, False - stop_method = 'stop_at_max_time' - # 'stop_at_end', 'stop_at_max_time', 'stop_at_condition' - stop_star = 'star_1' - # 'star_1', 'star_2' (only for stop_method='stop_at_condition') - stop_var_name = None - # str or None (only for stop_method='stop_at_condition') - stop_value = None - # float or None (only for stop_method='stop_at_condition') - stop_interpolate = True - # True, False - verbose = False - # True, False - - -[step_detached] - import = ['posydon.binary_evol.DT.step_detached', 'detached_step'] - # builtin posydon step - absolute_import = None - # if given, use an absolute filepath to user defined step: - # ['', ''] - matching_method = 'minimize' - # 'minimize', 'root' - matching_tolerance = 1e-2 - # float, DEF: 1e-2 - matching_tolerance_hard = 1e-1 - # float, DEF: 1e-1 - do_wind_loss = True - # True, False - do_tides = True - # True, False - do_gravitational_radiation = True - # True, False - do_magnetic_braking = True - # True, False - magnetic_braking_mode = 'RVJ83' - # 'RVJ83', 'M15', 'G18', 'CARB' - do_stellar_evolution_and_spin_from_winds = True - # True, False - RLO_orbit_at_orbit_with_same_am = False - # True, False - record_matching = False - # True, False - verbose = False - # True, False - -[step_disrupted] - import = ['posydon.binary_evol.DT.step_disrupted','DisruptedStep'] - # builtin posydon step - absolute_import = None - # if given, use an absolute filepath to user defined step: - # ['', ''] - matching_method = 'minimize' - # 'minimize', 'root' - matching_tolerance = 1e-2 - # float, DEF: 1e-2 - matching_tolerance_hard = 1e-1 - # float, DEF: 1e-1 - record_matching = False - # True, False - verbose = False - # True, False - -[step_merged] - import = ['posydon.binary_evol.DT.step_merged','MergedStep'] - # builtin posydon step - absolute_import = None - # if given, use an absolute filepath to user defined step: - # ['', ''] - record_matching = False - # True, False - verbose = False - # True, False - - -[step_initially_single] - import = ['posydon.binary_evol.DT.step_initially_single','InitiallySingleStep'] - # builtin posydon step - absolute_import = None - # if given, use an absolute filepath to user defined step: - # ['', ''] - matching_method = 'minimize' - # 'minimize', 'root' - matching_tolerance = 1e-2 - # float, DEF: 1e-2 - matching_tolerance_hard = 1e-1 - # float, DEF: 1e-1 - record_matching = False - # True, False - verbose = False - # True, False - -[step_CE] - import = ['posydon.binary_evol.CE.step_CEE', 'StepCEE'] - # builtin posydon step - absolute_import = None - # if given, use an absolute filepath to user defined step: - # ['', ''] - prescription = 'alpha-lambda' - # 'alpha-lambda' - common_envelope_efficiency = 1.0 - # float in (0, inf) - # values >1 are discouraged (consider changing lambda or post CE - # interactions) - common_envelope_option_for_lambda = 'lambda_from_grid_final_values' - # (1) 'default_lambda' (uses common_envelope_lambda_default), - # (2) 'lambda_from_grid_final_values', - # (3) 'lambda_from_profile_gravitational' (needs available profiles), - # (4) 'lambda_from_profile_gravitational_plus_internal' (needs available - # profiles), - # (5) 'lambda_from_profile_gravitational_plus_internal_minus_recombination' - # (needs available profiles) - common_envelope_lambda_default = 0.5 - # float in (0, inf) (only for common_envelope_option_for_lambda option 1) - common_envelope_option_for_HG_star = "optimistic" - # 'optimistic', 'pessimistic' - common_envelope_alpha_thermal = 1.0 - # float in (0, inf) (only for common_envelope_option_for_lambda options 4 - # and 5) - core_definition_H_fraction = 0.3 - # 0.01, 0.1, 0.3 - core_definition_He_fraction = 0.1 - # 0.1 - CEE_tolerance_err = 0.001 - # float (0, inf) (numerical tolerance on floats) - common_envelope_option_after_succ_CEE = 'two_phases_stableMT' - # 'two_phases_stableMT' 'one_phase_variable_core_definition' - # 'two_phases_windloss' - record_matching = False - # True, False - verbose = False - # True, False - -[step_SN] - import = ['posydon.binary_evol.SN.step_SN', 'StepSN'] - # builtin posydon step - absolute_import = None - # 'package' kwarg for importlib.import_module - mechanism = 'Fryer+12-delayed' - # v2 interpolators support: 'Fryer+12-rapid', 'Fryer+12-delayed', - # 'Sukhbold+16-engine', 'Patton&Sukhbold20-engine' - # need profiles: 'direct' - engine = '' - # 'N20' or 'W20' for 'Sukhbold+16-engine', 'Patton&Sukhbold20-engine' - # '' for the others - PISN = "Hendriks+23" - # v2 interpolators support: "Hendriks+23" - # other options: None, "Marchant+19" - PISN_CO_shift = 0.0 - # Only when using Hendriks+23 - # float (-inf,inf) - # v2 interpolators support: 0.0 - PPI_extra_mass_loss = -20.0 - # Only when using Hendriks+23 - # float (-inf,inf) - # v2 interpolators support: 0.0 or -20.0 - ECSN = "Tauris+15" - # "Tauris+15", "Podsiadlowski+04" - conserve_hydrogen_envelope = False - # True, False - conserve_hydrogen_PPI = False - # Only when using Hendriks+23 - # True, False - max_neutrino_mass_loss = 0.5 - # float (0,inf) - # v2 interpolators support: 0.5 - max_NS_mass = 2.5 - # float (0,inf) - # v2 interpolators support: 2.5 - use_interp_values = True - # True, False - use_profiles = True - # True, False - use_core_masses = True - # True, False - allow_spin_None = False - # True, False - approx_at_he_depletion = False - # True, False - kick = False - # True, False - kick_normalisation = 'one_over_mass' - # "one_minus_fallback", "one_over_mass", "NS_one_minus_fallback_BH_one", - # "one", "zero" - kick_prescription = 'maxwellian' - # "maxwellian", "log_normal", "asym_ej", "linear" - sigma_kick_CCSN_NS = 265.0 - # float (0,inf) - mean_kick_CCSN_NS = None - # float or None - sigma_kick_CCSN_BH = 265.0 - # float (0,inf) - mean_kick_CCSN_BH = None - # float or None - sigma_kick_ECSN = 20.0 - # float (0,inf) - mean_kick_ECSN = None - # float or None - verbose = False - # True, False - -[step_dco] - import = ['posydon.binary_evol.DT.double_CO', 'DoubleCO'] - # builtin posydon step - absolute_import = None - # if given, use an absolute filepath to user defined step: - # ['', ''] - n_o_steps_history = None - # None or int (0, inf) - -[step_end] - import = ['posydon.binary_evol.step_end', 'step_end'] - # builtin posydon step - absolute_import = None - # if given, use an absolute filepath to user defined step: - # ['', ''] - -[extra_hooks] - import_1 = ['posydon.binary_evol.simulationproperties', 'TimingHooks'] - # builtin posydon hook - absolute_import_1 = None - # if given, use an absolute filepath to user defined step: - # ['', ''] - kwargs_1 = {} - # dict - - import_2 = ['posydon.binary_evol.simulationproperties', 'StepNamesHooks'] - # builtin posydon hook - absolute_import_2 = None - # if given, use an absolute filepath to user defined step: - # ['', ''] - kwargs_2 = {} - # dict - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;;;;;;; BinaryPopulation ;;;;;;;;;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -[BinaryPopulation_options] - optimize_ram = True - # save population in batches: True, False - ram_per_cpu = None - # set maximum ram per cpu before batch saving (GB); None or float (0, inf) - dump_rate = 2000 - # batch save after evolving N binaries: int (0, inf) - # this should be at least 500 for populations of 100,000 binaries or more - temp_directory = 'batches' - # temporary folder for keeping batch files: str - tqdm = False - # progress bar: True, False - breakdown_to_df = True - # convert BinaryStars into DataFrames after evolution: True, False - use_MPI = False - # use only for local MPI runs: True, False - metallicities = [1., 0.1] - # in units of solar metallicity: list of float - # e.g. [2., 1., 0.45, 0.2, 0.1, 0.01, 0.001, 0.0001] - error_checking_verbose = False - # if True, write all POSYDON errors to stderr at runtime, default=False - warnings_verbose = False - # if True, write all POSYDON warnings to stderr at runtime, default=False - history_verbose = False - # if True, record extra functional steps in the output DataFrames - # (These steps represent internal workings of POSYDON rather than physical - # phases of evolution) - entropy = 0 - # if None uses system entropy (recommended): None or int - number_of_binaries = 2 - # int (0, inf) - binary_fraction_scheme = 'const' - # 'const', 'Moe+17-massdependent' - binary_fraction_const = 1.0 - # float [0, 1] - star_formation = 'burst' - # 'constant', 'burst', 'custom_linear', 'custom_log10', - # 'custom_linear_histogram', 'custom_log10_histogram' - max_simulation_time = 13.8e9 - # float (0, inf) - - read_samples_from_file = '' - # path to file to read initial parameters from (if empty string get random - # samples) - primary_mass_scheme = 'Kroupa2001' - # 'Salpeter', 'Kroupa1993', 'Kroupa2001' - primary_mass_min = 7.0 - # float (0, inf) - # value should be within the mass range given by the used grids - primary_mass_max = 150.0 - # float (primary_mass_min, inf) - # value should be within the mass range given by the used grids - secondary_mass_scheme = 'flat_mass_ratio' - # 'flat_mass_ratio', 'q=1', 'Moe+17-PsandQs' (will enforce - # orbital_period_scheme='Moe+17-PsandQs') - secondary_mass_min = 0.5 - # float (0,130) - # value should be within the mass range given by the used grids - secondary_mass_max = 150.0 - # float (secondary_mass_min, inf) - # value should be within the mass range given by the used grids - orbital_scheme = 'period' - # 'separation', 'period' - orbital_period_scheme = 'Sana+12_period_extended' - # (used only for orbital_scheme = 'period') 'Sana+12_period_extended', - # 'Moe+17-PsandQs' (will enforce secondary_mass_scheme='Moe+17-PsandQs') - orbital_period_min = 0.75 - # float (0, inf) (used only for orbital_scheme = 'period') - # value should be within the period range given by the used grids - orbital_period_max = 6000.0 - # float (0, inf) (used only for orbital_scheme = 'period') - # value should be within the period range given by the used grids -# orbital_separation_scheme = 'log_uniform' - # 'log_uniform', 'log_normal' (used only for orbital_scheme = 'separation') -# orbital_separation_min = 5.0 - # float (0, inf) (used only for orbital_scheme = 'separation') - # value should be within the separation range given by the used grids -# orbital_separation_max = 1e5 - # float (0, inf) (used only for orbital_scheme = 'separation') - # value should be within the separation range given by the used grids -# log_orbital_separation_mean = None - # float (0, inf) (used only for orbital_separation_scheme ='log_normal') - # value should be within the separation range given above -# log_orbital_separation_sigma = None - # float (0, inf) (used only for orbital_separation_scheme ='log_normal') - # value should respect the separation range given above - eccentricity_scheme = 'zero' - # 'zero', 'thermal', 'uniform', 'Moe+17-PsandQs' (will enforce - # secondary_mass_scheme='Moe+17-PsandQs' and - # orbital_period_scheme='Moe+17-PsandQs') - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;;;;;;; Saving Output ;;;;;;;;;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -[BinaryStar_output] - extra_columns = {'step_names': 'string', 'step_times': 'float64'} - # columns usually provided by hooks - # e.g. 'step_times' from TimingHooks, 'step_names' from StepNamesHooks - - # LIST BINARY PROPERTIES - only_select_columns = [ - 'state', - 'event', - 'time', - #'separation', - 'orbital_period', - 'eccentricity', - #'V_sys', - #'rl_relative_overflow_1', - #'rl_relative_overflow_2', - 'lg_mtransfer_rate', - #'mass_transfer_case', - #'trap_radius', - #'acc_radius', - #'t_sync_rad_1', - #'t_sync_conv_1', - #'t_sync_rad_2', - #'t_sync_conv_2', - #'nearest_neighbour_distance', - ] - scalar_names = [ - 'interp_class_HMS_HMS', - 'interp_class_CO_HMS_RLO', - 'interp_class_CO_HeMS', - 'interp_class_CO_HeMS_RLO', - 'mt_history_HMS_HMS', - 'mt_history_CO_HMS_RLO', - 'mt_history_CO_HeMS', - 'mt_history_CO_HeMS_RLO', - ] - -[SingleStar_1_output] - # LIST STAR PROPERTIES TO SAVE - include_S1 = True - # True, False - only_select_columns = [ - 'state', - #'metallicity', - 'mass', - 'log_R', - 'log_L', - 'lg_mdot', - #'lg_system_mdot', - #'lg_wind_mdot', - 'he_core_mass', - 'he_core_radius', - #'c_core_mass', - #'c_core_radius', - #'o_core_mass', - #'o_core_radius', - 'co_core_mass', - 'co_core_radius', - 'center_h1', - 'center_he4', - #'center_c12', - #'center_n14', - #'center_o16', - 'surface_h1', - 'surface_he4', - #'surface_c12', - #'surface_n14', - #'surface_o16', - #'log_LH', - #'log_LHe', - #'log_LZ', - #'log_Lnuc', - #'c12_c12', - #'center_gamma', - #'avg_c_in_c_core', - #'surf_avg_omega', - 'surf_avg_omega_div_omega_crit', - #'total_moment_of_inertia', - #'log_total_angular_momentum', - 'spin', - #'conv_env_top_mass', - #'conv_env_bot_mass', - #'conv_env_top_radius', - #'conv_env_bot_radius', - #'conv_env_turnover_time_g', - #'conv_env_turnover_time_l_b', - #'conv_env_turnover_time_l_t', - #'envelope_binding_energy', - #'mass_conv_reg_fortides', - #'thickness_conv_reg_fortides', - #'radius_conv_reg_fortides', - #'lambda_CE_1cent', - #'lambda_CE_10cent', - #'lambda_CE_30cent', - #'lambda_CE_pure_He_star_10cent', - #'profile', - #'total_mass_h1', - #'total_mass_he4', - ] - scalar_names = [ - 'natal_kick_velocity', - 'natal_kick_azimuthal_angle', - 'natal_kick_polar_angle', - 'natal_kick_mean_anomaly' - 'spin_orbit_tilt_first_SN', - 'spin_orbit_tilt_second_SN', - 'f_fb', - 'SN_type', - #'m_disk_accreted', - #'m_disk_radiated', - 'h1_mass_ej', - 'he4_mass_ej', - #'M4', - #'mu4', - 'avg_c_in_c_core_at_He_depletion', - 'co_core_mass_at_He_depletion', - #'m_core_CE_1cent', - #'m_core_CE_10cent', - #'m_core_CE_30cent', - #'m_core_CE_pure_He_star_10cent', - #'r_core_CE_1cent', - #'r_core_CE_10cent', - #'r_core_CE_30cent', - #'r_core_CE_pure_He_star_10cent' - ] - -[SingleStar_2_output] - # LIST STAR PROPERTIES TO SAVE - include_S2 = True - # True, False - only_select_columns = [ - 'state', - #'metallicity', - 'mass', - 'log_R', - 'log_L', - 'lg_mdot', - #'lg_system_mdot', - #'lg_wind_mdot', - 'he_core_mass', - 'he_core_radius', - #'c_core_mass', - #'c_core_radius', - #'o_core_mass', - #'o_core_radius', - 'co_core_mass', - 'co_core_radius', - 'center_h1', - 'center_he4', - #'center_c12', - #'center_n14', - #'center_o16', - 'surface_h1', - 'surface_he4', - #'surface_c12', - #'surface_n14', - #'surface_o16', - #'log_LH', - #'log_LHe', - #'log_LZ', - #'log_Lnuc', - #'c12_c12', - #'center_gamma', - #'avg_c_in_c_core', - #'surf_avg_omega', - 'surf_avg_omega_div_omega_crit', - #'total_moment_of_inertia', - #'log_total_angular_momentum', - 'spin', - #'conv_env_top_mass', - #'conv_env_bot_mass', - #'conv_env_top_radius', - #'conv_env_bot_radius', - #'conv_env_turnover_time_g', - #'conv_env_turnover_time_l_b', - #'conv_env_turnover_time_l_t', - #'envelope_binding_energy', - #'mass_conv_reg_fortides', - #'thickness_conv_reg_fortides', - #'radius_conv_reg_fortides', - #'lambda_CE_1cent', - #'lambda_CE_10cent', - #'lambda_CE_30cent', - #'lambda_CE_pure_He_star_10cent', - #'profile', - #'total_mass_h1', - #'total_mass_he4', - ] - scalar_names = ['natal_kick_velocity', - 'natal_kick_azimuthal_angle', - 'natal_kick_polar_angle', - 'natal_kick_mean_anomaly', - 'spin_orbit_tilt_first_SN', - 'spin_orbit_tilt_second_SN', - 'f_fb', - 'SN_type', - #'m_disk_accreted', - #'m_disk_radiated', - 'h1_mass_ej', - 'he4_mass_ej', - #'M4', - #'mu4', - 'avg_c_in_c_core_at_He_depletion', - 'co_core_mass_at_He_depletion', - #'m_core_CE_1cent', - #'m_core_CE_10cent', - #'m_core_CE_30cent', - #'m_core_CE_pure_He_star_10cent', - #'r_core_CE_1cent', - #'r_core_CE_10cent', - #'r_core_CE_30cent', - #'r_core_CE_pure_He_star_10cent' - ] diff --git a/dev-tools/script_data/src/binaries_suite.py b/dev-tools/script_data/src/binaries_suite.py index 4957420e88..ad8682f9cc 100644 --- a/dev-tools/script_data/src/binaries_suite.py +++ b/dev-tools/script_data/src/binaries_suite.py @@ -18,8 +18,8 @@ from posydon.binary_evol.simulationproperties import SimulationProperties from posydon.config import PATH_TO_POSYDON -base_dir = os.path.join(PATH_TO_POSYDON, "dev-tools/script_data/") -path_to_default_params = os.path.join(base_dir, "inlists/binary_test_params.ini") +base_dir = os.path.join(PATH_TO_POSYDON, "script_data/") +path_to_default_params = os.path.join(base_dir, "inlists/default_test_params.ini") def load_inlist(verbose): diff --git a/dev-tools/script_data/src/test_pops.py b/dev-tools/script_data/src/test_pops.py index a2f2846bbe..ea00526a91 100644 --- a/dev-tools/script_data/src/test_pops.py +++ b/dev-tools/script_data/src/test_pops.py @@ -10,9 +10,9 @@ from posydon.popsyn.binarypopulation import BinaryPopulation from posydon.popsyn.synthetic_population import Population, PopulationRunner -base_dir = os.path.join(PATH_TO_POSYDON, "dev-tools/script_data/") -path_to_default_params = os.path.join(base_dir, "inlists/population_test_params.ini") -path_to_multiZ_params = os.path.join(base_dir, "inlists/test_multiZ_population_params.ini") +base_dir = os.path.join(PATH_TO_POSYDON, "script_data/") +path_to_default_params = os.path.join(base_dir, "inlists/default_test_params.ini") +path_to_multiZ_params = os.path.join(base_dir, "inlists/multiZ_test_params.ini") path_to_popout = os.path.join(base_dir, "output/population_tests/batches") def test_binpop_evolve(population, popevo_kwargs, verbose=False): From 9a175a777db78f0ba6d56ca3b960d6ba11bc3b1f Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Wed, 11 Mar 2026 14:32:29 -0500 Subject: [PATCH 170/389] rename test_pops.py to popsynth_suite.py --- dev-tools/script_data/src/{test_pops.py => popsynth_suite.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename dev-tools/script_data/src/{test_pops.py => popsynth_suite.py} (100%) diff --git a/dev-tools/script_data/src/test_pops.py b/dev-tools/script_data/src/popsynth_suite.py similarity index 100% rename from dev-tools/script_data/src/test_pops.py rename to dev-tools/script_data/src/popsynth_suite.py From c7e16f7f117eacefa1322467fd51a214abb6cabd Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Wed, 11 Mar 2026 14:38:36 -0500 Subject: [PATCH 171/389] run pop_synth suite and binary suite in same script --- dev-tools/evolve_binaries.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dev-tools/evolve_binaries.sh b/dev-tools/evolve_binaries.sh index 61a4f9ef1f..b4a0932658 100755 --- a/dev-tools/evolve_binaries.sh +++ b/dev-tools/evolve_binaries.sh @@ -77,17 +77,23 @@ conda activate "$FULL_PATH/conda_env" echo "šŸ“¦ Installing POSYDON" pip install -e "$CLONE_DIR" -q 2>&1 | sed 's/^/ /' -echo "šŸš€ Running binaries_suite.py" -# # Run the Python script and capture output (stdout and stderr) -OUT_DIR=$FULL_PATH/script_data/output/binary_star_tests - # copy branch's default .ini file for testing and make one into a multi-metallicity .ini file for pop synth tests cp $CLONE_DIR/posydon/popsyn/population_params_default.ini $FULL_PATH/script_data/inlists/default_test_params.ini cp $CLONE_DIR/posydon/popsyn/population_params_default.ini $FULL_PATH/script_data/inlists/multiZ_test_params.ini sed -i 's/metallicities *= *\[1\.\]/metallicities = [1., 0.1]/' $FULL_PATH/script_data/inlists/multiZ_test_params.ini -# run binary test suite +# override environment's PATH_TO_POSYDON variable to point to the current branch's clone +# for these tests PATH_TO_POSYDON=$FULL_PATH + +# Run binary evolution tests and capture output (stdout and stderr) +OUT_DIR=$FULL_PATH/script_data/output/binary_star_tests +echo "šŸš€ Running binaries_suite.py" python script_data/src/binaries_suite.py > $OUT_DIR/evolve_binaries_$BRANCH.out 2>&1 +echo -e "āœ… Script completed. Output saved to \n$OUT_DIR/evolve_binaries_$BRANCH.out" +# Run population synthesis tests and capture output (stdout and stderr) +OUT_DIR=$FULL_PATH/script_data/output/population_tests +echo "šŸš€ Running popsynth_suite.py" +python script_data/src/popsynth_suite.py > $OUT_DIR/evolve_pop_$BRANCH.out 2>&1 echo -e "āœ… Script completed. Output saved to \n$OUT_DIR/evolve_binaries_$BRANCH.out" From 56c4879d8cd1d38a41f26d92c192301cd6ba2232 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Wed, 11 Mar 2026 14:40:46 -0500 Subject: [PATCH 172/389] merge test_suite scripts into one called run_rest_suite.sh --- dev-tools/evolve_population.sh | 85 ------------------- .../{evolve_binaries.sh => run_test_suite.sh} | 0 2 files changed, 85 deletions(-) delete mode 100644 dev-tools/evolve_population.sh rename dev-tools/{evolve_binaries.sh => run_test_suite.sh} (100%) diff --git a/dev-tools/evolve_population.sh b/dev-tools/evolve_population.sh deleted file mode 100644 index e19f15000f..0000000000 --- a/dev-tools/evolve_population.sh +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/bash - -# Script usage: ./evolve_binaries.sh -# This script clones the POSYDON repo to the specified branch (defaults to 'main'), -# copies evolve_binaries.py, runs it, and saves output to evolve_binaries.out - -# Set default branch to 'main' if not provided -BRANCH=${1:-main} -REPO_URL="https://github.com/POSYDON-code/POSYDON" - -if [[ -n "$2" ]]; then - SHA=$2 - WORK_DIR="POSYDON_${BRANCH}_${SHA}" -else - WORK_DIR="POSYDON_$BRANCH" -fi - -# Remove existing directory if it exists -if [ -d "$WORK_DIR" ]; then - echo "šŸ—‘ļø Removing existing directory: $WORK_DIR" - rm -rf "$WORK_DIR" -fi - -echo "šŸ“ Creating working directory: $WORK_DIR" -# Create the working directory -mkdir -p "$WORK_DIR" - -FULL_PATH="$(realpath "$WORK_DIR")" -CLONE_DIR="$FULL_PATH/POSYDON" - -echo "šŸ“‹ Copying script_data folder" -# copy the script_data folder -cp -r "./script_data" "$WORK_DIR" - -cd "$WORK_DIR" - -# Initialize conda for bash -echo "šŸ”§ Initializing conda" -# Source conda's shell integration -if [ -f "$HOME/miniconda3/etc/profile.d/conda.sh" ]; then - source "$HOME/miniconda3/etc/profile.d/conda.sh" -elif [ -f "$HOME/anaconda3/etc/profile.d/conda.sh" ]; then - source "$HOME/anaconda3/etc/profile.d/conda.sh" -elif [ -f "/opt/homebrew/Caskroom/miniconda/base/etc/profile.d/conda.sh" ]; then - source "/opt/homebrew/Caskroom/miniconda/base/etc/profile.d/conda.sh" -else - echo -e "\033[31mError: Could not find conda installation. Please check your conda setup.\033[0m" - exit 1 -fi - -# Clone the repository to the specified branch -echo "šŸ”„ Cloning POSYDON repository (branch: $BRANCH)" -if ! git clone -b "$BRANCH" "$REPO_URL" "$CLONE_DIR" 2>&1 | sed 's/^/ /'; then - echo -e "\033[31mError: Failed to clone branch '$BRANCH'. Please check if the branch exists.\033[0m" - exit 1 -fi - -# if SHA is provided, checkout that commit -if [[ -n "$SHA" ]]; then - echo "šŸ”„ Checking out commit: $SHA" - cd "$CLONE_DIR" - if ! git checkout "$SHA" 2>&1 | sed 's/^/ /'; then - echo -e "\033[31mError: Failed to checkout commit '$SHA'. Please check if the commit exists.\033[0m" - exit 1 - fi - cd - -fi - -# Create conda environment for POSYDON v2 -echo "šŸ Creating conda environment" -conda create --prefix="$FULL_PATH/conda_env" python=3.11 -y -q 2>&1 | sed 's/^/ /' - -echo "āš” Activating conda environment" -conda activate "$FULL_PATH/conda_env" - -# install POSYDON manually -echo "šŸ“¦ Installing POSYDON" -pip install -e "$CLONE_DIR" -q 2>&1 | sed 's/^/ /' - -echo "šŸš€ Running test_pops.py" -# # Run the Python script and capture output (stdout and stderr) -OUT_DIR=$FULL_PATH/script_data/output/population_tests -python script_data/src/test_pops.py > $OUT_DIR/evolve_pop_$BRANCH.out 2>&1 - -echo -e "āœ… Script completed. Output saved to \n$OUT_DIR/evolve_pop_$BRANCH.out" diff --git a/dev-tools/evolve_binaries.sh b/dev-tools/run_test_suite.sh similarity index 100% rename from dev-tools/evolve_binaries.sh rename to dev-tools/run_test_suite.sh From 42cad9fdaac282c00453621bdedff6e78f3d4fc5 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Wed, 11 Mar 2026 15:26:55 -0500 Subject: [PATCH 173/389] fix paths to script_data etc. --- dev-tools/run_test_suite.sh | 15 ++++++++------- dev-tools/script_data/src/binaries_suite.py | 5 +++-- dev-tools/script_data/src/popsynth_suite.py | 9 +++++---- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dev-tools/run_test_suite.sh b/dev-tools/run_test_suite.sh index b4a0932658..b20cff2e0f 100755 --- a/dev-tools/run_test_suite.sh +++ b/dev-tools/run_test_suite.sh @@ -1,8 +1,9 @@ #!/bin/bash -# Script usage: ./evolve_binaries.sh +# Script usage: ./run_test_suite.sh # This script clones the POSYDON repo to the specified branch (defaults to 'main'), -# copies evolve_binaries.py, runs it, and saves output to evolve_binaries.out +# copies script_data/ to it, runs binaries_suite.py and popsynth_suite.py, and +# saves output to evolve_binaries.out and evolve_pop.out # Set default branch to 'main' if not provided BRANCH=${1:-main} @@ -82,18 +83,18 @@ cp $CLONE_DIR/posydon/popsyn/population_params_default.ini $FULL_PATH/script_dat cp $CLONE_DIR/posydon/popsyn/population_params_default.ini $FULL_PATH/script_data/inlists/multiZ_test_params.ini sed -i 's/metallicities *= *\[1\.\]/metallicities = [1., 0.1]/' $FULL_PATH/script_data/inlists/multiZ_test_params.ini -# override environment's PATH_TO_POSYDON variable to point to the current branch's clone -# for these tests -PATH_TO_POSYDON=$FULL_PATH +# override environment's PATH_TO_POSYDON variable to point to the +# current branch's clone for these tests +PATH_TO_POSYDON=$CLONE_DIR # Run binary evolution tests and capture output (stdout and stderr) OUT_DIR=$FULL_PATH/script_data/output/binary_star_tests echo "šŸš€ Running binaries_suite.py" python script_data/src/binaries_suite.py > $OUT_DIR/evolve_binaries_$BRANCH.out 2>&1 -echo -e "āœ… Script completed. Output saved to \n$OUT_DIR/evolve_binaries_$BRANCH.out" +echo -e "āœ… Script completed. Output saved to: \n$OUT_DIR/evolve_binaries_$BRANCH.out" # Run population synthesis tests and capture output (stdout and stderr) OUT_DIR=$FULL_PATH/script_data/output/population_tests echo "šŸš€ Running popsynth_suite.py" python script_data/src/popsynth_suite.py > $OUT_DIR/evolve_pop_$BRANCH.out 2>&1 -echo -e "āœ… Script completed. Output saved to \n$OUT_DIR/evolve_binaries_$BRANCH.out" +echo -e "āœ… Script completed. Output saved to: \n$OUT_DIR/evolve_binaries_$BRANCH.out" diff --git a/dev-tools/script_data/src/binaries_suite.py b/dev-tools/script_data/src/binaries_suite.py index ad8682f9cc..a7ddb96a8b 100644 --- a/dev-tools/script_data/src/binaries_suite.py +++ b/dev-tools/script_data/src/binaries_suite.py @@ -18,8 +18,9 @@ from posydon.binary_evol.simulationproperties import SimulationProperties from posydon.config import PATH_TO_POSYDON -base_dir = os.path.join(PATH_TO_POSYDON, "script_data/") -path_to_default_params = os.path.join(base_dir, "inlists/default_test_params.ini") +base_dir =os.path.dirname(PATH_TO_POSYDON) +script_dir = os.path.join(PATH_TO_POSYDON, "script_data/") +path_to_default_params = os.path.join(script_dir, "inlists/default_test_params.ini") def load_inlist(verbose): diff --git a/dev-tools/script_data/src/popsynth_suite.py b/dev-tools/script_data/src/popsynth_suite.py index ea00526a91..a5cae64385 100644 --- a/dev-tools/script_data/src/popsynth_suite.py +++ b/dev-tools/script_data/src/popsynth_suite.py @@ -10,10 +10,11 @@ from posydon.popsyn.binarypopulation import BinaryPopulation from posydon.popsyn.synthetic_population import Population, PopulationRunner -base_dir = os.path.join(PATH_TO_POSYDON, "script_data/") -path_to_default_params = os.path.join(base_dir, "inlists/default_test_params.ini") -path_to_multiZ_params = os.path.join(base_dir, "inlists/multiZ_test_params.ini") -path_to_popout = os.path.join(base_dir, "output/population_tests/batches") +base_dir = os.path.dirname(PATH_TO_POSYDON) +script_dir = os.path.join(base_dir, "script_data/") +path_to_default_params = os.path.join(script_dir, "inlists/default_test_params.ini") +path_to_multiZ_params = os.path.join(script_dir, "inlists/multiZ_test_params.ini") +path_to_popout = os.path.join(script_dir, "output/population_tests/batches") def test_binpop_evolve(population, popevo_kwargs, verbose=False): From 4321142c5073dd87f49ebc573ff5eb81046c4f02 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 11 Mar 2026 20:27:13 +0000 Subject: [PATCH 174/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/run_test_suite.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-tools/run_test_suite.sh b/dev-tools/run_test_suite.sh index b20cff2e0f..5a862a22ec 100755 --- a/dev-tools/run_test_suite.sh +++ b/dev-tools/run_test_suite.sh @@ -2,7 +2,7 @@ # Script usage: ./run_test_suite.sh # This script clones the POSYDON repo to the specified branch (defaults to 'main'), -# copies script_data/ to it, runs binaries_suite.py and popsynth_suite.py, and +# copies script_data/ to it, runs binaries_suite.py and popsynth_suite.py, and # saves output to evolve_binaries.out and evolve_pop.out # Set default branch to 'main' if not provided @@ -83,7 +83,7 @@ cp $CLONE_DIR/posydon/popsyn/population_params_default.ini $FULL_PATH/script_dat cp $CLONE_DIR/posydon/popsyn/population_params_default.ini $FULL_PATH/script_data/inlists/multiZ_test_params.ini sed -i 's/metallicities *= *\[1\.\]/metallicities = [1., 0.1]/' $FULL_PATH/script_data/inlists/multiZ_test_params.ini -# override environment's PATH_TO_POSYDON variable to point to the +# override environment's PATH_TO_POSYDON variable to point to the # current branch's clone for these tests PATH_TO_POSYDON=$CLONE_DIR From fe10943c1ce75a5bff30ec5b1335eb21ecc3987d Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Wed, 11 Mar 2026 15:39:31 -0500 Subject: [PATCH 175/389] Update validate_binaries.sh to add guidance about tolerances --- dev-tools/validate_binaries.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-tools/validate_binaries.sh b/dev-tools/validate_binaries.sh index ef60c3e59c..9f454a3344 100755 --- a/dev-tools/validate_binaries.sh +++ b/dev-tools/validate_binaries.sh @@ -17,8 +17,8 @@ # Tolerance flags (passed through to compare_runs.py): # --loose Use relaxed floating-point tolerances # (rtol=1e-12, atol=1e-15 unless overridden) -# --rtol VALUE Set explicit relative tolerance -# --atol VALUE Set explicit absolute tolerance +# --rtol VALUE Set explicit relative tolerance as per np.allclose +# --atol VALUE Set explicit absolute tolerance as per np.allclose # # --rtol and --atol can be combined with --loose (explicit values take # precedence over the --loose defaults) or used on their own without --loose. From a4fa52c6fb5c60b50025cb0ba9c2ad9ad87d9419 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Wed, 11 Mar 2026 15:40:46 -0500 Subject: [PATCH 176/389] Update README.md to add guidance about tolerances --- dev-tools/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/README.md b/dev-tools/README.md index 4b74b1b1e5..fe1d2f2c8e 100644 --- a/dev-tools/README.md +++ b/dev-tools/README.md @@ -33,7 +33,7 @@ Top-level entry point. Evolves test binaries on a candidate branch, then compare ./validate_binaries.sh [baseline_branch] [metallicities] [--loose] [--rtol VALUE] [--atol VALUE] ``` -By default, comparison is exact (rtol=0, atol=0). Use `--loose` for relaxed floating-point tolerances (rtol=1e-12, atol=1e-15), or set `--rtol`/`--atol` explicitly. +By default, comparison is exact (rtol=0, atol=0). Use `--loose` for relaxed floating-point tolerances (rtol=1e-12, atol=1e-15), or set `--rtol`/`--atol` explicitly as per [np.allclose](https://numpy.org/devdocs/reference/generated/numpy.allclose.html). ### `generate_baseline.sh` From e6ae3c2bd40c4ac598a76af0aa7d5a49b476bf54 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Wed, 11 Mar 2026 15:41:12 -0500 Subject: [PATCH 177/389] Update README.md --- dev-tools/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/README.md b/dev-tools/README.md index fe1d2f2c8e..b1e9339b97 100644 --- a/dev-tools/README.md +++ b/dev-tools/README.md @@ -66,7 +66,7 @@ Compares two HDF5 files produced by `binaries_suite.py` and reports differences - **Structural**: missing or extra binaries, evolution step count changes, binaries that newly fail or newly pass, missing HDF5 tables. - **Qualitative**: changes to categorical columns such as state, event, step name, SN type, interpolation class, and mass transfer history. -- **Quantitative**: changes to any numeric column. By default, comparison is exact (bitwise identical floats). Use `--loose` for slightly relaxed tolerances (rtol=1e-12, atol=1e-15), or set `--rtol`/`--atol` explicitly. +- **Quantitative**: changes to any numeric column. By default, comparison is exact (bitwise identical floats). Use `--loose` for slightly relaxed tolerances (rtol=1e-12, atol=1e-15), or set `--rtol`/`--atol` explicitly as per [np.allclose](https://numpy.org/devdocs/reference/generated/numpy.allclose.html). The script also compares warning and error tables, reporting new, removed, or changed warnings per binary. From 23d78aca3901581f15a47adffd69f626dc9c94f2 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Wed, 11 Mar 2026 16:04:25 -0500 Subject: [PATCH 178/389] properly close PSyGrids per metallicity --- posydon/binary_evol/simulationproperties.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index dcc87b6a9c..b3148e5dc3 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -428,10 +428,10 @@ def close(self): if isinstance(step_func, self._MesaGridStep): step_func.close() - if self.grid_Hrich is not None: - self.grid_Hrich.close() - if self.grid_name_strippedHe is not None: - self.grid_strippedHe.close() + for metallicity in self.grids_Hrich: + self.grids_Hrich[metallicity].close() + for metallicity in self.grids_strippedHe: + self.grids_strippedHe[metallicity].close() def pre_evolve(self, binary): """Functions called before a binary evolves. From 55c9f09b516e48fa0a56bafe4c5f17e5f2a07171 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Wed, 11 Mar 2026 18:02:11 -0500 Subject: [PATCH 179/389] replace dump_rate in default_param generated .ini file --- dev-tools/run_test_suite.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-tools/run_test_suite.sh b/dev-tools/run_test_suite.sh index b20cff2e0f..febfa0892a 100755 --- a/dev-tools/run_test_suite.sh +++ b/dev-tools/run_test_suite.sh @@ -81,6 +81,7 @@ pip install -e "$CLONE_DIR" -q 2>&1 | sed 's/^/ /' # copy branch's default .ini file for testing and make one into a multi-metallicity .ini file for pop synth tests cp $CLONE_DIR/posydon/popsyn/population_params_default.ini $FULL_PATH/script_data/inlists/default_test_params.ini cp $CLONE_DIR/posydon/popsyn/population_params_default.ini $FULL_PATH/script_data/inlists/multiZ_test_params.ini +sed -i 's/dump_rate[[:space:]]*=[[:space:]]*[0-9]\+/dump_rate = 5/' $FULL_PATH/script_data/inlists/default_test_params.ini sed -i 's/metallicities *= *\[1\.\]/metallicities = [1., 0.1]/' $FULL_PATH/script_data/inlists/multiZ_test_params.ini # override environment's PATH_TO_POSYDON variable to point to the From 394b03fd68c9cbd242945927e8a0df3147a4f0be Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Wed, 11 Mar 2026 18:21:29 -0500 Subject: [PATCH 180/389] edit sed commands to match --- dev-tools/run_test_suite.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/run_test_suite.sh b/dev-tools/run_test_suite.sh index c81b8912f6..2a4432e33a 100755 --- a/dev-tools/run_test_suite.sh +++ b/dev-tools/run_test_suite.sh @@ -82,7 +82,7 @@ pip install -e "$CLONE_DIR" -q 2>&1 | sed 's/^/ /' cp $CLONE_DIR/posydon/popsyn/population_params_default.ini $FULL_PATH/script_data/inlists/default_test_params.ini cp $CLONE_DIR/posydon/popsyn/population_params_default.ini $FULL_PATH/script_data/inlists/multiZ_test_params.ini sed -i 's/dump_rate[[:space:]]*=[[:space:]]*[0-9]\+/dump_rate = 5/' $FULL_PATH/script_data/inlists/default_test_params.ini -sed -i 's/metallicities *= *\[1\.\]/metallicities = [1., 0.1]/' $FULL_PATH/script_data/inlists/multiZ_test_params.ini +sed -i 's/metallicities[[:space:]]*=[[:space:]]*\[1\.\]/metallicities = [1., 0.1]/' $FULL_PATH/script_data/inlists/multiZ_test_params.ini # override environment's PATH_TO_POSYDON variable to point to the # current branch's clone for these tests From 85761a056296d47cdc3c9c02ef5d91345a63ec2d Mon Sep 17 00:00:00 2001 From: Max <14039563+maxbriel@users.noreply.github.com> Date: Thu, 12 Mar 2026 14:52:13 +0100 Subject: [PATCH 181/389] Update posydon/popsyn/distributions.py Co-authored-by: Seth Gossage --- posydon/popsyn/distributions.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/posydon/popsyn/distributions.py b/posydon/popsyn/distributions.py index d8f1b66e5d..d7408b520a 100644 --- a/posydon/popsyn/distributions.py +++ b/posydon/popsyn/distributions.py @@ -363,7 +363,8 @@ def rvs(self, size=1, m1=None, rng=None): if m1.size == 1: m1 = np.full(size, m1[0]) elif m1.size != size: - raise ValueError(f"m1 must be a single value or have size={size}") + raise ValueError(f"m1 must be a single value or have size={size}" + f"\n m1 = {m1}\n m1.size = {m1.size}") # Import here to avoid circular dependency from posydon.utils.common_functions import rejection_sampler From 80c4410a427eaaab8635da5836e739684ee9c8bb Mon Sep 17 00:00:00 2001 From: Max Briel Date: Thu, 12 Mar 2026 15:03:32 +0100 Subject: [PATCH 182/389] remove unused import --- posydon/popsyn/IMFs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/popsyn/IMFs.py b/posydon/popsyn/IMFs.py index d09cf818a7..bfaace0213 100644 --- a/posydon/popsyn/IMFs.py +++ b/posydon/popsyn/IMFs.py @@ -9,7 +9,7 @@ import numpy as np from scipy.integrate import quad -from posydon.utils.common_functions import inverse_sampler, rejection_sampler +from posydon.utils.common_functions import inverse_sampler from posydon.utils.posydonwarning import Pwarn From 1f7a56b019689d81b59733dc0dba6a357b00bdfd Mon Sep 17 00:00:00 2001 From: Max Briel Date: Thu, 12 Mar 2026 16:06:22 +0100 Subject: [PATCH 183/389] make lower q boundary exclusive --- posydon/popsyn/norm_pop.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/popsyn/norm_pop.py b/posydon/popsyn/norm_pop.py index da195213a6..fbaee17c32 100644 --- a/posydon/popsyn/norm_pop.py +++ b/posydon/popsyn/norm_pop.py @@ -101,7 +101,7 @@ def get_pdf_for_m1(m1): axis=0) # Use FlatMassRatio distribution class - q_dist = lambda q: np.where((q >= minimum) & (q <= maximum), + q_dist = lambda q: np.where((q > minimum) & (q <= maximum), 1/(maximum - minimum), 0) return q_dist From b1c59b3b387c8fce7c0054d3412632724ef39974 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Thu, 12 Mar 2026 13:43:01 -0500 Subject: [PATCH 184/389] text styling --- dev-tools/script_data/src/popsynth_suite.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/script_data/src/popsynth_suite.py b/dev-tools/script_data/src/popsynth_suite.py index a5cae64385..8b0cda3ca0 100644 --- a/dev-tools/script_data/src/popsynth_suite.py +++ b/dev-tools/script_data/src/popsynth_suite.py @@ -48,7 +48,7 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): except Exception as e: print_warnings(captured_warnings) - print(f"šŸšØ Binary Population Evolution Failed!\n") + print(f"šŸšØ BinaryPopulation evolution failed!\n") traceback.print_exc(limit=3) print("\n") print("=" * line_length) From 9f7ac487078f027e7bfce7b8c3389fe480ef9117 Mon Sep 17 00:00:00 2001 From: Max Briel Date: Fri, 13 Mar 2026 23:03:46 +0100 Subject: [PATCH 185/389] move comment into doc string + expand description --- posydon/binary_evol/CE/step_CEE.py | 71 ++++++++++++++++++------------ 1 file changed, 43 insertions(+), 28 deletions(-) diff --git a/posydon/binary_evol/CE/step_CEE.py b/posydon/binary_evol/CE/step_CEE.py index a4c899d1a5..7f653aef6a 100644 --- a/posydon/binary_evol/CE/step_CEE.py +++ b/posydon/binary_evol/CE/step_CEE.py @@ -77,49 +77,64 @@ "record_matching": False } - -# common_envelope_option_for_lambda: -# 1) 'default_lambda': using for lambda the constant value of -# common_envelope_lambda_default parameter -# 2) 'lambda_from_grid_final_values': using lambda parameter from MESA history -# which was calulated ni the same way as method (5) below -# 3) 'lambda_from_profile_gravitational': calculating the lambda parameter -# from the donor's profile by using the gravitational binding energy from the -# surface to the core (needing "mass", and "radius" as columns in the profile) -# 4) 'lambda_from_profile_gravitational_plus_internal': as above but taking -# into account a factor of common_envelope_alpha_thermal * internal energy too -# in the binding energy (needing also "energy" as column in the profile) -# 5) 'lambda_from_profile_gravitational_plus_internal_minus_recombination': -# as above but not taking into account the recombination energy in the internal -# energy (needing also "y_mass_fraction_He", "x_mass_fraction_H", -# "neutral_fraction_H", "neutral_fraction_He", and "avg_charge_He" as column -# in the profile) -# the mass fraction of an element which is used as threshold to define a core, - class StepCEE(object): - """Compute supernova final remnant mass, fallback fraction & stellar state. - - This consider the nearest neighboor of the He core mass of the star, - previous to the collapse. Considering a set of data for which the He core - mass of the compact object projenitos previous the collapse, the final - remnant mass and final stellar state of the compact object is known. + """Handle common envelope evolution (CEE) for binary systems. + + This class computes the outcome of a common envelope phase for binary + systems containing a giant star. It calculates how much the orbit must + shrink in order to expel the envelope using the alpha-prescription. + If at the required post-CEE separation one of the stars fills its Roche lobe, + the system is considered a merger. Otherwise, the envelope is lost, + leaving a binary system with the core of the donor star (which initiates + the unstable CEE) and the core of the companion. + + If stellar profiles are available, the lambda parameter for the donor + can be calculated directly from the profile. Otherwise, default values + are used. The evolution is computed using a specified prescription + (e.g., alpha-lambda) which determines the final state of the binary + based on energy budget considerations. Parameters ---------- verbose : bool - If True, the messages will be prited in the console. + If True, the messages will be printed in the console. Keyword Arguments ----------------- prescription : str - Prescription to use for computing the prediction of common enevelope + Prescription to use for computing the prediction of common envelope evolution. Available options are: - * 'alpha-lambda' : Considers the the alpha-lambda prescription + * 'alpha-lambda' : Considers the alpha-lambda prescription described in [1]_ and [2]_ to predict the outcome of the common envelope evolution. If the profile of the donor star is available then it is used to compute the value of lambda. + common_envelope_option_for_lambda : str + Method for calculating the lambda parameter. Available options are: + + * 'default_lambda' : Use a constant value from the + `common_envelope_lambda_default` parameter. + + * 'lambda_from_grid_final_values' : Use the lambda parameter from + MESA history, calculated using the same method as option 5 below. + + * 'lambda_from_profile_gravitational' : Calculate lambda from the + donor's profile using the gravitational binding energy from the + surface to the core (requires "mass" and "radius" columns in the + profile). + + * 'lambda_from_profile_gravitational_plus_internal' : As above, + but also accounting for a factor of `common_envelope_alpha_thermal` + times the internal energy in the binding energy (requires also + "energy" column in the profile). + + * 'lambda_from_profile_gravitational_plus_internal_minus_recombination' : + As above, but excluding the recombination energy from the internal + energy calculation (requires also "y_mass_fraction_He", + "x_mass_fraction_H", "neutral_fraction_H", "neutral_fraction_He", + and "avg_charge_He" columns in the profile). + References ---------- .. [1] Webbink, R. F. (1984). Double white dwarfs as progenitors of R From 389b8d2d7abce717343a997f53671e8eb2c4b283 Mon Sep 17 00:00:00 2001 From: Max <14039563+maxbriel@users.noreply.github.com> Date: Mon, 16 Mar 2026 08:00:08 +0100 Subject: [PATCH 186/389] [fix] Variable assignment for binary star example (#813) * Fix variable assignment for binary star example --- dev-tools/script_data/1Zsun_binaries_suite.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/script_data/1Zsun_binaries_suite.py b/dev-tools/script_data/1Zsun_binaries_suite.py index a896df8fe9..5f7b796aa4 100644 --- a/dev-tools/script_data/1Zsun_binaries_suite.py +++ b/dev-tools/script_data/1Zsun_binaries_suite.py @@ -766,7 +766,7 @@ def evolve_binaries(verbose): star1 = SingleStar(**{'mass': 7.939736047577677, 'state': 'H-rich_Core_H_burning', 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star1 = SingleStar(**{'mass': 6.661421823348241, + star2 = SingleStar(**{'mass': 6.661421823348241, 'state': 'H-rich_Core_H_burning', 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) From 7fd0ce32dda9dcd06a5d6dffa3368ff452ddda30 Mon Sep 17 00:00:00 2001 From: Max <14039563+maxbriel@users.noreply.github.com> Date: Tue, 17 Mar 2026 09:36:16 +0100 Subject: [PATCH 187/389] [fix] Typo culmulative to cumulative (#820) * fix typo culmulative to cumulative --- posydon/binary_evol/MESA/step_mesa.py | 6 +++--- posydon/binary_evol/binarystar.py | 4 ++-- posydon/popsyn/binarypopulation.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/posydon/binary_evol/MESA/step_mesa.py b/posydon/binary_evol/MESA/step_mesa.py index b6fb65343c..517dc79f7c 100644 --- a/posydon/binary_evol/MESA/step_mesa.py +++ b/posydon/binary_evol/MESA/step_mesa.py @@ -696,8 +696,8 @@ def update_properties_NN(self, star_1_CO=False, star_2_CO=False, setattr(binary, 'event', binary_event) setattr(binary, 'mass_transfer_case', MT_case) - culmulative_mt_case = self.termination_flags[1] - setattr(self.binary, f'culmulative_mt_case_{self.grid_type}', culmulative_mt_case) + cumulative_mt_case = self.termination_flags[1] + setattr(self.binary, f'cumulative_mt_case_{self.grid_type}', cumulative_mt_case) setattr(self.binary, f'interp_class_{self.grid_type}', interpolation_class) mt_history = self.termination_flags[2] # mass transfer history (TF12 plot label) setattr(self.binary, f'mt_history_{self.grid_type}', mt_history) @@ -930,7 +930,7 @@ def initial_final_interpolation(self, star_1_CO=False, star_2_CO=False): setattr(self.binary, f'mt_history_{self.grid_type}', mt_history) #TODO: add classifier for tf2 - #setattr(self.binary, f'culmulative_mt_case', self.classes['termination_flags_2']) + #setattr(self.binary, f'cumulative_mt_case', self.classes['termination_flags_2']) S1_state_inferred = cf.check_state_of_star(self.binary.star_1, star_CO=star_1_CO) S2_state_inferred = cf.check_state_of_star(self.binary.star_2, diff --git a/posydon/binary_evol/binarystar.py b/posydon/binary_evol/binarystar.py index efad6b2067..d89f12d3ab 100644 --- a/posydon/binary_evol/binarystar.py +++ b/posydon/binary_evol/binarystar.py @@ -222,8 +222,8 @@ def __init__(self, star_1=None, star_2=None, index=None, properties=None, setattr(self, f'interp_class_{grid_type}', None) if not hasattr(self, f'mt_history_{grid_type}'): setattr(self, f'mt_history_{grid_type}', None) - if not hasattr(self, f'culmulative_mt_case_{grid_type}'): - setattr(self, f'culmulative_mt_case_{grid_type}', None) + if not hasattr(self, f'cumulative_mt_case_{grid_type}'): + setattr(self, f'cumulative_mt_case_{grid_type}', None) # SimulationProperties object - parameters & parameterizations if isinstance(properties, SimulationProperties): diff --git a/posydon/popsyn/binarypopulation.py b/posydon/popsyn/binarypopulation.py index d4f6a1ac73..1a6fdb91ef 100644 --- a/posydon/popsyn/binarypopulation.py +++ b/posydon/popsyn/binarypopulation.py @@ -97,8 +97,8 @@ 'interp_class_CO_HMS_RLO' : 15, 'interp_class_CO_HeMS_RLO' : 15, 'mt_history_HMS_HMS' : 40, 'mt_history_CO_HeMS' : 40, 'mt_history_CO_HMS_RLO' : 40, 'mt_history_CO_HeMS_RLO' : 40, - 'culmulative_mt_case_HMS_HMS': 40, 'culmulative_mt_case_CO_HeMS': 40, - 'culmulative_mt_case_CO_HMS_RLO': 40, 'culmulative_mt_case_CO_HeMS_RLO': 40, + 'cumulative_mt_case_HMS_HMS': 40, 'cumulative_mt_case_CO_HeMS': 40, + 'cumulative_mt_case_CO_HMS_RLO': 40, 'cumulative_mt_case_CO_HeMS_RLO': 40, } # BinaryPopulation will enforce a constant metallicity accross all steps that From 2e1e89d75b3b3d81b43fd4abc5b5b571b5cb3984 Mon Sep 17 00:00:00 2001 From: Max Briel Date: Tue, 17 Mar 2026 13:54:22 +0100 Subject: [PATCH 188/389] add units to model weights function docstrings --- posydon/popsyn/norm_pop.py | 24 +++++++++++++++++++++++- posydon/popsyn/synthetic_population.py | 11 +++++++++-- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/posydon/popsyn/norm_pop.py b/posydon/popsyn/norm_pop.py index 4f2946504e..b252cf56a5 100644 --- a/posydon/popsyn/norm_pop.py +++ b/posydon/popsyn/norm_pop.py @@ -305,7 +305,29 @@ def calculate_model_weights(pop_data, M_sim, simulation_parameters, population_parameters): - '''reweight each model in the simulation to the requested population''' + """Reweight each model in the simulation to the requested population + + Uses the PDF of the simulation and the PDF of the requested population to calculate + the weights for each model in the simulation to match the requested population. + + Parameters + ---------- + pop_data : dict + Dictionary containing the population data + M_sim : float + Mass of the simulation + simulation_parameters : dict + Dictionary containing the simulation parameters + population_parameters : dict + Dictionary containing the population parameters + + Returns + ------- + output : ndarray of floats + Weights for each model in the simulation to match the requested population + This has the units of likelihood of the systems per unit mass (Msun^-1). + + """ f_b_sim = simulation_parameters['binary_fraction_const'] f_b_pop = population_parameters['binary_fraction_const'] diff --git a/posydon/popsyn/synthetic_population.py b/posydon/popsyn/synthetic_population.py index 9c89c8971c..946f31f985 100644 --- a/posydon/popsyn/synthetic_population.py +++ b/posydon/popsyn/synthetic_population.py @@ -1882,6 +1882,9 @@ def calculate_model_weights(self, model_weights_identifier, population_parameter This method calculates the model weights of each event in the transient population based on the provided model parameters. It performs various calculations and stores the results in an HDF5 file at the location '/transients/{transient_name}/weights/{model_weights_identifier}'. + The calculated model weights represent the probability of an event per Msun + formed. Thus, it's units are Msun^{-1}. + Parameters ---------- model_weights_identifier : str @@ -1891,6 +1894,10 @@ def calculate_model_weights(self, model_weights_identifier, population_parameter population_parameters : dict, optional Dictionary containing the population parameters. If None, the default population parameters will be used. + Returns + ------- + pd.DataFrame + The model weights of the transient population and have units of Msun^-1. """ if population_parameters is None: population_parameters = {'number_of_binaries': 1000000, @@ -1972,7 +1979,7 @@ def model_weights(self, model_weights_identifier=None): """Retrieve the model weights of the transient population. This method retrieves the model weights of the transient population based on the provided model weights identifier. - The model weights are stored in an HDF5 file + The model weights are stored in an HDF5 file and have units of Msun^-1. Parameters ---------- @@ -1982,7 +1989,7 @@ def model_weights(self, model_weights_identifier=None): Returns ------- pd.DataFrame - The model weights of the transient population. + The model weights of the transient population in units of Msun^-1. """ if model_weights_identifier is None: From 424afc1402dafd825f6c0697c0fd196be8460811 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Tue, 17 Mar 2026 17:27:38 -0500 Subject: [PATCH 189/389] better separation of TrackMatcher and step handling --- posydon/binary_evol/CE/step_CEE.py | 110 ++++++------------- posydon/binary_evol/DT/double_CO.py | 7 -- posydon/binary_evol/DT/key_library.py | 13 +++ posydon/binary_evol/DT/step_detached.py | 74 ++++++------- posydon/binary_evol/DT/step_isolated.py | 16 +-- posydon/binary_evol/simulationproperties.py | 98 +++++++++-------- posydon/binary_evol/track_match.py | 103 +++++++++-------- posydon/popsyn/population_params_default.ini | 48 ++++++++ 8 files changed, 236 insertions(+), 233 deletions(-) diff --git a/posydon/binary_evol/CE/step_CEE.py b/posydon/binary_evol/CE/step_CEE.py index bbbaad638d..7925a9adfe 100644 --- a/posydon/binary_evol/CE/step_CEE.py +++ b/posydon/binary_evol/CE/step_CEE.py @@ -56,26 +56,6 @@ from posydon.utils.constants import Zsun from posydon.utils.posydonwarning import Pwarn -MODEL = {"prescription": 'alpha-lambda', - "common_envelope_efficiency": 1.0, - "common_envelope_lambda_default": 0.5, - "common_envelope_option_for_lambda": 'lambda_from_grid_final_values', - "common_envelope_option_for_HG_star": "optimistic", - "common_envelope_alpha_thermal": 1.0, - "core_definition_H_fraction": 0.3, # with 0.01 no CE BBHs - "core_definition_He_fraction": 0.1, - "CEE_tolerance_err": 0.001, - "verbose": False, - "common_envelope_option_after_succ_CEE": 'two_phases_stableMT', - "mass_loss_during_CEE_merged": False, # If False, then no mass loss from this step for a merged star - # If True, then we remove mass according to the alpha-lambda prescription - # assuming a final separation where the inner core RLOF starts. - # "one_phase_variable_core_definition" for core_definition_H_fraction=0.01 - "metallicity": None, - "track_matcher": None - } - - # common_envelope_option_for_lambda: # 1) 'default_lambda': using for lambda the constant value of # common_envelope_lambda_default parameter @@ -127,60 +107,41 @@ class StepCEE(object): .. [2] De Kool, M. (1990). Common envelope evolution and double cores of planetary nebulae. The Astrophysical Journal, 358, 189-195. """ - - def __init__( - self, prescription=MODEL['prescription'], - common_envelope_efficiency=MODEL['common_envelope_efficiency'], - common_envelope_lambda_default=MODEL[ - 'common_envelope_lambda_default'], - common_envelope_option_for_lambda=MODEL[ - 'common_envelope_option_for_lambda'], - common_envelope_option_for_HG_star=MODEL[ - 'common_envelope_option_for_HG_star'], - common_envelope_option_after_succ_CEE=MODEL[ - 'common_envelope_option_after_succ_CEE'], - common_envelope_alpha_thermal=MODEL[ - 'common_envelope_alpha_thermal'], - core_definition_H_fraction=MODEL[ - 'core_definition_H_fraction'], - core_definition_He_fraction=MODEL[ - 'core_definition_He_fraction'], - CEE_tolerance_err=MODEL['CEE_tolerance_err'], - mass_loss_during_CEE_merged=MODEL['mass_loss_during_CEE_merged'], - verbose=MODEL['verbose'], - metallicity = MODEL['metallicity'], - **kwargs): + DEFAULT_KWARGS = {"prescription": 'alpha-lambda', + "common_envelope_efficiency": 1.0, + "common_envelope_lambda_default": 0.5, + "common_envelope_option_for_lambda": 'lambda_from_grid_final_values', + "common_envelope_option_for_HG_star": "optimistic", + "common_envelope_alpha_thermal": 1.0, + "core_definition_H_fraction": 0.3, # with 0.01 no CE BBHs + "core_definition_He_fraction": 0.1, + "CEE_tolerance_err": 0.001, + "verbose": False, + "common_envelope_option_after_succ_CEE": 'two_phases_stableMT', + "mass_loss_during_CEE_merged": False, + # If False, then no mass loss from this step for a merged star + # If True, then we remove mass according to the alpha-lambda prescription + # assuming a final separation where the inner core RLOF starts. + # "one_phase_variable_core_definition" for core_definition_H_fraction=0.01 + "metallicity": None, + "track_matcher": None + } + + + def __init__(self, **kwargs): """Initialize a StepCEE instance.""" # read kwargs to initialize the class if kwargs: - #for key in kwargs: - # if key not in MODEL: - # raise ValueError(key + " is not a valid parameter name!") - for varname in MODEL: - default_value = MODEL[varname] + for key in kwargs: + if key not in self.DEFAULT_KWARGS: + raise ValueError(key + " is not a valid parameter name!") + for varname in self.DEFAULT_KWARGS: + default_value = self.DEFAULT_KWARGS[varname] setattr(self, varname, kwargs.get(varname, default_value)) else: - self.prescription = prescription - self.common_envelope_efficiency = common_envelope_efficiency - self.common_envelope_lambda_default = \ - common_envelope_lambda_default - self.common_envelope_option_for_lambda = \ - common_envelope_option_for_lambda - self.common_envelope_option_for_HG_star = \ - common_envelope_option_for_HG_star - self.common_envelope_alpha_thermal = common_envelope_alpha_thermal - self.core_definition_H_fraction = core_definition_H_fraction - self.core_definition_He_fraction = core_definition_He_fraction - self.CEE_tolerance_err = CEE_tolerance_err - self.common_envelope_option_after_succ_CEE = \ - common_envelope_option_after_succ_CEE - self.mass_loss_during_CEE_merged = mass_loss_during_CEE_merged - self.metallicity = metallicity - self.verbose = verbose - self.path_to_posydon = PATH_TO_POSYDON - - # set TrackMatcher reference - self.track_matcher = kwargs.get("track_matcher", None) + for varname in self.DEFAULT_KWARGS: + default_value = self.DEFAULT_KWARGS[varname] + setattr(self, varname, default_value) def __call__(self, binary): """Perform the CEE step for a BinaryStar object.""" @@ -805,11 +766,12 @@ def CEE_two_phases_windloss(self, donor, mc1_i, rc1_i, donor_type, def CEE_simple_alpha_prescription( self, binary, donor, comp_star, lambda1_CE, mc1_i, rc1_i, donor_type, lambda2_CE, mc2_i, rc2_i, comp_type, double_CE=False, - verbose=False, common_envelope_option_after_succ_CEE=MODEL[ - 'common_envelope_option_after_succ_CEE'], - core_definition_H_fraction=MODEL['core_definition_H_fraction'], - core_definition_He_fraction=MODEL['core_definition_He_fraction'], - mass_loss_during_CEE_merged=MODEL['mass_loss_during_CEE_merged']): + verbose=False, + common_envelope_option_after_succ_CEE=\ + DEFAULT_KWARGS['common_envelope_option_after_succ_CEE'], + core_definition_H_fraction=DEFAULT_KWARGS['core_definition_H_fraction'], + core_definition_He_fraction=DEFAULT_KWARGS['core_definition_He_fraction'], + mass_loss_during_CEE_merged=DEFAULT_KWARGS['mass_loss_during_CEE_merged']): """Apply the alpha-lambda common-envelope prescription. It uses energetics to calculate the shrinakge of the orbit diff --git a/posydon/binary_evol/DT/double_CO.py b/posydon/binary_evol/DT/double_CO.py index 615185b4ee..2aed9ff865 100644 --- a/posydon/binary_evol/DT/double_CO.py +++ b/posydon/binary_evol/DT/double_CO.py @@ -228,13 +228,6 @@ def __init__(self, **kwargs): super().__init__(**kwargs) - # For DCO system, only gravitational radiation is considered - self.do_magnetic_braking = False - self.do_tides = False - self.do_wind_loss = False - self.do_stellar_evolution_and_spin_from_winds = False - self.do_gravitational_radiation = True - def set_stars(self, primary, secondary, t0=0.0): diff --git a/posydon/binary_evol/DT/key_library.py b/posydon/binary_evol/DT/key_library.py index d203e8564f..877e976b43 100644 --- a/posydon/binary_evol/DT/key_library.py +++ b/posydon/binary_evol/DT/key_library.py @@ -162,6 +162,19 @@ 'avg_charge_He' ) +DEFAULT_FINAL_KEYS = ( + 'avg_c_in_c_core_at_He_depletion', + 'co_core_mass_at_He_depletion', + 'm_core_CE_1cent', + 'm_core_CE_10cent', + 'm_core_CE_30cent', + 'm_core_CE_pure_He_star_10cent', + 'r_core_CE_1cent', + 'r_core_CE_10cent', + 'r_core_CE_30cent', + 'r_core_CE_pure_He_star_10cent' + ) + # states to ID an HMS star # TODO: build these from the other lists to (hopefully) diff --git a/posydon/binary_evol/DT/step_detached.py b/posydon/binary_evol/DT/step_detached.py index 2960db1e15..37d9bc2209 100644 --- a/posydon/binary_evol/DT/step_detached.py +++ b/posydon/binary_evol/DT/step_detached.py @@ -214,59 +214,55 @@ class detached_step: """ - def __init__( - self, - dt=None, - n_o_steps_history=None, - do_wind_loss=True, - do_tides=True, - do_gravitational_radiation=True, - do_magnetic_braking=True, - magnetic_braking_mode="RVJ83", - do_stellar_evolution_and_spin_from_winds=True, - RLO_orbit_at_orbit_with_same_am=False, - verbose=False, - **kwargs): + # settings in .ini will override + DEFAULT_SETTINGS = {"dt": None, + "n_o_steps_history": None, + "do_wind_loss": True, + "do_tides": True, + "do_gravitational_radiation": True, + "do_magnetic_braking": True, + "magnetic_braking_mode": "RVJ83", + "do_stellar_evolution_and_spin_from_winds": True, + "RLO_orbit_at_orbit_with_same_am": False, + "metallicity": None, + "track_matcher": None, + "verbose": False} + + def __init__(self, **kwargs): """Initialize the step. See class documentation for details.""" - self.dt = dt - self.n_o_steps_history = n_o_steps_history - self.do_wind_loss = do_wind_loss - self.do_tides = do_tides - self.do_gravitational_radiation = do_gravitational_radiation - self.do_magnetic_braking = do_magnetic_braking - self.magnetic_braking_mode = magnetic_braking_mode - self.do_stellar_evolution_and_spin_from_winds = ( - do_stellar_evolution_and_spin_from_winds - ) - self.RLO_orbit_at_orbit_with_same_am = RLO_orbit_at_orbit_with_same_am - self.verbose = verbose - - + # read kwargs to initialize the class + if kwargs: + for key in kwargs: + if key not in self.DEFAULT_SETTINGS: + raise ValueError(key + " is not a valid parameter name!") + for varname in self.DEFAULT_SETTINGS: + default_value = self.DEFAULT_SETTINGS[varname] + setattr(self, varname, kwargs.get(varname, default_value)) + else: + for varname in self.DEFAULT_SETTINGS: + default_value = self.DEFAULT_SETTINGS[varname] + setattr(self, varname, default_value) self.translate = DEFAULT_TRANSLATION - # these are the KEYS read from POSYDON h5 grid files (after translating # them to the appropriate columns) self.KEYS = DEFAULT_TRANSLATED_KEYS - # Set TrackMatcher reference - self.track_matcher = kwargs.get('track_matcher', None) - # create evolution handler object self.init_evo_kwargs() self.evo = detached_evolution(**self.evo_kwargs) if self.verbose: - print(dt, - n_o_steps_history, + print(self.dt, + self.n_o_steps_history, self.track_matcher.matching_method, - do_wind_loss, - do_tides, - do_gravitational_radiation, - do_magnetic_braking, - magnetic_braking_mode, - do_stellar_evolution_and_spin_from_winds) + self.do_wind_loss, + self.do_tides, + self.do_gravitational_radiation, + self.do_magnetic_braking, + self.magnetic_braking_mode, + self.do_stellar_evolution_and_spin_from_winds) return diff --git a/posydon/binary_evol/DT/step_isolated.py b/posydon/binary_evol/DT/step_isolated.py index 2a8a0630bf..2afc19717f 100644 --- a/posydon/binary_evol/DT/step_isolated.py +++ b/posydon/binary_evol/DT/step_isolated.py @@ -24,19 +24,9 @@ class IsolatedStep(detached_step): """ - def __init__(self, - do_wind_loss=False, - do_tides=False, - do_gravitational_radiation=False, - do_magnetic_braking=False, - *args, **kwargs): - - super().__init__(do_wind_loss=do_wind_loss, - do_tides=do_tides, - do_gravitational_radiation=do_gravitational_radiation, - do_magnetic_braking=do_magnetic_braking, - *args, - **kwargs) + def __init__(self, *args, **kwargs): + + super().__init__(*args, **kwargs) diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index b3148e5dc3..8ba76ed0e2 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -17,7 +17,7 @@ import os import time -from posydon.binary_evol.track_match import DEFAULT_MATCH_SETTINGS, TrackMatcher +from posydon.binary_evol.track_match import TrackMatcher from posydon.config import PATH_TO_POSYDON_DATA from posydon.interpolation.interpolation import GRIDInterpolator from posydon.popsyn.io import simprop_kwargs_from_ini @@ -33,6 +33,13 @@ class NullStep: class SimulationProperties: """Class describing the properties of a population synthesis simulation.""" + # these steps and the flow do not require a metallicity + ignore_for_met = ["flow", "step_SN", "step_end"] + steps_with_matching = ["step_detached", "step_CE", + "step_isolated", "step_dco", + "step_merged", "step_disrupted", + "step_initially_single"] + def __init__(self, flow=({}, {}), step_HMS_HMS = (NullStep(), {}), step_CO_HeMS = (NullStep(), {}), @@ -283,11 +290,6 @@ def load_steps(self, metallicity=None, verbose=False): ------- None """ - if verbose: - print('STEP NAME'.ljust(20) + 'STEP FUNCTION'.ljust(25) + 'KWARGS') - - - self.track_matcher = None # for every other step, give it a metallicity and load each step for name, tup in self.kwargs.items(): @@ -329,12 +331,9 @@ def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, from ------- None """ - - # these steps and the flow do not require a metallicity - ignore_for_met = ["flow", "step_SN", "step_end"] - steps_with_matching = ["step_detached", "step_CE", - "step_isolated", "step_dco", - "step_merged", "step_disrupted"] + + if verbose: + print(f"Loading {step_name}...") # grab kwargs from ini file for given step if os.path.isfile(from_ini): @@ -343,8 +342,37 @@ def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, from step_func = step_tup[0] step_kwargs = step_tup[1].copy() + # check to make sure the step has a... + # 1) metallicity assigned (if needed) + # 2) TrackMatcher assigned (if needed) + step_kwargs = self.check_step(metallicity, step_name, + step_kwargs, verbose) + + # Try to load the step + try: + setattr(self, step_name, step_func(**step_kwargs)) + if verbose: + if step_kwargs: + print("step_kwargs: ") + kw_list = [f"\t{key}: {val}" for key, val in step_kwargs.items()] + print("\n".join(kw_list)) + print(f"{step_name} loaded successfully.") + print() + + except TypeError as e: + Pwarn(f"Error loading {step_name}: {e}", "StepWarning") + print(f"Loading {step_name} without arguments.") + setattr(self, step_name, step_func()) + + # check if all steps have been loaded + self.steps_loaded = all(hasattr(self, name) + for name, tup in self.kwargs.items() + if isinstance(tup, tuple)) + + def check_step(self, metallicity, step_name, step_kwargs, verbose=False): + # check/assign metallicity to the step - if step_name not in ignore_for_met: + if step_name not in self.ignore_for_met: metallicity = step_kwargs.get('metallicity', metallicity) if metallicity is None: Pwarn(f"{step_name} not assigned a metallicity. " @@ -353,46 +381,22 @@ def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, from metallicity = 1.0 step_kwargs['metallicity'] = float(metallicity) - # check/create a TrackMatcher object if needed + # each metallicity/step combo could require + # a unique TrackMatcher, so check for that matcher_key = (metallicity, step_name) - if step_name in steps_with_matching: + if step_name in self.steps_with_matching: matcher_needed = matcher_key not in self.track_matchers if matcher_needed: - step_kwargs, matcher_kwargs = self._separate_matcher_kwargs(step_kwargs) + # create TrackMatcher if needed + step_kwargs, matcher_kwargs = TrackMatcher.separate_kwargs(step_kwargs) self.create_track_matcher(metallicity, step_name, matcher_kwargs) - + + if verbose: + kw_list = [f"\t{key}: {val}" for key, val in matcher_kwargs.items()] + print(f"matcher_kwargs: \n" + "\n".join(kw_list)) step_kwargs['track_matcher'] = self.track_matchers[matcher_key] - if verbose: - print(step_name, step_tup, end='\n') - - # Try to load the step - try: - setattr(self, step_name, step_func(**step_kwargs)) - except TypeError as e: - Pwarn(f"Error loading step {step_name}: {e}", "StepWarning") - print(f"Loading {step_name} without arguments.") - setattr(self, step_name, step_func()) - - # check if all steps have been loaded - self.steps_loaded = all(hasattr(self, name) - for name, tup in self.kwargs.items() - if isinstance(tup, tuple) -) - - def _separate_matcher_kwargs(self, step_kwargs): - matcher_kwargs = DEFAULT_MATCH_SETTINGS.copy() - for key, val in step_kwargs.items(): - if key in matcher_kwargs: - matcher_kwargs.update({key: val}) - # peel off TrackMatcher kwargs from step_kwargs - except_keys = ["metallicity", "verbose"] - for key in matcher_kwargs: - if key in except_keys: - continue - _ = step_kwargs.pop(key, None) - - return step_kwargs, matcher_kwargs + return step_kwargs def create_track_matcher(self, metallicity, step_name, matcher_kwargs): diff --git a/posydon/binary_evol/track_match.py b/posydon/binary_evol/track_match.py index 1cc8a527da..5553b48a14 100644 --- a/posydon/binary_evol/track_match.py +++ b/posydon/binary_evol/track_match.py @@ -26,6 +26,7 @@ DEFAULT_PROFILE_KEYS, DEFAULT_TRANSLATED_KEYS, KEYS_POSITIVE, + DEFAULT_FINAL_KEYS ) from posydon.binary_evol.flow_chart import ( STAR_STATES_CO, @@ -59,20 +60,6 @@ # MAJOR.MINOR version of imported scipy package SCIPY_VER = float('.'.join(scipy.__version__.split('.')[:2])) -DEFAULT_MATCH_SETTINGS = {"grid_Hrich":None, - "grid_strippedHe":None, - "path":PATH_TO_POSYDON_DATA, - "metallicity":None, - "matching_method":"minimize", - "matching_tolerance":1e-2, - "matching_tolerance_hard":1e-1, - "list_for_matching_HMS":None, - "list_for_matching_HeStar":None, - "list_for_matching_postMS":None, - "list_for_matching_postHeMS":None, - "record_matching":False, - "verbose":False} - class TrackMatcher: """ This class contains the functionality to match binary star components @@ -265,6 +252,20 @@ class TrackMatcher: """ + DEFAULT_KWARGS = {"grid_Hrich":None, + "grid_strippedHe":None, + "path":PATH_TO_POSYDON_DATA, + "metallicity":None, + "matching_method":"minimize", + "matching_tolerance":1e-2, + "matching_tolerance_hard":1e-1, + "list_for_matching_HMS":None, + "list_for_matching_HeStar":None, + "list_for_matching_postMS":None, + "list_for_matching_postHeMS":None, + "record_matching":False, + "verbose":False} + def __init__(self, **kwargs): # MESA history column names used as matching metrics @@ -272,30 +273,25 @@ def __init__(self, **kwargs): # error is thrown when (possibly user defined) # matching metrics don't exist in this array. # That's not very flexible... - self.root_keys = np.array( - [ - "age", - "mass", - "he_core_mass", - "center_h1", - "center_he4", - "surface_he4", - "surface_h1", - "log_R", - "center_c12" - ] - ) + self.root_keys = np.array(["age", "mass", "he_core_mass", + "center_h1", "center_he4", + "surface_he4", "surface_h1", + "center_c12", "log_R"]) # ===================================================================== - - for kwarg in kwargs: - if kwarg not in DEFAULT_MATCH_SETTINGS.keys(): - raise POSYDONError(f"Unexpected keyword argument {kwarg} " - "passed to TrackMatcher. Expected " - f"kwargs: {DEFAULT_MATCH_SETTINGS.keys()}") - else: - # set attributes for all kwargs, using defaults if not specified - setattr(self, kwarg, kwargs.get(kwarg, DEFAULT_MATCH_SETTINGS[kwarg])) + if kwargs: + for key in kwargs: + if key not in self.DEFAULT_KWARGS: + raise POSYDONError(f"Unexpected keyword argument {key} " + "passed to TrackMatcher. Expected " + f"kwargs: {self.DEFAULT_KWARGS.keys()}") + for varname in self.DEFAULT_KWARGS: + default_value = self.DEFAULT_KWARGS[varname] + setattr(self, varname, kwargs.get(varname, default_value)) + else: + for varname in self.DEFAULT_KWARGS: + default_value = self.DEFAULT_KWARGS[varname] + setattr(self, varname, default_value) self.metallicity = convert_metallicity_to_string(self.metallicity) @@ -308,30 +304,15 @@ def __init__(self, **kwargs): # these are the KEYS read from POSYDON h5 grid files (after translating # them to the appropriate columns) - self.KEYS = DEFAULT_TRANSLATED_KEYS #KEYS #DEFAULT_TRANSLATED_KEYS + self.KEYS = DEFAULT_TRANSLATED_KEYS self.KEYS_POSITIVE = KEYS_POSITIVE - # keys for the final value interpolation - self.final_keys = ( - 'avg_c_in_c_core_at_He_depletion', - 'co_core_mass_at_He_depletion', - 'm_core_CE_1cent', - 'm_core_CE_10cent', - 'm_core_CE_30cent', - 'm_core_CE_pure_He_star_10cent', - 'r_core_CE_1cent', - 'r_core_CE_10cent', - 'r_core_CE_30cent', - 'r_core_CE_pure_He_star_10cent' - ) - + self.final_keys = DEFAULT_FINAL_KEYS # keys for the star profile interpolation self.profile_keys = DEFAULT_PROFILE_KEYS - # ===================================================================== # Initialize the matching lists: - # min/max ranges of initial masses for each grid m_min_H = np.min(self.grid_Hrich.grid_mass) m_max_H = np.max(self.grid_Hrich.grid_mass) @@ -411,6 +392,22 @@ def __init__(self, **kwargs): self.create_root0_he() self.train_scalers() + @classmethod + def separate_kwargs(cls, step_kwargs): + + matcher_kwargs = cls.DEFAULT_KWARGS.copy() + for key, val in step_kwargs.items(): + if key in matcher_kwargs: + matcher_kwargs.update({key: val}) + # peel off TrackMatcher kwargs from step_kwargs + except_keys = ["metallicity", "verbose"] + for key in matcher_kwargs: + if key in except_keys: + continue + _ = step_kwargs.pop(key, None) + + return step_kwargs, matcher_kwargs + def train_scalers(self): # ...if not, fit a new scaler, and store it for later use diff --git a/posydon/popsyn/population_params_default.ini b/posydon/popsyn/population_params_default.ini index 68179eb432..c56d1b6876 100644 --- a/posydon/popsyn/population_params_default.ini +++ b/posydon/popsyn/population_params_default.ini @@ -170,6 +170,18 @@ absolute_import = None # if given, use an absolute filepath to user defined step: # ['', ''] + do_wind_loss = False + # True, False + do_tides = False + # True, False + do_gravitational_radiation = False + # True, False + do_magnetic_braking = False + # True, False + magnetic_braking_mode = 'RVJ83' + # 'RVJ83', 'M15', 'G18', 'CARB' + do_stellar_evolution_and_spin_from_winds = True + # True, False matching_method = 'minimize' # 'minimize', 'root' matching_tolerance = 1e-2 @@ -187,6 +199,18 @@ absolute_import = None # if given, use an absolute filepath to user defined step: # ['', ''] + do_wind_loss = False + # True, False + do_tides = False + # True, False + do_gravitational_radiation = False + # True, False + do_magnetic_braking = False + # True, False + magnetic_braking_mode = 'RVJ83' + # 'RVJ83', 'M15', 'G18', 'CARB' + do_stellar_evolution_and_spin_from_winds = True + # True, False list_for_matching_HMS = [["mass", "center_h1", "he_core_mass"], [20.0, 1.0, 10.0], ["log_min_max", "min_max", "min_max"], @@ -219,6 +243,18 @@ absolute_import = None # if given, use an absolute filepath to user defined step: # ['', ''] + do_wind_loss = False + # True, False + do_tides = False + # True, False + do_gravitational_radiation = False + # True, False + do_magnetic_braking = False + # True, False + magnetic_braking_mode = 'RVJ83' + # 'RVJ83', 'M15', 'G18', 'CARB' + do_stellar_evolution_and_spin_from_winds = True + # True, False matching_method = 'minimize' # 'minimize', 'root' matching_tolerance = 1e-2 @@ -359,6 +395,18 @@ absolute_import = None # if given, use an absolute filepath to user defined step: # ['', ''] + do_wind_loss = False + # True, False + do_tides = False + # True, False + do_gravitational_radiation = True + # True, False + do_magnetic_braking = False + # True, False + magnetic_braking_mode = 'RVJ83' + # 'RVJ83', 'M15', 'G18', 'CARB' + do_stellar_evolution_and_spin_from_winds = False + # True, False n_o_steps_history = None # None or int (0, inf) From 52fd63d8a61b6945088e99575a486a72ddba7089 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 17 Mar 2026 22:27:58 +0000 Subject: [PATCH 190/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/binary_evol/CE/step_CEE.py | 4 ++-- posydon/binary_evol/simulationproperties.py | 8 ++++---- posydon/binary_evol/track_match.py | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/posydon/binary_evol/CE/step_CEE.py b/posydon/binary_evol/CE/step_CEE.py index 7925a9adfe..d74a0f54fe 100644 --- a/posydon/binary_evol/CE/step_CEE.py +++ b/posydon/binary_evol/CE/step_CEE.py @@ -118,7 +118,7 @@ class StepCEE(object): "CEE_tolerance_err": 0.001, "verbose": False, "common_envelope_option_after_succ_CEE": 'two_phases_stableMT', - "mass_loss_during_CEE_merged": False, + "mass_loss_during_CEE_merged": False, # If False, then no mass loss from this step for a merged star # If True, then we remove mass according to the alpha-lambda prescription # assuming a final separation where the inner core RLOF starts. @@ -766,7 +766,7 @@ def CEE_two_phases_windloss(self, donor, mc1_i, rc1_i, donor_type, def CEE_simple_alpha_prescription( self, binary, donor, comp_star, lambda1_CE, mc1_i, rc1_i, donor_type, lambda2_CE, mc2_i, rc2_i, comp_type, double_CE=False, - verbose=False, + verbose=False, common_envelope_option_after_succ_CEE=\ DEFAULT_KWARGS['common_envelope_option_after_succ_CEE'], core_definition_H_fraction=DEFAULT_KWARGS['core_definition_H_fraction'], diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index 8ba76ed0e2..829c08263d 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -331,7 +331,7 @@ def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, from ------- None """ - + if verbose: print(f"Loading {step_name}...") @@ -342,10 +342,10 @@ def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, from step_func = step_tup[0] step_kwargs = step_tup[1].copy() - # check to make sure the step has a... + # check to make sure the step has a... # 1) metallicity assigned (if needed) # 2) TrackMatcher assigned (if needed) - step_kwargs = self.check_step(metallicity, step_name, + step_kwargs = self.check_step(metallicity, step_name, step_kwargs, verbose) # Try to load the step @@ -390,7 +390,7 @@ def check_step(self, metallicity, step_name, step_kwargs, verbose=False): # create TrackMatcher if needed step_kwargs, matcher_kwargs = TrackMatcher.separate_kwargs(step_kwargs) self.create_track_matcher(metallicity, step_name, matcher_kwargs) - + if verbose: kw_list = [f"\t{key}: {val}" for key, val in matcher_kwargs.items()] print(f"matcher_kwargs: \n" + "\n".join(kw_list)) diff --git a/posydon/binary_evol/track_match.py b/posydon/binary_evol/track_match.py index 5553b48a14..2f5c11cde3 100644 --- a/posydon/binary_evol/track_match.py +++ b/posydon/binary_evol/track_match.py @@ -23,10 +23,10 @@ import posydon.utils.constants as const from posydon.binary_evol.DT.key_library import ( + DEFAULT_FINAL_KEYS, DEFAULT_PROFILE_KEYS, DEFAULT_TRANSLATED_KEYS, KEYS_POSITIVE, - DEFAULT_FINAL_KEYS ) from posydon.binary_evol.flow_chart import ( STAR_STATES_CO, @@ -273,7 +273,7 @@ def __init__(self, **kwargs): # error is thrown when (possibly user defined) # matching metrics don't exist in this array. # That's not very flexible... - self.root_keys = np.array(["age", "mass", "he_core_mass", + self.root_keys = np.array(["age", "mass", "he_core_mass", "center_h1", "center_he4", "surface_he4", "surface_h1", "center_c12", "log_R"]) From c8cbfabb947a8508a8d85f839ea14d0a655f4884 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Tue, 17 Mar 2026 19:30:42 -0500 Subject: [PATCH 191/389] adding doc strings in simulationproperties.py --- posydon/binary_evol/simulationproperties.py | 129 +++++++++++++++++--- 1 file changed, 110 insertions(+), 19 deletions(-) diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index 8ba76ed0e2..dd408e7100 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -209,6 +209,9 @@ def __init__(self, flow=({}, {}), # Should possibly be a section in sim props .ini file self.grid_path = PATH_TO_POSYDON_DATA + # These hold GRIDInterpolator objects + # and associated grid names for ea. metallicity + # (intended keys are metallicities): self.grid_names_Hrich = {} self.grids_Hrich = {} self.grid_names_strippedHe = {} @@ -298,38 +301,62 @@ def load_steps(self, metallicity=None, verbose=False): metallicity = step_kwargs.get('metallicity', metallicity) self.load_a_step(name, tup, metallicity=metallicity, verbose=verbose) - # track that all steps have been loaded + # track that all steps have been loaded (DEPRECATED?) self.steps_loaded = True def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, from_ini='', verbose=False): - """Instantiate one step class and set as instance attribute. + """ + Instantiate and attach a simulation step to this object. + + This method creates an instance of a step class and assigns it as an + attribute of SimulationProperties using ``step_name`` as the attribute + name. Step keyword arguments may be provided directly via ``step_tup`` + or loaded from an `.ini` configuration file. Before instantiation, + step arguments are validated and augmented (e.g., assigning metallicity + and creating a TrackMatcher if required). Parameters ---------- step_name : str + Name of the evolution step. The created step instance will be + attached to the object as ``self.``. See + ``SimulationProperties.__init__`` for the standard set of steps. - This string is the name of the evolution step. See - SimulationProperties.__init__ for the full standard set. + step_tup : tuple, optional + Tuple of the form ``(step_class, kwargs_dict)`` where: - step_tup : tuple - A tuple whose first element is the step class and whose - second is a dictionary representing the step's kwargs. + - ``step_class`` is the class representing the step. + - ``kwargs_dict`` is a dictionary of keyword arguments used to + initialize the step. - metallicity : float - A metallicity (Z) may be provided to automatically assign - to the step as it is loaded. Should be one of e.g., 2.0, 1.0, - 4.5e-1, 2e-1, 1e-1, 1e-2, 1e-3, 1e-4, corresponding to - metallicities available in your POSYDON_DATA grids. + Default is ``(NullStep, {})``. - from_ini : str - Path to a .ini file to read step options from. + metallicity : float, optional + Metallicity (Z) to assign to the step if required and not already + specified in the step keyword arguments. Default supported values + are: 2.0, 1.0, 4.5e-1, 2e-1, 1e-1, 1e-2, 1e-3, 1e-4. - verbose : bool - Print extra information. + from_ini : str, optional + Path to an `.ini` file containing step configuration. If provided + and the file exists, the step class and keyword arguments for + ``step_name`` are loaded from this file and override ``step_tup``. + + verbose : bool, optional + If True, print detailed information about step loading and the + keyword arguments used to instantiate the step. Returns ------- None + + Notes + ----- + - Step keyword arguments are processed by ``self.check_step`` before + instantiation. This may assign a metallicity and/or attach a + ``TrackMatcher`` if required for the step. + - The instantiated step is stored as an attribute of SimulationProperties. + - After loading, ``self.steps_loaded`` is updated to indicate whether + all configured steps have been successfully attached. """ if verbose: @@ -370,8 +397,45 @@ def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, from if isinstance(tup, tuple)) def check_step(self, metallicity, step_name, step_kwargs, verbose=False): + """ + Validate and update configuration for an evolution step. + + This method ensures that a valid metallicity is assigned to the step + (unless the step is excluded from metallicity handling) and that a + corresponding TrackMatcher exists if the step requires track matching. + If a TrackMatcher for the `(metallicity, step_name)` combination does + not yet exist, it is created and stored. - # check/assign metallicity to the step + Parameters + ---------- + metallicity : float or None + Default metallicity value to use for the step if not explicitly + provided in ``step_kwargs``. + step_name : str + Name of the pipeline step being checked. + step_kwargs : dict + Keyword arguments for the step. This dictionary may be modified + in-place to include validated metallicity and/or a TrackMatcher + instance. + verbose : bool, optional + If True, print the keyword arguments used to construct the + TrackMatcher. + + Returns + ------- + dict + The updated ``step_kwargs`` dictionary, containing a validated + ``metallicity`` entry and potentially a ``track_matcher`` object. + + Notes + ----- + - If metallicity is not provided for a step that requires it, a warning + is issued and a default value of ``Z = 1.0`` (solar metallicity) is used. + - TrackMatcher objects are stored in ``self.track_matchers`` and reused + for repeated `(metallicity, step_name)` combinations. + """ + + # check/assign metallicity for the step if step_name not in self.ignore_for_met: metallicity = step_kwargs.get('metallicity', metallicity) if metallicity is None: @@ -399,6 +463,34 @@ def check_step(self, metallicity, step_name, step_kwargs, verbose=False): return step_kwargs def create_track_matcher(self, metallicity, step_name, matcher_kwargs): + """ + Create and store a TrackMatcher for a given metallicity and step. + + This method ensures that the required stellar evolution grids + (H-rich and stripped-He) are loaded for the specified metallicity. + If the corresponding GRIDInterpolator objects do not yet exist, + they are created and cached. The interpolators are then passed to + a TrackMatcher instance, which is stored internally. + + Parameters + ---------- + metallicity : float + Stellar metallicity used to select the appropriate grid files. + step_name : str + Identifier for the evolutionary step associated with this + TrackMatcher. + matcher_kwargs : dict + Keyword arguments used to initialize the TrackMatcher. This + dictionary will be updated in-place with the following keys: + 'grid_Hrich' and 'grid_strippedHe'. + + Notes + ----- + - GRIDInterpolator objects are created only once per metallicity + and reused for subsequent TrackMatcher creations. + - The created TrackMatcher is stored in ``self.track_matchers`` + using the key ``(metallicity, step_name)``. + """ z_str = convert_metallicity_to_string(metallicity) # set up GRIDInterpolator objects for all TrackMatchers @@ -417,12 +509,11 @@ def create_track_matcher(self, metallicity, step_name, matcher_kwargs): self.grid_names_strippedHe[metallicity]) self.grids_strippedHe[metallicity] = GRIDInterpolator(grid_path_strippedHe) - # Create TrackMatcher object as needed, passing GRIDInterpolators + # Create TrackMatcher object as needed, passing GRIDInterpolator references matcher_kwargs['grid_Hrich'] = self.grids_Hrich[metallicity] matcher_kwargs['grid_strippedHe'] = self.grids_strippedHe[metallicity] self.track_matchers[(metallicity, step_name)] = TrackMatcher(**matcher_kwargs) - def close(self): """Close hdf5 files before exiting.""" From 0379b2bddce18244d8143af553d863e8a4fb33db Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2026 00:31:20 +0000 Subject: [PATCH 192/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/binary_evol/simulationproperties.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index 5f9aff7c10..d1b932b0d8 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -333,7 +333,7 @@ def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, from metallicity : float, optional Metallicity (Z) to assign to the step if required and not already - specified in the step keyword arguments. Default supported values + specified in the step keyword arguments. Default supported values are: 2.0, 1.0, 4.5e-1, 2e-1, 1e-1, 1e-2, 1e-3, 1e-4. from_ini : str, optional @@ -424,7 +424,7 @@ def check_step(self, metallicity, step_name, step_kwargs, verbose=False): Returns ------- dict - The updated ``step_kwargs`` dictionary, containing a validated + The updated ``step_kwargs`` dictionary, containing a validated ``metallicity`` entry and potentially a ``track_matcher`` object. Notes From eba4bac21fb3015da29f10716d4d3a70c5e5f219 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Tue, 17 Mar 2026 19:40:16 -0500 Subject: [PATCH 193/389] docstring for LazyHDF5 class --- posydon/binary_evol/simulationproperties.py | 3 +- posydon/grids/psygrid.py | 35 +++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index 5f9aff7c10..f34670f740 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -493,7 +493,7 @@ def create_track_matcher(self, metallicity, step_name, matcher_kwargs): """ z_str = convert_metallicity_to_string(metallicity) - # set up GRIDInterpolator objects for all TrackMatchers + # set up GRIDInterpolator objects # (only if one hasn't been created already for a given metallicity) if metallicity not in self.grids_Hrich: self.grid_names_Hrich[metallicity] = os.path.join('single_HMS', @@ -501,7 +501,6 @@ def create_track_matcher(self, metallicity, step_name, matcher_kwargs): grid_path_Hrich = os.path.join(self.grid_path, self.grid_names_Hrich[metallicity]) self.grids_Hrich[metallicity] = GRIDInterpolator(grid_path_Hrich) - if metallicity not in self.grids_strippedHe: self.grid_names_strippedHe[metallicity] = os.path.join('single_HeMS', z_str+'_Zsun.h5') diff --git a/posydon/grids/psygrid.py b/posydon/grids/psygrid.py index c1d72d6def..4a80863edd 100644 --- a/posydon/grids/psygrid.py +++ b/posydon/grids/psygrid.py @@ -383,6 +383,41 @@ } class LazyHDF5: + """ + Lazy wrapper around an HDF5 dataset with optional dtype conversion. + + This class provides a lightweight interface for accessing data from an + HDF5 dataset without immediately loading the entire dataset into memory. + Data are retrieved lazily when indexed. Optionally, a set of dtype + conversions can be applied when data are accessed. + + If dtype mappings are provided, retrieved data are cast to the specified + dtypes either per-field (for structured arrays) or for the selected field + when accessed by name. + + Assignments (via __setitem__) trigger full materialization of the dataset + in memory, after which the internal storage is replaced by the in-memory + array. + + Parameters + ---------- + dataset : h5py.Dataset or array-like + The underlying dataset providing the data. Typically an HDF5 dataset + object supporting NumPy-style indexing. + dtype_set : dict, optional + Mapping of field names to NumPy dtypes used to cast the returned data. + This is typically used for structured arrays where individual fields + require specific dtype conversions. + + Notes + ----- + - Data are only read from the dataset when accessed via ``__getitem__`` or + when converted to a NumPy array. + - Writing via ``__setitem__`` loads the entire dataset into memory before + modifying it. + - The ``dtype`` property reflects the converted dtype if ``dtype_set`` is + provided. + """ def __init__(self, dataset, dtype_set=None): self._dataset = dataset self._dtype_set = dtype_set From 7d7bcbf53f2b34b5a3f576d4134caf260cbbbc3b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2026 00:42:15 +0000 Subject: [PATCH 194/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/grids/psygrid.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/posydon/grids/psygrid.py b/posydon/grids/psygrid.py index 4a80863edd..794f066cad 100644 --- a/posydon/grids/psygrid.py +++ b/posydon/grids/psygrid.py @@ -395,8 +395,8 @@ class LazyHDF5: dtypes either per-field (for structured arrays) or for the selected field when accessed by name. - Assignments (via __setitem__) trigger full materialization of the dataset - in memory, after which the internal storage is replaced by the in-memory + Assignments (via __setitem__) trigger full materialization of the dataset + in memory, after which the internal storage is replaced by the in-memory array. Parameters From 430603d6aac297ff8bf54af040d53ebc8e2316d5 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Tue, 17 Mar 2026 19:51:20 -0500 Subject: [PATCH 195/389] replace a potentially deprecated line that forced self.steps_loaded = True in SimulationProperties.load_steps --- posydon/binary_evol/simulationproperties.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index 61faf8c12c..a0771ca357 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -301,8 +301,11 @@ def load_steps(self, metallicity=None, verbose=False): metallicity = step_kwargs.get('metallicity', metallicity) self.load_a_step(name, tup, metallicity=metallicity, verbose=verbose) - # track that all steps have been loaded (DEPRECATED?) - self.steps_loaded = True + if verbose: + if self.steps_loaded: + print("All steps loaded successfully.") + else: + print("Not all steps were loaded successfully. Check warnings for details.") def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, from_ini='', verbose=False): """ @@ -383,8 +386,7 @@ def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, from print("step_kwargs: ") kw_list = [f"\t{key}: {val}" for key, val in step_kwargs.items()] print("\n".join(kw_list)) - print(f"{step_name} loaded successfully.") - print() + print(f"{step_name} loaded successfully.\n") except TypeError as e: Pwarn(f"Error loading {step_name}: {e}", "StepWarning") From b440e924b4918b45a67f4da605e5ff9d766d11ee Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Tue, 17 Mar 2026 20:11:55 -0500 Subject: [PATCH 196/389] update doc strings in step_detached.py --- posydon/binary_evol/DT/step_detached.py | 187 +++++++++++++++--------- 1 file changed, 115 insertions(+), 72 deletions(-) diff --git a/posydon/binary_evol/DT/step_detached.py b/posydon/binary_evol/DT/step_detached.py index 37d9bc2209..20b2723b34 100644 --- a/posydon/binary_evol/DT/step_detached.py +++ b/posydon/binary_evol/DT/step_detached.py @@ -85,73 +85,6 @@ class detached_step: Parameters ---------- - path : str - Path to the directory that contains POSYDON data HDF5 files. Defaults - to the PATH_TO_POSYDON_DATA environment variable. Used for track - matching. - - metallicity : float - The metallicity of the grid. This should be one of the eight - supported metallicities: - - [2e+00, 1e+00, 4.5e-01, 2e-01, 1e-01, 1e-02, 1e-03, 1e-04] - - and this will be converted to a corresponding string (e.g., - 1e+00 --> "1e+00_Zsun"). Used for track matching. - - matching_method : str - Method to find the best match between a star from a previous step and a - point in a single star evolution track. Options: - - "root": Tries to find a root of two matching quantities. It is - possible to not find one, causing the evolution to fail. - - "minimize": Minimizes the sum of squares of differences of - various quantities between the previous evolution step and - a stellar evolution track. - - Used for track matching. - - grid_name_Hrich : str - Name of the single star H-rich grid h5 file, - including its parent directory. This is set to - (for example): - - grid_name_Hrich = 'single_HMS/1e+00_Zsun.h5' - - by default if not specified. Used for track matching. - - grid_name_strippedHe : str - Name of the single star He-rich grid h5 file. This is - set to (for example): - - grid_name_strippedHe = 'single_HeMS/1e+00_Zsun.h5' - - by default if not specified. Used for track matching. - - list_for_matching_HMS : list - A list of mixed type that specifies properties of the matching - process for HMS stars. Used for track matching. - - list_for_matching_postMS : list - A list of mixed type that specifies properties of the matching - process for postMS stars. Used for track matching. - - list_for_matching_HeStar : list - A list of mixed type that specifies properties of the matching - process for He stars. Used for track matching. - - record_matching : bool - Whether properties of the matched star(s) should be recorded in the - binary evolution history. Used for track matching. - - Attributes - ---------- - KEYS : list[str] - Contains keywords corresponding to MESA data column names - which are used to extract quantities from the single star - evolution grids. - dt : float The timestep size, in years, to be appended to the history of the binary. None means only the final step. Note: do not select very @@ -201,10 +134,6 @@ class detached_step: evolved until RLO commences once again, but without changing the orbit. - translate : dict - Dictionary containing data column name (key) translations between - POSYDON h5 file PSyGrid data names (items) and MESA data names (keys). - track_matcher : TrackMatcher object The TrackMatcher object performs functions related to matching binary stellar evolution components to single star evolution models. @@ -212,6 +141,24 @@ class detached_step: verbose : bool True if we want to print stuff. + Attributes + ---------- + KEYS : list[str] + Contains keywords corresponding to MESA data column names + which are used to extract quantities from the single star + evolution grids. + + translate : dict + Dictionary containing data column name (key) translations between + POSYDON h5 file PSyGrid data names (items) and MESA data names (keys). + + evo : detached_evolution + Handler object responsible for performing the detached binary + evolution. + + evo_kwargs : dict + Keyword arguments used to initialize ``detached_evolution``. + """ # settings in .ini will override @@ -826,6 +773,102 @@ def update_co_stars(self, t, primary, secondary): getattr(obj, key + "_history").extend(history) class detached_evolution: + """ + ODE system describing the evolution of a detached binary. + + This class defines the differential equations governing the orbital + evolution and stellar spin evolution of a detached binary system. + It is designed to be passed directly to ``scipy.integrate.solve_ivp``, + with ``__call__`` returning the derivatives of the system state. + + The evolution can include contributions from several physical processes: + + - Stellar wind mass loss + - Tidal interactions + - Magnetic braking + - Gravitational wave radiation + - Spin evolution from stellar winds and structural changes + + The stellar properties required for these calculations are obtained + from interpolated single-star evolution tracks associated with the + ``SingleStar`` objects (binary components) and their + PChipInterpolator2 objects. + + Parameters + ---------- + primary : SingleStar, optional + Primary star of the binary (typically the more evolved star). + These must have an ``interp1d`` interpolator to return stellar + properties as a function of time. + + secondary : SingleStar, optional + Secondary star of the binary. + + do_wind_loss : bool, optional + If True, include orbital evolution due to stellar wind mass loss. + + do_tides : bool, optional + If True, include tidal interactions affecting orbital separation, + eccentricity, and stellar spin. + + do_magnetic_braking : bool, optional + If True, include stellar spin evolution due to magnetic braking. + + magnetic_braking_mode : {"RVJ83", "M15", "G18", "CARB"}, optional + Magnetic braking prescription: + + - RVJ83 ā€” Rappaport, Verbunt & Joss (1983) + - M15 ā€” Matt et al. (2015) + - G18 ā€” Garraffo et al. (2018) + - CARB ā€” Van & Ivanova (2019) + + do_stellar_evolution_and_spin_from_winds : bool, optional + If True, include spin evolution caused by stellar structural + evolution and angular momentum loss from winds. + + do_gravitational_radiation : bool, optional + If True, include orbital evolution from gravitational wave emission. + + verbose : bool, optional + If True, print diagnostic information during the integration. + + Attributes + ---------- + primary : SingleStar + Primary star used in the evolution. + + secondary : SingleStar + Secondary star used in the evolution. + + a : float + Current orbital separation (solar radii). + + e : float + Current orbital eccentricity. + + phys_keys : list of str + Names of stellar quantities tracked from the interpolated stellar + evolution models. + + t : float + Current system age during integration. + + Notes + ----- + The system state vector ``y`` evolved by ``solve_ivp`` is defined as:: + + y = [a, e, omega_secondary, omega_primary] + + where + + - ``a`` is the orbital separation (Rā˜‰) + - ``e`` is the orbital eccentricity + - ``omega_secondary`` is the spin angular velocity of the secondary (rad/yr) + - ``omega_primary`` is the spin angular velocity of the primary (rad/yr) + + Event functions defined in this class detect important transitions such + as Roche-lobe overflow or reaching the end of a stellar evolution track. + """ def __init__(self, primary=None, secondary=None, do_wind_loss=True, @@ -1135,7 +1178,7 @@ def update_props(self, t, y): y[3] = np.max([y[3], 0]) self.primary.latest["omega"] = y[3] - # store current delta(t)/time + # store current time self.t = t def __call__(self, t, y): From c5a7fc1b3a97fab51496ed3361770eb67b865b6f Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2026 01:12:15 +0000 Subject: [PATCH 197/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/binary_evol/DT/step_detached.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/binary_evol/DT/step_detached.py b/posydon/binary_evol/DT/step_detached.py index 20b2723b34..839f12d4c5 100644 --- a/posydon/binary_evol/DT/step_detached.py +++ b/posydon/binary_evol/DT/step_detached.py @@ -791,7 +791,7 @@ class detached_evolution: The stellar properties required for these calculations are obtained from interpolated single-star evolution tracks associated with the - ``SingleStar`` objects (binary components) and their + ``SingleStar`` objects (binary components) and their PChipInterpolator2 objects. Parameters From 7c722f8ec00f68fc02f0a16871cb76d37ef4ac99 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Tue, 17 Mar 2026 20:28:57 -0500 Subject: [PATCH 198/389] add kwarg assignment to step_mesa, similar to how it is done in other evolution classes --- posydon/binary_evol/MESA/step_mesa.py | 78 +++++++++++++-------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/posydon/binary_evol/MESA/step_mesa.py b/posydon/binary_evol/MESA/step_mesa.py index 812570f0ae..c0ed4df8fd 100644 --- a/posydon/binary_evol/MESA/step_mesa.py +++ b/posydon/binary_evol/MESA/step_mesa.py @@ -126,23 +126,22 @@ class MesaGridStep: """Superclass for steps using the POSYDON grids.""" - def __init__( - self, - metallicity, - grid_name, - path=PATH_TO_POSYDON_DATA, - interpolation_path=None, - interpolation_filename=None, - interpolation_method="linear3c_kNN", - save_initial_conditions=True, - track_interpolation=False, - stop_method='stop_at_max_time', # "stop_at_end", - stop_star="star_1", - stop_var_name=None, - stop_value=None, - stop_interpolate=True, - verbose=False, - **kwargs): + DEFAULT_KWARGS = {'metallicity': None, + 'grid_name': None, + 'path': PATH_TO_POSYDON_DATA, + 'interpolation_path': None, + 'interpolation_filename': None, + 'interpolation_method': 'nearest_neighbour', + 'save_initial_conditions': True, + 'track_interpolation': False, + 'stop_method': 'stop_at_max_time', # "stop_at_end" + 'stop_star': 'star_1', + 'stop_var_name': None, + 'stop_value': None, + 'stop_interpolate': True, + 'verbose': False} + + def __init__(self, **kwargs): """Evolve a binary object given a MESA grid or interpolation object. Parameters @@ -180,13 +179,18 @@ def __init__( stop_value """ - # class variable - self.path = path - self.interpolation_method = interpolation_method - self.save_initial_conditions = save_initial_conditions - self.track_interpolation = track_interpolation - self.stop_method = stop_method - self.verbose = verbose + # read kwargs to initialize the class + if kwargs: + for key in kwargs: + if key not in self.DEFAULT_KWARGS: + raise ValueError(key + " is not a valid parameter name!") + for varname in self.DEFAULT_KWARGS: + default_value = self.DEFAULT_KWARGS[varname] + setattr(self, varname, kwargs.get(varname, default_value)) + else: + for varname in self.DEFAULT_KWARGS: + default_value = self.DEFAULT_KWARGS[varname] + setattr(self, varname, default_value) if (self.track_interpolation and self.interpolation_method != 'nearest_neighbour'): @@ -197,9 +201,9 @@ def __init__( # of interp method if (self.stop_method == 'stop_at_max_time' or self.interpolation_method == 'nearest_neighbour'): - self.load_psyTrackInterp(grid_name) + self.load_psyTrackInterp(self.grid_name) - grid_name = grid_name.replace('_%d', '') + self.grid_name = self.grid_name.replace('_%d', '') # Check interpolation method provided self.supported_interp_methods = ['linear_kNN', 'linear3c_kNN', @@ -207,20 +211,20 @@ def __init__( if self.interpolation_method in self.supported_interp_methods: # Set the interpolation path - if interpolation_path is None: - interpolation_path = os.path.join(self.path, - os.path.split(grid_name)[0], + if self.interpolation_path is None: + self.interpolation_path = os.path.join(self.path, + os.path.split(self.grid_name)[0], 'interpolators/%s' % self.interpolation_method) # Set the interpolation filename - if interpolation_filename is None: - interpolation_filename = os.path.join(interpolation_path, - os.path.split(grid_name)[1].replace('h5', 'pkl')) + if self.interpolation_filename is None: + self.interpolation_filename = os.path.join(self.interpolation_path, + os.path.split(self.grid_name)[1].replace('h5', 'pkl')) else: - interpolation_filename = os.path.join(interpolation_path, - interpolation_filename) + self.interpolation_filename = os.path.join(self.interpolation_path, + self.interpolation_filename) - self.load_Interp(interpolation_filename) + self.load_Interp(self.interpolation_filename) if (not (hasattr(self, '_psyTrackInterp') or hasattr(self, '_Interp'))): @@ -234,10 +238,6 @@ def __init__( # we drop the history self.flush_history = False self.flush_entries = None - self.stop_star = stop_star - self.stop_var_name = stop_var_name - self.stop_value = stop_value - self.stop_interpolate = stop_interpolate self._find_boundaries() def _find_boundaries(self): From 453b05be8b049f11b231d8e6adb22a18a52d9cae Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Tue, 17 Mar 2026 23:44:53 -0500 Subject: [PATCH 199/389] giving all evolution classes DEFAULT_KWARGS, which holds their default set of kwargs that may be accessed during simulation setup --- posydon/binary_evol/DT/step_detached.py | 12 +++--- posydon/binary_evol/SN/step_SN.py | 47 ++++++++++----------- posydon/binary_evol/simulationproperties.py | 29 +++++++------ posydon/binary_evol/step_end.py | 2 + 4 files changed, 46 insertions(+), 44 deletions(-) diff --git a/posydon/binary_evol/DT/step_detached.py b/posydon/binary_evol/DT/step_detached.py index 839f12d4c5..c7b1678334 100644 --- a/posydon/binary_evol/DT/step_detached.py +++ b/posydon/binary_evol/DT/step_detached.py @@ -162,7 +162,7 @@ class detached_step: """ # settings in .ini will override - DEFAULT_SETTINGS = {"dt": None, + DEFAULT_KWARGS = {"dt": None, "n_o_steps_history": None, "do_wind_loss": True, "do_tides": True, @@ -181,14 +181,14 @@ def __init__(self, **kwargs): # read kwargs to initialize the class if kwargs: for key in kwargs: - if key not in self.DEFAULT_SETTINGS: + if key not in self.DEFAULT_KWARGS: raise ValueError(key + " is not a valid parameter name!") - for varname in self.DEFAULT_SETTINGS: - default_value = self.DEFAULT_SETTINGS[varname] + for varname in self.DEFAULT_KWARGS: + default_value = self.DEFAULT_KWARGS[varname] setattr(self, varname, kwargs.get(varname, default_value)) else: - for varname in self.DEFAULT_SETTINGS: - default_value = self.DEFAULT_SETTINGS[varname] + for varname in self.DEFAULT_KWARGS: + default_value = self.DEFAULT_KWARGS[varname] setattr(self, varname, default_value) self.translate = DEFAULT_TRANSLATION diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index 6881de110f..afe015d737 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -86,24 +86,6 @@ path_to_Couch_datasets = os.path.join(PATH_TO_POSYDON_DATA, "Couch+2020/") -SN_MODEL = { - # kick physics - "kick": True, - "kick_normalisation": 'one_over_mass', - "kick_prescription": 'maxwellian', - "sigma_kick_CCSN_NS": 265.0, - "mean_kick_CCSN_NS": None, - "sigma_kick_CCSN_BH": 265.0, - "mean_kick_CCSN_BH": None, - "sigma_kick_ECSN": 20.0, - "mean_kick_ECSN": None, - # other - "verbose": False, -} -# add core collapse physics -SN_MODEL.update(DEFAULT_SN_MODEL) - - class StepSN(object): """The supernova step in POSYDON. @@ -255,21 +237,36 @@ class StepSN(object): Evolution on the Dynamics of Core Collapse and Neutron Star Kicks """ + DEFAULT_KWARGS = { + # kick physics + "kick": True, + "kick_normalisation": 'one_over_mass', + "kick_prescription": 'maxwellian', + "sigma_kick_CCSN_NS": 265.0, + "mean_kick_CCSN_NS": None, + "sigma_kick_CCSN_BH": 265.0, + "mean_kick_CCSN_BH": None, + "sigma_kick_ECSN": 20.0, + "mean_kick_ECSN": None, + # other + "verbose": False, + } + # add core collapse physics + DEFAULT_KWARGS.update(DEFAULT_SN_MODEL) + def __init__(self, **kwargs): """Initialize a StepSN instance.""" # read kwargs to initialize the class if kwargs: for key in kwargs: - if key not in SN_MODEL: + if key not in self.DEFAULT_KWARGS: raise ValueError(key + " is not a valid parameter name!") - for varname in SN_MODEL: - default_value = SN_MODEL[varname] - setattr(self, varname, kwargs.get(varname, default_value)) + for varname in self.DEFAULT_KWARGS: + setattr(self, varname, kwargs.get(varname, self.DEFAULT_KWARGS[varname])) else: - for varname in SN_MODEL: - default_value = SN_MODEL[varname] - setattr(self, varname, default_value) + for varname in self.DEFAULT_KWARGS: + setattr(self, varname, self.DEFAULT_KWARGS[varname]) # backward compatibility for kick if (self.kick_normalisation == 'asym_ej' diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index a0771ca357..67ad7d03d1 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -368,20 +368,21 @@ def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, from # grab kwargs from ini file for given step if os.path.isfile(from_ini): step_tup = simprop_kwargs_from_ini(from_ini, only=step_name)[step_name] - - step_func = step_tup[0] - step_kwargs = step_tup[1].copy() - - # check to make sure the step has a... - # 1) metallicity assigned (if needed) - # 2) TrackMatcher assigned (if needed) - step_kwargs = self.check_step(metallicity, step_name, - step_kwargs, verbose) + + if step_name is not "flow": + # check to make sure the step has a... + # 1) metallicity assigned (if needed) + # 2) TrackMatcher assigned (if needed) + step_tup = self.check_step(metallicity, step_name, + step_tup, verbose) + + step_func, step_kwargs = step_tup # Try to load the step try: setattr(self, step_name, step_func(**step_kwargs)) if verbose: + print(f"Class: {step_func}") if step_kwargs: print("step_kwargs: ") kw_list = [f"\t{key}: {val}" for key, val in step_kwargs.items()] @@ -398,7 +399,7 @@ def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, from for name, tup in self.kwargs.items() if isinstance(tup, tuple)) - def check_step(self, metallicity, step_name, step_kwargs, verbose=False): + def check_step(self, metallicity, step_name, step_tup, verbose=False): """ Validate and update configuration for an evolution step. @@ -436,9 +437,11 @@ def check_step(self, metallicity, step_name, step_kwargs, verbose=False): - TrackMatcher objects are stored in ``self.track_matchers`` and reused for repeated `(metallicity, step_name)` combinations. """ + step_func, step_kwargs = step_tup # check/assign metallicity for the step - if step_name not in self.ignore_for_met: + #if step_name not in self.ignore_for_met: + if "metallicity" in step_func.DEFAULT_KWARGS: metallicity = step_kwargs.get('metallicity', metallicity) if metallicity is None: Pwarn(f"{step_name} not assigned a metallicity. " @@ -450,7 +453,7 @@ def check_step(self, metallicity, step_name, step_kwargs, verbose=False): # each metallicity/step combo could require # a unique TrackMatcher, so check for that matcher_key = (metallicity, step_name) - if step_name in self.steps_with_matching: + if "track_matcher" in step_func.DEFAULT_KWARGS: matcher_needed = matcher_key not in self.track_matchers if matcher_needed: # create TrackMatcher if needed @@ -462,7 +465,7 @@ def check_step(self, metallicity, step_name, step_kwargs, verbose=False): print(f"matcher_kwargs: \n" + "\n".join(kw_list)) step_kwargs['track_matcher'] = self.track_matchers[matcher_key] - return step_kwargs + return step_tup def create_track_matcher(self, metallicity, step_name, matcher_kwargs): """ diff --git a/posydon/binary_evol/step_end.py b/posydon/binary_evol/step_end.py index 0b5aef7cc2..fff9f0dd3e 100644 --- a/posydon/binary_evol/step_end.py +++ b/posydon/binary_evol/step_end.py @@ -9,6 +9,8 @@ class step_end: """Default end step.""" + DEFAULT_KWARGS = {} + def __call__(self, binary): """Change the event of the binary to 'end'.""" if binary.state == "disrupted": From 5f97ff3939cb12cbe01deabfa819468a5de27940 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2026 04:45:50 +0000 Subject: [PATCH 200/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/binary_evol/simulationproperties.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index 67ad7d03d1..0da67cd771 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -368,14 +368,14 @@ def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, from # grab kwargs from ini file for given step if os.path.isfile(from_ini): step_tup = simprop_kwargs_from_ini(from_ini, only=step_name)[step_name] - + if step_name is not "flow": # check to make sure the step has a... # 1) metallicity assigned (if needed) # 2) TrackMatcher assigned (if needed) step_tup = self.check_step(metallicity, step_name, step_tup, verbose) - + step_func, step_kwargs = step_tup # Try to load the step From 67265ef3d4b1b0bae1e38caf9ad4679af626158b Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Tue, 17 Mar 2026 23:47:17 -0500 Subject: [PATCH 201/389] remove ignore_for_met and list contianing steps that need TrackMatcher instances. Now these are determined from each step's default kwargs --- posydon/binary_evol/simulationproperties.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index 67ad7d03d1..10380611e7 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -33,13 +33,6 @@ class NullStep: class SimulationProperties: """Class describing the properties of a population synthesis simulation.""" - # these steps and the flow do not require a metallicity - ignore_for_met = ["flow", "step_SN", "step_end"] - steps_with_matching = ["step_detached", "step_CE", - "step_isolated", "step_dco", - "step_merged", "step_disrupted", - "step_initially_single"] - def __init__(self, flow=({}, {}), step_HMS_HMS = (NullStep(), {}), step_CO_HeMS = (NullStep(), {}), @@ -440,7 +433,6 @@ def check_step(self, metallicity, step_name, step_tup, verbose=False): step_func, step_kwargs = step_tup # check/assign metallicity for the step - #if step_name not in self.ignore_for_met: if "metallicity" in step_func.DEFAULT_KWARGS: metallicity = step_kwargs.get('metallicity', metallicity) if metallicity is None: From 6aa0e6998a6dcb5ac99eb2494bbe5edbf1b37169 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Wed, 18 Mar 2026 13:07:34 -0500 Subject: [PATCH 202/389] adding function that handles printing test info and checking the result; this is code that would otherwise be repeated --- dev-tools/script_data/src/popsynth_suite.py | 68 +++++++++++++-------- 1 file changed, 44 insertions(+), 24 deletions(-) diff --git a/dev-tools/script_data/src/popsynth_suite.py b/dev-tools/script_data/src/popsynth_suite.py index 8b0cda3ca0..bef9538bec 100644 --- a/dev-tools/script_data/src/popsynth_suite.py +++ b/dev-tools/script_data/src/popsynth_suite.py @@ -81,6 +81,43 @@ def compare_io_to_ram(loaded_pop, pop_in_ram): print("āœ… Binaries from I/O match those in RAM.") print("=" * line_length) +def print_testinfo(test_title, population, popevo_kwargs): + + # print test title str + numchar = (line_length - len(test_title)) // 2 + print("=" * numchar + test_title + "=" * numchar) + + optimize_ram = popevo_kwargs.get("optimize_ram", False) + breakdown_to_df = popevo_kwargs.get("breakdown_to_df", False) + N_binaries = population.number_of_binaries + + # print expected behavior based on settings + if not breakdown_to_df and not optimize_ram: + print(f"šŸš€ Evolving a population and storing {N_binaries} binaries in RAM.") + elif breakdown_to_df and not optimize_ram: + print("šŸš€ Evolving a population and saving binaries to a hdf5 file.") + elif optimize_ram and not breakdown_to_df: + num_batch_files = population.number_of_binaries // population.kwargs["dump_rate"] + print(f"šŸš€ Evolving a population and saving to {num_batch_files} batch files.") + +def check_test(pop_in_ram, load_pop=False): + + # if we have population in RAM, check that the number + # stored in RAM matches the number we expected to run + if pop_in_ram and not load_pop: + num_binaries = pop_in_ram.number_of_binaries + num_in_ram = len(pop_in_ram.manager.binaries) + print(f"šŸ” Checking that we have {num_binaries} binaries in RAM...") + assert num_binaries == num_in_ram, \ + f"šŸšØ Number of binaries in RAM ({num_in_ram}) " \ + f"does not equal the number specified to run ({num_binaries})." + print(f"āœ… Successfully ran and stored {num_in_ram} binaries in RAM.") + + elif pop_in_ram and load_pop: + save_fn = os.path.join(path_to_popout, "evolution.combined.h5") + loaded_pop = Population(save_fn) + compare_io_to_ram(loaded_pop, pop_in_ram) + def test_popruns(): print("Performing population run tests...") @@ -90,41 +127,24 @@ def test_popruns(): print_pop_settings(pop) # test simple run, stays in RAM - test_str = " TEST: 01 " - numchar = (line_length - len(test_str)) // 2 - print("=" * numchar + test_str + "=" * numchar) - print(f"šŸš€ Evolving a population and storing {pop.number_of_binaries} binaries in RAM.") kwargs = {"optimize_ram":False, "breakdown_to_df":False, "tqdm":True} + print_testinfo("TEST: 01", pop, kwargs) pop_in_ram = test_binpop_evolve(pop, kwargs, verbose=True) - print(f"šŸ” Checking that we have {pop.number_of_binaries} binaries in RAM...") - num_in_ram = len(pop_in_ram.manager.binaries) - assert pop.number_of_binaries == num_in_ram, \ - f"šŸšØ Number of binaries in RAM ({num_in_ram}) " \ - f"does not equal the number specified to run ({pop.number_of_binaries})." - print(f"āœ… Successfully ran and stored {num_in_ram} binaries in RAM.") + check_test(pop_in_ram, load_pop=False) + # test same but w/ saving/loading binaries - test_str = " TEST: 02 " - numchar = (line_length - len(test_str)) // 2 - print("=" * numchar + test_str + "=" * numchar) - print("šŸš€ Evolving a population and saving binaries to a hdf5 file.") kwargs = {"optimize_ram":False, "breakdown_to_df":True, "tqdm":True} + print_testinfo("TEST: 02", pop, kwargs) _ = test_binpop_evolve(pop, kwargs, verbose=False) - save_fn = os.path.join(path_to_popout, "evolution.combined.h5") - loaded_pop = Population(save_fn) - compare_io_to_ram(loaded_pop, pop_in_ram) + check_test(pop_in_ram, load_pop=True) # test optimize RAM run w/ batch saving - test_str = " TEST: 03 " - numchar = (line_length - len(test_str)) // 2 - print("=" * numchar + test_str + "=" * numchar) - num_batch_files = int(pop.number_of_binaries/pop.kwargs["dump_rate"]) - print(f"šŸš€ Evolving a population and saving to {num_batch_files} batch files.") kwargs = {"optimize_ram":True, "breakdown_to_df":False, "tqdm":True} + print_testinfo("TEST: 03", pop, kwargs) _ = test_binpop_evolve(pop, kwargs, verbose=True) - save_fn = os.path.join(path_to_popout, "evolution.combined.h5") - loaded_pop = Population(save_fn) # This comparison FAILS at the moment...because of ordering in combined .h5? + # check_test(pop_in_ram, load_pop=True) # compare_io_to_ram(loaded_pop, pop_in_ram) # TEST POPRUNNER From f06b2993e230f90cc49a3bdbcde0cf5c9f56736a Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Wed, 18 Mar 2026 14:43:55 -0500 Subject: [PATCH 203/389] Adding an RNG kwarg to load_steps() and load_a_step() in simulationproperties.py. Adding RNG kwarg to step_SN and using RNG object in places where randomness occurs --- posydon/binary_evol/SN/step_SN.py | 19 ++++++++++--------- posydon/binary_evol/simulationproperties.py | 17 ++++++++++------- posydon/popsyn/binarypopulation.py | 2 +- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index afe015d737..64a8dce86d 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -250,6 +250,7 @@ class StepSN(object): "mean_kick_ECSN": None, # other "verbose": False, + "RNG": np.random.default_rng() } # add core collapse physics DEFAULT_KWARGS.update(DEFAULT_SN_MODEL) @@ -404,7 +405,7 @@ def format_data_Patton20(file_name): def __repr__(self): """Get the string representation of the class and any parameters.""" return "StepSN:\n" + \ - "\n".join([f"{key} = {getattr(self, key)}" for key in SN_MODEL]) + "\n".join([f"{key} = {getattr(self, key)}" for key in self.DEFAULT_KWARGS]) def _reset_other_star_properties(self, star): @@ -1538,13 +1539,13 @@ def orbital_kick(self, binary): if not binary.star_1.natal_kick_azimuthal_angle is None: phi = binary.star_1.natal_kick_azimuthal_angle else: - phi = np.random.uniform(0, 2 * np.pi) + phi = self.RNG.uniform(0, 2 * np.pi) binary.star_1.natal_kick_azimuthal_angle = phi if not binary.star_1.natal_kick_polar_angle is None: cos_theta = np.cos(binary.star_1.natal_kick_polar_angle) else: - cos_theta = np.random.uniform(-1, 1) + cos_theta = self.RNG.uniform(-1, 1) binary.star_1.natal_kick_polar_angle = np.arccos(cos_theta) # generate random point in the orbit where the kick happens @@ -1555,7 +1556,7 @@ def orbital_kick(self, binary): raise ValueError("mean_anomaly must be a single float value." f"\n mean_anomaly = {mean_anomaly}") else: - mean_anomaly = np.random.uniform(0, 2 * np.pi) + mean_anomaly = self.RNG.uniform(0, 2 * np.pi) binary.star_1.natal_kick_mean_anomaly = mean_anomaly elif binary.event == "CC2": @@ -1639,13 +1640,13 @@ def orbital_kick(self, binary): if not binary.star_2.natal_kick_azimuthal_angle is None: phi = binary.star_2.natal_kick_azimuthal_angle else: - phi = np.random.uniform(0, 2 * np.pi) + phi = self.RNG.uniform(0, 2 * np.pi) binary.star_2.natal_kick_azimuthal_angle = phi if not binary.star_2.natal_kick_polar_angle is None: cos_theta = np.cos(binary.star_2.natal_kick_polar_angle) else: - cos_theta = np.random.uniform(-1, 1) + cos_theta = self.RNG.uniform(-1, 1) binary.star_2.natal_kick_polar_angle = np.arccos(cos_theta) # generate random point in the orbit where the kick happens @@ -1655,7 +1656,7 @@ def orbital_kick(self, binary): if not isinstance(mean_anomaly, float): raise ValueError("mean_anomaly must be a single float value.") else: - mean_anomaly = np.random.uniform(0, 2 * np.pi) + mean_anomaly = self.RNG.uniform(0, 2 * np.pi) binary.star_2.natal_kick_mean_anomaly = mean_anomaly # update the orbit @@ -2081,7 +2082,7 @@ def _get_kick_velocity(self, star, sigma=None, mean=None): # this is a fallback if sigma is None: sigma = 265.0 - Vkick_ej = sp.stats.maxwell.rvs(loc=0., scale=sigma, size=1)[0] + Vkick_ej = sp.stats.maxwell.rvs(loc=0., scale=sigma, size=1, random_state=self.RNG)[0] elif self.kick_prescription == "log_normal": # sigma==None should never be reached, since in that case Vkick=0 @@ -2091,7 +2092,7 @@ def _get_kick_velocity(self, star, sigma=None, mean=None): sigma = 0.68 if mean is None: mean = np.exp(5.60) - Vkick_ej = sp.stats.lognorm.rvs(s=sigma, scale=mean, size=1)[0] + Vkick_ej = sp.stats.lognorm.rvs(s=sigma, scale=mean, size=1, random_state=self.RNG)[0] elif self.kick_prescription == "asym_ej": f_kin = 0.1 # Fraction of SN explosion energy that is kinetic energy of the gas diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index cdefb8fa0d..42002c9d1a 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -268,7 +268,7 @@ def from_ini(cls, path, metallicity = None, load_steps=False, verbose=False, **o return new_instance - def load_steps(self, metallicity=None, verbose=False): + def load_steps(self, metallicity=None, RNG=None, verbose=False): """Instantiate all step classes and set as instance attributes. Parameters @@ -292,7 +292,7 @@ def load_steps(self, metallicity=None, verbose=False): if isinstance(tup, tuple): step_kwargs = tup[1] metallicity = step_kwargs.get('metallicity', metallicity) - self.load_a_step(name, tup, metallicity=metallicity, verbose=verbose) + self.load_a_step(name, tup, metallicity=metallicity, RNG=RNG, verbose=verbose) if verbose: if self.steps_loaded: @@ -300,7 +300,7 @@ def load_steps(self, metallicity=None, verbose=False): else: print("Not all steps were loaded successfully. Check warnings for details.") - def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, from_ini='', verbose=False): + def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, RNG=None, from_ini='', verbose=False): """ Instantiate and attach a simulation step to this object. @@ -362,12 +362,12 @@ def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, from if os.path.isfile(from_ini): step_tup = simprop_kwargs_from_ini(from_ini, only=step_name)[step_name] - if step_name is not "flow": + if step_name != "flow": # check to make sure the step has a... # 1) metallicity assigned (if needed) # 2) TrackMatcher assigned (if needed) - step_tup = self.check_step(metallicity, step_name, - step_tup, verbose) + step_tup = self.check_step(metallicity, RNG, step_name, + step_tup, verbose) step_func, step_kwargs = step_tup @@ -392,7 +392,7 @@ def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, from for name, tup in self.kwargs.items() if isinstance(tup, tuple)) - def check_step(self, metallicity, step_name, step_tup, verbose=False): + def check_step(self, metallicity, RNG, step_name, step_tup, verbose=False): """ Validate and update configuration for an evolution step. @@ -457,6 +457,9 @@ def check_step(self, metallicity, step_name, step_tup, verbose=False): print(f"matcher_kwargs: \n" + "\n".join(kw_list)) step_kwargs['track_matcher'] = self.track_matchers[matcher_key] + if "RNG" in step_func.DEFAULT_KWARGS: + step_kwargs['RNG'] = RNG + return step_tup def create_track_matcher(self, metallicity, step_name, matcher_kwargs): diff --git a/posydon/popsyn/binarypopulation.py b/posydon/popsyn/binarypopulation.py index d4f6a1ac73..9e119490d6 100644 --- a/posydon/popsyn/binarypopulation.py +++ b/posydon/popsyn/binarypopulation.py @@ -304,7 +304,7 @@ def _safe_evolve(self, **kwargs): modified_tup = (step_function, step_kwargs) self.population_properties.kwargs[step_name] = modified_tup - self.population_properties.load_steps() + self.population_properties.load_steps(RNG=self.RNG) indices = kwargs.get('indices', list(range(self.number_of_binaries))) From 3f78229ecd4f1e992e0334fbeeca72abca538e1e Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Wed, 18 Mar 2026 15:09:41 -0500 Subject: [PATCH 204/389] change is not to != and update __repr__ for StepSN --- posydon/binary_evol/SN/step_SN.py | 2 +- posydon/binary_evol/simulationproperties.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index afe015d737..3dd4a6e447 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -404,7 +404,7 @@ def format_data_Patton20(file_name): def __repr__(self): """Get the string representation of the class and any parameters.""" return "StepSN:\n" + \ - "\n".join([f"{key} = {getattr(self, key)}" for key in SN_MODEL]) + "\n".join([f"{key} = {getattr(self, key)}" for key in self.DEFAULT_KWARGS]) def _reset_other_star_properties(self, star): diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index cdefb8fa0d..c5e2345e4d 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -362,7 +362,7 @@ def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, from if os.path.isfile(from_ini): step_tup = simprop_kwargs_from_ini(from_ini, only=step_name)[step_name] - if step_name is not "flow": + if step_name != "flow": # check to make sure the step has a... # 1) metallicity assigned (if needed) # 2) TrackMatcher assigned (if needed) From 85bfa7e9d8fd8e219cc61f34fe9b5c8aff6d7f5d Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Wed, 18 Mar 2026 15:22:55 -0500 Subject: [PATCH 205/389] use __dict__ to print all attributes of StepSN in __repr__ --- posydon/binary_evol/SN/step_SN.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index 3dd4a6e447..e077689752 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -404,7 +404,7 @@ def format_data_Patton20(file_name): def __repr__(self): """Get the string representation of the class and any parameters.""" return "StepSN:\n" + \ - "\n".join([f"{key} = {getattr(self, key)}" for key in self.DEFAULT_KWARGS]) + "\n".join([f"{key} = {getattr(self, key)}" for key in self.__dict__]) def _reset_other_star_properties(self, star): From 003060a6d6c667ac2d94e606664da72f99985e31 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Wed, 18 Mar 2026 15:23:49 -0500 Subject: [PATCH 206/389] use __dict__ to print all attributes of StepSN in __repr__ --- posydon/binary_evol/SN/step_SN.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index 64a8dce86d..054fc02e52 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -405,7 +405,7 @@ def format_data_Patton20(file_name): def __repr__(self): """Get the string representation of the class and any parameters.""" return "StepSN:\n" + \ - "\n".join([f"{key} = {getattr(self, key)}" for key in self.DEFAULT_KWARGS]) + "\n".join([f"{key} = {getattr(self, key)}" for key in self.__dict__]) def _reset_other_star_properties(self, star): From 04cf587c208fa73e2f0a02d096b99c5c71fd4f29 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2026 20:40:27 +0000 Subject: [PATCH 207/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/script_data/src/popsynth_suite.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/script_data/src/popsynth_suite.py b/dev-tools/script_data/src/popsynth_suite.py index bef9538bec..25068b1208 100644 --- a/dev-tools/script_data/src/popsynth_suite.py +++ b/dev-tools/script_data/src/popsynth_suite.py @@ -102,7 +102,7 @@ def print_testinfo(test_title, population, popevo_kwargs): def check_test(pop_in_ram, load_pop=False): - # if we have population in RAM, check that the number + # if we have population in RAM, check that the number # stored in RAM matches the number we expected to run if pop_in_ram and not load_pop: num_binaries = pop_in_ram.number_of_binaries From 90249b3ad70da85982c43a098fae5949affb8de7 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Wed, 18 Mar 2026 15:53:34 -0500 Subject: [PATCH 208/389] fix typo in population test output file name --- dev-tools/run_test_suite.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/run_test_suite.sh b/dev-tools/run_test_suite.sh index 2a4432e33a..87ca30030d 100755 --- a/dev-tools/run_test_suite.sh +++ b/dev-tools/run_test_suite.sh @@ -98,4 +98,4 @@ echo -e "āœ… Script completed. Output saved to: \n$OUT_DIR/evolve_binaries_$BRAN OUT_DIR=$FULL_PATH/script_data/output/population_tests echo "šŸš€ Running popsynth_suite.py" python script_data/src/popsynth_suite.py > $OUT_DIR/evolve_pop_$BRANCH.out 2>&1 -echo -e "āœ… Script completed. Output saved to: \n$OUT_DIR/evolve_binaries_$BRANCH.out" +echo -e "āœ… Script completed. Output saved to: \n$OUT_DIR/evolve_pop_$BRANCH.out" From dc5180bcb815474b85bab1dd33b8d7019e2cabae Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Wed, 18 Mar 2026 17:36:43 -0500 Subject: [PATCH 209/389] re-enabling optimize_ram test check --- dev-tools/script_data/src/popsynth_suite.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dev-tools/script_data/src/popsynth_suite.py b/dev-tools/script_data/src/popsynth_suite.py index 25068b1208..cea56bc6f8 100644 --- a/dev-tools/script_data/src/popsynth_suite.py +++ b/dev-tools/script_data/src/popsynth_suite.py @@ -121,18 +121,18 @@ def check_test(pop_in_ram, load_pop=False): def test_popruns(): print("Performing population run tests...") - pop = BinaryPopulation.from_ini(path_to_default_params, verbose=False) pop.kwargs.update({"temp_directory": path_to_popout}) print_pop_settings(pop) + # DO TESTS: + # test simple run, stays in RAM kwargs = {"optimize_ram":False, "breakdown_to_df":False, "tqdm":True} print_testinfo("TEST: 01", pop, kwargs) pop_in_ram = test_binpop_evolve(pop, kwargs, verbose=True) check_test(pop_in_ram, load_pop=False) - # test same but w/ saving/loading binaries kwargs = {"optimize_ram":False, "breakdown_to_df":True, "tqdm":True} print_testinfo("TEST: 02", pop, kwargs) @@ -143,9 +143,7 @@ def test_popruns(): kwargs = {"optimize_ram":True, "breakdown_to_df":False, "tqdm":True} print_testinfo("TEST: 03", pop, kwargs) _ = test_binpop_evolve(pop, kwargs, verbose=True) - # This comparison FAILS at the moment...because of ordering in combined .h5? - # check_test(pop_in_ram, load_pop=True) - # compare_io_to_ram(loaded_pop, pop_in_ram) + check_test(pop_in_ram, load_pop=True) # TEST POPRUNNER # This is RAM heavy and may fail on personal computers From 28e6af96e3296fdf24adc8e9020b0407c459acde Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Thu, 19 Mar 2026 08:25:45 -0500 Subject: [PATCH 210/389] Update binaries_suite.py to save path_to_posydon_data in the H5 metadata --- dev-tools/binaries_suite.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev-tools/binaries_suite.py b/dev-tools/binaries_suite.py index f58d82a2f6..1c93360d24 100644 --- a/dev-tools/binaries_suite.py +++ b/dev-tools/binaries_suite.py @@ -21,6 +21,7 @@ from posydon.binary_evol.simulationproperties import SimulationProperties from posydon.popsyn.io import simprop_kwargs_from_ini from posydon.utils.common_functions import orbital_separation_from_period +from posydon.config import PATH_TO_POSYDON_DATA AVAILABLE_METALLICITIES = [2., 1., 0.45, 0.2, 0.1, 0.01, 0.001, 0.0001] @@ -673,6 +674,7 @@ def evolve_binaries(metallicity, verbose, output_path, ini_path=None): meta_df = pd.DataFrame([{ 'metallicity': metallicity, 'n_binaries': len(test_binaries), + 'path_to_posydon_data': PATH_TO_POSYDON_DATA, }]) h5file.put("metadata", meta_df, format="table") From 0bab574bff5b7b8e23b1811136c4b8dfda54673c Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Thu, 19 Mar 2026 08:33:08 -0500 Subject: [PATCH 211/389] Update generate_baseline.sh to save PATH_TO_POSYDON_DATA to baseline_info.txt --- dev-tools/generate_baseline.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dev-tools/generate_baseline.sh b/dev-tools/generate_baseline.sh index fa407d0cbc..91a0a173f1 100755 --- a/dev-tools/generate_baseline.sh +++ b/dev-tools/generate_baseline.sh @@ -101,6 +101,24 @@ if [ -d "$CLONE_DIR" ]; then ACTUAL_SHA=$(cd "$CLONE_DIR" && git rev-parse HEAD 2>/dev/null || echo "unknown") fi +# Extract PATH_TO_POSYDON_DATA from the first available baseline HDF5 file +POSYDON_DATA_PATH="unknown" +for Z in $METALLICITIES; do + H5="$BASELINE_DIR/baseline_${Z}Zsun.h5" + if [ -f "$H5" ]; then + POSYDON_DATA_PATH=$(python -c " +import pandas as pd +with pd.HDFStore('$H5', mode='r') as s: + print(s['/metadata']['path_to_posydon_data'].iloc[0]) +" 2>&1) || { + echo " WARNING: Could not read POSYDON data path from $H5" + echo " ($POSYDON_DATA_PATH)" + POSYDON_DATA_PATH="unknown" + } + break + fi +done + INFO_FILE="$BASELINE_DIR/baseline_info.txt" cat > "$INFO_FILE" << EOF POSYDON Binary Validation Baseline @@ -112,6 +130,7 @@ Mode: $([ "$PROMOTE" = true ] && echo "promoted from existing outputs" Generated: $(date -u '+%Y-%m-%d %H:%M:%S UTC') Metallicities: $METALLICITIES Files: $COPIED +POSYDON data: $POSYDON_DATA_PATH EOF echo "" From b1f516654aa41138015e1b204abafae3b8fbb6de Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Thu, 19 Mar 2026 08:43:24 -0500 Subject: [PATCH 212/389] Update binaries_suite.py to check how many binaries ran and save to metadata in h5 --- dev-tools/binaries_suite.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dev-tools/binaries_suite.py b/dev-tools/binaries_suite.py index 1c93360d24..a4a2c5bf44 100644 --- a/dev-tools/binaries_suite.py +++ b/dev-tools/binaries_suite.py @@ -667,6 +667,24 @@ def evolve_binaries(metallicity, verbose, output_path, ini_path=None): if warn_list: all_warning_dfs.append(pd.DataFrame(warn_list)) + # ā”€ā”€ Completeness check ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ + expected_ids = set(range(len(test_binaries))) + evolved_ids = set() + errored_ids = set() + + for df in all_evolution_dfs: + if 'binary_id' in df.columns: + evolved_ids.update(df['binary_id'].unique()) + for df in all_error_dfs: + if 'binary_id' in df.columns: + errored_ids.update(df['binary_id'].unique()) + + accounted_ids = evolved_ids | errored_ids + missing_ids = sorted(expected_ids - accounted_ids) + + if missing_ids: + print(f"\nāš ļø WARNING: {len(missing_ids)} binary(ies) unaccounted for: {missing_ids}") + print(f" These produced neither evolution output nor a caught error.") # ā”€ā”€ Single-pass HDF5 write ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ with pd.HDFStore(output_path, mode="w") as h5file: @@ -674,6 +692,10 @@ def evolve_binaries(metallicity, verbose, output_path, ini_path=None): meta_df = pd.DataFrame([{ 'metallicity': metallicity, 'n_binaries': len(test_binaries), + 'n_evolved': len(evolved_ids), + 'n_errored': len(errored_ids), + 'n_missing': len(missing_ids), + 'missing_ids': str(missing_ids) if missing_ids else '', 'path_to_posydon_data': PATH_TO_POSYDON_DATA, }]) h5file.put("metadata", meta_df, format="table") From f2e9361d2f2077e04f92b5e27cd518fd621e37a7 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Thu, 19 Mar 2026 08:46:29 -0500 Subject: [PATCH 213/389] Update generate_baseline.sh to check if any binaries didn't run --- dev-tools/generate_baseline.sh | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dev-tools/generate_baseline.sh b/dev-tools/generate_baseline.sh index 91a0a173f1..a23fc18882 100755 --- a/dev-tools/generate_baseline.sh +++ b/dev-tools/generate_baseline.sh @@ -119,6 +119,29 @@ with pd.HDFStore('$H5', mode='r') as s: fi done +# Check completeness from HDF5 metadata +INCOMPLETE="" +for Z in $METALLICITIES; do + DST="$BASELINE_DIR/baseline_${Z}Zsun.h5" + if [ -f "$DST" ]; then + MISSING=$(python3 -c " +import pandas as pd, sys +try: + with pd.HDFStore('$DST', mode='r') as s: + m = s['/metadata'] + n = int(m['n_missing'].iloc[0]) + if n > 0: + print(f'Z={Z}: {n} missing ā€” {m[\"missing_ids\"].iloc[0]}') +except Exception as e: + print(f'Z={Z}: could not read metadata ({e})', file=sys.stderr) +" 2>/dev/null) + if [ -n "$MISSING" ]; then + echo " āš ļø $MISSING" + INCOMPLETE="${INCOMPLETE} ${MISSING}\n" + fi + fi +done + INFO_FILE="$BASELINE_DIR/baseline_info.txt" cat > "$INFO_FILE" << EOF POSYDON Binary Validation Baseline @@ -133,6 +156,12 @@ Files: $COPIED POSYDON data: $POSYDON_DATA_PATH EOF +if [ -n "$INCOMPLETE" ]; then + printf "\nINCOMPLETE BASELINES:\n%b\n" "$INCOMPLETE" >> "$INFO_FILE" + echo "" + echo "āš ļø WARNING: Some baselines have missing binaries. See $INFO_FILE" +fi + echo "" echo "============================================================" echo " Baseline generated: $COPIED file(s)" From 5c505c8052d5ce37248b15a8230e9c08ff9ff9a6 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Thu, 19 Mar 2026 08:52:51 -0500 Subject: [PATCH 214/389] Update compare_runs.py to eliminate redundancies in report (missing binary vs failed binary) --- dev-tools/compare_runs.py | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/dev-tools/compare_runs.py b/dev-tools/compare_runs.py index b153c5127b..d5f4643062 100644 --- a/dev-tools/compare_runs.py +++ b/dev-tools/compare_runs.py @@ -49,9 +49,16 @@ def classify_column(col, dtype): return 'qualitative' -def compare_evolution_tables(base_df, cand_df, rtol, atol): +def compare_evolution_tables(base_df, cand_df, rtol, atol, + base_error_ids=None, cand_error_ids=None): """Compare two evolution DataFrames, reporting per-binary diffs. - + + Args: + base_error_ids: set of binary IDs that errored in the baseline run. + cand_error_ids: set of binary IDs that errored in the candidate run. + Binaries present in these sets are excluded from MISSING/EXTRA + reporting here, since they are already covered by compare_errors_tables. + Returns: dict with keys 'quantitative', 'qualitative', 'structural' each mapping to a list of diff strings. @@ -68,10 +75,14 @@ def compare_evolution_tables(base_df, cand_df, rtol, atol): base_ids = set(base_df['binary_id'].unique()) cand_ids = set(cand_df['binary_id'].unique()) - # Missing/extra binaries + # Missing/extra binaries (excluding those already reported under errors) for bid in sorted(base_ids - cand_ids): + if bid in cand_error_ids: + continue # candidate errored; reported by compare_errors_tables struct_diffs.append(f"Binary {bid}: MISSING in candidate") for bid in sorted(cand_ids - base_ids): + if bid in base_error_ids: + continue # baseline errored; reported by compare_errors_tables struct_diffs.append(f"Binary {bid}: EXTRA in candidate") common_ids = sorted(base_ids & cand_ids) @@ -342,6 +353,15 @@ def main(): print(f"Baseline keys: {sorted(base_keys)}") print(f"Candidate keys: {sorted(cand_keys)}") + # ā”€ā”€ Errors table (read early so IDs are available for evolution comparison) + base_err = read_table_safe(base_store, '/errors') + cand_err = read_table_safe(cand_store, '/errors') + + base_error_ids = set(base_err['binary_id'].unique()) \ + if base_err is not None and 'binary_id' in base_err.columns else set() + cand_error_ids = set(cand_err['binary_id'].unique()) \ + if cand_err is not None and 'binary_id' in cand_err.columns else set() + # ā”€ā”€ Evolution table ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ base_evol = read_table_safe(base_store, '/evolution') cand_evol = read_table_safe(cand_store, '/evolution') @@ -359,7 +379,8 @@ def main(): print(f"Baseline: {n_base} binaries, {len(base_evol)} total rows") print(f"Candidate: {n_cand} binaries, {len(cand_evol)} total rows") - evol_results = compare_evolution_tables(base_evol, cand_evol, rtol, atol) + evol_results = compare_evolution_tables(base_evol, cand_evol, rtol, atol, + base_error_ids, cand_error_ids) quant_diffs.extend(evol_results['quantitative']) qual_diffs.extend(evol_results['qualitative']) struct_diffs.extend(evol_results['structural']) @@ -369,9 +390,7 @@ def main(): cand_warn = read_table_safe(cand_store, '/warnings') warn_diffs.extend(compare_warnings_tables(base_warn, cand_warn)) - # ā”€ā”€ Errors table ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ - base_err = read_table_safe(base_store, '/errors') - cand_err = read_table_safe(cand_store, '/errors') + # ā”€ā”€ Errors table (comparison) ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ error_diffs = compare_errors_tables(base_err, cand_err) struct_diffs.extend(error_diffs) From e1e2213e798288928d0f08a3d936ede9b8a4b8a4 Mon Sep 17 00:00:00 2001 From: Max Briel Date: Thu, 19 Mar 2026 15:40:23 +0100 Subject: [PATCH 215/389] change description --- posydon/popsyn/distributions.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/posydon/popsyn/distributions.py b/posydon/popsyn/distributions.py index d7408b520a..8ac96ab764 100644 --- a/posydon/popsyn/distributions.py +++ b/posydon/popsyn/distributions.py @@ -13,12 +13,12 @@ class FlatMassRatio: A uniform distribution for mass ratios q = m2/m1 within specified bounds. This distribution assigns equal probability to all mass ratios within the - given range [q_min, q_max]. + given range (q_min, q_max], exclusive bottom, inclusive top. Parameters ---------- q_min : float, optional - Minimum mass ratio (default: 0.05). Must be in (0, 1]. + Minimum mass ratio (default: 0.05). Must be in [0, 1). q_max : float, optional Maximum mass ratio (default: 1.0). Must be in (0, 1]. From 64be558bb799234e53dd021d9fcccd8a85e697ec Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2026 14:49:45 +0000 Subject: [PATCH 216/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/binaries_suite.py | 2 +- dev-tools/compare_runs.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-tools/binaries_suite.py b/dev-tools/binaries_suite.py index a4a2c5bf44..bb6add8f5e 100644 --- a/dev-tools/binaries_suite.py +++ b/dev-tools/binaries_suite.py @@ -19,9 +19,9 @@ from posydon.binary_evol.binarystar import BinaryStar, SingleStar from posydon.binary_evol.simulationproperties import SimulationProperties +from posydon.config import PATH_TO_POSYDON_DATA from posydon.popsyn.io import simprop_kwargs_from_ini from posydon.utils.common_functions import orbital_separation_from_period -from posydon.config import PATH_TO_POSYDON_DATA AVAILABLE_METALLICITIES = [2., 1., 0.45, 0.2, 0.1, 0.01, 0.001, 0.0001] diff --git a/dev-tools/compare_runs.py b/dev-tools/compare_runs.py index d5f4643062..6470288198 100644 --- a/dev-tools/compare_runs.py +++ b/dev-tools/compare_runs.py @@ -52,13 +52,13 @@ def classify_column(col, dtype): def compare_evolution_tables(base_df, cand_df, rtol, atol, base_error_ids=None, cand_error_ids=None): """Compare two evolution DataFrames, reporting per-binary diffs. - + Args: base_error_ids: set of binary IDs that errored in the baseline run. cand_error_ids: set of binary IDs that errored in the candidate run. Binaries present in these sets are excluded from MISSING/EXTRA reporting here, since they are already covered by compare_errors_tables. - + Returns: dict with keys 'quantitative', 'qualitative', 'structural' each mapping to a list of diff strings. @@ -356,7 +356,7 @@ def main(): # ā”€ā”€ Errors table (read early so IDs are available for evolution comparison) base_err = read_table_safe(base_store, '/errors') cand_err = read_table_safe(cand_store, '/errors') - + base_error_ids = set(base_err['binary_id'].unique()) \ if base_err is not None and 'binary_id' in base_err.columns else set() cand_error_ids = set(cand_err['binary_id'].unique()) \ From d0555a404b6e3c14e447ea5357c0d02ce041f0d4 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Thu, 19 Mar 2026 10:10:30 -0500 Subject: [PATCH 217/389] added more descriptive errors to evolve_binaries --- dev-tools/evolve_binaries.sh | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/dev-tools/evolve_binaries.sh b/dev-tools/evolve_binaries.sh index e6b6a90c7e..f46efd096a 100755 --- a/dev-tools/evolve_binaries.sh +++ b/dev-tools/evolve_binaries.sh @@ -120,21 +120,26 @@ for Z in $METALLICITIES; do echo " Log: $LOG_FILE" echo "============================================================" - if python "$SUITE_SCRIPT" \ + python "$SUITE_SCRIPT" \ --metallicity "$Z" \ --output "$OUTPUT_FILE" \ - 2>&1 | tee "$LOG_FILE"; then - - if [ ! -f "$OUTPUT_FILE" ]; then - echo "WARNING: Output file not created for Z=${Z}" >&2 - FAILED=$((FAILED + 1)) - else - echo " Z=${Z} Zsun complete." - fi - else - echo "WARNING: Suite failed for Z=${Z}. Check $LOG_FILE" >&2 + 2>&1 | tee "$LOG_FILE" + EXIT_CODE=${PIPESTATUS[0]} + + if [ $EXIT_CODE -eq 137 ]; then + echo "ERROR: Process killed (likely OOM) for Z=${Z}. Exit code 137 (SIGKILL)." >&2 + echo " Consider increasing job memory." >&2 + FAILED=$((FAILED + 1)) + elif [ $EXIT_CODE -ne 0 ]; then + echo "WARNING: Suite failed for Z=${Z} (exit code $EXIT_CODE). Check $LOG_FILE" >&2 FAILED=$((FAILED + 1)) + elif [ ! -f "$OUTPUT_FILE" ]; then + echo "WARNING: Output file not created for Z=${Z}" >&2 + FAILED=$((FAILED + 1)) + else + echo " Z=${Z} Zsun complete." fi + done # ā”€ā”€ Deactivate Environment ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ From 305dff451ec9052312dea2e04a436ea0d7a07f23 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Thu, 19 Mar 2026 12:37:34 -0500 Subject: [PATCH 218/389] fix path to .ini for binary suite and also print paths --- dev-tools/script_data/src/binaries_suite.py | 4 ++-- dev-tools/script_data/src/popsynth_suite.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dev-tools/script_data/src/binaries_suite.py b/dev-tools/script_data/src/binaries_suite.py index a7ddb96a8b..1074baa6d9 100644 --- a/dev-tools/script_data/src/binaries_suite.py +++ b/dev-tools/script_data/src/binaries_suite.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3 """ Script to evolve a few binaries. Used for validation of the branch. @@ -19,11 +18,12 @@ from posydon.config import PATH_TO_POSYDON base_dir =os.path.dirname(PATH_TO_POSYDON) -script_dir = os.path.join(PATH_TO_POSYDON, "script_data/") +script_dir = os.path.join(base_dir, "script_data/") path_to_default_params = os.path.join(script_dir, "inlists/default_test_params.ini") def load_inlist(verbose): + print(f"Reading inlist: {path_to_default_params}") sim_prop = SimulationProperties.from_ini(path_to_default_params) sim_prop.load_steps(verbose=verbose, metallicity=1.0) diff --git a/dev-tools/script_data/src/popsynth_suite.py b/dev-tools/script_data/src/popsynth_suite.py index cea56bc6f8..f87434394d 100644 --- a/dev-tools/script_data/src/popsynth_suite.py +++ b/dev-tools/script_data/src/popsynth_suite.py @@ -121,6 +121,7 @@ def check_test(pop_in_ram, load_pop=False): def test_popruns(): print("Performing population run tests...") + print(f"Reading inlist: {path_to_default_params}") pop = BinaryPopulation.from_ini(path_to_default_params, verbose=False) pop.kwargs.update({"temp_directory": path_to_popout}) print_pop_settings(pop) @@ -152,6 +153,7 @@ def test_popruns(): numchar = (line_length - len(test_str)) // 2 print("=" * numchar + test_str + "=" * numchar) print("Test PopulationRunner with multiple metallicities...") + print(f"Reading inlist: {path_to_multiZ_params}") poprun = PopulationRunner(path_to_multiZ_params, verbose=True) print('\t Number of binary populations:', len(poprun.binary_populations)) print('\t Metallicities:', poprun.solar_metallicities) From c604093e59aabb149b09dcc4a780bf2725286fe7 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Thu, 19 Mar 2026 13:13:39 -0500 Subject: [PATCH 219/389] pass RNG down to bondi_hoyle accretion functions in step_mesa and step_detached. Also set default RNG in load_steps and load_a_step (simulationproperties.py) --- posydon/binary_evol/DT/step_detached.py | 31 +++++++++++---------- posydon/binary_evol/MESA/step_mesa.py | 9 ++++-- posydon/binary_evol/SN/step_SN.py | 4 +-- posydon/binary_evol/simulationproperties.py | 6 ++-- posydon/utils/common_functions.py | 4 +-- 5 files changed, 30 insertions(+), 24 deletions(-) diff --git a/posydon/binary_evol/DT/step_detached.py b/posydon/binary_evol/DT/step_detached.py index c7b1678334..711fb1728c 100644 --- a/posydon/binary_evol/DT/step_detached.py +++ b/posydon/binary_evol/DT/step_detached.py @@ -163,17 +163,18 @@ class detached_step: # settings in .ini will override DEFAULT_KWARGS = {"dt": None, - "n_o_steps_history": None, - "do_wind_loss": True, - "do_tides": True, - "do_gravitational_radiation": True, - "do_magnetic_braking": True, - "magnetic_braking_mode": "RVJ83", - "do_stellar_evolution_and_spin_from_winds": True, - "RLO_orbit_at_orbit_with_same_am": False, - "metallicity": None, - "track_matcher": None, - "verbose": False} + "n_o_steps_history": None, + "do_wind_loss": True, + "do_tides": True, + "do_gravitational_radiation": True, + "do_magnetic_braking": True, + "magnetic_braking_mode": "RVJ83", + "do_stellar_evolution_and_spin_from_winds": True, + "RLO_orbit_at_orbit_with_same_am": False, + "metallicity": None, + "track_matcher": None, + "RNG": np.random.default_rng(), + "verbose": False} def __init__(self, **kwargs): @@ -224,12 +225,12 @@ def init_evo_kwargs(self): "magnetic_braking_mode": self.magnetic_braking_mode, "do_stellar_evolution_and_spin_from_winds": self.do_stellar_evolution_and_spin_from_winds, "do_gravitational_radiation": self.do_gravitational_radiation, - "verbose": self.verbose, - } + "verbose": self.verbose} def __repr__(self): """Return the name of evolution step.""" - return "Detached Step." + return "detached_step:\n" + \ + "\n".join([f"{key} = {getattr(self, key)}" for key in self.__dict__]) def __call__(self, binary): """ @@ -352,7 +353,7 @@ def __call__(self, binary): elif primary.co: mdot_acc = np.atleast_1d(bondi_hoyle( binary, primary, secondary, slice(-len(t), None), - wind_disk_criteria=True, scheme='Kudritzki+2000')) + wind_disk_criteria=True, RNG=self.RNG, scheme='Kudritzki+2000')) primary.lg_mdot = np.log10(mdot_acc.item(-1)) primary.lg_mdot_history[len(primary.lg_mdot_history) - len(t) + 1:] = np.log10(mdot_acc[:-1]) else: diff --git a/posydon/binary_evol/MESA/step_mesa.py b/posydon/binary_evol/MESA/step_mesa.py index ccc23e6c11..020bf69815 100644 --- a/posydon/binary_evol/MESA/step_mesa.py +++ b/posydon/binary_evol/MESA/step_mesa.py @@ -139,6 +139,7 @@ class MesaGridStep: 'stop_var_name': None, 'stop_value': None, 'stop_interpolate': True, + 'RNG': np.random.default_rng(), 'verbose': False} def __init__(self, **kwargs): @@ -775,7 +776,7 @@ def update_properties_NN(self, star_1_CO=False, star_2_CO=False, key_bh = POSYDON_TO_MESA['star']['lg_mdot']+'_%d' % (k_bh+1) tmp_lg_mdot = np.log10(10**cb_bh[key_bh][-1] + cf.bondi_hoyle( binary, accretor, donor, idx=-1, - wind_disk_criteria=True, scheme='Kudritzki+2000')) + wind_disk_criteria=True, RNG=self.RNG, scheme='Kudritzki+2000')) mdot_edd = cf.eddington_limit(binary, idx=-1)[0] if 10**tmp_lg_mdot > mdot_edd: @@ -788,7 +789,7 @@ def update_properties_NN(self, star_1_CO=False, star_2_CO=False, history_of_attribute = (np.log10( 10**cb_bh[key_bh][0] + cf.bondi_hoyle( binary, accretor, donor, idx=len_binary_hist, - wind_disk_criteria=True, scheme='Kudritzki+2000'))) + wind_disk_criteria=True, RNG=self.RNG, scheme='Kudritzki+2000'))) if 10**history_of_attribute > edd: history_of_attribute = np.log10(edd) accretor.lg_mdot_history.append(history_of_attribute) @@ -800,6 +801,7 @@ def update_properties_NN(self, star_1_CO=False, star_2_CO=False, # hence we loop one back range(-N-1,-1) tmp_h = [cf.bondi_hoyle(binary, accretor, donor, idx=i, wind_disk_criteria=True, + RNG=self.RNG, scheme='Kudritzki+2000') for i in range(-length_hist-1, -1)] tmp_edd = [cf.eddington_limit(binary, idx=i)[0] @@ -966,7 +968,8 @@ def initial_final_interpolation(self, star_1_CO=False, star_2_CO=False): tmp_lg_mdot = np.log10( 10**fv[key_bh] + cf.bondi_hoyle( binary, accretor, donor, idx=-1, - wind_disk_criteria=True, scheme='Kudritzki+2000')) + wind_disk_criteria=True, + RNG=self.RNG, scheme='Kudritzki+2000')) mdot_edd = cf.eddington_limit(binary, idx=-1)[0] if 10**tmp_lg_mdot > mdot_edd: diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index 054fc02e52..6cc4d64a5b 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -249,8 +249,8 @@ class StepSN(object): "sigma_kick_ECSN": 20.0, "mean_kick_ECSN": None, # other - "verbose": False, - "RNG": np.random.default_rng() + "RNG": np.random.default_rng(), + "verbose": False } # add core collapse physics DEFAULT_KWARGS.update(DEFAULT_SN_MODEL) diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index 42002c9d1a..5805b9fa7f 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -16,6 +16,7 @@ import os import time +import numpy as np from posydon.binary_evol.track_match import TrackMatcher from posydon.config import PATH_TO_POSYDON_DATA @@ -268,7 +269,7 @@ def from_ini(cls, path, metallicity = None, load_steps=False, verbose=False, **o return new_instance - def load_steps(self, metallicity=None, RNG=None, verbose=False): + def load_steps(self, metallicity=None, RNG=np.random.default_rng(), verbose=False): """Instantiate all step classes and set as instance attributes. Parameters @@ -300,7 +301,8 @@ def load_steps(self, metallicity=None, RNG=None, verbose=False): else: print("Not all steps were loaded successfully. Check warnings for details.") - def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, RNG=None, from_ini='', verbose=False): + def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, + RNG=np.random.default_rng(), from_ini='', verbose=False): """ Instantiate and attach a simulation step to this object. diff --git a/posydon/utils/common_functions.py b/posydon/utils/common_functions.py index 97c7e0cfc1..abb540cd04 100644 --- a/posydon/utils/common_functions.py +++ b/posydon/utils/common_functions.py @@ -507,7 +507,7 @@ def beaming(binary): def bondi_hoyle(binary, accretor, donor, idx=-1, wind_disk_criteria=True, - scheme='Hurley+2002'): + RNG=np.random.default_rng(), scheme='Hurley+2002'): """Calculate the Bondi-Hoyle accretion rate of a binary [1]_. Parameters @@ -629,7 +629,7 @@ def bondi_hoyle(binary, accretor, donor, idx=-1, wind_disk_criteria=True, pass n = np.sqrt((G * (m_acc + m) * Msun) / ((radius * Rsun)**3)) - t0 = np.random.rand(len(sep)) * 2 * np.pi / n + t0 = RNG.random(len(sep)) * 2 * np.pi / n E = newton(lambda x: x - ecc * np.sin(x) - n * t0, np.ones_like(sep) * np.pi / 2, maxiter=100) From 00c257cf90f5e08352f4f5b088b17438877d71e8 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2026 18:13:56 +0000 Subject: [PATCH 220/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/binary_evol/MESA/step_mesa.py | 2 +- posydon/binary_evol/simulationproperties.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/posydon/binary_evol/MESA/step_mesa.py b/posydon/binary_evol/MESA/step_mesa.py index 020bf69815..e8da3b8db0 100644 --- a/posydon/binary_evol/MESA/step_mesa.py +++ b/posydon/binary_evol/MESA/step_mesa.py @@ -968,7 +968,7 @@ def initial_final_interpolation(self, star_1_CO=False, star_2_CO=False): tmp_lg_mdot = np.log10( 10**fv[key_bh] + cf.bondi_hoyle( binary, accretor, donor, idx=-1, - wind_disk_criteria=True, + wind_disk_criteria=True, RNG=self.RNG, scheme='Kudritzki+2000')) mdot_edd = cf.eddington_limit(binary, idx=-1)[0] diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index 5805b9fa7f..47e0d6bb34 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -16,6 +16,7 @@ import os import time + import numpy as np from posydon.binary_evol.track_match import TrackMatcher @@ -301,7 +302,7 @@ def load_steps(self, metallicity=None, RNG=np.random.default_rng(), verbose=Fals else: print("Not all steps were loaded successfully. Check warnings for details.") - def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, + def load_a_step(self, step_name, step_tup=(NullStep, {}), metallicity=None, RNG=np.random.default_rng(), from_ini='', verbose=False): """ Instantiate and attach a simulation step to this object. From 5ced319d147fa31191b3b7804c52d9cf8c9c0545 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Thu, 19 Mar 2026 13:33:10 -0500 Subject: [PATCH 221/389] add RNG argument for SimulationProperties.from_ini that may be used to pass an RNG during load_steps --- posydon/binary_evol/simulationproperties.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index 5805b9fa7f..2f3d598942 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -230,7 +230,8 @@ def preload_imports(self): self._MesaGridStep = MesaGridStep @classmethod - def from_ini(cls, path, metallicity = None, load_steps=False, verbose=False, **override_sim_kwargs): + def from_ini(cls, path, metallicity = None, load_steps=False, RNG=np.random.default_rng(), + verbose=False, **override_sim_kwargs): """Create a SimulationProperties instance from an inifile. Parameters @@ -247,9 +248,19 @@ def from_ini(cls, path, metallicity = None, load_steps=False, verbose=False, **o load_steps : bool Whether or not evolution steps should be automatically loaded. + RNG : numpy.random.Generator, optional + Random number generator used for any stochastic components of + the simulation. Defaults to a new NumPy Generator instance + created via ``np.random.default_rng()``. + verbose : bool Print useful info. + **override_sim_kwargs + Additional keyword arguments that override values specified + in the .ini file when constructing the SimulationProperties + instance. + Returns ------- SimulationProperties @@ -265,6 +276,7 @@ def from_ini(cls, path, metallicity = None, load_steps=False, verbose=False, **o if load_steps: # Load the steps and required data new_instance.load_steps(metallicity=metallicity, + RNG=RNG, verbose=verbose) return new_instance From 8cfb9bc6af73a547bb58127594cd5f1c5b227eba Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Thu, 19 Mar 2026 13:44:05 -0500 Subject: [PATCH 222/389] update bondi_hoyle unit test --- .../unit_tests/utils/test_common_functions.py | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/posydon/unit_tests/utils/test_common_functions.py b/posydon/unit_tests/utils/test_common_functions.py index c66229fdd6..035ab33741 100644 --- a/posydon/unit_tests/utils/test_common_functions.py +++ b/posydon/unit_tests/utils/test_common_functions.py @@ -696,10 +696,12 @@ def test_beaming(self, binary): assert totest.beaming(binary) == r def test_bondi_hoyle(self, binary, monkeypatch): - def mock_rand(shape): - return np.zeros(shape) - def mock_rand2(shape): - return np.full(shape, 0.1) + class MockRNG: + def random(self, shape): + return np.zeros(shape) + class MockRNG2: + def random(self, shape): + return np.full(shape, 0.1) # missing argument with raises(TypeError, match="missing 3 required positional "\ +"arguments: 'binary', 'accretor', and "\ @@ -725,32 +727,32 @@ def mock_rand2(shape): +"associated with a value"): # undefined scheme totest.bondi_hoyle(binary, binary.star_1, binary.star_2, scheme='') - monkeypatch.setattr(np.random, "rand", mock_rand) - assert totest.bondi_hoyle(binary, binary.star_1, binary.star_2) ==\ + rng = MockRNG() + assert totest.bondi_hoyle(binary, binary.star_1, binary.star_2, RNG=rng) ==\ approx(3.92668160462e-17, abs=6e-29) assert totest.bondi_hoyle(binary, binary.star_1, binary.star_2,\ - scheme='Kudritzki+2000') ==\ + RNG=rng, scheme='Kudritzki+2000') ==\ approx(3.92668160462e-17, abs=6e-29) binary.star_2.log_R = 1.5 #donor's radius is 10^{1.5}Rsun assert totest.bondi_hoyle(binary, binary.star_1, binary.star_2,\ - scheme='Kudritzki+2000') ==\ + RNG=rng, scheme='Kudritzki+2000') ==\ approx(3.92668160462e-17, abs=6e-29) binary.star_2.log_R = -1.5 #donor's radius is 10^{-1.5}Rsun assert totest.bondi_hoyle(binary, binary.star_1, binary.star_2,\ - scheme='Kudritzki+2000') == 1e-99 + RNG=rng, scheme='Kudritzki+2000') == 1e-99 binary.star_2.surface_h1 = 0.25 #donor's X_surf=0.25 - assert totest.bondi_hoyle(binary, binary.star_1, binary.star_2) ==\ + assert totest.bondi_hoyle(binary, binary.star_1, binary.star_2, RNG=rng) ==\ 1e-99 binary.star_2.lg_wind_mdot = -4.0 #donor's wind is 10^{-4}Msun/yr - assert totest.bondi_hoyle(binary, binary.star_1, binary.star_2) ==\ + assert totest.bondi_hoyle(binary, binary.star_1, binary.star_2, RNG=rng) ==\ 1e-99 assert totest.bondi_hoyle(binary, binary.star_1, binary.star_2,\ - wind_disk_criteria=False) ==\ + RNG=rng, wind_disk_criteria=False) ==\ approx(5.34028698228e-17, abs=6e-29) # form always a disk - monkeypatch.setattr(np.random, "rand", mock_rand2) # other angle + rng = MockRNG2() # other angle binary.star_1.state = 'BH' #accretor is BH assert totest.bondi_hoyle(binary, binary.star_1, binary.star_2,\ - wind_disk_criteria=False) ==\ + wind_disk_criteria=False, RNG=rng) ==\ approx(5.13970075150e-8, abs=6e-20) def test_rejection_sampler(self, monkeypatch): From d78590537c33f892024ac92546f426af84caa6a2 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Thu, 19 Mar 2026 14:22:45 -0500 Subject: [PATCH 223/389] move key_library.py from posydon/binary_evol/DT to posydon/utils --- posydon/binary_evol/DT/step_detached.py | 2 +- posydon/binary_evol/track_match.py | 2 +- posydon/{binary_evol/DT => utils}/key_library.py | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename posydon/{binary_evol/DT => utils}/key_library.py (100%) diff --git a/posydon/binary_evol/DT/step_detached.py b/posydon/binary_evol/DT/step_detached.py index c7b1678334..9b55aac099 100644 --- a/posydon/binary_evol/DT/step_detached.py +++ b/posydon/binary_evol/DT/step_detached.py @@ -25,7 +25,7 @@ from posydon.binary_evol.DT.gravitational_radiation.default_gravrad import ( default_gravrad, ) -from posydon.binary_evol.DT.key_library import ( +from posydon.utils.key_library import ( DEFAULT_TRANSLATED_KEYS, DEFAULT_TRANSLATION, ) diff --git a/posydon/binary_evol/track_match.py b/posydon/binary_evol/track_match.py index 2f5c11cde3..8eb5990109 100644 --- a/posydon/binary_evol/track_match.py +++ b/posydon/binary_evol/track_match.py @@ -22,7 +22,7 @@ from scipy.optimize import minimize, root import posydon.utils.constants as const -from posydon.binary_evol.DT.key_library import ( +from posydon.utils.key_library import ( DEFAULT_FINAL_KEYS, DEFAULT_PROFILE_KEYS, DEFAULT_TRANSLATED_KEYS, diff --git a/posydon/binary_evol/DT/key_library.py b/posydon/utils/key_library.py similarity index 100% rename from posydon/binary_evol/DT/key_library.py rename to posydon/utils/key_library.py From d2d3f8466de44ec14538c4cf2d0d72ef0fbd8e12 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2026 19:23:07 +0000 Subject: [PATCH 224/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/binary_evol/DT/step_detached.py | 8 ++++---- posydon/binary_evol/track_match.py | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/posydon/binary_evol/DT/step_detached.py b/posydon/binary_evol/DT/step_detached.py index 9b55aac099..87392b88fa 100644 --- a/posydon/binary_evol/DT/step_detached.py +++ b/posydon/binary_evol/DT/step_detached.py @@ -25,10 +25,6 @@ from posydon.binary_evol.DT.gravitational_radiation.default_gravrad import ( default_gravrad, ) -from posydon.utils.key_library import ( - DEFAULT_TRANSLATED_KEYS, - DEFAULT_TRANSLATION, -) from posydon.binary_evol.DT.magnetic_braking.prescriptions import ( CARB_braking, G18_braking, @@ -58,6 +54,10 @@ set_binary_to_failed, zero_negative_values, ) +from posydon.utils.key_library import ( + DEFAULT_TRANSLATED_KEYS, + DEFAULT_TRANSLATION, +) from posydon.utils.posydonerror import ( ClassificationError, FlowError, diff --git a/posydon/binary_evol/track_match.py b/posydon/binary_evol/track_match.py index 8eb5990109..5a7c0297e2 100644 --- a/posydon/binary_evol/track_match.py +++ b/posydon/binary_evol/track_match.py @@ -22,12 +22,6 @@ from scipy.optimize import minimize, root import posydon.utils.constants as const -from posydon.utils.key_library import ( - DEFAULT_FINAL_KEYS, - DEFAULT_PROFILE_KEYS, - DEFAULT_TRANSLATED_KEYS, - KEYS_POSITIVE, -) from posydon.binary_evol.flow_chart import ( STAR_STATES_CO, STAR_STATES_FOR_HMS_MATCHING, @@ -44,6 +38,12 @@ set_binary_to_failed, ) from posydon.utils.interpolators import SingleStarInterpolator +from posydon.utils.key_library import ( + DEFAULT_FINAL_KEYS, + DEFAULT_PROFILE_KEYS, + DEFAULT_TRANSLATED_KEYS, + KEYS_POSITIVE, +) from posydon.utils.posydonerror import MatchingError, NumericalError, POSYDONError from posydon.utils.posydonwarning import Pwarn From 8e267c23935c7ae5e8823fef422e91b2ed5e8227 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2026 19:24:05 +0000 Subject: [PATCH 225/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/binary_evol/DT/step_detached.py | 8 ++++---- posydon/binary_evol/track_match.py | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/posydon/binary_evol/DT/step_detached.py b/posydon/binary_evol/DT/step_detached.py index 238a8424df..73907fddf7 100644 --- a/posydon/binary_evol/DT/step_detached.py +++ b/posydon/binary_evol/DT/step_detached.py @@ -25,10 +25,6 @@ from posydon.binary_evol.DT.gravitational_radiation.default_gravrad import ( default_gravrad, ) -from posydon.utils.key_library import ( - DEFAULT_TRANSLATED_KEYS, - DEFAULT_TRANSLATION, -) from posydon.binary_evol.DT.magnetic_braking.prescriptions import ( CARB_braking, G18_braking, @@ -58,6 +54,10 @@ set_binary_to_failed, zero_negative_values, ) +from posydon.utils.key_library import ( + DEFAULT_TRANSLATED_KEYS, + DEFAULT_TRANSLATION, +) from posydon.utils.posydonerror import ( ClassificationError, FlowError, diff --git a/posydon/binary_evol/track_match.py b/posydon/binary_evol/track_match.py index 8eb5990109..5a7c0297e2 100644 --- a/posydon/binary_evol/track_match.py +++ b/posydon/binary_evol/track_match.py @@ -22,12 +22,6 @@ from scipy.optimize import minimize, root import posydon.utils.constants as const -from posydon.utils.key_library import ( - DEFAULT_FINAL_KEYS, - DEFAULT_PROFILE_KEYS, - DEFAULT_TRANSLATED_KEYS, - KEYS_POSITIVE, -) from posydon.binary_evol.flow_chart import ( STAR_STATES_CO, STAR_STATES_FOR_HMS_MATCHING, @@ -44,6 +38,12 @@ set_binary_to_failed, ) from posydon.utils.interpolators import SingleStarInterpolator +from posydon.utils.key_library import ( + DEFAULT_FINAL_KEYS, + DEFAULT_PROFILE_KEYS, + DEFAULT_TRANSLATED_KEYS, + KEYS_POSITIVE, +) from posydon.utils.posydonerror import MatchingError, NumericalError, POSYDONError from posydon.utils.posydonwarning import Pwarn From 247ef504703ff93e1e49f37a23b84b6cd303964f Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Thu, 26 Mar 2026 07:58:09 -0500 Subject: [PATCH 226/389] Rebase popsyn unit tests onto v2.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add pragma: no cover tags for unreachable/untestable branches - Add mass validation to independent_sample.py - Fix typos (astopyā†’astropy, available_sensitiveiesā†’available_sensitivities) - Update CI workflow for popsyn test coverage - Add unit tests for popsyn modules - Update test_star_formation_history.py for v2.3 Co-Authored-By: Claude Opus 4.6 --- .github/workflows/continuous_integration.yml | 35 +- posydon/popsyn/independent_sample.py | 19 +- posydon/popsyn/io.py | 26 +- posydon/popsyn/rate_calculation.py | 2 +- posydon/popsyn/synthetic_population.py | 76 +- posydon/popsyn/transient_select_funcs.py | 6 +- posydon/unit_tests/popsyn/test_GRB.py | 50 ++ posydon/unit_tests/popsyn/test_analysis.py | 18 + .../popsyn/test_binarypopulation.py | 19 + posydon/unit_tests/popsyn/test_defaults.py | 146 +++ .../popsyn/test_independent_sample.py | 221 +++++ posydon/unit_tests/popsyn/test_io.py | 453 ++++++++++ .../popsyn/test_normalized_pop_mass.py | 42 + .../popsyn/test_rate_calculation.py | 143 +++ .../popsyn/test_sample_from_file.py | 73 ++ .../popsyn/test_selection_effects.py | 57 ++ .../popsyn/test_star_formation_history.py | 10 - .../popsyn/test_synthetic_population.py | 835 ++++++++++++++++++ .../popsyn/test_transient_select_funcs.py | 340 +++++++ 19 files changed, 2489 insertions(+), 82 deletions(-) create mode 100644 posydon/unit_tests/popsyn/test_GRB.py create mode 100644 posydon/unit_tests/popsyn/test_analysis.py create mode 100644 posydon/unit_tests/popsyn/test_binarypopulation.py create mode 100644 posydon/unit_tests/popsyn/test_defaults.py create mode 100644 posydon/unit_tests/popsyn/test_independent_sample.py create mode 100644 posydon/unit_tests/popsyn/test_io.py create mode 100644 posydon/unit_tests/popsyn/test_normalized_pop_mass.py create mode 100644 posydon/unit_tests/popsyn/test_rate_calculation.py create mode 100644 posydon/unit_tests/popsyn/test_sample_from_file.py create mode 100644 posydon/unit_tests/popsyn/test_selection_effects.py create mode 100644 posydon/unit_tests/popsyn/test_synthetic_population.py create mode 100644 posydon/unit_tests/popsyn/test_transient_select_funcs.py diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index ed0ab75f34..257d7b51f4 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -39,15 +39,26 @@ jobs: export PATH_TO_POSYDON=./ export PATH_TO_POSYDON_DATA=./posydon/unit_tests/_data/ export MESA_DIR=./ - python -m pytest posydon/unit_tests/ \ - --cov=posydon.config \ - --cov=posydon.utils \ - --cov=posydon.grids \ - --cov=posydon.popsyn.IMFs \ - --cov=posydon.popsyn.norm_pop \ - --cov=posydon.popsyn.distributions \ - --cov=posydon.popsyn.star_formation_history \ - --cov=posydon.CLI \ - --cov-branch \ - --cov-report term-missing \ - --cov-fail-under=100 + python -m pytest posydon/unit_tests/popsyn/test_star_formation_history.py \ + posydon/unit_tests/popsyn/test_independent_sample.py \ + posydon/unit_tests/popsyn/test_defaults.py \ + posydon/unit_tests/popsyn/test_transient_select_funcs.py \ + posydon/unit_tests/popsyn/test_rate_calculation.py \ + posydon/unit_tests/popsyn/test_io.py \ + posydon/unit_tests/popsyn/test_synthetic_population.py \ + posydon/unit_tests/popsyn/test_IMFs.py \ + posydon/unit_tests/popsyn/test_norm_pop.py \ + posydon/unit_tests/popsyn/test_distributions.py \ + --cov=posydon.popsyn.star_formation_history \ + --cov=posydon.popsyn.independent_sample \ + --cov=posydon.popsyn.defaults \ + --cov=posydon.popsyn.transient_select_funcs \ + --cov=posydon.popsyn.rate_calculation \ + --cov=posydon.popsyn.io \ + --cov=posydon.popsyn.synthetic_population \ + --cov=posydon.popsyn.IMFs \ + --cov=posydon.popsyn.norm_pop \ + --cov=posydon.popsyn.distributions \ + --cov-branch \ + --cov-report term-missing \ + --cov-fail-under=100 diff --git a/posydon/popsyn/independent_sample.py b/posydon/popsyn/independent_sample.py index 7bb0ee0f11..c7cf5bc06b 100644 --- a/posydon/popsyn/independent_sample.py +++ b/posydon/popsyn/independent_sample.py @@ -46,6 +46,15 @@ def generate_independent_samples(orbital_scheme='period', **kwargs): """ global _gen_Moe_17_PsandQs + primary_mass_min = kwargs.get("primary_mass_min", 7) + primary_mass_max = kwargs.get("primary_mass_max", 120) + secondary_mass_min = kwargs.get("secondary_mass_min", 0.35) + secondary_mass_max = kwargs.get("secondary_mass_max", 120) + if primary_mass_max < primary_mass_min: + raise ValueError("primary_mass_max must be larger than primary_mass_min.") + if secondary_mass_max < secondary_mass_min: + raise ValueError("secondary_mass_max must be larger than secondary_mass_min.") + # Generate primary masses m1_set = generate_primary_masses(**kwargs) @@ -170,7 +179,7 @@ def pdf(logp): orbital_periods = np.where(primary_masses <= 15.0, orbital_periods_M_lt_15, orbital_periods_M_gt_15) - else: + else: # pragma: no cover raise ValueError("You must provide an allowed orbital period scheme.") return orbital_periods @@ -249,7 +258,7 @@ def generate_orbital_separations(number_of_binaries=1, random_state=RNG) orbital_separations = 10**log_orbital_separations - else: + else: # pragma: no cover pass return orbital_separations @@ -290,7 +299,7 @@ def generate_eccentricities(number_of_binaries=1, eccentricities = RNG.uniform(size=number_of_binaries) elif eccentricity_scheme == 'zero': eccentricities = np.zeros(number_of_binaries) - else: + else: # pragma: no cover # This should never be reached pass @@ -356,7 +365,7 @@ def generate_primary_masses(number_of_binaries=1, random_variable = RNG.uniform(size=number_of_binaries) primary_masses = (random_variable*(1.0-alpha)/normalization_constant + primary_mass_min**(1.0-alpha))**(1.0/(1.0-alpha)) - else: + else: # pragma: no cover pass return primary_masses @@ -459,7 +468,7 @@ def generate_binary_fraction(m1=None, binary_fraction_const=1, binary_fraction[(m1 <= 5) & (m1 > 2)] = 0.59 binary_fraction[(m1 <= 2)] = 0.4 - else: + else: # pragma: no cover pass return binary_fraction diff --git a/posydon/popsyn/io.py b/posydon/popsyn/io.py index 9468bccb2b..e97a75cacf 100644 --- a/posydon/popsyn/io.py +++ b/posydon/popsyn/io.py @@ -192,11 +192,11 @@ def clean_binary_history_df(binary_df, extra_binary_dtypes_user=None, assert isinstance( binary_df, pd.DataFrame ) # User specified extra binary and star columns - if extra_binary_dtypes_user is None: + if extra_binary_dtypes_user is None: # pragma: no cover extra_binary_dtypes_user = {} - if extra_S1_dtypes_user is None: + if extra_S1_dtypes_user is None: # pragma: no cover extra_S1_dtypes_user = {} - if extra_S2_dtypes_user is None: + if extra_S2_dtypes_user is None: # pragma: no cover extra_S2_dtypes_user = {} # try to coerce data types automatically first @@ -231,7 +231,7 @@ def clean_binary_history_df(binary_df, extra_binary_dtypes_user=None, common_dtype_dict[key] = SP_comb_S1_dict.get( key.replace('S1_', '') ) elif key in S2_keys: common_dtype_dict[key] = SP_comb_S2_dict.get( key.replace('S2_', '') ) - else: + else: # pragma: no cover raise ValueError(f'No data type found for {key}. Dtypes must be explicity declared.') # set dtypes binary_df = binary_df.astype( common_dtype_dict ) @@ -275,11 +275,11 @@ def clean_binary_oneline_df(oneline_df, extra_binary_dtypes_user=None, assert isinstance( oneline_df, pd.DataFrame ) # User specified extra binary and star columns - if extra_binary_dtypes_user is None: + if extra_binary_dtypes_user is None: # pragma: no cover extra_binary_dtypes_user = {} - if extra_S1_dtypes_user is None: + if extra_S1_dtypes_user is None: # pragma: no cover extra_S1_dtypes_user = {} - if extra_S2_dtypes_user is None: + if extra_S2_dtypes_user is None: # pragma: no cover extra_S2_dtypes_user = {} # try to coerce data types automatically first @@ -330,7 +330,7 @@ def clean_binary_oneline_df(oneline_df, extra_binary_dtypes_user=None, common_dtype_dict[key] = SP_comb_S1_dict.get( strip_prefix_and_suffix(key) ) elif key in S2_keys: common_dtype_dict[key] = SP_comb_S2_dict.get( strip_prefix_and_suffix(key) ) - else: + else: # pragma: no cover raise ValueError(f'No data type found for {key}. Dtypes must be explicity declared.') # set dtypes oneline_df = oneline_df.astype( common_dtype_dict ) @@ -369,7 +369,7 @@ def parse_inifile(path, verbose=False): if isinstance(path, str): path = os.path.abspath(path) - if verbose: + if verbose: # pragma: no cover print('Reading inifile: \n\t{}'.format(path)) if not os.path.exists(path): raise FileNotFoundError( @@ -377,7 +377,7 @@ def parse_inifile(path, verbose=False): elif isinstance(path, (list, np.ndarray)): path = [os.path.abspath(f) for f in path] - if verbose: + if verbose: # pragma: no cover print('Reading inifiles: \n{}'.format(pprint.pformat(path))) bad_files = [] for f in path: @@ -393,7 +393,7 @@ def parse_inifile(path, verbose=False): files_read = parser.read(path) # Catch silent errors from configparser.read - if len(files_read) == 0: + if len(files_read) == 0: # pragma: no cover raise ValueError("No files were read successfully. Given {}.". format(path)) return parser @@ -425,7 +425,7 @@ def simprop_kwargs_from_ini(path, only=None, verbose=False): parser_dict = {} for section in parser: # skip default section - if section == 'DEFAULT': + if section == 'DEFAULT': # pragma: no cover continue if only is not None: if section != only: @@ -534,7 +534,7 @@ def binarypop_kwargs_from_ini(path, verbose=False): if pop_kwargs['use_MPI'] == True and JOB_ID is not None: raise ValueError('MPI must be turned off for job arrays.') exit() - elif pop_kwargs['use_MPI'] == True: + elif pop_kwargs['use_MPI'] == True: # pragma: no cover from mpi4py import MPI pop_kwargs['comm'] = MPI.COMM_WORLD # MPI needs to be turned off for job arrays diff --git a/posydon/popsyn/rate_calculation.py b/posydon/popsyn/rate_calculation.py index 4b57935d0b..6c8148c93d 100644 --- a/posydon/popsyn/rate_calculation.py +++ b/posydon/popsyn/rate_calculation.py @@ -204,7 +204,7 @@ def get_redshift_bin_centers(delta_t): # compute the redshift z_birth = [] for i in range(n_redshift_bin_centers + 1): - # z_at_value is from astopy.cosmology + # z_at_value is from astropy.cosmology z_birth.append(z_at_value(cosmology.age, t_birth[i] * u.Gyr)) z_birth = np.array(z_birth) diff --git a/posydon/popsyn/synthetic_population.py b/posydon/popsyn/synthetic_population.py index 9c89c8971c..34b49ab082 100644 --- a/posydon/popsyn/synthetic_population.py +++ b/posydon/popsyn/synthetic_population.py @@ -155,12 +155,12 @@ def evolve(self, overwrite=False): if os.path.exists(pop.kwargs["temp_directory"]) and not overwrite: raise FileExistsError(f"The {pop.kwargs['temp_directory']} directory already exists! Please remove it or rename it before running the population.") elif os.path.exists(pop.kwargs["temp_directory"]) and overwrite: - if self.verbose: + if self.verbose: # pragma: no cover print(f"Removing pre-existing {pop.kwargs['temp_directory']} directory...") shutil.rmtree(pop.kwargs["temp_directory"]) pop.evolve(optimize_ram=True) - if pop.comm is None: + if pop.comm is None: # pragma: no cover self.merge_parallel_runs(pop, overwrite) def merge_parallel_runs(self, pop, overwrite=False): @@ -179,7 +179,7 @@ def merge_parallel_runs(self, pop, overwrite=False): f"{Zstr}_Zsun_population.h5 already exists!\n" +"Files were not merged. You can use PopulationRunner.merge_parallel_runs() to merge the files manually." ) - elif os.path.exists(fname) and overwrite: + elif os.path.exists(fname) and overwrite: # pragma: no cover if self.verbose: print(f"Removing pre-exisiting {fname}...") os.remove(fname) @@ -191,12 +191,12 @@ def merge_parallel_runs(self, pop, overwrite=False): for f in os.listdir(path_to_batch) if os.path.isfile(os.path.join(path_to_batch, f)) ] - if self.verbose: + if self.verbose: # pragma: no cover print(f"Merging {len(tmp_files)} files...") pop.combine_saved_files(fname, tmp_files) - if self.verbose: + if self.verbose: # pragma: no cover print("Files merged!") print(f"Saved merged files to {fname}...") print(f"Removing files in {path_to_batch}...") @@ -377,7 +377,7 @@ def __init__(self, filename, verbose=False, chunksize=100000): if "/history_lengths" in store.keys(): self.lengths = store["history_lengths"] else: - if self.verbose: + if self.verbose: # pragma: no cover print( "history_lengths not found in population file. Calculating history lengths..." ) @@ -388,7 +388,7 @@ def __init__(self, filename, verbose=False, chunksize=100000): tmp_df.rename(columns={"index": "length"}, inplace=True) self.lengths = tmp_df del tmp_df - if self.verbose: + if self.verbose: # pragma: no cover print("Storing history lengths in population file!") store.put("history_lengths", pd.DataFrame(self.lengths), format="table") del history_events @@ -725,7 +725,7 @@ def __getitem__(self, key): else: raise ValueError("Invalid key type!") - def __len__(self): + def __len__(self): # pragma: no cover """ Get the number of systems in the oneline table. @@ -736,7 +736,7 @@ def __len__(self): """ return self.number_of_systems - def head(self, n=10): + def head(self, n=10): # pragma: no cover """Get the first n rows of the oneline table. Parameters @@ -751,7 +751,7 @@ def head(self, n=10): """ return super().head("oneline", n) - def tail(self, n=10): + def tail(self, n=10): # pragma: no cover """ Get the last n rows of the oneline table. @@ -767,7 +767,7 @@ def tail(self, n=10): """ return super().tail("oneline", n) - def __repr__(self): + def __repr__(self): # pragma: no cover """ Get a string representation of the oneline table. @@ -778,7 +778,7 @@ def __repr__(self): """ return super().get_repr("oneline") - def _repr_html_(self): + def _repr_html_(self): # pragma: no cover """ Get an HTML representation of the oneline table. @@ -789,7 +789,7 @@ def _repr_html_(self): """ return super().get_html_repr("oneline") - def select(self, where=None, start=None, stop=None, columns=None): + def select(self, where=None, start=None, stop=None, columns=None): # pragma: no cover """Select a subset of the oneline table based on the given conditions. This method allows you to filter and extract a subset of rows from the oneline table stored in an HDF file. @@ -1061,7 +1061,7 @@ def __init__( # check if formation channels are present if "/formation_channels" not in keys: - if self.verbose: + if self.verbose: # pragma: no cover print(f"{filename} does not contain formation channels!") self._formation_channels = None else: @@ -1070,7 +1070,7 @@ def __init__( ) # if an ini file is given, read the parameters from the ini file - if ini_file is not None: + if ini_file is not None: # pragma: no cover self.ini_params = binarypop_kwargs_from_ini(ini_file) self._save_ini_params(filename) self._load_ini_params(filename) @@ -1122,7 +1122,7 @@ def __init__( self.solar_metallicities = self.mass_per_metallicity.index.to_numpy() self.metallicities = self.solar_metallicities * Zsun - elif metallicity is not None and ini_file is None: + elif metallicity is not None and ini_file is None: # pragma: no cover raise ValueError( f"{filename} does not contain a mass_per_metallicity table and no ini file was given!" ) @@ -1132,7 +1132,7 @@ def __init__( self.number_of_systems = self.oneline.number_of_systems self.indices = self.history.indices - def __repr__(self): + def __repr__(self): # pragma: no cover """Return a string representation of the object. Returns @@ -1249,16 +1249,16 @@ def export_selection(self, selection, filename, overwrite=False, append=False, h elif "/history" in store.keys(): last_index_in_file = np.sort(store["history"].index)[-1] - if "/history" in store.keys() and self.verbose: + if "/history" in store.keys() and self.verbose: # pragma: no cover print("history in file. Appending to file") - if "/oneline" in store.keys() and self.verbose: + if "/oneline" in store.keys() and self.verbose: # pragma: no cover print("oneline in file. Appending to file") - if "/formation_channels" in store.keys() and self.verbose: + if "/formation_channels" in store.keys() and self.verbose: # pragma: no cover print("formation_channels in file. Appending to file") - if "/history_lengths" in store.keys() and self.verbose: + if "/history_lengths" in store.keys() and self.verbose: # pragma: no cover print("history_lengths in file. Appending to file") # TODO: I need to shift the indices of the binaries or should I reindex them? @@ -1289,7 +1289,7 @@ def export_selection(self, selection, filename, overwrite=False, append=False, h "The population file contains multiple metallicities. Please add a metallicity column to the oneline dataframe!" ) - if self.verbose: + if self.verbose: # pragma: no cover print("Writing selected systems to population file...") # write oneline of selected systems @@ -1313,7 +1313,7 @@ def export_selection(self, selection, filename, overwrite=False, append=False, h index=False, ) - if self.verbose: + if self.verbose: # pragma: no cover print("Oneline: Done") # write history of selected systems @@ -1332,7 +1332,7 @@ def export_selection(self, selection, filename, overwrite=False, append=False, h index=False, ) - if self.verbose: + if self.verbose: # pragma: no cover print("History: Done") # write formation channels of selected systems @@ -1396,7 +1396,7 @@ def formation_channels(self): self.filename, key="formation_channels" ) else: - if self.verbose: + if self.verbose: # pragma: no cover print("No formation channels in the population file!") self._formation_channels = None @@ -1420,7 +1420,7 @@ def calculate_formation_channels(self, mt_history=True): If the mt_history_HMS_HMS column is not present in the oneline dataframe. """ - if self.verbose: + if self.verbose: # pragma: no cover print("Calculating formation channels...") # load the HMS-HMS interp class @@ -1539,7 +1539,7 @@ def get_mt_history(row): self._write_formation_channels(self.filename, df) del df - if self.verbose: + if self.verbose: # pragma: no cover print("formation_channels written to population file!") def _write_formation_channels(self, filename, df): @@ -1567,7 +1567,7 @@ def _write_formation_channels(self, filename, df): min_itemsize={"channel_debug": str_length, "channel": str_length}, ) - def __len__(self): + def __len__(self): # pragma: no cover """Get the number of systems in the population. Returns @@ -1579,7 +1579,7 @@ def __len__(self): return self.number_of_systems @property - def columns(self): + def columns(self): # pragma: no cover """ Returns a dictionary containing the column names of the history and oneline dataframes. @@ -1733,7 +1733,7 @@ def create_transient_population( ) return synth_pop - def plot_binary_evolution(self, index): + def plot_binary_evolution(self, index): # pragma: no cover """Plot the binary evolution of a system This method is not currently implemented. @@ -1805,7 +1805,7 @@ def __init__(self, filename, transient_name, verbose=False, chunksize=100000): self.transient_name = transient_name @property - def population(self): + def population(self): # pragma: no cover """Returns the entire transient population as a pandas DataFrame. This method retrieves the transient population data from a file and returns it as a pandas DataFrame. @@ -1819,7 +1819,7 @@ def population(self): return pd.read_hdf(self.filename, key="transients/" + self.transient_name) @property - def columns(self): + def columns(self): # pragma: no cover """Return the columns of the transient population. Returns: @@ -2174,7 +2174,7 @@ def calculate_cosmic_weights(self, SFH_identifier, model_weights, MODEL_in=None) ) return rates - def plot_efficiency_over_metallicity(self, model_weight_identifier, channels=False, **kwargs): + def plot_efficiency_over_metallicity(self, model_weight_identifier, channels=False, **kwargs): # pragma: no cover """ Plot the efficiency over metallicity. @@ -2195,7 +2195,7 @@ def plot_efficiency_over_metallicity(self, model_weight_identifier, channels=Fal efficiency.index.to_numpy() * Zsun, efficiency, channels=channels, **kwargs ) - def plot_delay_time_distribution( + def plot_delay_time_distribution( # pragma: no cover self, model_weights_identifier, metallicity=None, ax=None, bins=100, color="black" ): """ @@ -2273,7 +2273,7 @@ def plot_delay_time_distribution( ax.set_xlabel("Time [yr]") ax.set_ylabel("Number of events/Msun/yr") - def plot_popsyn_over_grid_slice(self, grid_type, met_Zsun, **kwargs): + def plot_popsyn_over_grid_slice(self, grid_type, met_Zsun, **kwargs): # pragma: no cover """ Plot the transients over the grid slice. @@ -2292,7 +2292,7 @@ def plot_popsyn_over_grid_slice(self, grid_type, met_Zsun, **kwargs): pop=self, grid_type=grid_type, met_Zsun=met_Zsun, **kwargs ) - def _write_MODEL_data(self, filename, path_in_file, MODEL): + def _write_MODEL_data(self, filename, path_in_file, MODEL): # pragma: no cover """ Write the MODEL data to the HDFStore file. @@ -2311,7 +2311,7 @@ def _write_MODEL_data(self, filename, path_in_file, MODEL): store.put(path_in_file + "MODEL", pd.DataFrame(MODEL)) else: store.put(path_in_file + "MODEL", pd.DataFrame(MODEL, index=[0])) - if self.verbose: + if self.verbose: # pragma: no cover print("MODEL written to population file!") def efficiency(self, model_weights_identifier, channels=False): @@ -2450,7 +2450,7 @@ def _read_MODEL_data(self, filename): print("MODEL read from population file!") @property - def weights(self): + def weights(self): # pragma: no cover """ Retrieves the weights from the HDFStore. diff --git a/posydon/popsyn/transient_select_funcs.py b/posydon/popsyn/transient_select_funcs.py index 38ca3f6283..8430579e9c 100644 --- a/posydon/popsyn/transient_select_funcs.py +++ b/posydon/popsyn/transient_select_funcs.py @@ -294,9 +294,9 @@ def DCO_detectability(sensitivity, transient_pop_chunk, z_events_chunk, z_weight These have to be present and a valid value. If not, the function will raise an error! ''' - available_sensitiveies = ['O3actual_H1L1V1', 'O4low_H1L1V1', 'O4high_H1L1V1', 'design_H1L1V1'] - if sensitivity not in available_sensitiveies: - raise ValueError(f'Unknown sensitivity {sensitivity}. Available sensitivities are {available_sensitiveies}') + available_sensitivities = ['O3actual_H1L1V1', 'O4low_H1L1V1', 'O4high_H1L1V1', 'design_H1L1V1'] + if sensitivity not in available_sensitivities: + raise ValueError(f'Unknown sensitivity {sensitivity}. Available sensitivities are {available_sensitivities}') else: sel_eff = selection_effects.KNNmodel(grid_path=PATH_TO_PDET_GRID, sensitivity_key=sensitivity) diff --git a/posydon/unit_tests/popsyn/test_GRB.py b/posydon/unit_tests/popsyn/test_GRB.py new file mode 100644 index 0000000000..541a7b8d50 --- /dev/null +++ b/posydon/unit_tests/popsyn/test_GRB.py @@ -0,0 +1,50 @@ +"""Unit tests of posydon/popsyn/GRB.py +""" + +__authors__ = [ + "Elizabeth Teng " +] + +# import the module which will be tested +import posydon.popsyn.GRB as totest + +# aliases +np = totest.np + +from inspect import isclass, isroutine + +# import other needed code for the tests, which is not already imported in the +# module you like to test +from pytest import approx, fixture, raises, warns + +from posydon.utils.constants import Msun, clight +from posydon.utils.posydonwarning import Pwarn + + +# define test classes collecting several test functions +class TestElements: + # check for objects, which should be an element of the tested module + def test_dir(self): + elements = ['get_GRB_properties','__authors__',\ + '__builtins__', '__cached__', '__doc__', '__file__',\ + '__loader__', '__name__', '__package__', '__spec__', + 'Pwarn','Msun','clight','np'] + totest_elements = set(dir(totest)) + missing_in_test = set(elements) - totest_elements + assert len(missing_in_test) == 0, "There are missing objects in "\ + +f"{totest.__name__}: "\ + +f"{missing_in_test}. Please "\ + +"check, whether they have been "\ + +"removed on purpose and update "\ + +"this unit test." + new_in_test = totest_elements - set(elements) + assert len(new_in_test) == 0, "There are new objects in "\ + +f"{totest.__name__}: {new_in_test}. "\ + +"Please check, whether they have been "\ + +"added on purpose and update this "\ + +"unit test." + +class TestFunctions: + + def test_get_GRB_properties(): + pass diff --git a/posydon/unit_tests/popsyn/test_analysis.py b/posydon/unit_tests/popsyn/test_analysis.py new file mode 100644 index 0000000000..f9a58ad59b --- /dev/null +++ b/posydon/unit_tests/popsyn/test_analysis.py @@ -0,0 +1,18 @@ +"""Unit tests of posydon/popsyn/analysis.py +""" + +__authors__ = [ + "Elizabeth Teng " +] + +# import the module which will be tested +import posydon.popsyn.analysis as totest + +# aliases +pd = totest.pd + +from inspect import isclass, isroutine + +# import other needed code for the tests, which is not already imported in the +# module you like to test +from pytest import approx, fixture, raises, warns diff --git a/posydon/unit_tests/popsyn/test_binarypopulation.py b/posydon/unit_tests/popsyn/test_binarypopulation.py new file mode 100644 index 0000000000..a98286ce1b --- /dev/null +++ b/posydon/unit_tests/popsyn/test_binarypopulation.py @@ -0,0 +1,19 @@ +"""Unit tests of posydon/popsyn/binarypopulation.py +""" + +__authors__ = [ + "Elizabeth Teng " +] + +# import the module which will be tested +import posydon.popsyn.binarypopulation as totest + +# aliases +pd = totest.pd +np = totest.np + +from inspect import isclass, isroutine + +# import other needed code for the tests, which is not already imported in the +# module you like to test +from pytest import approx, fixture, raises, warns diff --git a/posydon/unit_tests/popsyn/test_defaults.py b/posydon/unit_tests/popsyn/test_defaults.py new file mode 100644 index 0000000000..a65ede9eb9 --- /dev/null +++ b/posydon/unit_tests/popsyn/test_defaults.py @@ -0,0 +1,146 @@ +"""Unit tests of posydon/popsyn/defaults.py +""" + +__authors__ = [ + "Elizabeth Teng " +] + +# import other needed code for the tests, which is not already imported in the +# module you like to test +import pytest + +# import the module which will be tested +import posydon.popsyn.defaults as totest + + +# define test classes collecting several test functions +class TestElements: + # check for objects, which should be an element of the tested module + + def test_dir(self): + elements = ['default_kwargs', '__authors__',\ + '__builtins__', '__cached__', '__doc__', '__file__',\ + '__loader__', '__name__', '__package__', '__spec__','age_of_universe'] + totest_elements = set(dir(totest)) + missing_in_test = set(elements) - totest_elements + assert len(missing_in_test) == 0, "There are missing objects in "\ + +f"{totest.__name__}: "\ + +f"{missing_in_test}. Please "\ + +"check, whether they have been "\ + +"removed on purpose and update "\ + +"this unit test." + new_in_test = totest_elements - set(elements) + assert len(new_in_test) == 0, "There are new objects in "\ + +f"{totest.__name__}: {new_in_test}. "\ + +"Please check, whether they have been "\ + +"added on purpose and update this "\ + +"unit test." + + def test_kwargs(self): + elements = [ + 'entropy', + 'number_of_binaries', + 'metallicity', + 'star_formation', + 'max_simulation_time', + 'orbital_scheme', + 'orbital_separation_scheme', + 'orbital_separation_min', + 'orbital_separation_max', + 'log_orbital_seperation_mean', + 'log_orbital_seperation_sigma', + 'orbital_period_scheme', + 'orbital_period_min', + 'orbital_period_max', + 'eccentricity_scheme', + 'primary_mass_scheme', + 'primary_mass_min', + 'primary_mass_max', + 'secondary_mass_scheme', + 'secondary_mass_min', + 'secondary_mass_max', + 'binary_fraction_const', + 'binary_fraction_scheme' + ] + assert set(totest.default_kwargs.keys()) == set(elements), \ + "The default_kwargs dictionary keys have changed. Please update the test." + + def test_instance_entropy(self): + assert isinstance(totest.default_kwargs['entropy'], (type(None), float)), \ + "entropy should be None or a float" + + def test_instance_number_of_binaries(self): + assert isinstance(totest.default_kwargs['number_of_binaries'], int), \ + "number_of_binaries should be an integer" + + def test_instance_metallicity(self): + assert isinstance(totest.default_kwargs['metallicity'], float), \ + "metallicity should be a float" + + def test_instance_star_formation(self): + assert isinstance(totest.default_kwargs['star_formation'], str), \ + "star_formation should be a string" + + def test_instance_max_simulation_time(self): + assert isinstance(totest.default_kwargs['max_simulation_time'], (float, int)), \ + "max_simulation_time should be a float or int" + + def test_instance_orbital_scheme(self): + assert isinstance(totest.default_kwargs['orbital_scheme'], str), \ + "orbital_scheme should be a string" + + def test_instance_orbital_separation_scheme(self): + assert isinstance(totest.default_kwargs['orbital_separation_scheme'], str), \ + "orbital_scheme should be a string" + + def test_instance_orbital_separation_min(self): + assert isinstance(totest.default_kwargs['orbital_separation_min'], float), \ + "orbital_separation_min should be a float" + + def test_instance_orbital_separation_max(self): + assert isinstance(totest.default_kwargs['orbital_separation_max'], float), \ + "orbital_separation_max should be a float" + + def test_instance_log_orbital_seperation_mean(self): + assert isinstance(totest.default_kwargs['log_orbital_seperation_mean'], (type(None), float)), \ + "log_orbital_seperation_mean should be None or a float" + + def test_instance_log_orbital_seperation_sigma(self): + assert isinstance(totest.default_kwargs['log_orbital_seperation_sigma'], (type(None), float)), \ + "log_orbital_seperation_sigma should be None or a float" + + def test_instance_orbital_period_min(self): + assert isinstance(totest.default_kwargs['orbital_period_min'], float), \ + "orbital_period_min should be a float" + + def test_instance_orbital_period_max(self): + assert isinstance(totest.default_kwargs['orbital_period_max'], float), \ + "orbital_period_max should be a float" + + def test_instance_eccentricity_scheme(self): + assert isinstance(totest.default_kwargs['eccentricity_scheme'], str), \ + "eccentricity_scheme should be a string" + + def test_instance_primary_mass_min(self): + assert isinstance(totest.default_kwargs['primary_mass_min'], float), \ + "primary_mass_min should be a float" + + def test_instance_primary_mass_max(self): + assert isinstance(totest.default_kwargs['primary_mass_max'], float), \ + "primary_mass_max should be a float" + + def test_instance_secondary_mass_min(self): + assert isinstance(totest.default_kwargs['secondary_mass_min'], float), \ + "secondary_mass_min should be a float" + + def test_instance_secondary_mass_max(self): + assert isinstance(totest.default_kwargs['secondary_mass_max'], float), \ + "secondary_mass_max should be a float" + + def test_instance_binary_fraction_const(self): + assert isinstance(totest.default_kwargs['binary_fraction_const'], (float, int)), \ + "binary_fraction_const should be a float or int" + + def test_instance_binary_fraction_scheme(self): + assert isinstance(totest.default_kwargs['binary_fraction_scheme'], str), \ + "binary_fraction_scheme should be a string" diff --git a/posydon/unit_tests/popsyn/test_independent_sample.py b/posydon/unit_tests/popsyn/test_independent_sample.py new file mode 100644 index 0000000000..7632d1b972 --- /dev/null +++ b/posydon/unit_tests/popsyn/test_independent_sample.py @@ -0,0 +1,221 @@ +"""Unit tests of posydon/popsyn/independent_sample.py +""" + +__authors__ = [ + "Elizabeth Teng " +] + +# import the module which will be tested +import posydon.popsyn.independent_sample as totest + +# aliases +np = totest.np + +# import other needed code for the tests, which is not already imported in the +# module you like to test +import re +from inspect import isclass, isroutine + +from pytest import approx, raises + + +# define test classes collecting several test functions +class TestElements: + + # check for objects, which should be an element of the tested module + def test_dir(self): + elements = ['generate_independent_samples', 'generate_orbital_periods', \ + 'generate_orbital_separations', 'generate_eccentricities',\ + 'generate_primary_masses','generate_secondary_masses',\ + 'binary_fraction_value','__authors__',\ + 'np','truncnorm','rejection_sampler',\ + '__builtins__', '__cached__', '__doc__', '__file__',\ + '__loader__', '__name__', '__package__', '__spec__'] + totest_elements = set(dir(totest)) + missing_in_test = set(elements) - totest_elements + assert len(missing_in_test) == 0, "There are missing objects in "\ + +f"{totest.__name__}: "\ + +f"{missing_in_test}. Please "\ + +"check, whether they have been "\ + +"removed on purpose and update "\ + +"this unit test." + new_in_test = totest_elements - set(elements) + assert len(new_in_test) == 0, "There are new objects in "\ + +f"{totest.__name__}: {new_in_test}. "\ + +"Please check, whether they have been "\ + +"added on purpose and update this "\ + +"unit test." + + def test_instance_generate_independent_samples(self): + assert isroutine(totest.generate_independent_samples) + + def test_instance_generate_orbital_periods(self): + assert isroutine(totest.generate_orbital_periods) + + def test_instance_generate_orbital_separations(self): + assert isroutine(totest.generate_orbital_separations) + + def test_instance_generate_eccentricities(self): + assert isroutine(totest.generate_eccentricities) + + def test_instance_generate_primary_masses(self): + assert isroutine(totest.generate_primary_masses) + + def test_instance_generate_secondary_masses(self): + assert isroutine(totest.generate_secondary_masses) + + def test_instance_binary_fraction_value(self): + assert isroutine(totest.binary_fraction_value) + +class TestFunctions: + + # test functions + def test_generate_independent_samples(self): + # bad input + with raises(ValueError, match="Allowed orbital schemes are separation or period."): + totest.generate_independent_samples('test') + # examples + tests = [("separation",42,approx(4993.106338349307,abs=6e-12)), + ("period",12,approx(200.82071793763188,abs=6e-12))] + for (s,r,o) in tests: + orb,ecc,m1,m2 = totest.generate_independent_samples(orbital_scheme=s, + RNG = np.random.default_rng(seed=42)) + assert orb[0] == approx(o,abs=6e-12) + assert ecc[0] == approx(0.8797477186989253,abs=6e-12) + assert m1[0] == approx(10.607132832170066,abs=6e-12) + assert m2[0] == approx(9.182255718237206,abs=6e-12) + + def test_generate_orbital_periods(self): + # missing argument + with raises(TypeError, match="missing 1 required positional argument: 'primary_masses'"): + totest.generate_orbital_periods() + # bad input + with raises(TypeError, match="expected a sequence of integers or a single integer"): + totest.generate_orbital_periods(np.array([1.]), + number_of_binaries=1.) + with raises(ValueError, match="high - low < 0"): + totest.generate_orbital_periods(np.array([1.]), + orbital_period_min=10., + orbital_period_max=1.) + with raises(ValueError, match="You must provide an allowed orbital period scheme."): + totest.generate_orbital_periods(np.array([1.]), + orbital_period_scheme='test') + # examples + tests = [(1.0,42,approx(403.44608837021764,abs=6e-12)), + (1.0,12,approx(3.4380527315000666,abs=6e-12))] + for (m,r,p) in tests: + assert totest.generate_orbital_periods(m,RNG = np.random.default_rng(seed=r))[0] == p + + def test_generate_orbital_separations(self): + # missing argument + with raises(ValueError,match="For the `log_normal separation` scheme you must give `log_orbital_separation_mean`, `log_orbital_separation_sigma`."): + totest.generate_orbital_separations(orbital_separation_scheme='log_normal') + # bad input + with raises(TypeError, match="expected a sequence of integers or a single integer"): + totest.generate_orbital_separations(number_of_binaries=1.) + with raises(ValueError, match="high - low < 0"): + totest.generate_orbital_separations(orbital_separation_min=10., + orbital_separation_max=1.) + with raises(OverflowError, match="high - low range exceeds valid bounds"): + totest.generate_orbital_separations(orbital_separation_min=0) + with raises(ValueError, match="You must provide an allowed orbital separation scheme."): + totest.generate_orbital_separations(orbital_separation_scheme='test') + # examples + tests_normal = [(0.,1.0,42,approx(39.83711402835139,abs=6e-12)), + (1.0,10.,42,approx(9799.179319004,abs=6e-9))] + # larger allowance for second test because of slightly different results between + # running pytest locally vs github actions workflow + for (m,s,r,sep) in tests_normal: + assert totest.generate_orbital_separations(orbital_separation_scheme='log_normal', + log_orbital_separation_mean=m, + log_orbital_separation_sigma=s, + RNG = np.random.default_rng(seed=r))[0] == sep + tests_uniform = [(1.,3.,42,approx(2.3402964885050066,abs=6e-12)), + (2.,10.,42,approx(6.950276115688688,abs=6e-12))] + for (mi,ma,r,sep) in tests_uniform: + assert totest.generate_orbital_separations(orbital_separation_min=mi, + orbital_separation_max=ma, + RNG = np.random.default_rng(seed=r))[0] == sep + def test_generate_eccentricities(self): + # bad input + with raises(TypeError, match="expected a sequence of integers or a single integer"): + totest.generate_eccentricities(number_of_binaries=1.) + with raises(ValueError, match="You must provide an allowed eccentricity scheme."): + totest.generate_eccentricities(eccentricity_scheme='test') + # examples + tests = [('thermal',42,approx(0.8797477186989253,abs=6e-12)), + ('uniform',42,approx(0.7739560485559633,abs=6e-12)), + ('zero',42,approx(0.,abs=6e-12))] + for (s,r,e) in tests: + assert totest.generate_eccentricities(eccentricity_scheme=s, + RNG = np.random.default_rng(seed=r))[0] == e + + def test_generate_primary_masses(self): + # bad input + with raises(TypeError, match="expected a sequence of integers or a single integer"): + totest.generate_primary_masses(number_of_binaries=1.) + with raises(ValueError, match="primary_mass_max must be larger than primary_mass_min."): + totest.generate_primary_masses(primary_mass_min=100.,primary_mass_max=10.) + with raises(ValueError, match="You must provide an allowed primary mass scheme."): + totest.generate_primary_masses(primary_mass_scheme='test') + # examples + tests = [('Salpeter',42,approx(19.97764511120556,abs=6e-12)), + ('Kroupa1993',42,approx(16.52331793661949,abs=6e-12)), + ('Kroupa2001',42,approx(20.633412780370865,abs=6e-12))] + for (s,r,m1) in tests: + assert totest.generate_primary_masses(primary_mass_scheme=s, + RNG = np.random.default_rng(seed=r))[0] == m1 + + def test_generate_secondary_masses(self): + # missing argument + with raises(TypeError,match="missing 1 required positional argument: 'primary_masses'"): + totest.generate_secondary_masses() + # bad input + with raises(TypeError, match=re.escape("unsupported operand type(s) for /: 'float' and 'list'")): + totest.generate_secondary_masses(primary_masses=[10.]) + with raises(TypeError, match="expected a sequence of integers or a single integer"): + totest.generate_secondary_masses(primary_masses=np.array([10.]), + number_of_binaries=1.) + with raises(ValueError, match="secondary_mass_max must be larger than secondary_mass_min"): + totest.generate_secondary_masses(primary_masses=np.array([100.]), + secondary_mass_min=10., + secondary_mass_max=1.) + with raises(ValueError, match="`secondary_mass_min` is larger than some primary masses"): + totest.generate_secondary_masses(primary_masses=np.array([1.]), + secondary_mass_min=10., + secondary_mass_max=100.) + with raises(ValueError, match="You must provide an allowed secondary mass scheme."): + totest.generate_secondary_masses(primary_masses=np.array([1.]), + secondary_mass_scheme='test') + # examples + tests = [('flat_mass_ratio',42,approx(7.852582461281652,abs=6e-12)), + ('q=1',42,approx(10.,abs=6e-12))] + for (s,r,m2) in tests: + assert totest.generate_secondary_masses(primary_masses=np.array([10.]), + secondary_mass_scheme=s, + RNG = np.random.default_rng(seed=r))[0] == m2 + + def test_binary_fraction_value(self): + # missing argument + with raises(ValueError, match="There was not a primary mass provided in the inputs."): + totest.binary_fraction_value(binary_fraction_scheme='Moe_17') + # bad input + with raises(ValueError, match="You must provide an allowed binary fraction scheme."): + totest.binary_fraction_value(binary_fraction_scheme='test') + with raises(ValueError, match="The scheme doesn't support values of m1 less than 0.8"): + totest.binary_fraction_value(binary_fraction_scheme='Moe_17',m1=0.2) + with raises(ValueError, match="The primary mass provided nan is not supported by the Moe_17 scheme."): + totest.binary_fraction_value(binary_fraction_scheme='Moe_17',m1=np.nan) + # examples + tests_const = [1.0,1,0.5] + for (c) in tests_const: + assert totest.binary_fraction_value(binary_fraction_const=c, + binary_fraction_scheme='const') == c + tests_moe = [(1,0.4), + (3,0.59), + (8,0.76), + (10,0.84), + (18,0.94)] + for (m1,f) in tests_moe: + assert totest.binary_fraction_value(binary_fraction_scheme='Moe_17', + m1=m1) == f diff --git a/posydon/unit_tests/popsyn/test_io.py b/posydon/unit_tests/popsyn/test_io.py new file mode 100644 index 0000000000..0857e0bd5f --- /dev/null +++ b/posydon/unit_tests/popsyn/test_io.py @@ -0,0 +1,453 @@ +"""Unit tests of posydon/popsyn/io.py +""" + +__authors__ = [ + "Elizabeth Teng " +] + +# import the module which will be tested +import posydon.popsyn.io as totest + +# aliases +np = totest.np +pd = totest.pd + +import ast +import errno +import importlib +import os +import pprint +import textwrap +from configparser import ConfigParser, MissingSectionHeaderError +from inspect import isclass, isroutine + +# import other needed code for the tests, which is not already imported in the +# module you like to test +from pytest import approx, fixture, raises, warns + +from posydon.binary_evol.simulationproperties import SimulationProperties + + +# define test classes collecting several test functions +class TestElements: + # check for objects, which should be an element of the tested module + def test_dir(self): + elements = ['BINARYPROPERTIES_DTYPES', 'OBJECT_FIXED_SUB_DTYPES', \ + 'STARPROPERTIES_DTYPES', 'EXTRA_BINARY_COLUMNS_DTYPES', \ + 'EXTRA_STAR_COLUMNS_DTYPES', 'SCALAR_NAMES_DTYPES', \ + 'clean_binary_history_df', 'clean_binary_oneline_df', \ + 'parse_inifile', 'simprop_kwargs_from_ini', \ + 'binarypop_kwargs_from_ini', 'create_run_script_text', \ + 'create_merge_script_text', \ + '__builtins__', '__cached__', '__doc__', '__file__',\ + '__loader__', '__name__', '__package__', '__spec__', \ + 'ConfigParser', 'ast', 'importlib', 'os', 'errno', \ + 'pprint', 'np', 'pd','SimulationProperties'] + totest_elements = set(dir(totest)) + missing_in_test = set(elements) - totest_elements + assert len(missing_in_test) == 0, "There are missing objects in "\ + +f"{totest.__name__}: "\ + +f"{missing_in_test}. Please "\ + +"check, whether they have been "\ + +"removed on purpose and update "\ + +"this unit test." + new_in_test = totest_elements - set(elements) + assert len(new_in_test) == 0, "There are new objects in "\ + +f"{totest.__name__}: {new_in_test}. "\ + +"Please check, whether they have been "\ + +"added on purpose and update this "\ + +"unit test." + +class TestFunctions: + + @fixture + def simple_ini(self,tmp_path): + file_path = os.path.join(tmp_path, "test.ini") + with open(file_path, "w") as f: + f.write("[section]\nkey=value\n") + return file_path + + @fixture + def multi_ini(self,tmp_path): + file1 = os.path.join(tmp_path, "a.ini") + file2 = os.path.join(tmp_path, "b.ini") + with open(file1, "w") as f: + f.write("[section]\nkey1=value1\n") + with open(file2, "w") as f: + f.write("[section]\nkey2=value2\n") + return [file1, file2] + + @fixture + def textfile(self,tmp_path): + file_path = os.path.join(tmp_path, "textfile.txt") + with open(file_path, "w") as f: + f.write("test") + return file_path + + @fixture + def sim_ini(self,tmp_path): + ini_content = """ + [flow] + import = ['posydon.binary_evol.flow_chart', 'flow_chart'] + absolute_import = None + + [step_HMS_HMS] + import = ['posydon.binary_evol.MESA.step_mesa', 'MS_MS_step'] + absolute_import = None + interpolation_method = 'linear3c_kNN' + save_initial_conditions = True + verbose = False + + [extra_hooks] + import_1 = ['posydon.binary_evol.simulationproperties', 'TimingHooks'] + absolute_import_1 = None + kwargs_1 = {} + import_2 = ['posydon.binary_evol.simulationproperties', 'StepNamesHooks'] + absolute_import_2 = None + kwargs_2 = {} + """ + file_path = os.path.join(tmp_path, "sim.ini") + with open(file_path, "w") as f: + f.write(ini_content) + return file_path + + @fixture + def binpop_ini(self, tmp_path): + ini_content = """ + [BinaryPopulation_options] + use_MPI = False + metallicity = [0.02] + number_of_binaries = 1 + temp_directory = 'tmp' + + [BinaryStar_output] + extra_columns = {} + only_select_columns = [] + scalar_names = [] + + [SingleStar_1_output] + include_S1 = False + + [SingleStar_2_output] + include_S2 = False + + [flow] + import = ['builtins', 'int'] + + [extra_hooks] + import_1 = ['builtins', 'int'] + absolute_import_1 = None + kwargs_1 = {} + """ + file_path = os.path.join(tmp_path, "binpop.ini") + with open(file_path, "w") as f: + f.write(ini_content) + return file_path + + @fixture + def binpop_ini_mpi(self, tmp_path): + ini_content = """ + [BinaryPopulation_options] + use_MPI = True + metallicity = [0.02] + number_of_binaries = 1 + temp_directory = 'tmp' + + [BinaryStar_output] + extra_columns = {} + only_select_columns = [] + scalar_names = [] + + [SingleStar_1_output] + include_S1 = False + + [SingleStar_2_output] + include_S2 = False + + [flow] + import = ['builtins', 'int'] + + [extra_hooks] + import_1 = ['builtins', 'int'] + absolute_import_1 = None + kwargs_1 = {} + """ + file_path = os.path.join(tmp_path, "binpop_mpi.ini") + with open(file_path, "w") as f: + f.write(ini_content) + return file_path + + @fixture + def binpop_ini_stars(self, tmp_path): + ini_content = """ + [BinaryPopulation_options] + use_MPI = False + metallicity = [0.02] + number_of_binaries = 1 + temp_directory = 'tmp' + + [BinaryStar_output] + extra_columns = {} + only_select_columns = [] + scalar_names = [] + + [SingleStar_1_output] + include_S1 = True + only_select_columns = [ + 'state', + 'mass', + 'log_R'] + + [SingleStar_2_output] + include_S2 = True + only_select_columns = [ + 'log_L', + 'lg_mdot'] + + [flow] + import = ['builtins', 'int'] + + [extra_hooks] + import_1 = ['builtins', 'int'] + absolute_import_1 = None + kwargs_1 = {} + """ + file_path = os.path.join(tmp_path, "binpop_stars.ini") + with open(file_path, "w") as f: + f.write(ini_content) + return file_path + + @fixture + def history_df(self): + data = { + 'state': ['disrupted'], + 'time': [1.23], + 'S1_mass': [10.0], + 'S2_spin': [0.3] + } + return pd.DataFrame(data) + + @fixture + def oneline_df(self): + data = { + 'state_i': ['detached', 'detached'], + 'state_f': ['contact', 'merged'], + 'mass_i': [1.4, 2.1], + 'mass_f': [1.3, 2.0], + 'S1_spin_i': [0.5, 0.6], + 'S1_spin_f': [0.7, 0.8], + 'S1_SN_type': ['CCSN', 'NaN'], + 'S2_mass_i': [5.0, 6.0], + 'S2_mass_f': [7.0, 8.0], + 'S2_kick': [123.0, 456.0], + } + df = pd.DataFrame(data) + return df + + def test_clean_binary_history_df(self, history_df): + extra_binary = {'extra_binary': 'int32'} + extra_S1 = {} + extra_S2 = {} + + clean_df = totest.clean_binary_history_df( + history_df, + extra_binary_dtypes_user=extra_binary, + extra_S1_dtypes_user=extra_S1, + extra_S2_dtypes_user=extra_S2 + ) + assert isinstance(clean_df, pd.DataFrame) + assert clean_df.dtypes['time'] == np.dtype('float64') + assert clean_df.dtypes['S1_mass'] == np.dtype('float64') + assert clean_df.dtypes['S2_spin'] == np.dtype('float64') + assert clean_df.dtypes['state'] == np.dtype('O') + + def test_clean_binary_oneline_df(self, oneline_df): + cleaned_df = totest.clean_binary_oneline_df(oneline_df) + assert isinstance(cleaned_df, pd.DataFrame) + assert cleaned_df['mass_i'].dtype == np.float64 + assert cleaned_df['S1_spin_i'].dtype == np.float64 + assert cleaned_df['state_i'].dtype == 'object' + assert cleaned_df['state_f'].dtype == 'object' + assert cleaned_df['S1_SN_type'].dtype == 'object' + assert cleaned_df['S2_kick'].dtype == np.float64 + assert cleaned_df.loc[0, 'mass_i'] == 1.4 + assert cleaned_df.loc[1, 'state_f'] == 'merged' + + def test_parse_inifile(self,simple_ini,multi_ini,textfile): + # missing argument + with raises(TypeError, match="missing 1 required positional argument: 'path'"): + totest.parse_inifile() + # bad input + with raises(FileNotFoundError): + totest.parse_inifile('nonexistent.ini') + with raises(FileNotFoundError): + totest.parse_inifile([simple_ini,'nonexistent.ini']) + with raises(MissingSectionHeaderError, match="File contains no section headers"): + totest.parse_inifile(textfile) + with raises(ValueError, match="Path must be a string or list of strings."): + totest.parse_inifile(0) + + # example: single inifile + parser = totest.parse_inifile(simple_ini) + assert isinstance(parser, ConfigParser) + assert parser.has_section("section") + assert parser.get("section", "key") == "value" + + # example: multiple inifiles + parser = totest.parse_inifile(multi_ini) + assert parser.has_option("section", "key1") + assert parser.has_option("section", "key2") + + + def test_simprop_kwargs_from_ini(self,monkeypatch,sim_ini,tmp_path): + # example + dummy_cls = type('DummyClass', (), {})() + + # Patch importlib.import_module to return dummy modules with dummy classes + def dummy_import_module(name, package=None): + class DummyModule: + pass + setattr(DummyModule, 'TimingHooks', dummy_cls) + setattr(DummyModule, 'StepNamesHooks', dummy_cls) + setattr(DummyModule, 'flow_chart', dummy_cls) + setattr(DummyModule, 'MS_MS_step', dummy_cls) + return DummyModule() + + monkeypatch.setattr(importlib, "import_module", dummy_import_module) + + simkwargs = totest.simprop_kwargs_from_ini(sim_ini) + + # Check keys exist + assert 'flow' in simkwargs + assert 'step_HMS_HMS' in simkwargs + assert 'extra_hooks' in simkwargs + + # Check classes mapped to dummy_cls + assert simkwargs['flow'][0] is dummy_cls + assert simkwargs['step_HMS_HMS'][0] is dummy_cls + + # extra_hooks is a list of tuples (class, kwargs) + hooks = simkwargs['extra_hooks'] + assert isinstance(hooks, list) + assert hooks[0][0] is dummy_cls + assert hooks[0][1] == {} + assert hooks[1][0] is dummy_cls + assert hooks[1][1] == {} + + # absolute imports + dummy_code = """ +class MyDummyClass: + def __init__(self): + self.value = 42 +""" + dummy_path = os.path.join(tmp_path, "dummy.py") + with open(dummy_path, "w") as f: + f.write(dummy_code) + ini_content = f""" + [flow] + import = ['builtins', 'int'] + absolute_import = ['{dummy_path}', 'MyDummyClass'] + """ + ini_path = os.path.join(tmp_path, "sim_abs_import.ini") + with open(ini_path, "w") as f: + f.write(ini_content) + simkwargs = totest.simprop_kwargs_from_ini(str(ini_path)) + dummy_class = simkwargs['flow'][0] + assert dummy_class.__name__ == "MyDummyClass" + instance = dummy_class() + assert instance.value == 42 + + + def test_binarypop_kwargs_from_ini(self,monkeypatch,binpop_ini, + binpop_ini_mpi,binpop_ini_stars): + # bad configuration: MPI and job array + monkeypatch.setenv("SLURM_ARRAY_JOB_ID", "123") + with raises(ValueError, match="MPI must be turned off for job arrays."): + totest.binarypop_kwargs_from_ini(binpop_ini_mpi) + # example: include s1 and s2 + class DummySimProps: + def __init__(self, **kwargs): + self.config = kwargs + monkeypatch.setattr(totest, "SimulationProperties", DummySimProps) + monkeypatch.setenv("SLURM_ARRAY_JOB_ID", "456") + monkeypatch.setenv("SLURM_ARRAY_TASK_ID", "4") + monkeypatch.setenv("SLURM_ARRAY_TASK_MIN", "2") + monkeypatch.setenv("SLURM_ARRAY_TASK_COUNT", "10") + binkwargs = totest.binarypop_kwargs_from_ini(binpop_ini_stars) + assert binkwargs["include_S1"] is True + assert "only_select_columns" in binkwargs["S1_kwargs"] + assert "S2_kwargs" in binkwargs + assert "log_L" in binkwargs["S2_kwargs"]["only_select_columns"] + # example: environment variables + binkwargs = totest.binarypop_kwargs_from_ini(binpop_ini) + assert binkwargs["JOB_ID"] == 456 + assert binkwargs["RANK"] == 2 # 4 - 2 + assert binkwargs["size"] == 10 + assert isinstance(binkwargs, dict) + assert binkwargs["metallicity"] == [0.02] + assert isinstance(binkwargs["population_properties"], DummySimProps) + assert "flow" in binkwargs["population_properties"].config + # example: no Job ID, no MPI + monkeypatch.delenv('SLURM_ARRAY_JOB_ID', raising=False) + binkwargs = totest.binarypop_kwargs_from_ini(binpop_ini) + assert binkwargs['RANK'] is None + assert binkwargs['size'] is None + + + def test_create_run_script_text(self): + # missing argument + with raises(TypeError, match="missing 1 required positional argument: 'ini_file'"): + totest.create_run_script_text() + # bad input + with raises(NameError, match="name 'testfile' is not defined"): + totest.create_run_script_text(testfile.ini) + # example + out = textwrap.dedent("""\ + from posydon.popsyn.binarypopulation import BinaryPopulation + from posydon.popsyn.io import binarypop_kwargs_from_ini + from posydon.utils.common_functions import convert_metallicity_to_string + import argparse + if __name__ == "__main__": + parser = argparse.ArgumentParser() + parser.add_argument('metallicity', type=float) + args = parser.parse_args() + ini_kw = binarypop_kwargs_from_ini('testfile.ini') + ini_kw['metallicity'] = args.metallicity + str_met = convert_metallicity_to_string(args.metallicity) + ini_kw['temp_directory'] = str_met+'_Zsun_' + ini_kw['temp_directory'] + synpop = BinaryPopulation(**ini_kw) + synpop.evolve()""") + assert totest.create_run_script_text('testfile.ini') == out + + + def test_create_merge_script_text(self): + # missing argument + with raises(TypeError, match="missing 1 required positional argument: 'ini_file'"): + totest.create_merge_script_text() + # bad input + with raises(NameError, match="name 'testfile' is not defined"): + totest.create_merge_script_text(testfile.ini) + # example + out = textwrap.dedent("""\ + from posydon.popsyn.binarypopulation import BinaryPopulation + from posydon.popsyn.io import binarypop_kwargs_from_ini + from posydon.utils.common_functions import convert_metallicity_to_string + import argparse + import os + if __name__ == "__main__": + parser = argparse.ArgumentParser() + parser.add_argument("metallicity", type=float) + args = parser.parse_args() + ini_kw = binarypop_kwargs_from_ini("testfile.ini") + ini_kw["metallicity"] = args.metallicity + str_met = convert_metallicity_to_string(args.metallicity) + ini_kw["temp_directory"] = str_met+"_Zsun_" + ini_kw["temp_directory"] + synpop = BinaryPopulation(**ini_kw) + path_to_batch = ini_kw["temp_directory"] + tmp_files = [os.path.join(path_to_batch, f) for f in os.listdir(path_to_batch) if os.path.isfile(os.path.join(path_to_batch, f))] + tmp_files = sorted(tmp_files, key=lambda x: int(x.split(".")[-1])) + synpop.combine_saved_files(str_met+ "_Zsun_population.h5", tmp_files) + print("done") + if len(os.listdir(path_to_batch)) == 0: + os.rmdir(path_to_batch)""") + assert totest.create_merge_script_text('testfile.ini') == out diff --git a/posydon/unit_tests/popsyn/test_normalized_pop_mass.py b/posydon/unit_tests/popsyn/test_normalized_pop_mass.py new file mode 100644 index 0000000000..a9b9a94004 --- /dev/null +++ b/posydon/unit_tests/popsyn/test_normalized_pop_mass.py @@ -0,0 +1,42 @@ +"""Unit tests of posydon/popsyn/normalized_pop_mass.py +""" + +__authors__ = [ + "Elizabeth Teng " +] + +# import the module which will be tested +import posydon.popsyn.normalized_pop_mass as totest + +# aliases +np = totest.np + +from inspect import isclass, isroutine + +# import other needed code for the tests, which is not already imported in the +# module you like to test +from pytest import approx, fixture, raises, warns + + +# define test classes collecting several test functions +class TestElements: + # check for objects, which should be an element of the tested module + def test_dir(self): + totest_elements = set(dir(totest)) + missing_in_test = set(elements) - totest_elements + assert len(missing_in_test) == 0, "There are missing objects in "\ + +f"{totest.__name__}: "\ + +f"{missing_in_test}. Please "\ + +"check, whether they have been "\ + +"removed on purpose and update "\ + +"this unit test." + new_in_test = totest_elements - set(elements) + assert len(new_in_test) == 0, "There are new objects in "\ + +f"{totest.__name__}: {new_in_test}. "\ + +"Please check, whether they have been "\ + +"added on purpose and update this "\ + +"unit test." + +class TestFunctions: + def test_initial_total_underlying_mass(self): + pass diff --git a/posydon/unit_tests/popsyn/test_rate_calculation.py b/posydon/unit_tests/popsyn/test_rate_calculation.py new file mode 100644 index 0000000000..b5b8b640d8 --- /dev/null +++ b/posydon/unit_tests/popsyn/test_rate_calculation.py @@ -0,0 +1,143 @@ +"""Unit tests of posydon/popsyn/rate_calculation.py +""" + +__authors__ = [ + "Elizabeth Teng " +] + +# import the module which will be tested +import posydon.popsyn.rate_calculation as totest + +# aliases +np = totest.np +sp = totest.sp + +from inspect import isclass, isroutine + +# import other needed code for the tests, which is not already imported in the +# module you like to test +from pytest import approx, fixture, raises, warns +from scipy.interpolate import CubicSpline + + +# define test classes collecting several test functions +class TestElements: + + # check for objects, which should be an element of the tested module + def test_dir(self): + elements = ['DEFAULT_SFH_MODEL','np','sp','CubicSpline','Zsun','cosmology',\ + 'const','z_at_value','u',\ + 'get_shell_comoving_volume', 'get_comoving_distance_from_redshift', \ + 'get_cosmic_time_from_redshift', 'redshift_from_cosmic_time_interpolator',\ + 'get_redshift_from_cosmic_time','get_redshift_bin_edges',\ + 'get_redshift_bin_centers','__authors__',\ + '__builtins__', '__cached__', '__doc__', '__file__',\ + '__loader__', '__name__', '__package__', '__spec__'] + totest_elements = set(dir(totest)) + missing_in_test = set(elements) - totest_elements + assert len(missing_in_test) == 0, "There are missing objects in "\ + +f"{totest.__name__}: "\ + +f"{missing_in_test}. Please "\ + +"check, whether they have been "\ + +"removed on purpose and update "\ + +"this unit test." + new_in_test = totest_elements - set(elements) + assert len(new_in_test) == 0, "There are new objects in "\ + +f"{totest.__name__}: {new_in_test}. "\ + +"Please check, whether they have been "\ + +"added on purpose and update this "\ + +"unit test." + + def test_instance_get_shell_comoving_volume(self): + assert isroutine(totest.get_shell_comoving_volume) + + def test_instance_get_comoving_distance_from_redshift(self): + assert isroutine(totest.get_comoving_distance_from_redshift) + + def test_instance_get_cosmic_time_from_redshift(self): + assert isroutine(totest.get_cosmic_time_from_redshift) + + def test_instance_redshift_from_cosmic_time_interpolator(self): + assert isroutine(totest.redshift_from_cosmic_time_interpolator) + + def test_instance_get_redshift_from_cosmic_time(self): + assert isroutine(totest.get_redshift_from_cosmic_time) + + def test_instance_get_redshift_bin_edges(self): + assert isroutine(totest.get_redshift_bin_edges) + + def test_instance_get_redshift_bin_centers(self): + assert isroutine(totest.get_redshift_bin_centers) + +class TestFunctions: + + # test functions + def test_get_shell_comoving_volume(self): + # 2 missing arguments + with raises(TypeError, match="missing 2 required positional arguments: 'z_hor_i' and 'z_hor_f'"): + totest.get_shell_comoving_volume() + # 1 missing argument + with raises(TypeError, match="missing 1 required positional argument: 'z_hor_f'"): + totest.get_shell_comoving_volume(0.1) + # bad input + with raises(ValueError, match="Sensitivity not supported!"): + totest.get_shell_comoving_volume(0.1,1.0,"finite") + # examples + tests = [(0.1, 1.0, approx(97.7972132977263, abs=6e-12)),\ + (0.3, 2.0, approx(277.8780499884267, abs=6e-12))] + for (z1, z2, v) in tests: + assert totest.get_shell_comoving_volume(z1, z2) == v + + def test_get_comoving_distance_from_redshift(self): + # missing argument + with raises(TypeError, match="missing 1 required positional argument: 'z'"): + totest.get_comoving_distance_from_redshift() + # examples + tests = [(0.1, approx(432.1244883487781, abs=6e-12)),\ + (1.0, approx(3395.905311975348, abs=6e-12))] + for (z, d) in tests: + assert totest.get_comoving_distance_from_redshift(z) == d + + def test_get_cosmic_time_from_redshift(self): + # missing argument + with raises(TypeError, match="missing 1 required positional argument: 'z'"): + totest.get_cosmic_time_from_redshift() + # examples + tests = [(0.1, approx(12.453793290949799, abs=6e-12)),\ + (1.0, approx(5.862549255024051, abs=6e-12))] + for (z, t) in tests: + assert totest.get_cosmic_time_from_redshift(z) == t + + def test_redshift_from_cosmic_time_interpolator(self): + interp = totest.redshift_from_cosmic_time_interpolator() + assert isinstance(interp, CubicSpline) + + def test_get_redshift_from_cosmic_time(self): + # missing argument + with raises(TypeError, match="missing 1 required positional argument: 't_cosm'"): + totest.get_redshift_from_cosmic_time() + # examples + tests = [(0.1, approx(29.832529897287746, abs=6e-12)),\ + (1.0, approx(5.675847792368566, abs=6e-12))] + for (t, z) in tests: + assert totest.get_redshift_from_cosmic_time(t) == z + + def test_get_redshift_bin_edges(self): + # missing argument + with raises(TypeError, match="missing 1 required positional argument: 'delta_t'"): + totest.get_redshift_bin_edges() + # examples + tests = [(100., approx(0.006963184181145605, abs=6e-12)),\ + (1000., approx(0.07301543666184201, abs=6e-12))] + for (t,arr) in tests: + assert totest.get_redshift_bin_edges(t)[1] == arr + + def test_get_redshift_bin_centers(self): + # missing argument + with raises(TypeError, match="missing 1 required positional argument: 'delta_t'"): + totest.get_redshift_bin_centers() + # examples + tests = [(100., approx(49.33542627789386, abs=6e-12)),\ + (1000., approx(13.957133275502315, abs=6e-12))] + for (t,arr) in tests: + assert totest.get_redshift_bin_centers(t)[-1] == arr diff --git a/posydon/unit_tests/popsyn/test_sample_from_file.py b/posydon/unit_tests/popsyn/test_sample_from_file.py new file mode 100644 index 0000000000..6d28b3e969 --- /dev/null +++ b/posydon/unit_tests/popsyn/test_sample_from_file.py @@ -0,0 +1,73 @@ +"""Unit tests of posydon/popsyn/sample_from_file.py +""" + +__authors__ = [ + "Elizabeth Teng " +] + +# import the module which will be tested +import posydon.popsyn.sample_from_file as totest + +# aliases +os = totest.os +np = totest.np +pd = totest.pd + +from inspect import isclass, isroutine + +# import other needed code for the tests, which is not already imported in the +# module you like to test +from pytest import approx, fixture, raises, warns + +from posydon.popsyn.independent_sample import ( + generate_eccentricities, + generate_orbital_periods, + generate_orbital_separations, + generate_primary_masses, + generate_secondary_masses, +) +from posydon.utils.posydonwarning import Pwarn + + +# define test classes collecting several test functions +class TestElements: + # check for objects, which should be an element of the tested module + def test_dir(self): + elements = ['infer_key', 'get_samples_from_file', \ + 'get_kick_samples_from_file', '__authors__',\ + '__builtins__', '__cached__', '__doc__', '__file__',\ + '__loader__', '__name__', '__package__', '__spec__'] + totest_elements = set(dir(totest)) + missing_in_test = set(elements) - totest_elements + assert len(missing_in_test) == 0, "There are missing objects in "\ + +f"{totest.__name__}: "\ + +f"{missing_in_test}. Please "\ + +"check, whether they have been "\ + +"removed on purpose and update "\ + +"this unit test." + new_in_test = totest_elements - set(elements) + assert len(new_in_test) == 0, "There are new objects in "\ + +f"{totest.__name__}: {new_in_test}. "\ + +"Please check, whether they have been "\ + +"added on purpose and update this "\ + +"unit test." + + def test_instance_infer_key(self): + assert isroutine(totest.infer_key) + + def test_instance_get_samples_from_file(self): + assert isroutine(totest.get_samples_from_file) + + def test_instance_get_kick_samples_from_file(self): + assert isroutine(totest.get_kick_samples_from_file) + +class TestFunctions: + + def test_infer_key(): + pass + + def test_get_samples_from_file(): + pass + + def test_get_kick_samples_from_file(): + pass diff --git a/posydon/unit_tests/popsyn/test_selection_effects.py b/posydon/unit_tests/popsyn/test_selection_effects.py new file mode 100644 index 0000000000..a17c5f1cc8 --- /dev/null +++ b/posydon/unit_tests/popsyn/test_selection_effects.py @@ -0,0 +1,57 @@ +"""Unit tests of posydon/popsyn/selection_effects.py +""" + +__authors__ = [ + "Elizabeth Teng " +] + +# import the module which will be tested +import posydon.popsyn.selection_effects as totest + +# aliases +np = totest.np +pd = totest.pd +time = totest.time +KNeighborsRegressor = totest.KNeighborsRegressor + +from inspect import isclass, isroutine + +# import other needed code for the tests, which is not already imported in the +# module you like to test +from pytest import approx, fixture, raises, warns + + +# define test classes collecting several test functions +class TestElements: + # check for objects, which should be an element of the tested module + def test_dir(self): + elements = ['KNNmodel', '__authors__',\ + '__builtins__', '__cached__', '__doc__', '__file__',\ + '__loader__', '__name__', '__package__', '__spec__', + 'np','pd','time','KNeighborsRegressor'] + totest_elements = set(dir(totest)) + missing_in_test = set(elements) - totest_elements + assert len(missing_in_test) == 0, "There are missing objects in "\ + +f"{totest.__name__}: "\ + +f"{missing_in_test}. Please "\ + +"check, whether they have been "\ + +"removed on purpose and update "\ + +"this unit test." + new_in_test = totest_elements - set(elements) + assert len(new_in_test) == 0, "There are new objects in "\ + +f"{totest.__name__}: {new_in_test}. "\ + +"Please check, whether they have been "\ + +"added on purpose and update this "\ + +"unit test." +class TestKNNmodel: + + def test_predict_pdet(self): + # missing argument + # bad input + # examples + pass + def test_normalize(self): + # missing argument + # bad input + # examples + pass diff --git a/posydon/unit_tests/popsyn/test_star_formation_history.py b/posydon/unit_tests/popsyn/test_star_formation_history.py index fa086c2144..dad1846bfd 100644 --- a/posydon/unit_tests/popsyn/test_star_formation_history.py +++ b/posydon/unit_tests/popsyn/test_star_formation_history.py @@ -778,16 +778,6 @@ def test_mean_metallicity(self, chruslinska_model, mock_chruslinska_data): with pytest.raises(AssertionError): result = chruslinska_model.mean_metallicity(z_values) - def test_lowest_z_bin(self, chruslinska_model, mock_chruslinska_data): - """Test that if z is below the lowest bin, it uses the lowest bin.""" - z_values = np.array([-1.0, 0.0, 0.5]) - met_bins = np.array([0.001, 0.01, 0.02, 0.03]) - - result = chruslinska_model.fSFR(z_values, met_bins) - - # The value at -1.0 should be the same as at 0.0 - assert np.allclose(result[0], result[1]) - def test_csfrd_calculation(self, chruslinska_model, mock_chruslinska_data): """Test the CSFRD method.""" # Test at specific redshifts diff --git a/posydon/unit_tests/popsyn/test_synthetic_population.py b/posydon/unit_tests/popsyn/test_synthetic_population.py new file mode 100644 index 0000000000..ded4352659 --- /dev/null +++ b/posydon/unit_tests/popsyn/test_synthetic_population.py @@ -0,0 +1,835 @@ +"""Unit tests of posydon/popsyn/synthetic_population.py +""" + +__authors__ = [ + "Elizabeth Teng " +] + +# import the module which will be tested +import posydon.popsyn.synthetic_population as totest +from posydon.utils.constants import Zsun + +# aliases +np = totest.np +pd = totest.pd + +import warnings +from inspect import isclass, isroutine + +# import other needed code for the tests, which is not already imported in the +# module you like to test +from pytest import approx, fixture, raises, warns + +warnings.simplefilter("always") +import os +import shutil + + +# define test classes collecting several test functions +class TestElements: + # check for objects, which should be an element of the tested module + def test_dir(self): + elements = ['DFInterface','History','Oneline', + 'Population','PopulationIO','PopulationRunner', + 'Rates','TransientPopulation', + '__authors__','__builtins__', '__cached__', '__doc__', + '__file__','__loader__', '__name__', '__package__', '__spec__', + 'np', 'pd', 'tqdm', 'os', 'shutil','plt', + 'Zsun', 'binarypop_kwargs_from_ini','plot_pop','SimulationProperties', + 'calculate_model_weights','saved_ini_parameters', + 'convert_metallicity_to_string','Pwarn','cosmology','const', + 'get_shell_comoving_volume', 'get_comoving_distance_from_redshift', + 'get_cosmic_time_from_redshift', 'redshift_from_cosmic_time_interpolator', + 'DEFAULT_SFH_MODEL', 'get_redshift_bin_edges', + 'get_redshift_bin_centers', 'SFR_per_met_at_z', + 'BinaryPopulation', 'HISTORY_MIN_ITEMSIZE','ONELINE_MIN_ITEMSIZE' + ] + totest_elements = set(dir(totest)) + missing_in_test = set(elements) - totest_elements + assert len(missing_in_test) == 0, "There are missing objects in "\ + +f"{totest.__name__}: "\ + +f"{missing_in_test}. Please "\ + +"check, whether they have been "\ + +"removed on purpose and update "\ + +"this unit test." + new_in_test = totest_elements - set(elements) + assert len(new_in_test) == 0, "There are new objects in "\ + +f"{totest.__name__}: {new_in_test}. "\ + +"Please check, whether they have been "\ + +"added on purpose and update this "\ + +"unit test." + +class TestPopulationRunner: + + def test_init(self): + # missing argument + with raises(TypeError,match="missing 1 required positional argument: 'path_to_ini'"): + totest.PopulationRunner() + # bad input + with raises(ValueError, match="You did not provide a valid path_to_ini!"): + totest.PopulationRunner("test") + + def test_evolve(self,tmp_path,monkeypatch): + # mock dependencies + class DummyPop: + def __init__(self, **kwargs): + self.kwargs = kwargs + self.comm = None + self.metallicity = kwargs["metallicity"] + def evolve(self,**kwargs): + self.evolved = True + def combine_saved_files(self, *args): + self.combined = True + def dummy_kwargs(path): + return { + "metallicity": 0.1, + "temp_directory": "tmp_dir", + "verbose": False} + def dummy_kwargs_list(path): + return { + "metallicity": [0.1,1.], + "temp_directory": "tmp_dir", + "verbose": False} + def dummy_merge(pop,overwrite): + pop.merged = True + + ini_path = os.path.join(tmp_path, "dummy.ini") + with open(ini_path, "w") as f: + f.write("[DEFAULT]\nkey=value\n") + + # Mock out functions + monkeypatch.setattr(totest, "binarypop_kwargs_from_ini", dummy_kwargs) + monkeypatch.setattr(totest, "BinaryPopulation", DummyPop) + monkeypatch.setattr(totest, "convert_metallicity_to_string", lambda x: "0.1") + run = totest.PopulationRunner(str(ini_path)) + # overwrite=False, directory doesn't exist + monkeypatch.setattr(os.path, "exists", lambda path: False) + run.merge_parallel_runs = dummy_merge + run.evolve() + assert run.binary_populations[0].evolved is True + assert run.binary_populations[0].merged is True + # overwrite=False, directory exists + monkeypatch.setattr(os.path, "exists", lambda path: True) + monkeypatch.setattr(totest, "binarypop_kwargs_from_ini", dummy_kwargs_list) + run = totest.PopulationRunner(str(ini_path), verbose=True) + with raises(FileExistsError, match="tmp_dir"): + run.evolve(overwrite=False) + # overwrite=True, directory exists + removed = {} + monkeypatch.setattr(shutil, "rmtree", lambda path: removed.setdefault("called", path)) + run.merge_parallel_runs = dummy_merge + run.evolve(overwrite=True) + assert removed["called"] == "0.1_Zsun_tmp_dir" + assert run.binary_populations[0].evolved is True + assert run.binary_populations[0].merged is True + + def test_merge_parallel_runs(self, tmp_path, monkeypatch, capsys): + class DummyPop: + def __init__(self, metallicity, temp_directory,**kwargs): + self.metallicity = metallicity + self.kwargs = {"temp_directory": temp_directory} + self.combine_args = None + self.combined = False + + def combine_saved_files(self, out_path, files): + self.combine_args = (out_path, files) + self.combined = True + + def dummy_kwargs(path): + return { + "metallicity": 0.1, + "temp_directory": "tmp_dir", + "verbose": False} + + ini_path = os.path.join(tmp_path.parent, "dummy.ini") + with open(ini_path, "w") as f: + f.write("[DEFAULT]\nkey=value\n") + + monkeypatch.setattr(totest, "binarypop_kwargs_from_ini", dummy_kwargs) + monkeypatch.setattr(totest, "BinaryPopulation", DummyPop) + monkeypatch.setattr(totest, "convert_metallicity_to_string", + lambda x: str(os.path.join(tmp_path, "0.1"))) + + # 1) File exists case: should raise FileExistsError + pop = DummyPop(metallicity=0.1, temp_directory=str(tmp_path)) + output_file = os.path.join(tmp_path,"0.1_Zsun_population.h5") + with open(output_file, "w") as f: + f.write("test") + run = totest.PopulationRunner(str(ini_path)) + run.verbose = False + with raises(FileExistsError, match="Files were not merged"): + run.merge_parallel_runs(pop) + + # 2) Normal merge case + file1 = os.path.join(tmp_path,"file1.tmp") + file2 = os.path.join(tmp_path,"file2.tmp") + output_file = os.path.join(tmp_path,"0.1_Zsun_population.h5") + with open(file1, "w") as f: + f.write("test") + with open(file2, "w") as f: + f.write("test") + pop = DummyPop(metallicity=0.1, temp_directory=str(tmp_path)) + run = totest.PopulationRunner(str(ini_path)) + run.verbose = True + monkeypatch.setattr(totest, "convert_metallicity_to_string", lambda x: "0.1") + run.merge_parallel_runs(pop) + assert pop.combined is True + out_path, files = pop.combine_args + assert out_path == "0.1_Zsun_population.h5" + # Filter out output file if somehow included (defensive) + filtered_files = [f for f in files if os.path.basename(f) != out_path] + assert set(os.path.basename(f) for f in filtered_files) == {"file1.tmp", "file2.tmp"} + captured = capsys.readouterr() + assert "Merging" in captured.out + assert "Files merged!" in captured.out + assert f"Removing files in {tmp_path}" in captured.out + # cleanup + for f in [file1, file2, output_file]: + if os.path.exists(f): + os.remove(f) + assert len(os.listdir(tmp_path)) == 0 + + run.verbose = False + run.merge_parallel_runs(pop) + assert not os.path.exists(pop.kwargs["temp_directory"]) + +class TestDFInterface: + + def test_head_tail_select(self, tmp_path): + # Setup test HDF5 file + data = pd.DataFrame({ + "index": np.repeat(np.arange(5), 2), + "time": np.random.rand(10), + "value": np.random.rand(10) + }) + hdf_path = os.path.join(tmp_path,"test.h5") + data.to_hdf(hdf_path, key="history", format="table", index=False) + + dfi = totest.DFInterface() + dfi.filename = str(hdf_path) + dfi.chunksize = 3 + + head = dfi.head("history", n=3) + tail = dfi.tail("history", n=2) + subset = dfi.select("history", columns=["time"]) + + assert len(head) == 3 + assert len(tail) == 2 + assert "time" in subset.columns + assert subset.shape[1] == 1 + + def test_repr_methods(self, tmp_path): + df = pd.DataFrame({"index": range(10), "x": np.random.rand(10)}) + path = os.path.join(tmp_path, "test_repr.h5") + df.to_hdf(path, key="history", format="table", index=False) + + dfi = totest.DFInterface() + dfi.filename = str(path) + + s = dfi.get_repr("history") + html = dfi.get_html_repr("history") + + assert isinstance(s, str) + assert "x" in s + assert isinstance(html, str) + assert "=2 for i in out_stopnone.index) + + # __getitem__ with int + out = hist[0] + assert isinstance(out, pd.DataFrame) + + # __getitem__ with list of int + out = hist[[0, 1]] + assert isinstance(out, pd.DataFrame) + out_none = hist[[]] + assert isinstance(out_none,pd.DataFrame) + assert out_none.empty + + # __getitem__ with numpy array of int + out = hist[np.array([0, 1])] + assert isinstance(out, pd.DataFrame) + out_none = hist[np.array([], dtype=int)] + assert isinstance(out_none,pd.DataFrame) + assert out_none.empty + + # __getitem__ with bool array + full_data = pd.read_hdf(file_path, key="history") + mask = full_data["a"] > -1 + empty_mask = np.array([],dtype=bool) + out = hist[mask.to_numpy()] + out_none = hist[empty_mask] + assert not out.empty + assert (out["a"] > -1).all() + assert isinstance(out_none,pd.DataFrame) + assert out_none.empty + + # __getitem__ with str column + out = hist["a"] + assert "a" in out.columns + + # __getitem__ with list of str columns + out = hist[["a"]] + assert "a" in out.columns + + # Invalid column + with raises(ValueError, match="is not a valid column name"): + hist["bad_column"] + + # Invalid list of column names + with raises(ValueError, match="Not all columns in"): + hist[["a", "bad"]] + + # Invalid type + with raises(ValueError, match="Invalid key type"): + hist[None] + + def test_slice(self, tmp_path): + df = pd.DataFrame({ + "index": np.repeat(np.arange(5), 2), + "val": np.random.rand(10) + }) + path = os.path.join(tmp_path, "test_slice.h5") + df.to_hdf(path, key="history", format="table", index=False) + hist = totest.History(str(path)) + sliced = hist[1:3] + assert isinstance(sliced, pd.DataFrame) + + def test_head_tail_repr(self, tmp_path): + df = pd.DataFrame({ + "index": np.repeat(np.arange(5), 2), + "val": np.random.rand(10) + }) + path = os.path.join(tmp_path, "test_repr2.h5") + df.to_hdf(path, key="history", format="table", index=False) + hist = totest.History(str(path)) + + head = hist.head(n=3) + tail = hist.tail(n=2) + rep = repr(hist) + html = hist._repr_html_() + + assert isinstance(head, pd.DataFrame) + assert isinstance(tail, pd.DataFrame) + assert isinstance(rep, str) + assert isinstance(html, str) + assert "val" in rep + assert "= 3 for i in out.index) + + # int + out = one[2] + assert isinstance(out, pd.DataFrame) + assert 2 in out.index + + # list of int + out = one[[1, 3, 5]] + assert set(out.index) == {1, 3, 5} + + # numpy array of int + out = one[np.array([0, 2, 4])] + assert set(out.index) == {0, 2, 4} + + # numpy array of bool + mask = np.array([True, False, True, False, True, False]) + out = one[mask] + assert set(out.index) == {0, 2, 4} + + # pandas DataFrame mask of bool + mask_df = pd.DataFrame({"mask": [True, False, True, False, True, False]}) + out = one[mask_df] + assert set(out.index) == {0, 2, 4} + + # str column + out = one["a"] + assert list(out.columns) == ["a"] + + # list of str columns + out = one[["a", "b"]] + assert list(out.columns) == ["a", "b"] + + # invalid column + with raises(ValueError, match="is not a valid column"): + one["bad"] + + # invalid list of str columns + with raises(ValueError, match="Not all columns in"): + one[["a", "bad"]] + + # invalid type + with raises(ValueError, match="Invalid key type"): + one[None] + + def test_invalid_float_list(self, tmp_path): + df = pd.DataFrame({ + "index": np.arange(3), + "val": np.random.rand(3) + }) + file_path = os.path.join(tmp_path, "test_invalid_float_list.h5") + df.set_index("index", inplace=True) + df.to_hdf(file_path, key="oneline", format="table") + + one = totest.Oneline(str(file_path)) + + with raises(ValueError, match="elements in list are not integers"): + one[[1.1, 2.2]] + +class TestPopulationIO: + + @fixture + def popio(self): + p = totest.PopulationIO() + p.mass_per_metallicity = pd.DataFrame({"Z": [0.02], "mass": [1.0]}) + p.ini_params = {"param1": 42, "param2": "abc"} + return p + + def test_load_metadata(self,monkeypatch,popio): + # bad input + with raises(ValueError,match='does not contain .h5'): + popio._load_metadata("not_pop.txt") + # examples + called={} + monkeypatch.setattr(popio, "_load_ini_params", lambda f: called.setdefault("ini", f)) + monkeypatch.setattr(popio, "_load_mass_per_metallicity", lambda f: called.setdefault("mass", f)) + popio._load_metadata("file.h5") + assert called == {"ini": "file.h5", "mass": "file.h5"} + + def test_save_mass_per_metallicity(self, tmp_path, popio): + filename = os.path.join(tmp_path, "mass.h5") + popio._save_mass_per_metallicity(filename) + + with pd.HDFStore(filename, "r") as store: + df = store["mass_per_metallicity"] + + pd.testing.assert_frame_equal(df, popio.mass_per_metallicity) + + def test_save_ini_params(self,tmp_path,popio,monkeypatch): + filename = os.path.join(tmp_path, "ini_out.h5") + monkeypatch.setattr("posydon.popsyn.synthetic_population.saved_ini_parameters", ["param1", "param3"]) + + popio._save_ini_params(filename) + + with pd.HDFStore(filename, "r") as store: + df = store["ini_parameters"] + + assert list(df.columns) == ["param1"] + assert df["param1"][0] == 42 + def test_load_ini_params(self,tmp_path,popio,monkeypatch): + filename = os.path.join(tmp_path, "ini.h5") + monkeypatch.setattr("posydon.popsyn.synthetic_population.saved_ini_parameters", ["param1", "param2", "param3"]) + + df = pd.DataFrame({"param1": [1], "param2": ["x"]}) + with pd.HDFStore(filename, "w") as store: + store.put("ini_parameters", df) + + popio._load_ini_params(filename) + + assert popio.ini_params["param1"] == 1 + assert popio.ini_params["param2"] == "x" + assert "param3" not in popio.ini_params + +class TestPopulation: + + def create_minimal_population_file(self,tmp_path): + filename = tmp_path / "pop.h5" + + # Minimal History table + history_df = pd.DataFrame({ + "event": [0], + "time": [0.0] + }) + history_df.index.name = "binary_index" + + # History lengths table + history_lengths_df = pd.DataFrame({ + "length": [len(history_df)] + }, index=history_df.index) + + # Minimal Oneline table + oneline_df = pd.DataFrame({ + "S1_mass_i": [1], + "S2_mass_i": [1], + "state_i": ["initial"], + "metallicity": [0.02], + "interp_class_HMS_HMS": ["stable_MT"], + "mt_history_HMS_HMS": ["Stable contact phase"] + }) + oneline_df.index.name = "binary_index" + + ini_df = pd.DataFrame({ + "Parameter": [ + "metallicity", "number_of_binaries", "binary_fraction_scheme", + "binary_fraction_const", "star_formation", "max_simulation_time", + "primary_mass_scheme", "primary_mass_min", "primary_mass_max", + "secondary_mass_scheme", "secondary_mass_min", "secondary_mass_max", + "orbital_scheme", "orbital_period_scheme", "orbital_period_min", + "orbital_period_max", "orbital_separation_scheme", "orbital_separation_min", + "orbital_separation_max", "eccentricity_scheme" + ], + "Value": [0.02]*20 # dummy values for testing + }) + + # Mass per metallicity table + mass_df = pd.DataFrame({"simulated_mass": [0]}, index=[0.02]) + + # Save all tables + with pd.HDFStore(filename, "w") as store: + store.put("history", history_df, format="table") + store.put("history_lengths", history_lengths_df, format="table") + store.put("oneline", oneline_df, format="table") + store.put("ini_parameters", ini_df, format="table") + store.put("mass_per_metallicity", mass_df, format="table") + + return filename + + + def test_population_init(self, tmp_path, monkeypatch): + + # bad input + with raises(ValueError, match="does not contain .h5"): + totest.Population("hello.txt") + + # missing /history + filename = os.path.join(tmp_path, "pop_missing.h5") + with pd.HDFStore(filename, "w") as store: + store.append("ini_parameters", pd.DataFrame({"Parameter": [], "Value": []}), format="table") + with raises(ValueError, match="does not contain a history table"): + totest.Population(str(filename)) + + # /history exists, /oneline missing + history_df = pd.DataFrame({"event": [0], "time": [0.0], "binary_index": [0]}) + with pd.HDFStore(filename, "a") as store: + store.append("history", history_df, format="table") + with raises(ValueError, match="does not contain an oneline table"): + totest.Population(str(filename)) + + # /history and /oneline exist, no ini_parameters + oneline_df = pd.DataFrame({ + "S1_mass_i": [1], + "S2_mass_i": [1], + "state_i": ["initially_single_star"], # <- must match the branch + "metallicity": [0.02] + }) + with pd.HDFStore(filename, "a") as store: + store.append("oneline", oneline_df, format="table") + store.put("mass_per_metallicity", + pd.DataFrame({"simulated_mass": [0]}, index=[0.02]), + format="table") + with raises(ValueError,match='does not contain an ini_parameters table'): + pop = totest.Population(str(filename)) + + # /history and /oneline exist, yes ini_parameters, no mass_per_metallicity + filename_no_mass = os.path.join(tmp_path, "pop_no_mass.h5") + with pd.HDFStore(filename_no_mass, "w") as store: + store.put("history", history_df,format="table") + store.put("oneline", oneline_df, format="table") + store.put("ini_parameters", + pd.DataFrame({"Parameter": ["metallicity"], "Value": [0.02]}),format="table") + with raises(ValueError,match='does not contain a mass_per_metallicity table'): + pop = totest.Population(str(filename_no_mass)) + + # metallicity specified + monkeypatch.setattr( + "posydon.popsyn.synthetic_population.binarypop_kwargs_from_ini", + lambda ini_file: {"dummy_param": 1}) + dummy_ini_file = os.path.join(tmp_path,"dummy.ini") + pop_with_metallicity = totest.Population( + str(filename_no_mass), metallicity=0.02, ini_file=str(dummy_ini_file) + ) + assert pop_with_metallicity.mass_per_metallicity is not None + assert pop_with_metallicity.solar_metallicities[0] == 0.02 + assert pop_with_metallicity.metallicities[0] == 0.02 * Zsun + + # everything exists + filename_full = os.path.join(tmp_path, "pop_full.h5") + with pd.HDFStore(filename_full, "w") as store: + store.put("history", history_df,format="table") + store.put("oneline", oneline_df,format="table") + store.put("ini_parameters", pd.DataFrame({"param1": [1]}),format="table") + store.put("mass_per_metallicity", pd.DataFrame({"simulated_mass": [0]}, index=[0.02]), + format="table") + store.put("formation_channels", pd.DataFrame({"channel": ["dynamic"]})) + pop = totest.Population(str(filename_full)) + assert pop.number_of_systems == 1 + assert isinstance(pop.history, totest.History) + assert isinstance(pop.oneline, totest.Oneline) + + # Metallicity specified + dummy_ini_file = os.path.join(tmp_path,"dummy.ini") + pop_with_metallicity = totest.Population( + str(filename_full), metallicity=0.02, ini_file=str(dummy_ini_file) + ) + assert pop_with_metallicity.mass_per_metallicity is not None + assert pop_with_metallicity.solar_metallicities[0] == 0.02 + assert pop_with_metallicity.metallicities[0] == 0.02 * Zsun + + def test_export_selection(self,tmp_path,monkeypatch): + filename = self.create_minimal_population_file(tmp_path) + pop = totest.Population(str(filename)) + export_file = tmp_path / "exp.h5" + + # bad input + with raises(ValueError,match='does not contain .h5'): + pop.export_selection([0],'hello.txt') + + with raises(ValueError,match="Both overwrite and append cannot be True!"): + pop.export_selection([0],str(export_file),append=True,overwrite=True) + + dummy_file = tmp_path / "exists.h5" + pd.DataFrame({"a": [1]}).to_hdf(dummy_file, "dummy", format="table") + with raises(FileExistsError,match='Set overwrite or append to True'): + pop.export_selection([0], str(dummy_file),overwrite=False,append=False) + + # overwrite export + out_file = tmp_path / "out.h5" + pop.export_selection([0], str(out_file), overwrite=True, history_chunksize=1) + + # append export + pop.export_selection([0], str(out_file), append=True, history_chunksize=1) + + # write export + pop.export_selection([0], os.path.join(tmp_path,'new.h5'), append=False, + overwrite=False, + history_chunksize=1) + + # No metallicity column + class DummyOnelineNoMetal: + columns = ["S1_mass_i", "S2_mass_i", "state_i"] # no 'metallicity' + number_of_systems = 1 + + def __getitem__(self, cols): + import pandas as pd + return pd.DataFrame({ + "S1_mass_i": [1], + "S2_mass_i": [1], + "state_i": ["initial"] + }) + + def __len__(self): + return self.number_of_systems + + pop.oneline = DummyOnelineNoMetal() + pop.export_selection([0], str(tmp_path/"out2.h5"), overwrite=True) + + # Check mass_per_metallicity updated + df = pd.read_hdf(out_file, "mass_per_metallicity") + assert "number_of_systems" in df.columns + + def test_calculate_formation_channels(self,tmp_path): + filename = self.create_minimal_population_file(tmp_path) + + pop = totest.Population(str(filename)) + + # Should not error even with empty data + pop.calculate_formation_channels() + + # Result should be a dataframe (even if empty) + assert hasattr(pop.formation_channels, "columns") + def test_create_transient_population(self): + # missing argument + # bad input + # examples + pass + +class TestTransientPopulation: + + @fixture + def fix(self): +# return + pass + + def test_population(self): + # missing argument + # bad input + # examples + pass + def test_columns(self): + # missing argument + # bad input + # examples + pass + def test_select(self): + # missing argument + # bad input + # examples + pass + def test_get_efficiency_over_metallicity(self): + # missing argument + # bad input + # examples + pass + def test_calculate_cosmic_weights(self): + # missing argument + # bad input + # examples + pass + +class TestRates: + + @fixture + def fix(self): + # return + pass + + def test_weights(self): + # missing argument + # bad input + # examples + pass + def test_z_birth(self): + # missing argument + # bad input + # examples + pass + def test_z_events(self): + # missing argument + # bad input + # examples + pass + def test_select_rate_slice(self): + # missing argument + # bad input + # examples + pass + def test_calculate_intrinsic_rate_density(self): + # missing argument + # bad input + # examples + pass + def test_calculate_observable_population(self): + # missing argument + # bad input + # examples + pass + def test_observable_population(self): + # missing argument + # bad input + # examples + pass + def test_observable_population_names(self): + # missing argument + # bad input + # examples + pass + def test_intrinsic_rate_density(self): + # missing argument + # bad input + # examples + pass + def test_edges_metallicity_bins(self): + # missing argument + # bad input + # examples + pass + def test_centers_metallicity_bins(self): + # missing argument + # bad input + # examples + pass + def test_edges_redshift_bins(self): + # missing argument + # bad input + # examples + pass + def test_centers_redshift_bins(self): + # missing argument + # bad input + # examples + pass diff --git a/posydon/unit_tests/popsyn/test_transient_select_funcs.py b/posydon/unit_tests/popsyn/test_transient_select_funcs.py new file mode 100644 index 0000000000..ac80c256d9 --- /dev/null +++ b/posydon/unit_tests/popsyn/test_transient_select_funcs.py @@ -0,0 +1,340 @@ +"""Unit tests of posydon/popsyn/transient_select_funcs.py +""" + +__authors__ = [ + "Elizabeth Teng " +] + +# import the module which will be tested +import posydon.popsyn.transient_select_funcs as totest + +# aliases +np = totest.np +pd = totest.pd +PATH_TO_POSYDON_DATA = totest.PATH_TO_POSYDON_DATA + +import warnings +from inspect import isclass, isroutine + +# import other needed code for the tests, which is not already imported in the +# module you like to test +from pytest import approx, fixture, raises, warns + +import posydon.popsyn.selection_effects as selection_effects +from posydon.utils.posydonwarning import ReplaceValueWarning + +warnings.simplefilter("always") + +# define test classes collecting several test functions +class TestElements: + # check for objects, which should be an element of the tested module + def test_dir(self): + elements = ['PATH_TO_PDET_GRID', 'GRB_selection', 'chi_eff', 'm_chirp', \ + 'mass_ratio', 'BBH_selection_function','DCO_detectability', \ + '__builtins__', '__cached__', '__doc__', \ + '__file__','__loader__', '__name__', '__package__', '__spec__', \ + 'np', 'pd', 'PATH_TO_POSYDON_DATA', \ + 'os', 'tqdm', 'warnings', 'Pwarn','selection_effects'] + totest_elements = set(dir(totest)) + missing_in_test = set(elements) - totest_elements + assert len(missing_in_test) == 0, "There are missing objects in "\ + +f"{totest.__name__}: "\ + +f"{missing_in_test}. Please "\ + +"check, whether they have been "\ + +"removed on purpose and update "\ + +"this unit test." + new_in_test = totest_elements - set(elements) + assert len(new_in_test) == 0, "There are new objects in "\ + +f"{totest.__name__}: {new_in_test}. "\ + +"Please check, whether they have been "\ + +"added on purpose and update this "\ + +"unit test." + + def test_instance_GRB_selection(self): + assert isroutine(totest.GRB_selection) + + def test_instance_chi_eff(self): + assert isroutine(totest.chi_eff) + + def test_instance_m_chirp(self): + assert isroutine(totest.m_chirp) + + def test_instance_mass_ratio(self): + assert isroutine(totest.mass_ratio) + + def test_instance_BBH_selection_function(self): + assert isroutine(totest.BBH_selection_function) + + def test_instance_DCO_detectability(self): + assert isroutine(totest.DCO_detectability) + +class TestFunctions: + + @fixture + def history_chunk(self): + return pd.DataFrame({ + 'binary_index': [10, 10, 10], + 'S1_state': ['MS', 'HG', 'BH'], + 'S2_state': ['MS', 'HG', 'BH'], + 'step_names': ['step_RLO', 'step_RLO', 'step_SN'], + 'orbital_period': [1.0, 1.1, 1.2], + 'eccentricity': [0.1, 0.15, 0.2], + 'S1_spin': [0.3, 0.35, 0.4], + 'S2_spin': [0.5, 0.55, 0.6], + 'S1_mass': [10.0, 9.5, 9.0], + 'S2_mass': [8.0, 7.5, 7.0], + 'time': [1.0e6, 2.0e6, 3.0e6]}) + + @fixture + def oneline_chunk(self): + return pd.DataFrame({ + 'metallicity': [0.02], + 'S1_m_disk_radiated': [0.5], + 'S2_m_disk_radiated': [0.0], + }, index=[10]) + + @fixture + def formation_channels_chunk(self): + return pd.DataFrame({ + 'channel': ['foo_CC1','bar_CC2'] + }, index=[10,11]) + + @fixture + def history_BBH(self): + return pd.DataFrame({ + 'event': ['MID', 'END', 'END'], + 'time': [1e6, 5e6, 6e6], + 'S1_state': ['BH', 'BH', 'BH'], + 'S2_state': ['BH', 'BH', 'BH'], + 'step_names': ['step_SN', 'step_SN', 'step_SN'], + 'state': ['detached', 'detached', 'detached'], + 'S1_mass': [30, 35, 40], + 'S2_mass': [20, 25, 30], + 'S1_spin': [0.5, 0.6, 0.7], + 'S2_spin': [0.4, 0.3, 0.2], + 'orbital_period': [0.5, 0.6, 0.7], + 'eccentricity': [0.1, 0.2, 0.3], + }, index=[0,1,2]) + + @fixture + def oneline_BBH(self): + return pd.DataFrame({ + 'metallicity': [0.01, 0.02, 0.03], + 'S1_spin_orbit_tilt_second_SN': [0.1, 0.2, 0.3], + 'S2_spin_orbit_tilt_second_SN': [0.4, 0.5, 0.6], + }, index=[0,1,2]) + + @fixture + def formation_channels_BBH(self): + return pd.DataFrame({ + 'channel': ['foo', 'bar', 'baz'], + }, index=[0,1,2]) + + @fixture + def array(self): + return np.array([1.0,2.0,3.0]) + + @fixture + def nan_array(self): + return np.array([np.nan,np.nan,np.nan]) + + @fixture + def wrong_array(self): + return np.array(['1.0','2.0','3.0']) + + @fixture + def transient_pop_chunk(self): + return pd.DataFrame({ + 'S1_mass': [30, 35], + 'S2_mass': [25, 30], + 'S1_spin': [0.1, 0.2], + 'S2_spin': [0.1, 0.2], + 'S1_spin_orbit_tilt_at_merger': [0.5, 0.6], + 'S2_spin_orbit_tilt_at_merger': [0.4, 0.5], + 'q': [0.83, 0.86], + 'chi_eff': [0.1, 0.2]}) + + @fixture + def z_events_chunk(self): + return pd.DataFrame({ + 'event_1': [0.1, np.nan], + 'event_2': [0.2, 0.3]}) + + @fixture + def z_events_chunk_with_nan(self): + return pd.DataFrame({ + 'event_1': [1.0, np.nan], + 'event_2': [np.nan, np.nan] + }, index=[0,1]) + + @fixture + def z_weights_chunk(self): + return pd.DataFrame({ + 'event_1': [1.0, 1.0], + 'event_2': [1.0, 1.0] + }, index=[0, 1]) + + + def test_GRB_selection(self,history_chunk,oneline_chunk, + formation_channels_chunk): + # missing argument + with raises(TypeError,match="missing 2 required positional arguments"): + totest.GRB_selection() + # bad input + with raises(TypeError,match='string indices must be integers'): + totest.GRB_selection("1.1", "1.2") + with raises(AttributeError,match="'float' object has no attribute 'index'"): + totest.GRB_selection(1.1, 1.2) + with raises(ValueError,match='S1_S2 must be either S1 or S2'): + totest.GRB_selection(history_chunk, oneline_chunk.copy(), + S1_S2='test') + # example with S1 + df = totest.GRB_selection(history_chunk, oneline_chunk.copy(), + formation_channels_chunk, S1_S2='S1') + assert not df.empty + assert df.index[0] == 10 + assert 'S1_mass_preSN' in df.columns + assert 'S1_mass_postSN' in df.columns + assert df['time'].iloc[0] == 3.0 # 3 Myr = 3e6 years * 1e-6 + assert df['channel'].iloc[0] == 'foo_CC1' + # example with no formation channels + df = totest.GRB_selection(history_chunk, oneline_chunk.copy(), + formation_channels_chunk=None, S1_S2='S1') + assert not df.empty + assert 'channel' not in df.columns + # example with S2 + chunk = oneline_chunk.copy() + chunk['S1_m_disk_radiated'] = [0.0] + chunk['S2_m_disk_radiated'] = [0.5] + df = totest.GRB_selection(history_chunk, chunk, + formation_channels_chunk, S1_S2='S2') + assert not df.empty + assert 'S2_mass_postSN' in df.columns + assert 'metallicity' in df.columns + assert 'channel' in df.columns + # example with no disk radiation + chunk = oneline_chunk.copy() + chunk['S1_m_disk_radiated'] = [0.0] + df = totest.GRB_selection(history_chunk, chunk, formation_channels_chunk=None,S1_S2='S1') + assert df.empty + + def test_chi_eff(self,array,nan_array,wrong_array): + # missing argument + with raises(TypeError,match="missing 6 required positional arguments"): + totest.chi_eff() + # bad input + with raises(TypeError,match="ufunc 'cos' not supported for the input types"): + totest.chi_eff(array,array,array,array,array,wrong_array) + # undefined values + with warns(ReplaceValueWarning,match="a_1 contains undefined values"): + totest.chi_eff(array,array,nan_array.copy(),array,array,array) + with warns(ReplaceValueWarning,match="a_2 contains undefined values"): + totest.chi_eff(array,array,array,nan_array.copy(),array,array) + with warns(ReplaceValueWarning,match="tilt_1 contains undefined values"): + totest.chi_eff(array,array,array,array,nan_array.copy(),array) + with warns(ReplaceValueWarning,match="tilt_2 contains undefined values"): + totest.chi_eff(array,array,array,array,array,nan_array.copy()) + # example + assert totest.chi_eff(array,array,array, + array,array,array)[0] == 0.5403023058681398 + + def test_m_chirp(self): + # missing argument + with raises(TypeError,match="missing 1 required positional argument: 'm_2'"): + totest.m_chirp(3.) + # bad input + with raises(TypeError,match="can't multiply sequence by non-int of type 'str'"): + totest.m_chirp("3.","2.") + # examples + tests = [(4.,2.,2.433457367572823), + (40.,10.,16.65106414803746)] + for (m1,m2,mc) in tests: + assert totest.m_chirp(m1,m2) == mc + + def test_mass_ratio(self): + # missing argument + with raises(TypeError,match="missing 1 required positional argument: 'm_2'"): + totest.mass_ratio(3.) + # bad input + with raises(TypeError,match="unsupported operand type"): + totest.mass_ratio("3.","2.") + # examples + tests = [(5.,1.,0.2), + (1.,5.,0.2), + (4.,2.,0.5)] + for (m1,m2,q) in tests: + assert totest.mass_ratio(np.array([m1]), + np.array([m2])) == q + + def test_BBH_selection_function(self, history_BBH, oneline_BBH, + formation_channels_BBH): + # missing argument + with raises(TypeError,match="missing 2 required positional arguments"): + totest.BBH_selection_function() + # bad input + with raises(AttributeError,match="'float' object has no attribute 'index'"): + totest.BBH_selection_function(1.1, 1.2) + # example without formation channels + df = totest.BBH_selection_function(history_BBH, oneline_BBH) + assert not df.empty + assert all(col in df.columns for col in [ + 'time', 't_inspiral', 'metallicity', 'S1_state', 'S2_state', + 'S1_mass', 'S2_mass', 'S1_spin', 'S2_spin', + 'S1_spin_orbit_tilt_at_merger', 'S2_spin_orbit_tilt_at_merger', + 'orbital_period', 'chirp_mass', 'mass_ratio', 'chi_eff', 'eccentricity' + ]) + assert (df.index == oneline_BBH.index).all() + assert df['t_inspiral'].iloc[1] == 0.0 + # example with formation channels + df = totest.BBH_selection_function(history_BBH, oneline_BBH, formation_channels_BBH) + assert 'channel' in df.columns + assert (df['channel'] == formation_channels_BBH['channel']).all() + + def test_DCO_detectability(self, + transient_pop_chunk, + z_events_chunk, + z_events_chunk_with_nan, + z_weights_chunk, + monkeypatch): + class FakeKNNmodel: + def __init__(self, grid_path, sensitivity_key): + pass + def predict_pdet(self, df): + # Return a fixed probability (e.g., 0.5) for each row in df + return np.full(len(df), 0.5) + + monkeypatch.setattr('posydon.popsyn.selection_effects.KNNmodel', + FakeKNNmodel) + + # missing argument + with raises(TypeError,match="missing 4 required positional arguments"): + totest.DCO_detectability() + # bad input + with raises(ValueError,match='Unknown sensitivity sens_example'): + totest.DCO_detectability("sens_example", + transient_pop_chunk, + z_events_chunk, + z_weights_chunk) + # example: basic functionality + out = totest.DCO_detectability('O3actual_H1L1V1', transient_pop_chunk, + z_events_chunk, z_weights_chunk) + assert isinstance(out, pd.DataFrame) + assert out.shape == z_weights_chunk.shape + assert (out.values <= 1.0).all() + # example: missing q + transient = transient_pop_chunk.drop(columns=['q']) + out = totest.DCO_detectability('O3actual_H1L1V1', transient, + z_events_chunk, z_weights_chunk) + assert not out.empty + # example: missing chi_eff + transient = transient_pop_chunk.drop(columns=['chi_eff']) + out = totest.DCO_detectability('O3actual_H1L1V1', transient, + z_events_chunk, z_weights_chunk) + assert not out.empty + assert (out.values <= 1.0).all() + # example: masking for nans in z_events_chunk + out = totest.DCO_detectability('O3actual_H1L1V1', + transient_pop_chunk, + z_events_chunk_with_nan, + z_weights_chunk) + assert (out['event_2'] == 0.0).all() From 1c9bda5f1fe9987c854ccb2680a78fa7dad0d78b Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Thu, 26 Mar 2026 08:33:10 -0500 Subject: [PATCH 227/389] population helper function --- .../_helper_functions_for_tests/population.py | 131 ++++++++++++++++++ .../popsyn/test_normalized_pop_mass.py | 42 ------ 2 files changed, 131 insertions(+), 42 deletions(-) create mode 100644 posydon/unit_tests/_helper_functions_for_tests/population.py delete mode 100644 posydon/unit_tests/popsyn/test_normalized_pop_mass.py diff --git a/posydon/unit_tests/_helper_functions_for_tests/population.py b/posydon/unit_tests/_helper_functions_for_tests/population.py new file mode 100644 index 0000000000..413341ed42 --- /dev/null +++ b/posydon/unit_tests/_helper_functions_for_tests/population.py @@ -0,0 +1,131 @@ +"""Helper function(s) for tests requiring a POSYDON Population + +used in: + - posydon/unit_tests/popsyn/test_synthetic_population.py +""" + +__authors__ = [ + "Elizabeth Teng " +] + +import os +import h5py +import numpy as np +import pandas as pd + +from posydon.popsyn.synthetic_population import Population + + +# helper functions + +def make_ini(tmp_path,content=None): + """ + Create a minimal dummy .ini file inside the pytest tmp_path using os.path. + + Parameters + ---------- + tmp_path : pathlib.Path + pytest temporary directory. + content : str, optional + Content to write to the ini file. + + Returns + ------- + str + Path (string) to the created dummy ini file. + """ + dir_path = str(tmp_path) + ini_path = os.path.join(dir_path, "dummy.ini") + + if content is None: + content = "[DEFAULT]\nkey=value\n" + + with open(ini_path, "w") as f: + f.write(content) + + return str(ini_path) + +def make_test_pop( + tmp_path, + filename="test_population.h5", + oneline_rows=None, + history_rows=None, + metallicity=0.02): + """ + Create a minimally valid synthetic population HDF5 file and return a + fully initialized Population object. This centralizes and standardizes + population generation across unit tests. + + Parameters + ---------- + tmp_path : Path-like + Directory in which the HDF5 file will be created. + filename : str + Name of the file to write. + oneline_rows : list[dict], optional + Rows for the /oneline table. + history_rows : list[dict], optional + Rows for the /history table. + metallicity : float + Metallicty value for oneline and mass_per_metallicity tables. + + Returns + ------- + Population + A fully initialized Population instance. + """ + + # history and oneline tables + + if history_rows is None: + history_rows = [{"binary_index": 0, "event": "start", "time": 0.0}, + {"binary_index": 0, "event": "end", "time": 1.0}, + {"binary_index": 1, "event": "start", "time": 0.0}, + {"binary_index": 1, "event": "end", "time": 1.0}] + + if oneline_rows is None: + oneline_rows = [{"binary_index": 0, + "S1_mass_i": 1.0, + "S2_mass_i": 1.0, + "state_i": "initial", + "metallicity": metallicity, + "interp_class_HMS_HMS": "initial_MT", + "mt_history_HMS_HMS": "Stable"}, + {"binary_index": 1, + "S1_mass_i": 1.0, + "S2_mass_i": 1.0, + "state_i": "initial", + "metallicity": metallicity, + "interp_class_HMS_HMS": "no_MT", + "mt_history_HMS_HMS": None}] + + # Convert to DataFrames + oneline_df = pd.DataFrame(oneline_rows).sort_values("binary_index") + history_df = pd.DataFrame(history_rows).sort_values(["binary_index", "time"]) + + # history_lengths = number of rows per binary_index + history_lengths_df = history_df.groupby("binary_index").size().to_frame("length") + + # ini_parameters + ini_df = pd.DataFrame({ + "Parameter": ["metallicity", "number_of_binaries"], + "Value": [metallicity, len(oneline_df)], + }) + + # mass_per_metallicity + mass_df = pd.DataFrame( + {"simulated_mass": [1.0], "number_of_systems": [len(oneline_df)]}, + index=[metallicity] + ) + + # Write HDF5 file using pandas/HDFStore (Population expects PyTables layout) + fpath = os.path.join(tmp_path, filename) + with pd.HDFStore(fpath, "w") as store: + store.put("oneline", oneline_df, format="table") + store.put("history", history_df, format="table") + store.put("history_lengths", history_lengths_df, format="table") + store.put("ini_parameters", ini_df, format="table") + store.put("mass_per_metallicity", mass_df, format="table") + + # Return fully initialized Population object + return Population(fpath) diff --git a/posydon/unit_tests/popsyn/test_normalized_pop_mass.py b/posydon/unit_tests/popsyn/test_normalized_pop_mass.py deleted file mode 100644 index a9b9a94004..0000000000 --- a/posydon/unit_tests/popsyn/test_normalized_pop_mass.py +++ /dev/null @@ -1,42 +0,0 @@ -"""Unit tests of posydon/popsyn/normalized_pop_mass.py -""" - -__authors__ = [ - "Elizabeth Teng " -] - -# import the module which will be tested -import posydon.popsyn.normalized_pop_mass as totest - -# aliases -np = totest.np - -from inspect import isclass, isroutine - -# import other needed code for the tests, which is not already imported in the -# module you like to test -from pytest import approx, fixture, raises, warns - - -# define test classes collecting several test functions -class TestElements: - # check for objects, which should be an element of the tested module - def test_dir(self): - totest_elements = set(dir(totest)) - missing_in_test = set(elements) - totest_elements - assert len(missing_in_test) == 0, "There are missing objects in "\ - +f"{totest.__name__}: "\ - +f"{missing_in_test}. Please "\ - +"check, whether they have been "\ - +"removed on purpose and update "\ - +"this unit test." - new_in_test = totest_elements - set(elements) - assert len(new_in_test) == 0, "There are new objects in "\ - +f"{totest.__name__}: {new_in_test}. "\ - +"Please check, whether they have been "\ - +"added on purpose and update this "\ - +"unit test." - -class TestFunctions: - def test_initial_total_underlying_mass(self): - pass From 9527e7cc15c2b840e565b18f52127e66ce4d6d7a Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Thu, 26 Mar 2026 08:34:16 -0500 Subject: [PATCH 228/389] Refactor test_synthetic_population to use make_test_pop helper - Replace inline population file creation with make_test_pop/make_ini helpers - Remove duplicate test_export_selection and test_calculate_formation_channels from TestRates - Remove editing artifacts (embedded code block) - Add multiple-metallicities error test in test_export_selection - Expand test_calculate_formation_channels with DummyOneline mock Co-Authored-By: Claude Opus 4.6 (1M context) --- .../popsyn/test_synthetic_population.py | 296 ++++++------------ 1 file changed, 101 insertions(+), 195 deletions(-) diff --git a/posydon/unit_tests/popsyn/test_synthetic_population.py b/posydon/unit_tests/popsyn/test_synthetic_population.py index ded4352659..230d8beba6 100644 --- a/posydon/unit_tests/popsyn/test_synthetic_population.py +++ b/posydon/unit_tests/popsyn/test_synthetic_population.py @@ -24,6 +24,7 @@ import os import shutil +from posydon.unit_tests._helper_functions_for_tests.population import make_test_pop, make_ini # define test classes collecting several test functions class TestElements: @@ -93,15 +94,11 @@ def dummy_kwargs_list(path): def dummy_merge(pop,overwrite): pop.merged = True - ini_path = os.path.join(tmp_path, "dummy.ini") - with open(ini_path, "w") as f: - f.write("[DEFAULT]\nkey=value\n") - # Mock out functions monkeypatch.setattr(totest, "binarypop_kwargs_from_ini", dummy_kwargs) monkeypatch.setattr(totest, "BinaryPopulation", DummyPop) monkeypatch.setattr(totest, "convert_metallicity_to_string", lambda x: "0.1") - run = totest.PopulationRunner(str(ini_path)) + run = totest.PopulationRunner(make_ini(tmp_path)) # overwrite=False, directory doesn't exist monkeypatch.setattr(os.path, "exists", lambda path: False) run.merge_parallel_runs = dummy_merge @@ -111,7 +108,7 @@ def dummy_merge(pop,overwrite): # overwrite=False, directory exists monkeypatch.setattr(os.path, "exists", lambda path: True) monkeypatch.setattr(totest, "binarypop_kwargs_from_ini", dummy_kwargs_list) - run = totest.PopulationRunner(str(ini_path), verbose=True) + run = totest.PopulationRunner(make_ini(tmp_path), verbose=True) with raises(FileExistsError, match="tmp_dir"): run.evolve(overwrite=False) # overwrite=True, directory exists @@ -141,10 +138,6 @@ def dummy_kwargs(path): "temp_directory": "tmp_dir", "verbose": False} - ini_path = os.path.join(tmp_path.parent, "dummy.ini") - with open(ini_path, "w") as f: - f.write("[DEFAULT]\nkey=value\n") - monkeypatch.setattr(totest, "binarypop_kwargs_from_ini", dummy_kwargs) monkeypatch.setattr(totest, "BinaryPopulation", DummyPop) monkeypatch.setattr(totest, "convert_metallicity_to_string", @@ -155,7 +148,7 @@ def dummy_kwargs(path): output_file = os.path.join(tmp_path,"0.1_Zsun_population.h5") with open(output_file, "w") as f: f.write("test") - run = totest.PopulationRunner(str(ini_path)) + run = totest.PopulationRunner(make_ini(tmp_path.parent)) run.verbose = False with raises(FileExistsError, match="Files were not merged"): run.merge_parallel_runs(pop) @@ -169,7 +162,7 @@ def dummy_kwargs(path): with open(file2, "w") as f: f.write("test") pop = DummyPop(metallicity=0.1, temp_directory=str(tmp_path)) - run = totest.PopulationRunner(str(ini_path)) + run = totest.PopulationRunner(make_ini(tmp_path.parent)) run.verbose = True monkeypatch.setattr(totest, "convert_metallicity_to_string", lambda x: "0.1") run.merge_parallel_runs(pop) @@ -527,59 +520,6 @@ def test_load_ini_params(self,tmp_path,popio,monkeypatch): class TestPopulation: - def create_minimal_population_file(self,tmp_path): - filename = tmp_path / "pop.h5" - - # Minimal History table - history_df = pd.DataFrame({ - "event": [0], - "time": [0.0] - }) - history_df.index.name = "binary_index" - - # History lengths table - history_lengths_df = pd.DataFrame({ - "length": [len(history_df)] - }, index=history_df.index) - - # Minimal Oneline table - oneline_df = pd.DataFrame({ - "S1_mass_i": [1], - "S2_mass_i": [1], - "state_i": ["initial"], - "metallicity": [0.02], - "interp_class_HMS_HMS": ["stable_MT"], - "mt_history_HMS_HMS": ["Stable contact phase"] - }) - oneline_df.index.name = "binary_index" - - ini_df = pd.DataFrame({ - "Parameter": [ - "metallicity", "number_of_binaries", "binary_fraction_scheme", - "binary_fraction_const", "star_formation", "max_simulation_time", - "primary_mass_scheme", "primary_mass_min", "primary_mass_max", - "secondary_mass_scheme", "secondary_mass_min", "secondary_mass_max", - "orbital_scheme", "orbital_period_scheme", "orbital_period_min", - "orbital_period_max", "orbital_separation_scheme", "orbital_separation_min", - "orbital_separation_max", "eccentricity_scheme" - ], - "Value": [0.02]*20 # dummy values for testing - }) - - # Mass per metallicity table - mass_df = pd.DataFrame({"simulated_mass": [0]}, index=[0.02]) - - # Save all tables - with pd.HDFStore(filename, "w") as store: - store.put("history", history_df, format="table") - store.put("history_lengths", history_lengths_df, format="table") - store.put("oneline", oneline_df, format="table") - store.put("ini_parameters", ini_df, format="table") - store.put("mass_per_metallicity", mass_df, format="table") - - return filename - - def test_population_init(self, tmp_path, monkeypatch): # bad input @@ -589,139 +529,162 @@ def test_population_init(self, tmp_path, monkeypatch): # missing /history filename = os.path.join(tmp_path, "pop_missing.h5") with pd.HDFStore(filename, "w") as store: - store.append("ini_parameters", pd.DataFrame({"Parameter": [], "Value": []}), format="table") + store.put("ini_parameters", pd.DataFrame({"Parameter": [], "Value": []}), format="table") with raises(ValueError, match="does not contain a history table"): totest.Population(str(filename)) # /history exists, /oneline missing - history_df = pd.DataFrame({"event": [0], "time": [0.0], "binary_index": [0]}) + history_df = pd.DataFrame({"binary_index": [0], "event": [0], "time": [0.0]}) with pd.HDFStore(filename, "a") as store: - store.append("history", history_df, format="table") + store.put("history", history_df, format="table") with raises(ValueError, match="does not contain an oneline table"): totest.Population(str(filename)) # /history and /oneline exist, no ini_parameters oneline_df = pd.DataFrame({ + "binary_index": [0], "S1_mass_i": [1], "S2_mass_i": [1], - "state_i": ["initially_single_star"], # <- must match the branch + "state_i": ["initially_single_star"], "metallicity": [0.02] - }) + }) with pd.HDFStore(filename, "a") as store: - store.append("oneline", oneline_df, format="table") - store.put("mass_per_metallicity", - pd.DataFrame({"simulated_mass": [0]}, index=[0.02]), - format="table") - with raises(ValueError,match='does not contain an ini_parameters table'): - pop = totest.Population(str(filename)) + store.put("oneline", oneline_df, format="table") + store.put("mass_per_metallicity", pd.DataFrame({"simulated_mass": [0]}, index=[0.02]), format="table") + with raises(ValueError, match='does not contain an ini_parameters table'): + totest.Population(str(filename)) # /history and /oneline exist, yes ini_parameters, no mass_per_metallicity filename_no_mass = os.path.join(tmp_path, "pop_no_mass.h5") with pd.HDFStore(filename_no_mass, "w") as store: - store.put("history", history_df,format="table") + store.put("history", history_df, format="table") store.put("oneline", oneline_df, format="table") - store.put("ini_parameters", - pd.DataFrame({"Parameter": ["metallicity"], "Value": [0.02]}),format="table") - with raises(ValueError,match='does not contain a mass_per_metallicity table'): - pop = totest.Population(str(filename_no_mass)) + store.put("ini_parameters", pd.DataFrame({"Parameter": ["metallicity"], "Value": [0.02]}), format="table") + with raises(ValueError, match='does not contain a mass_per_metallicity table'): + totest.Population(str(filename_no_mass)) # metallicity specified monkeypatch.setattr( "posydon.popsyn.synthetic_population.binarypop_kwargs_from_ini", - lambda ini_file: {"dummy_param": 1}) - dummy_ini_file = os.path.join(tmp_path,"dummy.ini") + lambda ini_file: {"dummy_param": 1}, + ) + pop_with_metallicity = totest.Population( - str(filename_no_mass), metallicity=0.02, ini_file=str(dummy_ini_file) + str(filename_no_mass), metallicity=0.02, ini_file=str(tmp_path / "dummy.ini") ) assert pop_with_metallicity.mass_per_metallicity is not None assert pop_with_metallicity.solar_metallicities[0] == 0.02 assert pop_with_metallicity.metallicities[0] == 0.02 * Zsun # everything exists - filename_full = os.path.join(tmp_path, "pop_full.h5") - with pd.HDFStore(filename_full, "w") as store: - store.put("history", history_df,format="table") - store.put("oneline", oneline_df,format="table") - store.put("ini_parameters", pd.DataFrame({"param1": [1]}),format="table") - store.put("mass_per_metallicity", pd.DataFrame({"simulated_mass": [0]}, index=[0.02]), - format="table") - store.put("formation_channels", pd.DataFrame({"channel": ["dynamic"]})) - pop = totest.Population(str(filename_full)) - assert pop.number_of_systems == 1 + pop = make_test_pop(tmp_path, filename="full_pop.h5") + assert pop.number_of_systems > 0 assert isinstance(pop.history, totest.History) assert isinstance(pop.oneline, totest.Oneline) - # Metallicity specified - dummy_ini_file = os.path.join(tmp_path,"dummy.ini") pop_with_metallicity = totest.Population( - str(filename_full), metallicity=0.02, ini_file=str(dummy_ini_file) + str(pop.filename), metallicity=0.02, ini_file=str(tmp_path / "dummy.ini") ) assert pop_with_metallicity.mass_per_metallicity is not None assert pop_with_metallicity.solar_metallicities[0] == 0.02 assert pop_with_metallicity.metallicities[0] == 0.02 * Zsun - def test_export_selection(self,tmp_path,monkeypatch): - filename = self.create_minimal_population_file(tmp_path) - pop = totest.Population(str(filename)) + def test_export_selection(self, tmp_path, monkeypatch): + pop = make_test_pop(tmp_path) export_file = tmp_path / "exp.h5" # bad input - with raises(ValueError,match='does not contain .h5'): - pop.export_selection([0],'hello.txt') + with raises(ValueError, match='does not contain .h5'): + pop.export_selection([0], 'hello.txt') - with raises(ValueError,match="Both overwrite and append cannot be True!"): - pop.export_selection([0],str(export_file),append=True,overwrite=True) + with raises(ValueError, match="Both overwrite and append cannot be True!"): + pop.export_selection([0], str(export_file), append=True, overwrite=True) dummy_file = tmp_path / "exists.h5" pd.DataFrame({"a": [1]}).to_hdf(dummy_file, "dummy", format="table") - with raises(FileExistsError,match='Set overwrite or append to True'): - pop.export_selection([0], str(dummy_file),overwrite=False,append=False) + with raises(FileExistsError, match='Set overwrite or append to True'): + pop.export_selection([0], str(dummy_file), overwrite=False, append=False) - # overwrite export + # overwrite out_file = tmp_path / "out.h5" pop.export_selection([0], str(out_file), overwrite=True, history_chunksize=1) - # append export + # append pop.export_selection([0], str(out_file), append=True, history_chunksize=1) # write export - pop.export_selection([0], os.path.join(tmp_path,'new.h5'), append=False, - overwrite=False, - history_chunksize=1) + pop.export_selection( + [0], os.path.join(tmp_path, 'new.h5'), append=False, overwrite=False, history_chunksize=1 + ) - # No metallicity column + # test case: oneline missing metallicity class DummyOnelineNoMetal: - columns = ["S1_mass_i", "S2_mass_i", "state_i"] # no 'metallicity' + columns = ["S1_mass_i", "S2_mass_i", "state_i"] number_of_systems = 1 - def __getitem__(self, cols): - import pandas as pd return pd.DataFrame({ - "S1_mass_i": [1], - "S2_mass_i": [1], - "state_i": ["initial"] - }) - - def __len__(self): - return self.number_of_systems + "S1_mass_i": [1], "S2_mass_i": [1], "state_i": ["initial"] + }, index=[0]) + def __len__(self): return 1 pop.oneline = DummyOnelineNoMetal() - pop.export_selection([0], str(tmp_path/"out2.h5"), overwrite=True) + pop.export_selection([0], str(tmp_path / "out2.h5"), overwrite=True) - # Check mass_per_metallicity updated + # mass_per_metallicity updated df = pd.read_hdf(out_file, "mass_per_metallicity") assert "number_of_systems" in df.columns - def test_calculate_formation_channels(self,tmp_path): - filename = self.create_minimal_population_file(tmp_path) - - pop = totest.Population(str(filename)) - - # Should not error even with empty data - pop.calculate_formation_channels() + # multiple metallicities error + class DummyNoMet: + columns = ["foo"] + number_of_systems = 1 + def __getitem__(self, idx): return pd.DataFrame({"foo": [1]}) + def __len__(self): return 1 + + pop.oneline = DummyNoMet() + pop.metallicities = [0.02, 0.01] + + with raises(ValueError, match="multiple metallicities"): + pop.export_selection([0], str(tmp_path / "multi_met.h5"), overwrite=True) + + def test_calculate_formation_channels(self, tmp_path): + pop = make_test_pop(tmp_path) + + class DummyOneline: + columns = ["interp_class_HMS_HMS", "mt_history_HMS_HMS"] + number_of_systems = 4 + + def select(self, start=None, stop=None, columns=None): + data = [ + {"interp_class_HMS_HMS": "initial_MT", "mt_history_HMS_HMS": "Stable contact phase"}, + {"interp_class_HMS_HMS": "stable_MT", "mt_history_HMS_HMS": None}, + {"interp_class_HMS_HMS": "stable_reverse_MT", "mt_history_HMS_HMS": None}, + {"interp_class_HMS_HMS": "no_MT", "mt_history_HMS_HMS": None}, + ] + selected = data[start:stop] + while len(selected) < (stop - start): + selected.append(data[-1]) + df = pd.DataFrame(selected) + if columns is not None: + df = df[columns] + return df + + pop.oneline = DummyOneline() + pop.chunksize = 2 + + pop.calculate_formation_channels(mt_history=True) + assert hasattr(pop, "formation_channels") + assert all(col in pop.formation_channels.columns for col in ["channel", "channel_debug"]) + assert any("contact" in str(c) for c in pop.formation_channels["channel"]) + + pop.calculate_formation_channels(mt_history=False) + assert hasattr(pop, "formation_channels") + assert "channel" in pop.formation_channels.columns + + pop.calculate_formation_channels(mt_history=True) + with pd.HDFStore(pop.filename, "r") as store: + assert "/formation_channels" in store.keys() - # Result should be a dataframe (even if empty) - assert hasattr(pop.formation_channels, "columns") def test_create_transient_population(self): # missing argument # bad input @@ -730,32 +693,22 @@ def test_create_transient_population(self): class TestTransientPopulation: - @fixture - def fix(self): -# return - pass - - def test_population(self): - # missing argument - # bad input - # examples - pass - def test_columns(self): + def test_select(self): # missing argument # bad input # examples pass - def test_select(self): + def test_calculate_model_weights(self): # missing argument # bad input # examples pass - def test_get_efficiency_over_metallicity(self): + def test_calculate_cosmic_weights(self): # missing argument # bad input # examples pass - def test_calculate_cosmic_weights(self): + def test_efficiency(self): # missing argument # bad input # examples @@ -763,26 +716,6 @@ def test_calculate_cosmic_weights(self): class TestRates: - @fixture - def fix(self): - # return - pass - - def test_weights(self): - # missing argument - # bad input - # examples - pass - def test_z_birth(self): - # missing argument - # bad input - # examples - pass - def test_z_events(self): - # missing argument - # bad input - # examples - pass def test_select_rate_slice(self): # missing argument # bad input @@ -803,33 +736,6 @@ def test_observable_population(self): # bad input # examples pass - def test_observable_population_names(self): - # missing argument - # bad input - # examples - pass - def test_intrinsic_rate_density(self): - # missing argument - # bad input - # examples - pass def test_edges_metallicity_bins(self): - # missing argument - # bad input - # examples - pass - def test_centers_metallicity_bins(self): - # missing argument - # bad input - # examples - pass - def test_edges_redshift_bins(self): - # missing argument - # bad input - # examples - pass - def test_centers_redshift_bins(self): - # missing argument - # bad input - # examples + # TODO: needs Rates object setup pass From 30bcbcf2b986f575e4a42b9c2d10085195642785 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2026 13:34:40 +0000 Subject: [PATCH 229/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .../unit_tests/_helper_functions_for_tests/population.py | 4 ++-- posydon/unit_tests/popsyn/test_synthetic_population.py | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/posydon/unit_tests/_helper_functions_for_tests/population.py b/posydon/unit_tests/_helper_functions_for_tests/population.py index 413341ed42..08dfa5d0b3 100644 --- a/posydon/unit_tests/_helper_functions_for_tests/population.py +++ b/posydon/unit_tests/_helper_functions_for_tests/population.py @@ -9,13 +9,13 @@ ] import os + import h5py import numpy as np import pandas as pd from posydon.popsyn.synthetic_population import Population - # helper functions def make_ini(tmp_path,content=None): @@ -76,7 +76,7 @@ def make_test_pop( """ # history and oneline tables - + if history_rows is None: history_rows = [{"binary_index": 0, "event": "start", "time": 0.0}, {"binary_index": 0, "event": "end", "time": 1.0}, diff --git a/posydon/unit_tests/popsyn/test_synthetic_population.py b/posydon/unit_tests/popsyn/test_synthetic_population.py index 230d8beba6..a254864b33 100644 --- a/posydon/unit_tests/popsyn/test_synthetic_population.py +++ b/posydon/unit_tests/popsyn/test_synthetic_population.py @@ -24,7 +24,11 @@ import os import shutil -from posydon.unit_tests._helper_functions_for_tests.population import make_test_pop, make_ini +from posydon.unit_tests._helper_functions_for_tests.population import ( + make_ini, + make_test_pop, +) + # define test classes collecting several test functions class TestElements: From cc63eaf22b7d652dbc80d79095e581a180631282 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Thu, 26 Mar 2026 09:03:24 -0500 Subject: [PATCH 230/389] fix failing tests --- .../popsyn/test_synthetic_population.py | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/posydon/unit_tests/popsyn/test_synthetic_population.py b/posydon/unit_tests/popsyn/test_synthetic_population.py index a254864b33..7a6f05e883 100644 --- a/posydon/unit_tests/popsyn/test_synthetic_population.py +++ b/posydon/unit_tests/popsyn/test_synthetic_population.py @@ -24,11 +24,7 @@ import os import shutil -from posydon.unit_tests._helper_functions_for_tests.population import ( - make_ini, - make_test_pop, -) - +from posydon.unit_tests._helper_functions_for_tests.population import make_test_pop, make_ini # define test classes collecting several test functions class TestElements: @@ -87,12 +83,12 @@ def combine_saved_files(self, *args): self.combined = True def dummy_kwargs(path): return { - "metallicity": 0.1, + "metallicities": 0.1, "temp_directory": "tmp_dir", "verbose": False} def dummy_kwargs_list(path): return { - "metallicity": [0.1,1.], + "metallicities": [0.1,1.], "temp_directory": "tmp_dir", "verbose": False} def dummy_merge(pop,overwrite): @@ -102,6 +98,7 @@ def dummy_merge(pop,overwrite): monkeypatch.setattr(totest, "binarypop_kwargs_from_ini", dummy_kwargs) monkeypatch.setattr(totest, "BinaryPopulation", DummyPop) monkeypatch.setattr(totest, "convert_metallicity_to_string", lambda x: "0.1") + monkeypatch.setattr(totest.SimulationProperties, "from_ini", staticmethod(lambda path: None)) run = totest.PopulationRunner(make_ini(tmp_path)) # overwrite=False, directory doesn't exist monkeypatch.setattr(os.path, "exists", lambda path: False) @@ -138,12 +135,13 @@ def combine_saved_files(self, out_path, files): def dummy_kwargs(path): return { - "metallicity": 0.1, + "metallicities": 0.1, "temp_directory": "tmp_dir", "verbose": False} monkeypatch.setattr(totest, "binarypop_kwargs_from_ini", dummy_kwargs) monkeypatch.setattr(totest, "BinaryPopulation", DummyPop) + monkeypatch.setattr(totest.SimulationProperties, "from_ini", staticmethod(lambda path: None)) monkeypatch.setattr(totest, "convert_metallicity_to_string", lambda x: str(os.path.join(tmp_path, "0.1"))) @@ -660,8 +658,8 @@ class DummyOneline: def select(self, start=None, stop=None, columns=None): data = [ - {"interp_class_HMS_HMS": "initial_MT", "mt_history_HMS_HMS": "Stable contact phase"}, - {"interp_class_HMS_HMS": "stable_MT", "mt_history_HMS_HMS": None}, + {"interp_class_HMS_HMS": "stable_MT", "mt_history_HMS_HMS": "Stable contact phase"}, + {"interp_class_HMS_HMS": "no_MT", "mt_history_HMS_HMS": None}, {"interp_class_HMS_HMS": "stable_reverse_MT", "mt_history_HMS_HMS": None}, {"interp_class_HMS_HMS": "no_MT", "mt_history_HMS_HMS": None}, ] @@ -742,4 +740,4 @@ def test_observable_population(self): pass def test_edges_metallicity_bins(self): # TODO: needs Rates object setup - pass + pass \ No newline at end of file From af54106a44f824f76735eb2659b1523562e56ec0 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2026 14:03:57 +0000 Subject: [PATCH 231/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/unit_tests/popsyn/test_synthetic_population.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/posydon/unit_tests/popsyn/test_synthetic_population.py b/posydon/unit_tests/popsyn/test_synthetic_population.py index 7a6f05e883..386fdddda4 100644 --- a/posydon/unit_tests/popsyn/test_synthetic_population.py +++ b/posydon/unit_tests/popsyn/test_synthetic_population.py @@ -24,7 +24,11 @@ import os import shutil -from posydon.unit_tests._helper_functions_for_tests.population import make_test_pop, make_ini +from posydon.unit_tests._helper_functions_for_tests.population import ( + make_ini, + make_test_pop, +) + # define test classes collecting several test functions class TestElements: @@ -740,4 +744,4 @@ def test_observable_population(self): pass def test_edges_metallicity_bins(self): # TODO: needs Rates object setup - pass \ No newline at end of file + pass From a97e18b5c7376cce7f84aad50ea216d81adbdef1 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Thu, 26 Mar 2026 09:37:17 -0500 Subject: [PATCH 232/389] Update setup.cfg to exclude analysis.py and GRB.py from testing --- setup.cfg | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/setup.cfg b/setup.cfg index 3a53872f29..871fe8718f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -20,3 +20,12 @@ source = posydon omit = posydon/tests/* posydon/_version.py + posydon/popsyn/analysis.py + posydon/popsyn/GRB.py + +[coverage:report] +omit = + posydon/tests/* + posydon/_version.py + posydon/popsyn/analysis.py + posydon/popsyn/GRB.py From e85ff24b9d24f20f257ed6bb20a0ae54d7d9e0b6 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Thu, 26 Mar 2026 09:39:08 -0500 Subject: [PATCH 233/389] removed tests for inactive code --- posydon/unit_tests/popsyn/test_GRB.py | 50 ---------------------- posydon/unit_tests/popsyn/test_analysis.py | 18 -------- 2 files changed, 68 deletions(-) delete mode 100644 posydon/unit_tests/popsyn/test_GRB.py delete mode 100644 posydon/unit_tests/popsyn/test_analysis.py diff --git a/posydon/unit_tests/popsyn/test_GRB.py b/posydon/unit_tests/popsyn/test_GRB.py deleted file mode 100644 index 541a7b8d50..0000000000 --- a/posydon/unit_tests/popsyn/test_GRB.py +++ /dev/null @@ -1,50 +0,0 @@ -"""Unit tests of posydon/popsyn/GRB.py -""" - -__authors__ = [ - "Elizabeth Teng " -] - -# import the module which will be tested -import posydon.popsyn.GRB as totest - -# aliases -np = totest.np - -from inspect import isclass, isroutine - -# import other needed code for the tests, which is not already imported in the -# module you like to test -from pytest import approx, fixture, raises, warns - -from posydon.utils.constants import Msun, clight -from posydon.utils.posydonwarning import Pwarn - - -# define test classes collecting several test functions -class TestElements: - # check for objects, which should be an element of the tested module - def test_dir(self): - elements = ['get_GRB_properties','__authors__',\ - '__builtins__', '__cached__', '__doc__', '__file__',\ - '__loader__', '__name__', '__package__', '__spec__', - 'Pwarn','Msun','clight','np'] - totest_elements = set(dir(totest)) - missing_in_test = set(elements) - totest_elements - assert len(missing_in_test) == 0, "There are missing objects in "\ - +f"{totest.__name__}: "\ - +f"{missing_in_test}. Please "\ - +"check, whether they have been "\ - +"removed on purpose and update "\ - +"this unit test." - new_in_test = totest_elements - set(elements) - assert len(new_in_test) == 0, "There are new objects in "\ - +f"{totest.__name__}: {new_in_test}. "\ - +"Please check, whether they have been "\ - +"added on purpose and update this "\ - +"unit test." - -class TestFunctions: - - def test_get_GRB_properties(): - pass diff --git a/posydon/unit_tests/popsyn/test_analysis.py b/posydon/unit_tests/popsyn/test_analysis.py deleted file mode 100644 index f9a58ad59b..0000000000 --- a/posydon/unit_tests/popsyn/test_analysis.py +++ /dev/null @@ -1,18 +0,0 @@ -"""Unit tests of posydon/popsyn/analysis.py -""" - -__authors__ = [ - "Elizabeth Teng " -] - -# import the module which will be tested -import posydon.popsyn.analysis as totest - -# aliases -pd = totest.pd - -from inspect import isclass, isroutine - -# import other needed code for the tests, which is not already imported in the -# module you like to test -from pytest import approx, fixture, raises, warns From 4f604c1871ef4a200614c362bafb898a5b78ce2d Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Thu, 26 Mar 2026 09:41:42 -0500 Subject: [PATCH 234/389] add note about being omitted from testing --- posydon/popsyn/GRB.py | 3 +++ posydon/popsyn/analysis.py | 2 ++ 2 files changed, 5 insertions(+) diff --git a/posydon/popsyn/GRB.py b/posydon/popsyn/GRB.py index 82e5809771..a271269a54 100644 --- a/posydon/popsyn/GRB.py +++ b/posydon/popsyn/GRB.py @@ -1,3 +1,6 @@ +# This code is currently not being actively used, and is not covered by unit tests. +# To test this file, remove it from the 'omit' blocks in POSYDON/setup.cfg. + __author__ = ['Simone Bavera '] import numpy as np diff --git a/posydon/popsyn/analysis.py b/posydon/popsyn/analysis.py index 2f7717b593..49b91b3a6c 100644 --- a/posydon/popsyn/analysis.py +++ b/posydon/popsyn/analysis.py @@ -1,5 +1,7 @@ """Module for analyzing binary population simulation results.""" +# This code is currently not being actively used, and is not covered by unit tests. +# To test this file, remove it from the 'omit' blocks in POSYDON/setup.cfg. __authors__ = [ "Konstantinos Kovlakas ", From 1c50d14432a6da1951858a7adf57fd49500786d8 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2026 14:46:56 +0000 Subject: [PATCH 235/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/popsyn/GRB.py | 4 ++-- posydon/popsyn/analysis.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/posydon/popsyn/GRB.py b/posydon/popsyn/GRB.py index a271269a54..dd0b3ab4e2 100644 --- a/posydon/popsyn/GRB.py +++ b/posydon/popsyn/GRB.py @@ -1,5 +1,5 @@ -# This code is currently not being actively used, and is not covered by unit tests. -# To test this file, remove it from the 'omit' blocks in POSYDON/setup.cfg. +# This code is currently not being actively used, and is not covered by unit tests. +# To test this file, remove it from the 'omit' blocks in POSYDON/setup.cfg. __author__ = ['Simone Bavera '] diff --git a/posydon/popsyn/analysis.py b/posydon/popsyn/analysis.py index 49b91b3a6c..e2f373c6d4 100644 --- a/posydon/popsyn/analysis.py +++ b/posydon/popsyn/analysis.py @@ -1,7 +1,7 @@ """Module for analyzing binary population simulation results.""" -# This code is currently not being actively used, and is not covered by unit tests. -# To test this file, remove it from the 'omit' blocks in POSYDON/setup.cfg. +# This code is currently not being actively used, and is not covered by unit tests. +# To test this file, remove it from the 'omit' blocks in POSYDON/setup.cfg. __authors__ = [ "Konstantinos Kovlakas ", From b25e22f81ae77d1a55ec36a76064758ac27e2417 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Thu, 26 Mar 2026 16:24:36 -0500 Subject: [PATCH 236/389] add [grid_paths] section to .ini file and link settings to MESA grid steps --- posydon/binary_evol/MESA/step_mesa.py | 94 ++++++++++---------- posydon/binary_evol/simulationproperties.py | 77 +++++++++++----- posydon/popsyn/io.py | 4 + posydon/popsyn/population_params_default.ini | 25 ++++++ 4 files changed, 133 insertions(+), 67 deletions(-) diff --git a/posydon/binary_evol/MESA/step_mesa.py b/posydon/binary_evol/MESA/step_mesa.py index e8da3b8db0..2ba7062434 100644 --- a/posydon/binary_evol/MESA/step_mesa.py +++ b/posydon/binary_evol/MESA/step_mesa.py @@ -127,8 +127,7 @@ class MesaGridStep: """Superclass for steps using the POSYDON grids.""" DEFAULT_KWARGS = {'metallicity': None, - 'grid_name': None, - 'path': PATH_TO_POSYDON_DATA, + 'grid_path': None, 'interpolation_path': None, 'interpolation_filename': None, 'interpolation_method': 'nearest_neighbour', @@ -197,12 +196,15 @@ def __init__(self, **kwargs): and self.interpolation_method != 'nearest_neighbour'): raise ValueError('Track interpolation is currently supported only ' 'by the nearest neighbour interpolation method!') + + z_str = convert_metallicity_to_string(self.metallicity) + self.grid_name = os.path.join(self.grid_path, f"{z_str}_Zsun.h5") # we load NN any time stop_at_max_time requested - regardless # of interp method if (self.stop_method == 'stop_at_max_time' or self.interpolation_method == 'nearest_neighbour'): - self.load_psyTrackInterp(self.grid_name) + self.load_psyTrackInterp() self.grid_name = self.grid_name.replace('_%d', '') @@ -213,14 +215,13 @@ def __init__(self, **kwargs): # Set the interpolation path if self.interpolation_path is None: - self.interpolation_path = os.path.join(self.path, - os.path.split(self.grid_name)[0], + self.interpolation_path = os.path.join(self.grid_path, 'interpolators/%s' % self.interpolation_method) # Set the interpolation filename if self.interpolation_filename is None: self.interpolation_filename = os.path.join(self.interpolation_path, - os.path.split(self.grid_name)[1].replace('h5', 'pkl')) + os.path.basename(self.grid_name).replace('h5', 'pkl')) else: self.interpolation_filename = os.path.join(self.interpolation_path, self.interpolation_filename) @@ -258,17 +259,16 @@ def initial_values_min_max(parameter_name): self.m2_min, self.m2_max = initial_values_min_max('star_2_mass') self.p_min, self.p_max = initial_values_min_max('period_days') - def load_psyTrackInterp(self, grid_name): + def load_psyTrackInterp(self): """Load the interpolator that has been trained on the grid.""" # Check if interpolation files exist - filename = os.path.join(self.path,grid_name) - if not (os.path.exists(filename.replace('%d','0')) or - os.path.exists(filename.replace('_%d',''))): + if not (os.path.exists(self.grid_name.replace('%d','0')) or + os.path.exists(self.grid_name.replace('_%d',''))): data_download() if self.verbose: - print("loading psyTrackInterp: {}".format(filename)) - self._psyTrackInterp = psyTrackInterp(filename, + print("loading psyTrackInterp: {}".format(self.grid_name)) + self._psyTrackInterp = psyTrackInterp(self.grid_name, interp_in_q=self.interp_in_q, verbose=self.verbose) self._psyTrackInterp.train() @@ -1266,16 +1266,11 @@ def interpolate_at_t(self, t, t_before, t_after, v_before, v_after): class MS_MS_step(MesaGridStep): """Class for performing the MESA step for a MS-MS binary.""" - def __init__(self, metallicity=1., grid_name=None, *args, **kwargs): + def __init__(self, *args, **kwargs): """Initialize a MS_MS_step instance.""" self.grid_type = 'HMS_HMS' self.interp_in_q = True - if grid_name is None: - metallicity = convert_metallicity_to_string(metallicity) - grid_name = 'HMS-HMS/' + metallicity + '_Zsun.h5' - super().__init__(metallicity=metallicity, - grid_name=grid_name, - *args, **kwargs) + super().__init__(*args, **kwargs) # special stuff for my step goes here # set mass ratio @@ -1363,21 +1358,21 @@ def __call__(self, binary): 'binary.event = %s and not H-rich_Core_H_burning ' '- H-rich_Core_H_burning - * - ZAMS' % (state_1, state_2, event)) + + def __repr__(self): + """Return the name of evolution step and settings.""" + return "MS_MS_step:\n" + \ + "\n".join([f"{key} = {getattr(self, key)}" for key in self.__dict__]) class CO_HMS_RLO_step(MesaGridStep): """Class for performing the MESA step for a CO-HMS_RLO binary.""" - def __init__(self, metallicity=1., grid_name=None, *args, **kwargs): + def __init__(self, *args, **kwargs): """Initialize a CO_HMS_RLO_step instance.""" self.grid_type = 'CO_HMS_RLO' self.interp_in_q = False - if grid_name is None: - metallicity = convert_metallicity_to_string(metallicity) - grid_name = 'CO-HMS_RLO/' + metallicity + '_Zsun.h5' - super().__init__(metallicity=metallicity, - grid_name=grid_name, - *args, **kwargs) + super().__init__(*args, **kwargs) def __call__(self, binary): """Evolve a binary using the MESA step.""" @@ -1478,21 +1473,21 @@ def __call__(self, binary): self.binary.state = "detached" self.binary.event = "redirect_from_CO_HMS_RLO" return + + def __repr__(self): + """Return the name of evolution step and settings.""" + return "CO_HMS_RLO_step:\n" + \ + "\n".join([f"{key} = {getattr(self, key)}" for key in self.__dict__]) class CO_HeMS_RLO_step(MesaGridStep): """Class for performing the MESA step for a CO-HeMS_RLO binary.""" - def __init__(self, metallicity=1., grid_name=None, *args, **kwargs): + def __init__(self, *args, **kwargs): """Initialize a CO_HeMS_RLO_step instance.""" self.grid_type = 'CO_HeMS_RLO' self.interp_in_q = False - if grid_name is None: - metallicity = convert_metallicity_to_string(metallicity) - grid_name = 'CO-HeMS_RLO/' + metallicity + '_Zsun.h5' - super().__init__(metallicity=metallicity, - grid_name=grid_name, - *args, **kwargs) + super().__init__(*args, **kwargs) def __call__(self, binary): """Evolve a binary using the MESA step.""" @@ -1593,21 +1588,21 @@ def __call__(self, binary): self.binary.state = "detached" self.binary.event = "redirect_from_CO_HeMS_RLO" return + + def __repr__(self): + """Return the name of evolution step and settings.""" + return "CO_HeMS_RLO_step:\n" + \ + "\n".join([f"{key} = {getattr(self, key)}" for key in self.__dict__]) class CO_HeMS_step(MesaGridStep): """Class for performing the MESA step for a CO-HeMS binary.""" - def __init__(self, metallicity=1., grid_name=None, *args, **kwargs): + def __init__(self, *args, **kwargs): """Initialize a CO_HeMS_step instance.""" self.grid_type = 'CO_HeMS' self.interp_in_q = False - if grid_name is None: - metallicity = convert_metallicity_to_string(metallicity) - grid_name = 'CO-HeMS/' + metallicity + '_Zsun.h5' - super().__init__(metallicity=metallicity, - grid_name=grid_name, - *args, **kwargs) + super().__init__(*args, **kwargs) def __call__(self, binary): """Apply the CO_HeMS step to a BinaryStar object.""" @@ -1689,6 +1684,11 @@ def __call__(self, binary): self.binary.state = 'detached' self.binary.event = 'redirect_from_CO_HeMS' return + + def __repr__(self): + """Return the name of evolution step and settings.""" + return "CO_HeMS_step:\n" + \ + "\n".join([f"{key} = {getattr(self, key)}" for key in self.__dict__]) class HMS_HMS_RLO_step(MesaGridStep): @@ -1697,16 +1697,11 @@ class HMS_HMS_RLO_step(MesaGridStep): we evolve them first with step detached and map to the HMS-HMS RLO grid using `initial_eccentricity_flow_chart`.""" - def __init__(self, metallicity=1., grid_name=None, *args, **kwargs): + def __init__(self, *args, **kwargs): """Initialize a HMS_HMS_RLO_step instance.""" self.grid_type = 'HMS_HMS_RLO' self.interp_in_q = True - if grid_name is None: - metallicity = convert_metallicity_to_string(metallicity) - grid_name = 'HMS-HMS_RLO/' + metallicity + '_Zsun.h5' - super().__init__(metallicity=metallicity, - grid_name=grid_name, - *args, **kwargs) + super().__init__(*args, **kwargs) # special stuff for my step goes here # If nothing to do, no init necessary @@ -1839,3 +1834,8 @@ def __call__(self, binary): self.binary.state = "detached" self.binary.event = "redirect_from_HMS_HMS_RLO" return + + def __repr__(self): + """Return the name of evolution step and settings.""" + return "HMS_HMS_RLO_step:\n" + \ + "\n".join([f"{key} = {getattr(self, key)}" for key in self.__dict__]) diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index 3159075dbd..d342bff71a 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -26,6 +26,7 @@ from posydon.utils.common_functions import convert_metallicity_to_string from posydon.utils.constants import age_of_universe from posydon.utils.posydonwarning import Pwarn +from posydon.utils.posydonerror import GridError class NullStep: @@ -35,6 +36,17 @@ class NullStep: class SimulationProperties: """Class describing the properties of a population synthesis simulation.""" + # each value in this dict represents the expected path for the respective grid. + # A user may specify their own full path to a custom grid in the [grid_paths] + # section of their .ini file. I.e., HMS-HMS_path = 'path/to/my_own_grid/' to + # override these defaults. + default_grid_paths = {"single_HMS_path": os.path.join(PATH_TO_POSYDON_DATA, "single_HMS"), + "single_HeMS_path": os.path.join(PATH_TO_POSYDON_DATA, "single_HeMS"), + "HMS_HMS_path": os.path.join(PATH_TO_POSYDON_DATA, "HMS-HMS"), + "CO_HMS_RLO_path": os.path.join(PATH_TO_POSYDON_DATA, "CO-HMS_RLO"), + "CO_HeMS_path": os.path.join(PATH_TO_POSYDON_DATA, "CO-HeMS"), + "CO_HeMS_RLO_path": os.path.join(PATH_TO_POSYDON_DATA, "CO-HeMS_RLO")} + def __init__(self, flow=({}, {}), step_HMS_HMS = (NullStep(), {}), step_CO_HeMS = (NullStep(), {}), @@ -169,12 +181,6 @@ def __init__(self, flow=({}, {}), "(i) a class deriving from EvolveHooks and a kwargs dict, " "or (ii) the name of the extra function and the callable.") - # Binary parameters and parameterizations - self.initial_rotation = 0.0 - self.mass_transfer_efficiency = 1.0 - - self.common_envelope_efficiency = 1.0 - # Limits on simulation if not hasattr(self, 'max_simulation_time'): self.max_simulation_time = age_of_universe @@ -202,16 +208,44 @@ def __init__(self, flow=({}, {}), # maybe get rid of this self.track_matchers = {} - # Should possibly be a section in sim props .ini file - self.grid_path = PATH_TO_POSYDON_DATA + for grid_name in self.default_grid_paths: + try: + self.set_path(grid_name, self.kwargs[grid_name]) + except KeyError as e: + Pwarn(f"{grid_name} is not set in the kwargs passed to SimulationProperties. " + f"Falling back to the default: {self.default_grid_paths[grid_name]}", + "ReplaceValueWarning") + + self.set_path(grid_name, self.default_grid_paths[grid_name]) + # These hold GRIDInterpolator objects # and associated grid names for ea. metallicity # (intended keys are metallicities): - self.grid_names_Hrich = {} self.grids_Hrich = {} - self.grid_names_strippedHe = {} self.grids_strippedHe = {} + def set_path(self, path_name, path_str): + + # construct path to *_Zsun.h5 files if not specified + if path_str is None: + if path_name in self.default_grid_paths: + path_str = self.default_grid_paths[path_name] + else: + valid_names = "\n".join(f"{k} = " for k in self.default_grid_paths) + raise GridError(f'Trying to assign a grid path for "{path_name}".\n' + "This is an unrecognized path name. Please check " + "the [grid_paths] section of your .ini file.\n\n" + "Valid path variable names are:\n" + f"{valid_names}\n") + + path_str = os.path.abspath(path_str) + + if not os.path.exists(path_str): + # should trigger data download if someone happened to put the default path manually? + raise GridError(f"Path does not exist: {path_str}") + + setattr(self, path_name, path_str) + def preload_imports(self): """ Preload the imports of detached_step and MesaGridStep to avoid @@ -453,9 +487,18 @@ def check_step(self, metallicity, RNG, step_name, step_tup, verbose=False): if metallicity is None: Pwarn(f"{step_name} not assigned a metallicity. " "Defaulting to Z = Zsun (solar).", - "MissingValueWarning") + "ReplaceValueWarning") metallicity = 1.0 step_kwargs['metallicity'] = float(metallicity) + print(step_name, step_kwargs['metallicity']) + + # These steps need these grids: + step_grid_map = {"step_HMS_HMS": self.HMS_HMS_path, + "step_CO_HMS_RLO": self.CO_HMS_RLO_path, + "step_CO_HeMS": self.CO_HeMS_path, + "step_CO_HeMS_RLO": self.CO_HeMS_RLO_path} + if step_name in step_grid_map: + step_kwargs['grid_path'] = step_grid_map[step_name] # each metallicity/step combo could require # a unique TrackMatcher, so check for that @@ -508,19 +551,13 @@ def create_track_matcher(self, metallicity, step_name, matcher_kwargs): """ z_str = convert_metallicity_to_string(metallicity) - # set up GRIDInterpolator objects + # set up GRIDInterpolator objects (for HMS and HeMS) # (only if one hasn't been created already for a given metallicity) if metallicity not in self.grids_Hrich: - self.grid_names_Hrich[metallicity] = os.path.join('single_HMS', - z_str+'_Zsun.h5') - grid_path_Hrich = os.path.join(self.grid_path, - self.grid_names_Hrich[metallicity]) + grid_path_Hrich = os.path.join(self.single_HMS_path, f"{z_str}_Zsun.h5") self.grids_Hrich[metallicity] = GRIDInterpolator(grid_path_Hrich) if metallicity not in self.grids_strippedHe: - self.grid_names_strippedHe[metallicity] = os.path.join('single_HeMS', - z_str+'_Zsun.h5') - grid_path_strippedHe = os.path.join(self.grid_path, - self.grid_names_strippedHe[metallicity]) + grid_path_strippedHe = os.path.join(self.single_HeMS_path, f"{z_str}_Zsun.h5") self.grids_strippedHe[metallicity] = GRIDInterpolator(grid_path_strippedHe) # Create TrackMatcher object as needed, passing GRIDInterpolator references diff --git a/posydon/popsyn/io.py b/posydon/popsyn/io.py index 9468bccb2b..4f2374abab 100644 --- a/posydon/popsyn/io.py +++ b/posydon/popsyn/io.py @@ -494,6 +494,10 @@ def simprop_kwargs_from_ini(path, only=None, verbose=False): parser_dict[section] = hooks_list + if section == "grid_paths": + + parser_dict.update(sect_dict) + return parser_dict diff --git a/posydon/popsyn/population_params_default.ini b/posydon/popsyn/population_params_default.ini index c56d1b6876..f32ea087aa 100644 --- a/posydon/popsyn/population_params_default.ini +++ b/posydon/popsyn/population_params_default.ini @@ -434,6 +434,31 @@ kwargs_2 = {} # dict +[grid_paths] + # You shouldn't need to edit these paths unless you want to specify paths to + # your own custom MESA grids. Leaving these as None will tell POSYDON to use + # the default paths inside of your $PATH_TO_POSYDON_DATA environment variable. + + HMS_HMS_path = None + # A string representing the path to your grid HDF5 files for HMS-HMS evolution. + # If None, the default $PATH_TO_POSYDON_DATA/HMS-HMS/*_Zsun.h5 files will be used + CO_HMS_RLO_path = None + # A string representing the path to your grid HDF5 files for CO-HMS evolution. + # If None, the default $PATH_TO_POSYDON_DATA/CO-HMS_RLO/*_Zsun.h5 files will be used + CO_HeMS_path = None + # A string representing the path to your grid HDF5 files for CO-HeMS evolution. + # If None, the default $PATH_TO_POSYDON_DATA/CO-HeMS/*_Zsun.h5 files will be used + CO_HeMS_RLO_path = None + # A string representing the path to your grid HDF5 files for CO-HeMS evolution. + # If None, the default $PATH_TO_POSYDON_DATA/CO-HeMS_RLO/*_Zsun.h5 files will be used + single_HMS_path = None + # A string representing the path to your grid HDF5 files for single star HMS evolution. + # If None, the default $PATH_TO_POSYDON_DATA/single_HMS/*_Zsun.h5 files will be used. + # These are used by detached binaries and single stars in your population. + single_HeMS_path = None + # A string representing the path to your grid HDF5 files for single star HeMS evolution. + # If None, the default $PATH_TO_POSYDON_DATA/single_HeMS/*_Zsun.h5 files will be used. + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;; BinaryPopulation ;;;;;;;;;; From 9babcf031e5bbae5926a65b79c27c828a39262f9 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2026 21:28:46 +0000 Subject: [PATCH 237/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/binary_evol/MESA/step_mesa.py | 12 ++++++------ posydon/binary_evol/simulationproperties.py | 14 +++++++------- posydon/popsyn/population_params_default.ini | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/posydon/binary_evol/MESA/step_mesa.py b/posydon/binary_evol/MESA/step_mesa.py index 2ba7062434..1b324c3b84 100644 --- a/posydon/binary_evol/MESA/step_mesa.py +++ b/posydon/binary_evol/MESA/step_mesa.py @@ -196,7 +196,7 @@ def __init__(self, **kwargs): and self.interpolation_method != 'nearest_neighbour'): raise ValueError('Track interpolation is currently supported only ' 'by the nearest neighbour interpolation method!') - + z_str = convert_metallicity_to_string(self.metallicity) self.grid_name = os.path.join(self.grid_path, f"{z_str}_Zsun.h5") @@ -1358,7 +1358,7 @@ def __call__(self, binary): 'binary.event = %s and not H-rich_Core_H_burning ' '- H-rich_Core_H_burning - * - ZAMS' % (state_1, state_2, event)) - + def __repr__(self): """Return the name of evolution step and settings.""" return "MS_MS_step:\n" + \ @@ -1473,7 +1473,7 @@ def __call__(self, binary): self.binary.state = "detached" self.binary.event = "redirect_from_CO_HMS_RLO" return - + def __repr__(self): """Return the name of evolution step and settings.""" return "CO_HMS_RLO_step:\n" + \ @@ -1588,7 +1588,7 @@ def __call__(self, binary): self.binary.state = "detached" self.binary.event = "redirect_from_CO_HeMS_RLO" return - + def __repr__(self): """Return the name of evolution step and settings.""" return "CO_HeMS_RLO_step:\n" + \ @@ -1684,7 +1684,7 @@ def __call__(self, binary): self.binary.state = 'detached' self.binary.event = 'redirect_from_CO_HeMS' return - + def __repr__(self): """Return the name of evolution step and settings.""" return "CO_HeMS_step:\n" + \ @@ -1834,7 +1834,7 @@ def __call__(self, binary): self.binary.state = "detached" self.binary.event = "redirect_from_HMS_HMS_RLO" return - + def __repr__(self): """Return the name of evolution step and settings.""" return "HMS_HMS_RLO_step:\n" + \ diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index d342bff71a..1eb8c467de 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -25,8 +25,8 @@ from posydon.popsyn.io import simprop_kwargs_from_ini from posydon.utils.common_functions import convert_metallicity_to_string from posydon.utils.constants import age_of_universe -from posydon.utils.posydonwarning import Pwarn from posydon.utils.posydonerror import GridError +from posydon.utils.posydonwarning import Pwarn class NullStep: @@ -36,9 +36,9 @@ class NullStep: class SimulationProperties: """Class describing the properties of a population synthesis simulation.""" - # each value in this dict represents the expected path for the respective grid. + # each value in this dict represents the expected path for the respective grid. # A user may specify their own full path to a custom grid in the [grid_paths] - # section of their .ini file. I.e., HMS-HMS_path = 'path/to/my_own_grid/' to + # section of their .ini file. I.e., HMS-HMS_path = 'path/to/my_own_grid/' to # override these defaults. default_grid_paths = {"single_HMS_path": os.path.join(PATH_TO_POSYDON_DATA, "single_HMS"), "single_HeMS_path": os.path.join(PATH_TO_POSYDON_DATA, "single_HeMS"), @@ -213,9 +213,9 @@ def __init__(self, flow=({}, {}), self.set_path(grid_name, self.kwargs[grid_name]) except KeyError as e: Pwarn(f"{grid_name} is not set in the kwargs passed to SimulationProperties. " - f"Falling back to the default: {self.default_grid_paths[grid_name]}", + f"Falling back to the default: {self.default_grid_paths[grid_name]}", "ReplaceValueWarning") - + self.set_path(grid_name, self.default_grid_paths[grid_name]) # These hold GRIDInterpolator objects @@ -237,9 +237,9 @@ def set_path(self, path_name, path_str): "the [grid_paths] section of your .ini file.\n\n" "Valid path variable names are:\n" f"{valid_names}\n") - + path_str = os.path.abspath(path_str) - + if not os.path.exists(path_str): # should trigger data download if someone happened to put the default path manually? raise GridError(f"Path does not exist: {path_str}") diff --git a/posydon/popsyn/population_params_default.ini b/posydon/popsyn/population_params_default.ini index f32ea087aa..411f2bc3a7 100644 --- a/posydon/popsyn/population_params_default.ini +++ b/posydon/popsyn/population_params_default.ini @@ -453,7 +453,7 @@ # If None, the default $PATH_TO_POSYDON_DATA/CO-HeMS_RLO/*_Zsun.h5 files will be used single_HMS_path = None # A string representing the path to your grid HDF5 files for single star HMS evolution. - # If None, the default $PATH_TO_POSYDON_DATA/single_HMS/*_Zsun.h5 files will be used. + # If None, the default $PATH_TO_POSYDON_DATA/single_HMS/*_Zsun.h5 files will be used. # These are used by detached binaries and single stars in your population. single_HeMS_path = None # A string representing the path to your grid HDF5 files for single star HeMS evolution. From 101da5c91a7d307e26e4a8960e2ae6fc0e75edfe Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Thu, 26 Mar 2026 16:36:55 -0500 Subject: [PATCH 238/389] only check path existence if a custom path provided --- posydon/binary_evol/simulationproperties.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index d342bff71a..28e1b31651 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -240,7 +240,7 @@ def set_path(self, path_name, path_str): path_str = os.path.abspath(path_str) - if not os.path.exists(path_str): + if not os.path.exists(path_str) and path_str is not None: # should trigger data download if someone happened to put the default path manually? raise GridError(f"Path does not exist: {path_str}") From 27253e572513e70f32fcb427600560a722d4e41c Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2026 21:39:36 +0000 Subject: [PATCH 239/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/binary_evol/simulationproperties.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index 3aa4f01527..b3a6552503 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -239,7 +239,7 @@ def set_path(self, path_name, path_str): f"{valid_names}\n") path_str = os.path.abspath(path_str) - + if not os.path.exists(path_str) and path_str is not None: # should trigger data download if someone happened to put the default path manually? raise GridError(f"Path does not exist: {path_str}") From 7653a3265368c66c710b920c7892fbdb5144195d Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Thu, 26 Mar 2026 16:44:01 -0500 Subject: [PATCH 240/389] disabling path validity check for unit test --- posydon/binary_evol/simulationproperties.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index 3aa4f01527..ad0dc62604 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -240,9 +240,9 @@ def set_path(self, path_name, path_str): path_str = os.path.abspath(path_str) - if not os.path.exists(path_str) and path_str is not None: - # should trigger data download if someone happened to put the default path manually? - raise GridError(f"Path does not exist: {path_str}") + #if not os.path.exists(path_str) and path_str is not None: + # # should trigger data download if someone happened to put the default path manually? + # raise GridError(f"Path does not exist: {path_str}") setattr(self, path_name, path_str) From 22492a4a812b43f1b5682b16d6e65724e77e4aaf Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2026 21:45:10 +0000 Subject: [PATCH 241/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/binary_evol/simulationproperties.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index ad0dc62604..bc3391104a 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -239,7 +239,7 @@ def set_path(self, path_name, path_str): f"{valid_names}\n") path_str = os.path.abspath(path_str) - + #if not os.path.exists(path_str) and path_str is not None: # # should trigger data download if someone happened to put the default path manually? # raise GridError(f"Path does not exist: {path_str}") From 3475da589d9aabde7788720b19ddfc25cbfd2337 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Thu, 26 Mar 2026 16:53:28 -0500 Subject: [PATCH 242/389] add doc string to SimulationProperties.set_path() and delete the path existence check because it breaks the unit tests --- posydon/binary_evol/simulationproperties.py | 43 +++++++++++++++++++-- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index bc3391104a..745f849a81 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -225,6 +225,45 @@ def __init__(self, flow=({}, {}), self.grids_strippedHe = {} def set_path(self, path_name, path_str): + """ + Set and normalize a grid path attribute that points to one of the + MESA grids needed for binary evolution. By default, these are the + grids inside of the directory name held in $PATH_TO_POSYDON_DATA. + + For example, for the step_HMS_HMS, the grid would be + + $PATH_TO_POSYDON_DATA/HMS-HMS/_Zsun.h5 + + by default. The grid HDF5 file names themselves are expected to + follow formats like so: 1e+00_Zsun.h5, 1e-04_Zsun.h5, etc. + + If ``path_str`` is ``None``, a default path is assigned based on + ``path_name`` using ``self.default_grid_paths``. If ``path_name`` is not + recognized, a ``GridError`` is raised listing the valid options. + + The resulting path is converted to an absolute path before being stored + as an attribute of the instance. + + Parameters + ---------- + path_name : str + Name of the grid path attribute to set. Must be a key in + ``self.default_grid_paths`` if ``path_str`` is ``None``. + + path_str : str or None + Path to assign. If ``None``, a default path corresponding to + ``path_name`` is used. + + Raises + ------ + GridError + If ``path_name`` is not recognized and no default path can be assigned. + + Notes + ----- + The path is not validated for existence here; only normalization to an + absolute path is performed. + """ # construct path to *_Zsun.h5 files if not specified if path_str is None: @@ -240,10 +279,6 @@ def set_path(self, path_name, path_str): path_str = os.path.abspath(path_str) - #if not os.path.exists(path_str) and path_str is not None: - # # should trigger data download if someone happened to put the default path manually? - # raise GridError(f"Path does not exist: {path_str}") - setattr(self, path_name, path_str) def preload_imports(self): From 5e2d126cc946189c77d847742ac9b096f873dcdb Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2026 21:53:47 +0000 Subject: [PATCH 243/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/binary_evol/simulationproperties.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index 745f849a81..ee60afc818 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -226,15 +226,15 @@ def __init__(self, flow=({}, {}), def set_path(self, path_name, path_str): """ - Set and normalize a grid path attribute that points to one of the - MESA grids needed for binary evolution. By default, these are the + Set and normalize a grid path attribute that points to one of the + MESA grids needed for binary evolution. By default, these are the grids inside of the directory name held in $PATH_TO_POSYDON_DATA. - For example, for the step_HMS_HMS, the grid would be + For example, for the step_HMS_HMS, the grid would be $PATH_TO_POSYDON_DATA/HMS-HMS/_Zsun.h5 - by default. The grid HDF5 file names themselves are expected to + by default. The grid HDF5 file names themselves are expected to follow formats like so: 1e+00_Zsun.h5, 1e-04_Zsun.h5, etc. If ``path_str`` is ``None``, a default path is assigned based on From b7987c931dfa10993370138c2cfbf5b20f69b839 Mon Sep 17 00:00:00 2001 From: Max Briel Date: Fri, 27 Mar 2026 13:37:04 +0100 Subject: [PATCH 244/389] Remove added model after merge --- posydon/binary_evol/CE/step_CEE.py | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/posydon/binary_evol/CE/step_CEE.py b/posydon/binary_evol/CE/step_CEE.py index 1760b9244a..dcbcd7f5c8 100644 --- a/posydon/binary_evol/CE/step_CEE.py +++ b/posydon/binary_evol/CE/step_CEE.py @@ -56,24 +56,6 @@ from posydon.utils.constants import Zsun from posydon.utils.posydonwarning import Pwarn -MODEL = {"prescription": 'alpha-lambda', - "common_envelope_efficiency": 1.0, - "common_envelope_lambda_default": 0.5, - "common_envelope_option_for_lambda": 'lambda_from_grid_final_values', - "common_envelope_option_for_HG_star": "optimistic", - "common_envelope_alpha_thermal": 1.0, - "core_definition_H_fraction": 0.3, # with 0.01 no CE BBHs - "core_definition_He_fraction": 0.1, - "CEE_tolerance_err": 0.001, - "verbose": False, - "common_envelope_option_after_succ_CEE": 'two_phases_stableMT', - "mass_loss_during_CEE_merged": False, # If False, then no mass loss from this step for a merged star - # If True, then we remove mass according to the alpha-lambda prescription - # assuming a final separation where the inner core RLOF starts. - # "one_phase_variable_core_definition" for core_definition_H_fraction=0.01 - "metallicity": None, - "record_matching": False - } class StepCEE(object): """Handle common envelope evolution (CEE) for binary systems. From 9ec275235f5c3cb8b7d9d44cf3b9138eb9e92dc5 Mon Sep 17 00:00:00 2001 From: Max Briel Date: Fri, 27 Mar 2026 13:42:05 +0100 Subject: [PATCH 245/389] add additional info on types of info in dict --- posydon/popsyn/norm_pop.py | 45 +++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/posydon/popsyn/norm_pop.py b/posydon/popsyn/norm_pop.py index 27eee417f4..ad4c855bb8 100644 --- a/posydon/popsyn/norm_pop.py +++ b/posydon/popsyn/norm_pop.py @@ -315,13 +315,52 @@ def calculate_model_weights(pop_data, Parameters ---------- pop_data : dict - Dictionary containing the population data + Dictionary containing the population data. + This needs to contain the following keys: + - `S1_mass_i`: initial mass of the primary + - `S2_mass_i`: initial mass of the secondary + - `orbital_period_i`: initial orbital period + - `state_i`: initial state of the system (e.g. 'initially_single_star' for single stars) + These are used to calculate the PDF for each model in the simulation. + M_sim : float Mass of the simulation simulation_parameters : dict - Dictionary containing the simulation parameters + Dictionary containing the simulation parameters. + This is used to calculate the PDF of the simulation. + The parameters in this dictionary are the initial conditions of the population. + The following parameters are required to be present in the dictionary: + - `primary_mass_scheme` + - `primary_mass_min` + - `primary_mass_max` + - `secondary_mass_scheme` + - `secondary_mass_min` + - `secondary_mass_max` + - `binary_fraction_scheme` + - `binary_fraction_const` + - `orbital_scheme` + - `orbital_period_scheme` or `orbital_separation_scheme` depending on the `orbital_scheme` + - `orbital_period_min` and `orbital_period_max` or `orbital_separation_min` and `orbital_separation_max` depending on the `orbital_scheme` + - `power_law_slope` if `orbital_period_scheme` is `power_law` + - `q_min` and `q_max` if `secondary_mass_scheme` is `flat_mass_ratio` + population_parameters : dict - Dictionary containing the population parameters + Dictionary containing the population parameters, which is the requested population to which we want to reweight the simulation. This is used to calculate the PDF of the requested population. + The parameters in this dictionary are the initial conditions of the population you want to reweight to. + The following parameters are required to be present in the dictionary: + - `primary_mass_scheme` + - `primary_mass_min` + - `primary_mass_max` + - `secondary_mass_scheme` + - `secondary_mass_min` + - `secondary_mass_max` + - `binary_fraction_scheme` + - `binary_fraction_const` + - `orbital_scheme` + - `orbital_period_scheme` or `orbital_separation_scheme` depending on the `orbital_scheme` + - `orbital_period_min` and `orbital_period_max` or `orbital_separation_min` and `orbital_separation_max` depending on the `orbital_scheme` + - `power_law_slope` if `orbital_period_scheme` is `power_law` + - `q_min` and `q_max` if `secondary_mass_scheme` is `flat_mass_ratio` Returns ------- From cd8693cb2ddb9d52159855fe3af29ff0acf5d19a Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Fri, 27 Mar 2026 15:55:49 -0500 Subject: [PATCH 246/389] Merging et-validation branch into this one --- dev-tools/binaries_suite.py | 752 ------------ dev-tools/generate_baseline.sh | 15 +- dev-tools/run_test_suite.sh | 23 +- dev-tools/script_data/src/binaries_suite.py | 227 +++- .../script_data/src/binary_test_cases.py | 1016 +++++++---------- .../{ => script_data/src}/compare_runs.py | 0 dev-tools/script_data/src/formatting.py | 3 +- dev-tools/script_data/src/utils.py | 10 +- dev-tools/validate_binaries.sh | 18 +- 9 files changed, 645 insertions(+), 1419 deletions(-) delete mode 100644 dev-tools/binaries_suite.py rename dev-tools/{ => script_data/src}/compare_runs.py (100%) diff --git a/dev-tools/binaries_suite.py b/dev-tools/binaries_suite.py deleted file mode 100644 index bb6add8f5e..0000000000 --- a/dev-tools/binaries_suite.py +++ /dev/null @@ -1,752 +0,0 @@ -#!/usr/bin/env python3 -""" -Script to evolve a set of test binaries at a given metallicity. -Used for validation of POSYDON branches. - -Usage: - python binaries_suite.py --output results.h5 --metallicity 1 - python binaries_suite.py --output results.h5 --metallicity 0.45 --verbose - -Authors: Max Briel, Elizabeth Teng -""" - -import argparse -import os -import sys -import warnings - -import pandas as pd - -from posydon.binary_evol.binarystar import BinaryStar, SingleStar -from posydon.binary_evol.simulationproperties import SimulationProperties -from posydon.config import PATH_TO_POSYDON_DATA -from posydon.popsyn.io import simprop_kwargs_from_ini -from posydon.utils.common_functions import orbital_separation_from_period - -AVAILABLE_METALLICITIES = [2., 1., 0.45, 0.2, 0.1, 0.01, 0.001, 0.0001] - -# Display settings -TARGET_ROWS = 12 -LINE_LENGTH = 80 -COLUMNS_TO_SHOW = ['step_names', 'state', 'event', - 'S1_state', 'S1_mass', - 'S2_state', 'S2_mass', 'orbital_period'] - -def load_inlist(metallicity, verbose, ini_path=None): - """Load simulation properties from ini file and configure for given metallicity. - - Args: - metallicity: float, metallicity in solar units - verbose: bool - ini_path: str, path to ini file (auto-detected if None) - - Returns: - SimulationProperties object with loaded steps - """ - if ini_path is None: - # Look for ini file relative to this script's location - script_dir = os.path.dirname(os.path.abspath(__file__)) - ini_path = os.path.join(script_dir, 'binaries_params.ini') - - if not os.path.exists(ini_path): - raise FileNotFoundError(f"INI file not found: {ini_path}") - - sim_kwargs = simprop_kwargs_from_ini(ini_path, verbose=verbose) - - metallicity_kwargs = {'metallicity': metallicity, 'verbose': verbose} - - # Apply metallicity to all steps that need it - metallicity_steps = [ - 'step_HMS_HMS', 'step_CO_HeMS', 'step_CO_HMS_RLO', - 'step_CO_HeMS_RLO', 'step_detached', 'step_disrupted', - 'step_merged', 'step_initially_single' - ] - for step_name in metallicity_steps: - if step_name in sim_kwargs: - sim_kwargs[step_name][1].update(metallicity_kwargs) - - sim_prop = SimulationProperties(**sim_kwargs) - sim_prop.load_steps(verbose=verbose) - return sim_prop - -def write_binary_to_screen(binary): - """Writes a binary DataFrame to screen.""" - df = binary.to_df(**{'extra_columns':{'step_names':'str'}}) - - # Filter to only existing columns - available_columns = [col for col in COLUMNS_TO_SHOW if col in df.columns] - df_filtered = df[available_columns].reset_index(drop=True) - - print("=" * LINE_LENGTH) - - # Print the DataFrame - df_string = df_filtered.to_string(index=True, float_format='%.3f') - print(df_string) - - # Add empty lines to reach exactly 10 rows of output - current_rows = len(df_filtered) + 1 # add one for header - - if current_rows < TARGET_ROWS: - for _ in range(TARGET_ROWS - current_rows): - print("") - - print("-" * LINE_LENGTH) - - -def print_failed_binary(binary,e, max_error_lines=3): - """Print information about a binary that failed to evolve.""" - - print("=" * LINE_LENGTH) - print(f"šŸšØ Binary Evolution Failed!") - print(f"Exception: {type(e).__name__}") - print(f"Message: {e}") - - # Get the binary's current state and limit output - try: - df = binary.to_df(**{'extra_columns':{'step_names':'str'}}) - if len(df) > 0: - # Select only the desired columns - available_columns = [col for col in COLUMNS_TO_SHOW if col in df.columns] - df_filtered = df[available_columns].reset_index(drop=True) - - # Limit to max_error_lines - if len(df_filtered) > max_error_lines: - df_filtered = df_filtered.tail(max_error_lines) - print(f"\nShowing last {max_error_lines} evolution steps before failure:") - else: - print(f"\nEvolution steps before failure ({len(df_filtered)} steps):") - - df_string = df_filtered.to_string(index=True, float_format='%.3f') - print(df_string) - - current_rows = len(df_filtered) + 1 + 5 # add one for header - empty_lines_needed = TARGET_ROWS - current_rows - for _ in range(max(0, empty_lines_needed)): - print("") - else: - print("\nNo evolution steps recorded before failure.") - except Exception as inner_e: - print(f"\nCould not retrieve binary state: {inner_e}") - - print("-" * LINE_LENGTH) - -def evolve_binary(binary, binary_id): - """ - Evolves a single binary, prints its evolution, and returns results. - - Args: - binary: BinaryStar object - binary_id: unique identifier for this binary - - Returns: - tuple of (evolution_df, error_df, captured_warnings) - evolution_df: DataFrame or None - error_df: DataFrame or None - captured_warnings: list of dicts - """ - - # Capture warnings during evolution - captured_warnings = [] - - def warning_handler(message, category, filename, lineno, file=None, line=None): - captured_warnings.append({ - "binary_id": int(binary_id), - "category": category.__name__, - "message": str(message), - "filename": filename, - "lineno": lineno - }) - - # Set up warning capture - old_showwarning = warnings.showwarning - warnings.showwarning = warning_handler - - print(f"Binary {binary_id}") - evolution_df = None - error_df = None - - try: - binary.evolve() - write_binary_to_screen(binary) - evolution_df = binary.to_df(extra_columns={'step_names':'str'}) - - except Exception as e: - print_failed_binary(binary, e) - - error_df = pd.DataFrame([{ - "binary_id": int(binary_id), - "exception_type": type(e).__name__, - "exception_message": str(e) - }]) - - finally: - warnings.showwarning = old_showwarning - - # Ensure we always have a dataframe - if evolution_df is not None: - # Decode bytes columns if needed - for col in evolution_df.select_dtypes([object]): - if evolution_df[col].apply(lambda x: isinstance(x, bytes)).any(): - evolution_df[col] = evolution_df[col].apply( - lambda x: x.decode('utf-8') if isinstance(x, bytes) else x - ) - - # Always ensure binary_id exists - if "binary_id" not in evolution_df.columns: - evolution_df["binary_id"] = int(binary_id) - - # Defragment the DataFrame from POSYDON's column-by-column construction - evolution_df = evolution_df.copy() - - # Save warnings - if captured_warnings: - print(f"āš ļø {len(captured_warnings)} warning(s) raised during evolution:") - for i, w in enumerate(captured_warnings[:3], 1): - print(f" {i}. {w['category']}: {w['message'][:80]}") - if len(captured_warnings) > 3: - print(f" ... and {len(captured_warnings) - 3} more warning(s)") - else: - print(f" No warning(s) raised during evolution") - - print(f"āœ… Finished binary {binary_id}") - print("=" * LINE_LENGTH) - - return evolution_df, error_df, captured_warnings - -def get_test_binaries(metallicity, sim_prop): - """Return the list of test binaries as (star1_kwargs, star2_kwargs, binary_kwargs, description) tuples. - - All binaries use the specified metallicity. - """ - Z = metallicity - - binaries = [ - # 0: Failing binary in matching - ({'mass': 11.948472796094759, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [231.97383621190582, 5.927334890264575, 1.5990566013567014, 6.137994236518587]}, - {'mass': 7.636958434479617, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 190925.99636740884, 'eccentricity': 0.0}, - "Failing binary in matching"), - - # 1: Failing binary in matching - ({'mass': 30.169861921689556, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [77.96834852144123, 0.05021460132555987, 2.3146518208348152, 1.733054979982291]}, - {'mass': 10.972734402996027, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 20479.71919353725, 'eccentricity': 0.0}, - "Failing binary in matching"), - - # 2: Flipped S1 and S2 (near-equal mass) - ({'mass': 9.474917413943635, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [133.5713935237759, 4.398754864537542, 2.703102872841114, 1.4633904612711142]}, - {'mass': 9.311073918196263, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 18.605997832086413, 'eccentricity': 0.0}, - "Flipped S1 and S2 (near-equal mass)"), - - # 3: Flipped S1 and S2 (high mass ratio) - ({'mass': 10.438541, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'mass': 1.400713, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 9.824025, 'eccentricity': 0.0}, - "Flipped S1 and S2 (high mass ratio)"), - - # 4: Flipped S1 and S2 - ({'mass': 9.845907, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}, - {'mass': 9.611029, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 3.820571, 'eccentricity': 0.0}, - "Flipped S1 and S2"), - - # 5: Normal binary evolution (high mass) - ({'mass': 30.845907, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}, - {'mass': 30.611029, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 30.820571, 'eccentricity': 0.0}, - "Normal binary evolution (high mass)"), - - # 6: Normal binary (wide orbit) - ({'mass': 9.213534679594247, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [327.5906384501521, 1.7707176050073297, 1.573225822966838, 1.6757313876001914]}, - {'mass': 7.209878522799272, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 63123.74544474666, 'eccentricity': 0.0}, - "Normal binary (wide orbit)"), - - # 7: Normal binary (near-equal mass, close) - ({'mass': 9.561158487732602, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [317.5423844462847, 2.9095984678057603, 1.754121288652108, 2.3693917842468784]}, - {'mass': 9.382732464319286, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 27.77657038557851, 'eccentricity': 0.0}, - "Normal binary (near-equal mass, close)"), - - # 8: Normal binary - ({'mass': 7.552858, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [40.91509926587841, 2.6295454150818256, 1.6718337470964977, 6.0408769315244895]}, - {'mass': 6.742063, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 17.957531550841225, 'eccentricity': 0.0}, - "Normal binary"), - - # 9: High BH spin options - ({'mass': 31.616785, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [10, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}, - {'mass': 26.874267, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 501.99252706449792, 'eccentricity': 0.0}, - "High BH spin options"), - - # 10: Original a>1 spin error - ({'mass': 18.107506844123645, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [528.2970725443025, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}, - {'mass': 15.641392951875442, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 151.99252706449792, 'eccentricity': 0.0}, - "Original a>1 spin error"), - - # 11: FIXED disrupted crash - ({'mass': 52.967313, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'mass': 36.306444, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 12.877004, 'eccentricity': 0.0}, - "FIXED disrupted crash"), - - # 12: FIXED error with SN type - ({'mass': 17.782576, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'mass': 3.273864, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 4513.150157, 'eccentricity': 0.0}, - "FIXED error with SN type"), - - # 13: FIXED oRLO2 looping - ({'mass': 170.638207, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [4.921294, 4.31745, 1.777768, 3.509656]}, - {'mass': 37.917852, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 113.352736, 'eccentricity': 0.0}, - "FIXED oRLO2 looping"), - - # 14: Redirect to step_CO_HeMS - ({'mass': 8.333579, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [17.125568, 4.101834, 0.917541, 3.961291]}, - {'mass': 8.208376, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 66.870417, 'eccentricity': 0.0}, - "Redirect to step_CO_HeMS"), - - # 15: FIXED oRLO2 looping - ({'mass': 16.921378, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}, - {'mass': 16.286318, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 37.958768, 'eccentricity': 0.0}, - "FIXED oRLO2 looping"), - - # 16: FIXED step_detached failure - ({'mass': 19.787769, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [24.464803, 0.666314, 1.954698, 5.598975]}, - {'mass': 7.638741, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 3007.865561, 'eccentricity': 0.0}, - "FIXED step_detached failure"), - - # 17: Disrupted binary - ({'mass': 16.921378, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}, - {'mass': 16.286318, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 3007.865561, 'eccentricity': 0.0}, - "Disrupted binary"), - - # 18: FIXED Detached binary failure (low mass) - ({'mass': 9, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'mass': 0.8, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 4513.150157, 'eccentricity': 0.0}, - "FIXED Detached binary failure (low mass)"), - - # 19: FIXED SN_TYPE = None crash - ({'mass': 17.782576, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'mass': 3.273864, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 4513.150157, 'eccentricity': 0.0}, - "FIXED SN_TYPE = None crash"), - - # 20: FIXED SN_TYPE errors (low mass primary) - ({'mass': 6.782576, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'mass': 3.273864, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 4513.150157, 'eccentricity': 0.0}, - "FIXED SN_TYPE errors (low mass primary)"), - - # 21: FIXED SN_TYPE errors (high mass) - ({'mass': 40.638207, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [30.921294, 4.31745, 1.777768, 3.509656]}, - {'mass': 37.917852, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 2113.352736, 'eccentricity': 0.0}, - "FIXED SN_TYPE errors (high mass)"), - - # 22: FIXED ECSN errors - ({'mass': 12.376778, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [80, 4.31745, 1.777768, 3.509656]}, - {'mass': 9.711216, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 79.83702, 'eccentricity': 0.0}, - "FIXED ECSN errors"), - - # 23: Interpolator masses (close) - ({'mass': 7.592921, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'mass': 5.038679, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 5.537807, 'eccentricity': 0.0}, - "Interpolator masses (close)"), - - # 24: Interpolator masses (both kicked) - ({'mass': 38.741115, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [21.113771, 2.060135, 2.224789, 4.089729]}, - {'mass': 27.776178, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [282.712103, 0.296252, 1.628433, 5.623812]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 93.387072, 'eccentricity': 0.0}, - "Interpolator masses (both kicked)"), - - # 25: FIXED NaN spin (very high mass, wide) - ({'mass': 70.066924, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'mass': 34.183110, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 5.931492e+03, 'eccentricity': 0.0}, - "FIXED NaN spin (very high mass, wide)"), - - # 26: FIXED NaN spin - ({'mass': 28.837286, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'mass': 6.874867, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 35.609894, 'eccentricity': 0.0}, - "FIXED NaN spin"), - - # 27: oRLO2 issue (near-equal mass) - ({'mass': 29.580210, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'mass': 28.814626, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 40.437993, 'eccentricity': 0.0}, - "oRLO2 issue (near-equal mass)"), - - # 28: oRLO2 issue (high mass ratio) - ({'mass': 67.126795, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'mass': 19.622908, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 1484.768582, 'eccentricity': 0.0}, - "oRLO2 issue (high mass ratio)"), - - # 29: oRLO2 issue (very high mass, near-equal) - ({'mass': 58.947503, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'mass': 56.660506, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 2011.300659, 'eccentricity': 0.0}, - "oRLO2 issue (very high mass, near-equal)"), - - # 30: oRLO2 issue (extreme mass, kicked) - ({'mass': 170.638207, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [47.979957374424956, 5.317304576107798, 2.7259013166068145, 4.700929589520818]}, - {'mass': 37.917852, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 113.352736, 'eccentricity': 0.0}, - "oRLO2 issue (extreme mass, kicked)"), - - # 31: oRLO2 issue (very high mass, close) - ({'mass': 109.540207, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'mass': 84.344530, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 5.651896, 'eccentricity': 0.0}, - "oRLO2 issue (very high mass, close)"), - - # 32: Redirect (extreme mass ratio) - ({'mass': 13.889634, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'mass': 0.490231, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 14513.150157, 'eccentricity': 0.0}, - "Redirect (extreme mass ratio)"), - - # 33: Redirect (low mass secondary) - ({'mass': 9, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'mass': 0.8, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 4513.150157, 'eccentricity': 0.0}, - "Redirect (low mass secondary)"), - - # 34: Max time (very high mass, wide) - ({'mass': 103.07996766780799, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.2965418610971261, 2.0789170290719117, 3.207488023705968]}, - {'mass': 83.66522615073987, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 1449.1101985875678, 'eccentricity': 0.0}, - "Max time (very high mass, wide)"), - - # 35: Max time - ({'mass': 8.860934140643465, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [11.818027275431337, 2.812412688633058, 0.4998731824233789, 2.9272630485628643]}, - {'mass': 8.584716012668551, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 20.82030114750744, 'eccentricity': 0.0}, - "Max time"), - - # 36: PR421 - ({'mass': 24.035366, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'mass': 23.187355, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 18.865029, 'eccentricity': 0.0}, - "PR421"), - - # 37: CE class - ({'mass': 33.964274, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'mass': 28.98149, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 82.370989, 'eccentricity': 0.0}, - "CE class"), - - # 38: PR574 - stepCE fix - ({'mass': 29.580210, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'mass': 28.814626 * 0.4, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 300.437993, 'eccentricity': 0.0}, - "PR574 - stepCE fix"), - - # 39: e_ZAMS error - ({'mass': 8.161885721822461, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'mass': 3.5907829421526154, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 36.873457164644144, 'eccentricity': 0.0}, - "e_ZAMS error"), - - # 40: e_ZAMS error (eccentric) - ({'mass': 35.24755025317775, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [19.755993125895806, 0.37149222852233904, 1.6588846085306563, 1.434617029858906]}, - {'mass': 30.000450298072902, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 24060.02101364665, 'eccentricity': 0.8085077857996965}, - "e_ZAMS error (eccentric)"), - - # 41: e_ZAMS error (high mass ratio) - ({'mass': 11.862930493162692, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'mass': 1.4739109294156703, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 4111.083887312003, 'eccentricity': 0.0}, - "e_ZAMS error (high mass ratio)"), - - # 42: e_ZAMS error (extreme mass ratio) - ({'mass': 8.527361341212108, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'mass': 0.7061748406821822, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 2521.1927287891444, 'eccentricity': 0.0}, - "e_ZAMS error (extreme mass ratio)"), - - # 43: e_ZAMS error - ({'mass': 13.661942533447398, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'mass': 4.466151109802313, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, - {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 3110.1346707516914, 'eccentricity': 0.0}, - "e_ZAMS error"), - ] - - return binaries - - -def evolve_binaries(metallicity, verbose, output_path, ini_path=None): - """Evolves the test binary suite at the given metallicity and saves results. - - Args: - metallicity: float, metallicity in solar units - verbose: bool - output_path: str, path to save HDF5 output - ini_path: str, path to ini file (auto-detected if None) - """ - print(f"{'=' * LINE_LENGTH}") - print(f" Evolving test binaries at Z = {metallicity} Zsun") - print(f" Output: {output_path}") - print(f"{'=' * LINE_LENGTH}\n") - - sim_prop = load_inlist(metallicity, verbose, ini_path) - test_binaries = get_test_binaries(metallicity, sim_prop) - - # Collect all results in memory, then write once at the end. - # This avoids repeated HDFStore.append() calls, each of which - # reconciles schemas, checks string sizing, and flushes to disk. - all_evolution_dfs = [] - all_error_dfs = [] - all_warning_dfs = [] - - for binary_id, (s1_kw, s2_kw, bin_kw, description) in enumerate(test_binaries): - print(f"\n[{binary_id}/{len(test_binaries)-1}] {description}") - - star_1 = SingleStar(**s1_kw) - star_2 = SingleStar(**s2_kw) - - # Add separation from period if not explicitly provided - if 'separation' not in bin_kw and 'orbital_period' in bin_kw: - bin_kw['separation'] = orbital_separation_from_period( - bin_kw['orbital_period'], star_1.mass, star_2.mass - ) - - binary = BinaryStar(star_1, star_2, **bin_kw, properties=sim_prop) - evo_df, err_df, warn_list = evolve_binary(binary, binary_id) - - if evo_df is not None: - all_evolution_dfs.append(evo_df) - if err_df is not None: - all_error_dfs.append(err_df) - if warn_list: - all_warning_dfs.append(pd.DataFrame(warn_list)) - - # ā”€ā”€ Completeness check ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ - expected_ids = set(range(len(test_binaries))) - evolved_ids = set() - errored_ids = set() - - for df in all_evolution_dfs: - if 'binary_id' in df.columns: - evolved_ids.update(df['binary_id'].unique()) - for df in all_error_dfs: - if 'binary_id' in df.columns: - errored_ids.update(df['binary_id'].unique()) - - accounted_ids = evolved_ids | errored_ids - missing_ids = sorted(expected_ids - accounted_ids) - - if missing_ids: - print(f"\nāš ļø WARNING: {len(missing_ids)} binary(ies) unaccounted for: {missing_ids}") - print(f" These produced neither evolution output nor a caught error.") - - # ā”€ā”€ Single-pass HDF5 write ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ - with pd.HDFStore(output_path, mode="w") as h5file: - # Save metadata - meta_df = pd.DataFrame([{ - 'metallicity': metallicity, - 'n_binaries': len(test_binaries), - 'n_evolved': len(evolved_ids), - 'n_errored': len(errored_ids), - 'n_missing': len(missing_ids), - 'missing_ids': str(missing_ids) if missing_ids else '', - 'path_to_posydon_data': PATH_TO_POSYDON_DATA, - }]) - h5file.put("metadata", meta_df, format="table") - - if all_evolution_dfs: - combined_evo = pd.concat(all_evolution_dfs, ignore_index=True) - string_cols = combined_evo.select_dtypes([object]).columns - min_itemsize = {col: 500 for col in string_cols} - h5file.put("evolution", combined_evo, format="table", - data_columns=True, min_itemsize=min_itemsize) - - if all_error_dfs: - combined_err = pd.concat(all_error_dfs, ignore_index=True) - err_string_cols = combined_err.select_dtypes([object]).columns - err_min_itemsize = {col: 1000 for col in err_string_cols} - h5file.put("errors", combined_err, format="table", - min_itemsize=err_min_itemsize) - - if all_warning_dfs: - combined_warn = pd.concat(all_warning_dfs, ignore_index=True) - warn_string_cols = combined_warn.select_dtypes([object]).columns - warn_min_itemsize = {col: 1000 for col in warn_string_cols} - h5file.put("warnings", combined_warn, format="table", - min_itemsize=warn_min_itemsize) - - print(f"\n{'=' * LINE_LENGTH}") - print(f" All {len(test_binaries)} binaries complete. Results saved to {output_path}") - print(f"{'=' * LINE_LENGTH}") - -if __name__ == "__main__": - parser = argparse.ArgumentParser( - description='Evolve test binaries for POSYDON branch validation.', - formatter_class=argparse.ArgumentDefaultsHelpFormatter - ) - parser.add_argument('--verbose', '-v', action='store_true', default=False, - help='Enable verbose output') - parser.add_argument('--output', type=str, required=True, - help='Path to save HDF5 output') - parser.add_argument('--metallicity', '-Z', type=float, default=1.0, - help=f'Metallicity in solar units. Available: {AVAILABLE_METALLICITIES}') - parser.add_argument('--ini', type=str, default=None, - help='Path to params ini file (auto-detected if not given)') - args = parser.parse_args() - - if args.metallicity not in AVAILABLE_METALLICITIES: - print(f"WARNING: Metallicity {args.metallicity} not in standard set {AVAILABLE_METALLICITIES}.") - print(f"Proceeding anyway, but POSYDON grids may not exist for this value.") - - evolve_binaries( - metallicity=args.metallicity, - verbose=args.verbose, - output_path=args.output, - ini_path=args.ini, - ) diff --git a/dev-tools/generate_baseline.sh b/dev-tools/generate_baseline.sh index a23fc18882..2f1d9025c3 100755 --- a/dev-tools/generate_baseline.sh +++ b/dev-tools/generate_baseline.sh @@ -40,10 +40,11 @@ else METALLICITIES=${3:-"2 1 0.45 0.2 0.1 0.01 0.001 0.0001"} fi -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +DEV_TOOLS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +SCRIPT_DIR="${DEV_TOOLS_DIR}/script_data" SAFE_BRANCH="${BRANCH//\//_}" BASELINE_DIR="$SCRIPT_DIR/baselines/${SAFE_BRANCH}" -CANDIDATE_DIR="$SCRIPT_DIR/outputs/${SAFE_BRANCH}" +BINARY_CANDIDATE_DIR="$SCRIPT_DIR/output/binary_star_tests/${SAFE_BRANCH}" echo "============================================================" echo " POSYDON Binary Validation ā€” Generating Baseline" @@ -60,17 +61,17 @@ echo "============================================================" # ā”€ā”€ Step 1: Evolve binaries (skip if --promote) ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ if [ "$PROMOTE" = true ]; then echo "" - echo "Step 1: SKIPPED (--promote: using existing outputs in $CANDIDATE_DIR)" + echo "Step 1: SKIPPED (--promote: using existing outputs in $BINARY_CANDIDATE_DIR)" - if [ ! -d "$CANDIDATE_DIR" ]; then - echo "ERROR: No outputs found at $CANDIDATE_DIR" >&2 + if [ ! -d "$BINARY_CANDIDATE_DIR" ]; then + echo "ERROR: No outputs found at $BINARY_CANDIDATE_DIR" >&2 echo "Run evolve_binaries.sh first, or drop --promote to evolve from scratch." >&2 exit 1 fi else echo "" echo "Step 1: Evolving binaries on branch '$BRANCH'..." - "$SCRIPT_DIR/evolve_binaries.sh" "$BRANCH" "$SHA" "$METALLICITIES" + "${DEV_TOOLS_DIR}/run_test_suite.sh" "$BRANCH" "$SHA" "$METALLICITIES" fi # ā”€ā”€ Step 2: Copy results into the baselines directory ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ @@ -82,7 +83,7 @@ mkdir -p "$BASELINE_DIR" COPIED=0 for Z in $METALLICITIES; do - SRC="$CANDIDATE_DIR/candidate_${Z}Zsun.h5" + SRC="$BINARY_CANDIDATE_DIR/candidate_${Z}Zsun.h5" DST="$BASELINE_DIR/baseline_${Z}Zsun.h5" if [ -f "$SRC" ]; then diff --git a/dev-tools/run_test_suite.sh b/dev-tools/run_test_suite.sh index 05163b45d5..de3fecb48f 100755 --- a/dev-tools/run_test_suite.sh +++ b/dev-tools/run_test_suite.sh @@ -34,7 +34,7 @@ SHA=${2:-} METALLICITIES=${3:-$ALL_METALLICITIES} REPO_URL="https://github.com/POSYDON-code/POSYDON" -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/script_data" # Sanitize branch name for filesystem SAFE_BRANCH="${BRANCH//\//_}" @@ -42,11 +42,12 @@ SAFE_BRANCH="${BRANCH//\//_}" # Directories (all relative to SCRIPT_DIR, the dev-tools root) WORK_DIR="$SCRIPT_DIR/workdirs/POSYDON_${SAFE_BRANCH}" -OUTPUT_DIR="$SCRIPT_DIR/outputs/${SAFE_BRANCH}" +BINARY_OUTPUT_DIR="$SCRIPT_DIR/output/binary_star_tests/${SAFE_BRANCH}" +POP_OUTPUT_DIR="$SCRIPT_DIR/output/population_tests/${SAFE_BRANCH}" LOG_DIR="$SCRIPT_DIR/logs/${SAFE_BRANCH}" CLONE_DIR="$WORK_DIR/POSYDON" -mkdir -p "$OUTPUT_DIR" "$LOG_DIR" +mkdir -p ${LOG_DIR} ${BINARY_OUTPUT_DIR} # ā”€ā”€ Conda Setup ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ echo "šŸ”§ Initializing conda" @@ -106,11 +107,20 @@ echo "šŸ“¦ Installing POSYDON" pip install -e "$CLONE_DIR" -q 2>&1 | sed 's/^/ /' # ā”€ā”€ Run Suite for Each Metallicity ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ -SUITE_SCRIPT="$SCRIPT_DIR/binaries_suite.py" +SUITE_SCRIPT="$SCRIPT_DIR/src/binaries_suite.py" FAILED=0 +# override environment's PATH_TO_POSYDON variable to point to the +# current branch's clone for these tests +#PATH_TO_POSYDON=$CLONE_DIR + +# copy this branch's default .ini file to perform tests +DEFAULT_INI="${CLONE_DIR}/posydon/popsyn/population_params_default.ini" +TEST_INI="${SCRIPT_DIR}/inlists/${SAFE_BRANCH}_test_params.ini" +cp $DEFAULT_INI $TEST_INI + for Z in $METALLICITIES; do - OUTPUT_FILE="$OUTPUT_DIR/candidate_${Z}Zsun.h5" + OUTPUT_FILE="$BINARY_OUTPUT_DIR/candidate_${Z}Zsun.h5" LOG_FILE="$LOG_DIR/evolve_${Z}Zsun.log" echo "" @@ -123,6 +133,7 @@ for Z in $METALLICITIES; do python "$SUITE_SCRIPT" \ --metallicity "$Z" \ --output "$OUTPUT_FILE" \ + --ini "$TEST_INI" \ 2>&1 | tee "$LOG_FILE" EXIT_CODE=${PIPESTATUS[0]} @@ -158,7 +169,7 @@ if [ $FAILED -eq 0 ]; then else echo "Completed with $FAILED failure(s)." fi -echo " Outputs in: $OUTPUT_DIR/" +echo " Outputs in: $BINARY_OUTPUT_DIR/" echo "============================================================" exit $FAILED diff --git a/dev-tools/script_data/src/binaries_suite.py b/dev-tools/script_data/src/binaries_suite.py index 1074baa6d9..0652ef584c 100644 --- a/dev-tools/script_data/src/binaries_suite.py +++ b/dev-tools/script_data/src/binaries_suite.py @@ -7,41 +7,63 @@ import argparse import os +import shutil import signal import warnings +import pandas as pd +import numpy as np from binary_test_cases import get_test_binaries -from formatting import line_length +from formatting import LINE_LENGTH, AVAILABLE_METALLICITIES from utils import print_failed_binary, print_warnings, write_binary_to_screen from posydon.binary_evol.simulationproperties import SimulationProperties -from posydon.config import PATH_TO_POSYDON +from posydon.config import PATH_TO_POSYDON, PATH_TO_POSYDON_DATA +from posydon.binary_evol.binarystar import BinaryStar, SingleStar +from posydon.utils.common_functions import orbital_separation_from_period -base_dir =os.path.dirname(PATH_TO_POSYDON) -script_dir = os.path.join(base_dir, "script_data/") -path_to_default_params = os.path.join(script_dir, "inlists/default_test_params.ini") +#base_dir =os.path.dirname(PATH_TO_POSYDON) +#script_dir = os.path.join(PATH_TO_POSYDON, "dev-tools/script_data/") +#path_to_default_params = os.path.join(script_dir, "inlists/default_test_params.ini") -def load_inlist(verbose): +def load_inlist(ini_path, metallicity, verbose): - print(f"Reading inlist: {path_to_default_params}") - sim_prop = SimulationProperties.from_ini(path_to_default_params) - sim_prop.load_steps(verbose=verbose, metallicity=1.0) + if ini_path is None: + # copy the .ini file from the POSYDON version installed in current environment + default_ini_fn = os.path.join(PATH_TO_POSYDON, "posydon/popsyn/population_params_default.ini") + test_ini_fn = os.path.join(PATH_TO_POSYDON, "dev-tools/script_data/inlists/test_params.ini") + ini_path = shutil.copyfile(default_ini_fn, test_ini_fn) + + print(f"Reading inlist: {ini_path}") + sim_prop = SimulationProperties.from_ini(ini_path) + + # TODO: try to create/pass RNG with a fixed seed + RNG = np.random.default_rng(0) + try: + sim_prop.load_steps(verbose=verbose, RNG=RNG, metallicity=metallicity) + except TypeError as e: + sim_prop.load_steps(verbose=verbose, metallicity=metallicity) return sim_prop -def evolve_binary(binary): +def evolve_binary(binary, binary_id): # Capture warnings during evolution captured_warnings = [] def warning_handler(message, category, filename, lineno, file=None, line=None): captured_warnings.append({ - 'message': str(message), - 'category': category.__name__, - 'filename': filename, - 'lineno': lineno + "binary_id": int(binary_id), + "category": category.__name__, + "message": str(message), + "filename": filename, + "lineno": lineno }) + print(f"Binary {binary_id}") + evolution_df = None + error_df = None + # Set up warning capture old_showwarning = warnings.showwarning warnings.showwarning = warning_handler @@ -50,10 +72,11 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): binary.evolve() # Display the evolution summary for successful evolution write_binary_to_screen(binary) + evolution_df = binary.to_df(extra_columns={'step_names':'str'}) # Show warnings if any were captured print_warnings(captured_warnings) - print("=" * line_length) + print("=" * LINE_LENGTH) except Exception as e: @@ -61,30 +84,184 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): signal.alarm(0) print_failed_binary(binary, e) + error_df = pd.DataFrame([{ + "binary_id": int(binary_id), + "exception_type": type(e).__name__, + "exception_message": str(e) + }]) # Show warnings if any were captured before the exception print_warnings(captured_warnings) - print("=" * line_length) + print("=" * LINE_LENGTH) finally: # Always turn off binary alarm and restore warning handler signal.alarm(0) warnings.showwarning = old_showwarning + # Ensure we always have a dataframe + if evolution_df is not None: + # Decode bytes columns if needed + for col in evolution_df.select_dtypes([object]): + if evolution_df[col].apply(lambda x: isinstance(x, bytes)).any(): + evolution_df[col] = evolution_df[col].apply( + lambda x: x.decode('utf-8') if isinstance(x, bytes) else x + ) + + # Always ensure binary_id exists + if "binary_id" not in evolution_df.columns: + evolution_df["binary_id"] = int(binary_id) + + # Defragment the DataFrame from POSYDON's column-by-column construction + evolution_df = evolution_df.copy() + + # Save warnings + if captured_warnings: + print(f"āš ļø {len(captured_warnings)} warning(s) raised during evolution:") + for i, w in enumerate(captured_warnings[:3], 1): + print(f" {i}. {w['category']}: {w['message'][:80]}") + if len(captured_warnings) > 3: + print(f" ... and {len(captured_warnings) - 3} more warning(s)") + else: + print(f" No warning(s) raised during evolution") + + print(f"āœ… Finished binary {binary_id}") + print("=" * LINE_LENGTH) -def evolve_binaries(verbose): - """Evolves a few binaries to validate their output + return evolution_df, error_df, captured_warnings + +def create_binary(s1_kw, s2_kw, bin_kw, sim_prop): + + star_1 = SingleStar(**s1_kw) + star_2 = SingleStar(**s2_kw) + + # Add separation from period if not explicitly provided + if 'separation' not in bin_kw and 'orbital_period' in bin_kw: + bin_kw['separation'] = orbital_separation_from_period( + bin_kw['orbital_period'], star_1.mass, star_2.mass + ) + + return BinaryStar(star_1, star_2, **bin_kw, properties=sim_prop) + +def evolve_binaries(metallicity, output_path, verbose, ini_path=None): + """Evolves the test binary suite at the given metallicity and saves results. + + Args: + metallicity: float, metallicity in solar units + verbose: bool + output_path: str, path to save HDF5 output + ini_path: str, path to ini file (auto-detected if None) """ - sim_prop = load_inlist(verbose) - test_binaries = get_test_binaries(sim_prop) + print(f"{'=' * LINE_LENGTH}") + print(f" Evolving test binaries at Z = {metallicity} Zsun") + print(f" Output: {output_path}") + print(f"{'=' * LINE_LENGTH}\n") + + sim_prop = load_inlist(ini_path, metallicity, verbose) + test_binaries = get_test_binaries(metallicity) + + # Collect all results in memory, then write once at the end. + # This avoids repeated HDFStore.append() calls, each of which + # reconciles schemas, checks string sizing, and flushes to disk. + all_evolution_dfs = [] + all_error_dfs = [] + all_warning_dfs = [] + + for binary_id, (s1_kw, s2_kw, bin_kw, description) in enumerate(test_binaries): + print(f"\n[{binary_id}/{len(test_binaries)-1}] {description}") + + binary = create_binary(s1_kw, s2_kw, bin_kw, sim_prop) + + evo_df, err_df, warn_list = evolve_binary(binary, binary_id) + + if evo_df is not None: + all_evolution_dfs.append(evo_df) + if err_df is not None: + all_error_dfs.append(err_df) + if warn_list: + all_warning_dfs.append(pd.DataFrame(warn_list)) + + # ā”€ā”€ Completeness check ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ + expected_ids = set(range(len(test_binaries))) + evolved_ids = set() + errored_ids = set() + + for df in all_evolution_dfs: + if 'binary_id' in df.columns: + evolved_ids.update(df['binary_id'].unique()) + for df in all_error_dfs: + if 'binary_id' in df.columns: + errored_ids.update(df['binary_id'].unique()) + + accounted_ids = evolved_ids | errored_ids + missing_ids = sorted(expected_ids - accounted_ids) + + if missing_ids: + print(f"\nāš ļø WARNING: {len(missing_ids)} binary(ies) unaccounted for: {missing_ids}") + print(f" These produced neither evolution output nor a caught error.") + + # ā”€ā”€ Single-pass HDF5 write ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ + with pd.HDFStore(output_path, mode="w") as h5file: + # Save metadata + meta_df = pd.DataFrame([{ + 'metallicity': metallicity, + 'n_binaries': len(test_binaries), + 'n_evolved': len(evolved_ids), + 'n_errored': len(errored_ids), + 'n_missing': len(missing_ids), + 'missing_ids': str(missing_ids) if missing_ids else '', + 'path_to_posydon_data': PATH_TO_POSYDON_DATA, + }]) + h5file.put("metadata", meta_df, format="table") + + if all_evolution_dfs: + combined_evo = pd.concat(all_evolution_dfs, ignore_index=True) + string_cols = combined_evo.select_dtypes([object]).columns + min_itemsize = {col: 500 for col in string_cols} + h5file.put("evolution", combined_evo, format="table", + data_columns=True, min_itemsize=min_itemsize) + + if all_error_dfs: + combined_err = pd.concat(all_error_dfs, ignore_index=True) + err_string_cols = combined_err.select_dtypes([object]).columns + err_min_itemsize = {col: 1000 for col in err_string_cols} + h5file.put("errors", combined_err, format="table", + min_itemsize=err_min_itemsize) + + if all_warning_dfs: + combined_warn = pd.concat(all_warning_dfs, ignore_index=True) + warn_string_cols = combined_warn.select_dtypes([object]).columns + warn_min_itemsize = {col: 1000 for col in warn_string_cols} + h5file.put("warnings", combined_warn, format="table", + min_itemsize=warn_min_itemsize) + + print(f"\n{'=' * LINE_LENGTH}") + print(f" All {len(test_binaries)} binaries complete. Results saved to {output_path}") + print(f"{'=' * LINE_LENGTH}") - for binary in test_binaries: - evolve_binary(binary) if __name__ == "__main__": - parser = argparse.ArgumentParser(description='Evolve binaries for validation.') + parser = argparse.ArgumentParser( + description='Evolve test binaries for POSYDON branch validation.', + formatter_class=argparse.ArgumentDefaultsHelpFormatter + ) parser.add_argument('--verbose', '-v', action='store_true', default=False, - help='Enable verbose output (default: False)') + help='Enable verbose output') + parser.add_argument('--output', type=str, required=True, + help='Path to save HDF5 output') + parser.add_argument('--metallicity', '-Z', type=float, default=1.0, + help=f'Metallicity in solar units. Available: {AVAILABLE_METALLICITIES}') + parser.add_argument('--ini', type=str, default=None, + help='Path to params ini file (auto-detected if not given)') args = parser.parse_args() - evolve_binaries(verbose=args.verbose) + if args.metallicity not in AVAILABLE_METALLICITIES: + print(f"WARNING: Metallicity {args.metallicity} not in standard set {AVAILABLE_METALLICITIES}.") + print(f"Proceeding anyway, but POSYDON grids may not exist for this value.") + + evolve_binaries( + metallicity=args.metallicity, + verbose=args.verbose, + output_path=args.output, + ini_path=args.ini, + ) diff --git a/dev-tools/script_data/src/binary_test_cases.py b/dev-tools/script_data/src/binary_test_cases.py index d4b1e5118e..36444a57a0 100644 --- a/dev-tools/script_data/src/binary_test_cases.py +++ b/dev-tools/script_data/src/binary_test_cases.py @@ -1,617 +1,403 @@ -from posydon.binary_evol.binarystar import BinaryStar, SingleStar -from posydon.utils.common_functions import orbital_separation_from_period - - -def get_test_binaries(sim_prop): - - test_binaries = [] - - ######################################## - # Failing binary in matching - ######################################## - star_1 = SingleStar(**{'mass': 11.948472796094759, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [231.97383621190582, 5.927334890264575, 1.5990566013567014, 6.137994236518587]}) - star_2 = SingleStar(**{'mass': 7.636958434479617, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 190925.99636740884,'eccentricity': 0.0}, properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # Failing binary in matching - ######################################## - star_1 = SingleStar(**{'mass': 30.169861921689556, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [77.96834852144123, 0.05021460132555987, 2.3146518208348152, 1.733054979982291]}) - star_2 = SingleStar(**{'mass': 10.972734402996027, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 20479.71919353725,'eccentricity': 0.0}, properties = sim_prop) - - ######################################## - # flipped S1 and S2 ? - ######################################## - star_1 = SingleStar(**{'mass': 9.474917413943635, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [133.5713935237759, 4.398754864537542, 2.703102872841114, 1.4633904612711142]}) - star_2 = SingleStar(**{'mass': 9.311073918196263, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 18.605997832086413,'eccentricity': 0.0}, properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # flipped S1 and S2 - ######################################## - star_1 = SingleStar(**{'mass': 10.438541, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star_2 = SingleStar(**{'mass': 1.400713, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 9.824025,'eccentricity': 0.0}, properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # flipped S1 and S2 - ######################################## - star_1= SingleStar(**{'mass': 9.845907 , 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - star_2 = SingleStar(**{'mass': 9.611029, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 3.820571,'eccentricity': 0.0}, properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # Normal binary evolution - ######################################## - star_1= SingleStar(**{'mass': 30.845907 , 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - star_2 = SingleStar(**{'mass': 30.611029, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 30.820571,'eccentricity': 0.0}, properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # Normal binary - ######################################## - star_1= SingleStar(**{'mass': 9.213534679594247 , 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [327.5906384501521, 1.7707176050073297, 1.573225822966838, 1.6757313876001914]}) - star_2 = SingleStar(**{'mass': 7.209878522799272, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 63123.74544474666,'eccentricity': 0.0}, properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # Normal binary - ######################################## - star_1= SingleStar(**{'mass': 9.561158487732602 , 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [317.5423844462847, 2.9095984678057603, 1.754121288652108, 2.3693917842468784]}) - star_2 = SingleStar(**{'mass': 9.382732464319286, 'state': 'H-rich_Core_H_burning','metallicity':1, - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 27.77657038557851,'eccentricity': 0.0}, properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # Normal binary - ######################################## - star_1 = SingleStar(**{'mass': 7.552858,#29829485, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [40.91509926587841, 2.6295454150818256, 1.6718337470964977, 6.0408769315244895]}) - star_2 = SingleStar(**{'mass': 6.742063, #481560266, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 17.957531550841225, 'eccentricity': 0.0,}, - properties=sim_prop) - test_binaries.append(binary) - - ######################################## - # High BH spin options - ######################################## - star_1 = SingleStar(**{'mass': 31.616785, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [10, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - star_2 = SingleStar(**{'mass': 26.874267, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 501.99252706449792,'eccentricity': 0.0}, properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # Original a>1 spin error - ######################################## - star_1 = SingleStar(**{'mass': 18.107506844123645, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [528.2970725443025, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}) - star_2 = SingleStar(**{'mass': 15.641392951875442, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 151.99252706449792,'eccentricity': 0.0}, properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # FIXED disrupted crash - ######################################## - star_1 = SingleStar(**{'mass': 52.967313, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star_2 = SingleStar(**{'mass': 36.306444, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':12.877004, 'eccentricity': 0.0}, - properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # FIXED error with SN type - ######################################## - star_1 = SingleStar(**{'mass': 17.782576, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star_2 = SingleStar(**{'mass':3.273864, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # FIXED oRLO2 looping - ######################################## - star_1 = SingleStar(**{'mass': 170.638207, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [4.921294, 4.31745, 1.777768, 3.509656]}) - star_2 = SingleStar(**{'mass':37.917852, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':113.352736, 'eccentricity': 0.0}, - properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # Redirect to step_CO_HeMS (H-rich non-burning?) - ######################################## - star_1 = SingleStar(**{'mass': 8.333579, 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [17.125568, 4.101834, 0.917541, 3.961291]}) - star_2 = SingleStar(**{'mass' : 8.208376, 'state' : 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 66.870417, 'eccentricity': 0.0}, - properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # FIXED oRLO2 looping - ######################################## - star_1 = SingleStar(**{'mass': 16.921378, 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}) - star_2 = SingleStar(**{'mass' : 16.286318, 'state' : 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 37.958768, 'eccentricity': 0.0}, - properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # FIXED? step_detached failure - ######################################## - star_1 = SingleStar(**{'mass': 19.787769, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [24.464803, 0.666314, 1.954698, 5.598975]}) - star_2 = SingleStar(**{'mass': 7.638741, 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3007.865561, 'eccentricity': 0.0}, - properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # Disrupted binary - ######################################## - star_1 = SingleStar(**{'mass': 16.921378, 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}) - star_2 = SingleStar(**{'mass' : 16.286318, 'state' : 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3007.865561, 'eccentricity': 0.0}, - properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # FIXED Detached binary failure (low mass) - ######################################## - star_1 = SingleStar(**{'mass': 9, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star_2 = SingleStar(**{'mass':0.8, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # FIXED SN_TYPE = None crash - ######################################## - star_1 = SingleStar(**{'mass': 17.782576, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star_2 = SingleStar(**{'mass':3.273864, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # FIXED SN_TYPE errors - ######################################## - star_1 = SingleStar(**{'mass': 6.782576, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star_2 = SingleStar(**{'mass':3.273864, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # FIXED SN_TYPE errors - ######################################## - star_1 = SingleStar(**{'mass': 40.638207, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [30.921294, 4.31745, 1.777768, 3.509656]}) - star_2 = SingleStar(**{'mass':37.917852, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':2113.352736, 'eccentricity': 0.0}, - properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # FIXED ECSN errors? - ######################################## - star_1 = SingleStar(**{'mass': 12.376778, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [80, 4.31745, 1.777768, 3.509656]}) - star_2 = SingleStar(**{'mass': 9.711216, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':79.83702, 'eccentricity': 0.0}, - properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # Interpolator masses?? - ######################################## - star_1 = SingleStar(**{'mass': 7.592921, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star_2 = SingleStar(**{'mass':5.038679 , - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.537807, 'eccentricity': 0.0}, - properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # Interpolator masses? - ######################################## - star_1 = SingleStar(**{'mass': 38.741115, - 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [21.113771, 2.060135, 2.224789, 4.089729]}) - star_2 = SingleStar(**{'mass': 27.776178, - 'state': 'H-rich_Core_H_burning',\ - 'natal_kick_array': [282.712103, 0.296252, 1.628433, 5.623812]}) - - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 93.387072, 'eccentricity': 0.0}, - properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # FIXED NaN spin - ######################################## - star_1 = SingleStar(**{'mass': 70.066924, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0], - 'metallicity':1}) - star_2 = SingleStar(**{'mass': 34.183110, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0], - 'metallicity':1}) - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.931492e+03, - 'separation': orbital_separation_from_period(5.931492e+03, star_1.mass, star_2.mass), - 'eccentricity': 0.0}, - properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # FIXED NaN spin - ######################################## - star_1 = SingleStar(**{'mass': 28.837286, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star_2 = SingleStar(**{'mass': 6.874867, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':35.609894, - 'separation': orbital_separation_from_period(35.609894, star_1.mass, star_2.mass), - 'eccentricity': 0.0}, - properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # oRLO2 issue - ######################################## - star_1 = SingleStar(**{'mass':29.580210, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star_2 = SingleStar(**{'mass': 28.814626, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':40.437993, 'eccentricity': 0.0}, - properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # oRLO2 issue - ######################################## - star_1 = SingleStar(**{'mass':67.126795, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star_2 = SingleStar(**{'mass': 19.622908, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':1484.768582, 'eccentricity': 0.0}, - properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # oRLO2 issue - ######################################## - star_1 = SingleStar(**{'mass': 58.947503, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star_2 = SingleStar(**{'mass': 56.660506, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':2011.300659, 'eccentricity': 0.0}, - properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # oRLO2 issue - ######################################## - star_1 = SingleStar(**{'mass': 170.638207, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[47.979957374424956, 5.317304576107798, 2.7259013166068145, 4.700929589520818]}) - star_2 = SingleStar(**{'mass': 37.917852, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':113.352736, 'eccentricity': 0.0}, - properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # oRLO2 issue - ######################################## - star_1 = SingleStar(**{'mass': 109.540207, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star_2 = SingleStar(**{'mass': 84.344530, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':5.651896, 'eccentricity': 0.0}, - properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # redirect - ######################################## - star_1 = SingleStar(**{'mass': 13.889634, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star_2 = SingleStar(**{'mass':0.490231, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':14513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # redirect - ######################################## - star_1 = SingleStar(**{'mass': 9, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star_2 = SingleStar(**{'mass':0.8, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':4513.150157, 'eccentricity': 0.0}, - properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # Max time - ######################################## - star_1 = SingleStar(**{'mass': 103.07996766780799, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.2965418610971261, 2.0789170290719117, 3.207488023705968]}) - star_2 = SingleStar(**{'mass': 83.66522615073987, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 1449.1101985875678,'eccentricity': 0.0}, properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # Max time - ######################################## - star_1 = SingleStar(**{'mass': 8.860934140643465, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [11.818027275431337, 2.812412688633058, 0.4998731824233789, 2.9272630485628643]}) - star_2 = SingleStar(**{'mass': 8.584716012668551, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - binary = BinaryStar(star_1, star_2, **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', - 'orbital_period': 20.82030114750744,'eccentricity': 0.0}, properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # PR421 - ######################################## - star_1 = SingleStar(**{'mass': 24.035366, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star_2 = SingleStar(**{'mass': 23.187355, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':18.865029, 'eccentricity': 0.0}, - properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # CE class - ######################################## - star_1 = SingleStar(**{'mass':33.964274, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star_2 = SingleStar(**{'mass': 28.98149, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':82.370989, 'eccentricity': 0.0}, - properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # PR574 - stepCE fix - ######################################## - star_1 = SingleStar(**{'mass':29.580210, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - star_2 = SingleStar(**{'mass': 28.814626*0.4, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array':[0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':300.437993, 'eccentricity': 0.0}, - properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # e_ZAMS error - ######################################## - star_1 = SingleStar(**{'mass': 8.161885721822461, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star_2 = SingleStar(**{'mass': 3.5907829421526154, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 36.873457164644144, 'eccentricity': 0.0}, - properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # e_ZAMS error - ######################################## - star_1 = SingleStar(**{'mass': 35.24755025317775, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [19.755993125895806, 0.37149222852233904, 1.6588846085306563, - 1.434617029858906]}) - star_2 = SingleStar(**{'mass': 30.000450298072902, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 24060.02101364665, 'eccentricity': 0.8085077857996965}, - properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # e_ZAMS error - ######################################## - star_1 = SingleStar(**{'mass': 11.862930493162692, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star_2 = SingleStar(**{'mass': 1.4739109294156703, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 4111.083887312003, 'eccentricity':0.0}, - properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # e_ZAMS error - ######################################## - star_1 = SingleStar(**{'mass': 8.527361341212108, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star_2 = SingleStar(**{'mass': 0.7061748406821822, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period': 2521.1927287891444, 'eccentricity':0.0}, - properties = sim_prop) - test_binaries.append(binary) - - ######################################## - # e_ZAMS error - ######################################## - star_1 = SingleStar(**{'mass': 13.661942533447398 ,#29829485, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - star_2 = SingleStar(**{'mass': 4.466151109802313 , #481560266, - 'state': 'H-rich_Core_H_burning', - 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}) - - binary = BinaryStar(star_1, star_2, - **{'time': 0.0, 'state': 'detached', 'event': 'ZAMS', 'orbital_period':3110.1346707516914, 'eccentricity':0.0}, - properties = sim_prop) - test_binaries.append(binary) +def get_test_binaries(metallicity): + + Z = metallicity + + test_binaries = [ + # 0: Failing binary in matching + ({'mass': 11.948472796094759, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [231.97383621190582, 5.927334890264575, 1.5990566013567014, 6.137994236518587]}, + {'mass': 7.636958434479617, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 190925.99636740884, 'eccentricity': 0.0}, + "Failing binary in matching"), + + # 1: Failing binary in matching + ({'mass': 30.169861921689556, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [77.96834852144123, 0.05021460132555987, 2.3146518208348152, 1.733054979982291]}, + {'mass': 10.972734402996027, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 20479.71919353725, 'eccentricity': 0.0}, + "Failing binary in matching"), + + # 2: Flipped S1 and S2 (near-equal mass) + ({'mass': 9.474917413943635, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [133.5713935237759, 4.398754864537542, 2.703102872841114, 1.4633904612711142]}, + {'mass': 9.311073918196263, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 18.605997832086413, 'eccentricity': 0.0}, + "Flipped S1 and S2 (near-equal mass)"), + + # 3: Flipped S1 and S2 (high mass ratio) + ({'mass': 10.438541, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 1.400713, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 9.824025, 'eccentricity': 0.0}, + "Flipped S1 and S2 (high mass ratio)"), + + # 4: Flipped S1 and S2 + ({'mass': 9.845907, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}, + {'mass': 9.611029, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 3.820571, 'eccentricity': 0.0}, + "Flipped S1 and S2"), + + # 5: Normal binary evolution (high mass) + ({'mass': 30.845907, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}, + {'mass': 30.611029, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 30.820571, 'eccentricity': 0.0}, + "Normal binary evolution (high mass)"), + + # 6: Normal binary (wide orbit) + ({'mass': 9.213534679594247, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [327.5906384501521, 1.7707176050073297, 1.573225822966838, 1.6757313876001914]}, + {'mass': 7.209878522799272, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 63123.74544474666, 'eccentricity': 0.0}, + "Normal binary (wide orbit)"), + + # 7: Normal binary (near-equal mass, close) + ({'mass': 9.561158487732602, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [317.5423844462847, 2.9095984678057603, 1.754121288652108, 2.3693917842468784]}, + {'mass': 9.382732464319286, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 27.77657038557851, 'eccentricity': 0.0}, + "Normal binary (near-equal mass, close)"), + + # 8: Normal binary + ({'mass': 7.552858, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [40.91509926587841, 2.6295454150818256, 1.6718337470964977, 6.0408769315244895]}, + {'mass': 6.742063, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 17.957531550841225, 'eccentricity': 0.0}, + "Normal binary"), + + # 9: High BH spin options + ({'mass': 31.616785, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [10, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}, + {'mass': 26.874267, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 501.99252706449792, 'eccentricity': 0.0}, + "High BH spin options"), + + # 10: Original a>1 spin error + ({'mass': 18.107506844123645, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [528.2970725443025, 4.190728383757787, 1.1521129697118118, 5.015343794234789]}, + {'mass': 15.641392951875442, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 151.99252706449792, 'eccentricity': 0.0}, + "Original a>1 spin error"), + + # 11: FIXED disrupted crash + ({'mass': 52.967313, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 36.306444, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 12.877004, 'eccentricity': 0.0}, + "FIXED disrupted crash"), + + # 12: FIXED error with SN type + ({'mass': 17.782576, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 3.273864, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 4513.150157, 'eccentricity': 0.0}, + "FIXED error with SN type"), + + # 13: FIXED oRLO2 looping + ({'mass': 170.638207, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [4.921294, 4.31745, 1.777768, 3.509656]}, + {'mass': 37.917852, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 113.352736, 'eccentricity': 0.0}, + "FIXED oRLO2 looping"), + + # 14: Redirect to step_CO_HeMS + ({'mass': 8.333579, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [17.125568, 4.101834, 0.917541, 3.961291]}, + {'mass': 8.208376, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 66.870417, 'eccentricity': 0.0}, + "Redirect to step_CO_HeMS"), + + # 15: FIXED oRLO2 looping + ({'mass': 16.921378, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}, + {'mass': 16.286318, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 37.958768, 'eccentricity': 0.0}, + "FIXED oRLO2 looping"), + + # 16: FIXED step_detached failure + ({'mass': 19.787769, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [24.464803, 0.666314, 1.954698, 5.598975]}, + {'mass': 7.638741, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 3007.865561, 'eccentricity': 0.0}, + "FIXED step_detached failure"), + + # 17: Disrupted binary + ({'mass': 16.921378, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [268.837139, 5.773527, 2.568105, 2.519068]}, + {'mass': 16.286318, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 3007.865561, 'eccentricity': 0.0}, + "Disrupted binary"), + + # 18: FIXED Detached binary failure (low mass) + ({'mass': 9, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 0.8, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 4513.150157, 'eccentricity': 0.0}, + "FIXED Detached binary failure (low mass)"), + + # 19: FIXED SN_TYPE = None crash + ({'mass': 17.782576, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 3.273864, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 4513.150157, 'eccentricity': 0.0}, + "FIXED SN_TYPE = None crash"), + + # 20: FIXED SN_TYPE errors (low mass primary) + ({'mass': 6.782576, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 3.273864, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 4513.150157, 'eccentricity': 0.0}, + "FIXED SN_TYPE errors (low mass primary)"), + + # 21: FIXED SN_TYPE errors (high mass) + ({'mass': 40.638207, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [30.921294, 4.31745, 1.777768, 3.509656]}, + {'mass': 37.917852, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 2113.352736, 'eccentricity': 0.0}, + "FIXED SN_TYPE errors (high mass)"), + + # 22: FIXED ECSN errors + ({'mass': 12.376778, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [80, 4.31745, 1.777768, 3.509656]}, + {'mass': 9.711216, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 79.83702, 'eccentricity': 0.0}, + "FIXED ECSN errors"), + + # 23: Interpolator masses (close) + ({'mass': 7.592921, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 5.038679, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 5.537807, 'eccentricity': 0.0}, + "Interpolator masses (close)"), + + # 24: Interpolator masses (both kicked) + ({'mass': 38.741115, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [21.113771, 2.060135, 2.224789, 4.089729]}, + {'mass': 27.776178, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [282.712103, 0.296252, 1.628433, 5.623812]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 93.387072, 'eccentricity': 0.0}, + "Interpolator masses (both kicked)"), + + # 25: FIXED NaN spin (very high mass, wide) + ({'mass': 70.066924, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 34.183110, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 5.931492e+03, 'eccentricity': 0.0}, + "FIXED NaN spin (very high mass, wide)"), + + # 26: FIXED NaN spin + ({'mass': 28.837286, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 6.874867, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 35.609894, 'eccentricity': 0.0}, + "FIXED NaN spin"), + + # 27: oRLO2 issue (near-equal mass) + ({'mass': 29.580210, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 28.814626, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 40.437993, 'eccentricity': 0.0}, + "oRLO2 issue (near-equal mass)"), + + # 28: oRLO2 issue (high mass ratio) + ({'mass': 67.126795, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 19.622908, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 1484.768582, 'eccentricity': 0.0}, + "oRLO2 issue (high mass ratio)"), + + # 29: oRLO2 issue (very high mass, near-equal) + ({'mass': 58.947503, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 56.660506, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 2011.300659, 'eccentricity': 0.0}, + "oRLO2 issue (very high mass, near-equal)"), + + # 30: oRLO2 issue (extreme mass, kicked) + ({'mass': 170.638207, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [47.979957374424956, 5.317304576107798, 2.7259013166068145, 4.700929589520818]}, + {'mass': 37.917852, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 113.352736, 'eccentricity': 0.0}, + "oRLO2 issue (extreme mass, kicked)"), + + # 31: oRLO2 issue (very high mass, close) + ({'mass': 109.540207, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 84.344530, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 5.651896, 'eccentricity': 0.0}, + "oRLO2 issue (very high mass, close)"), + + # 32: Redirect (extreme mass ratio) + ({'mass': 13.889634, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 0.490231, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 14513.150157, 'eccentricity': 0.0}, + "Redirect (extreme mass ratio)"), + + # 33: Redirect (low mass secondary) + ({'mass': 9, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 0.8, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 4513.150157, 'eccentricity': 0.0}, + "Redirect (low mass secondary)"), + + # 34: Max time (very high mass, wide) + ({'mass': 103.07996766780799, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.2965418610971261, 2.0789170290719117, 3.207488023705968]}, + {'mass': 83.66522615073987, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 1449.1101985875678, 'eccentricity': 0.0}, + "Max time (very high mass, wide)"), + + # 35: Max time + ({'mass': 8.860934140643465, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [11.818027275431337, 2.812412688633058, 0.4998731824233789, 2.9272630485628643]}, + {'mass': 8.584716012668551, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 20.82030114750744, 'eccentricity': 0.0}, + "Max time"), + + # 36: PR421 + ({'mass': 24.035366, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 23.187355, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 18.865029, 'eccentricity': 0.0}, + "PR421"), + + # 37: CE class + ({'mass': 33.964274, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 28.98149, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 82.370989, 'eccentricity': 0.0}, + "CE class"), + + # 38: PR574 - stepCE fix + ({'mass': 29.580210, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 28.814626 * 0.4, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 300.437993, 'eccentricity': 0.0}, + "PR574 - stepCE fix"), + + # 39: e_ZAMS error + ({'mass': 8.161885721822461, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 3.5907829421526154, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 36.873457164644144, 'eccentricity': 0.0}, + "e_ZAMS error"), + + # 40: e_ZAMS error (eccentric) + ({'mass': 35.24755025317775, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [19.755993125895806, 0.37149222852233904, 1.6588846085306563, 1.434617029858906]}, + {'mass': 30.000450298072902, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 24060.02101364665, 'eccentricity': 0.8085077857996965}, + "e_ZAMS error (eccentric)"), + + # 41: e_ZAMS error (high mass ratio) + ({'mass': 11.862930493162692, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 1.4739109294156703, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 4111.083887312003, 'eccentricity': 0.0}, + "e_ZAMS error (high mass ratio)"), + + # 42: e_ZAMS error (extreme mass ratio) + ({'mass': 8.527361341212108, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 0.7061748406821822, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 2521.1927287891444, 'eccentricity': 0.0}, + "e_ZAMS error (extreme mass ratio)"), + + # 43: e_ZAMS error + ({'mass': 13.661942533447398, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'mass': 4.466151109802313, 'state': 'H-rich_Core_H_burning', 'metallicity': Z, + 'natal_kick_array': [0.0, 0.0, 0.0, 0.0]}, + {'time': 0.0, 'state': 'detached', 'event': 'ZAMS', + 'orbital_period': 3110.1346707516914, 'eccentricity': 0.0}, + "e_ZAMS error"), + ] return test_binaries diff --git a/dev-tools/compare_runs.py b/dev-tools/script_data/src/compare_runs.py similarity index 100% rename from dev-tools/compare_runs.py rename to dev-tools/script_data/src/compare_runs.py diff --git a/dev-tools/script_data/src/formatting.py b/dev-tools/script_data/src/formatting.py index 699d5ca8c3..61a34fccfb 100644 --- a/dev-tools/script_data/src/formatting.py +++ b/dev-tools/script_data/src/formatting.py @@ -1,3 +1,4 @@ target_rows = 12 -line_length = 140 +LINE_LENGTH = 140 columns_to_show = ['step_names', 'state', 'event', 'S1_state', 'S1_mass', 'S2_state', 'S2_mass', 'orbital_period'] +AVAILABLE_METALLICITIES = [2., 1., 0.45, 0.2, 0.1, 0.01, 0.001, 0.0001] diff --git a/dev-tools/script_data/src/utils.py b/dev-tools/script_data/src/utils.py index 14b8f3f552..9f8d12e4cf 100644 --- a/dev-tools/script_data/src/utils.py +++ b/dev-tools/script_data/src/utils.py @@ -1,4 +1,4 @@ -from formatting import columns_to_show, line_length, target_rows +from formatting import columns_to_show, LINE_LENGTH, target_rows def print_warnings(captured_warnings): @@ -50,7 +50,7 @@ def write_binary_to_screen(binary): # Reset index to use a counter instead of NaN df_filtered = df_filtered.reset_index(drop=True) - print("=" * line_length) + print("=" * LINE_LENGTH) # Print the DataFrame df_string = df_filtered.to_string(index=True, float_format='%.3f') @@ -68,12 +68,12 @@ def write_binary_to_screen(binary): for i in range(empty_lines_needed): print("") - print("-" * line_length) + print("-" * LINE_LENGTH) def print_failed_binary(binary, e, max_error_lines=3): - print("=" * line_length) + print("=" * LINE_LENGTH) print(f"šŸšØ Binary Evolution Failed!") print(f"Exception: {type(e).__name__}") print(f"Message: {e}") @@ -109,4 +109,4 @@ def print_failed_binary(binary, e, max_error_lines=3): except Exception as inner_e: print(f"\nCould not retrieve binary state: {inner_e}") - print("-" * line_length) + print("-" * LINE_LENGTH) diff --git a/dev-tools/validate_binaries.sh b/dev-tools/validate_binaries.sh index 9f454a3344..9048ed8599 100755 --- a/dev-tools/validate_binaries.sh +++ b/dev-tools/validate_binaries.sh @@ -73,13 +73,15 @@ while [[ $# -gt 0 ]]; do esac done -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +DEV_TOOLS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +SCRIPT_DIR="${DEV_TOOLS_DIR}/script_data" +SRC_DIR="${SCRIPT_DIR}/src" SAFE_CANDIDATE="${CANDIDATE_BRANCH//\//_}" SAFE_BASELINE="${BASELINE_BRANCH//\//_}" BASELINE_DIR="$SCRIPT_DIR/baselines/${SAFE_BASELINE}" -OUTPUT_DIR="$SCRIPT_DIR/outputs/${SAFE_CANDIDATE}" -SUMMARY_FILE="$OUTPUT_DIR/comparison_summary.txt" +BINARY_OUTPUT_DIR="$SCRIPT_DIR/output/binary_star_tests/${SAFE_CANDIDATE}" +SUMMARY_FILE="$BINARY_OUTPUT_DIR/comparison_summary.txt" # ā”€ā”€ Build compare_runs.py flags ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ COMPARE_FLAGS="" @@ -136,7 +138,7 @@ echo " Found $BASELINE_COUNT baseline file(s)." # ā”€ā”€ Step 1: Evolve binaries on candidate branch ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ echo "" echo "Step 1: Evolving binaries on candidate branch '$CANDIDATE_BRANCH'..." -"$SCRIPT_DIR/evolve_binaries.sh" "$CANDIDATE_BRANCH" "" "$METALLICITIES" +"$DEV_TOOLS_DIR/run_test_suite.sh" "$CANDIDATE_BRANCH" "" "$METALLICITIES" # ā”€ā”€ Step 2: Compare each metallicity ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ echo "" @@ -148,7 +150,7 @@ FAIL=0 SKIP=0 # Initialize summary -mkdir -p "$OUTPUT_DIR" +mkdir -p "$BINARY_OUTPUT_DIR" cat > "$SUMMARY_FILE" << EOF POSYDON Binary Validation ā€” Comparison Summary ================================================ @@ -164,8 +166,8 @@ for Z in $METALLICITIES; do TOTAL=$((TOTAL + 1)) BASELINE_FILE="$BASELINE_DIR/baseline_${Z}Zsun.h5" - CANDIDATE_FILE="$OUTPUT_DIR/candidate_${Z}Zsun.h5" - COMPARISON_FILE="$OUTPUT_DIR/comparison_${Z}Zsun.txt" + CANDIDATE_FILE="$BINARY_OUTPUT_DIR/candidate_${Z}Zsun.h5" + COMPARISON_FILE="$BINARY_OUTPUT_DIR/comparison_${Z}Zsun.txt" echo "" echo "--- Z = ${Z} Zsun ---" @@ -186,7 +188,7 @@ for Z in $METALLICITIES; do # $COMPARE_FLAGS is intentionally unquoted so it word-splits into # separate arguments for compare_runs.py. - if python "$SCRIPT_DIR/compare_runs.py" "$BASELINE_FILE" "$CANDIDATE_FILE" \ + if python "$SRC_DIR/compare_runs.py" "$BASELINE_FILE" "$CANDIDATE_FILE" \ $COMPARE_FLAGS \ 2>&1 | tee "$COMPARISON_FILE"; then echo " PASS: No differences" From beb9dc193cc232be51f617da46b4a82118394b9d Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 27 Mar 2026 20:57:15 +0000 Subject: [PATCH 247/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/script_data/src/binaries_suite.py | 10 +++++----- dev-tools/script_data/src/utils.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-tools/script_data/src/binaries_suite.py b/dev-tools/script_data/src/binaries_suite.py index 0652ef584c..c13a681b32 100644 --- a/dev-tools/script_data/src/binaries_suite.py +++ b/dev-tools/script_data/src/binaries_suite.py @@ -10,16 +10,16 @@ import shutil import signal import warnings -import pandas as pd -import numpy as np +import numpy as np +import pandas as pd from binary_test_cases import get_test_binaries -from formatting import LINE_LENGTH, AVAILABLE_METALLICITIES +from formatting import AVAILABLE_METALLICITIES, LINE_LENGTH from utils import print_failed_binary, print_warnings, write_binary_to_screen +from posydon.binary_evol.binarystar import BinaryStar, SingleStar from posydon.binary_evol.simulationproperties import SimulationProperties from posydon.config import PATH_TO_POSYDON, PATH_TO_POSYDON_DATA -from posydon.binary_evol.binarystar import BinaryStar, SingleStar from posydon.utils.common_functions import orbital_separation_from_period #base_dir =os.path.dirname(PATH_TO_POSYDON) @@ -156,7 +156,7 @@ def evolve_binaries(metallicity, output_path, verbose, ini_path=None): print(f" Evolving test binaries at Z = {metallicity} Zsun") print(f" Output: {output_path}") print(f"{'=' * LINE_LENGTH}\n") - + sim_prop = load_inlist(ini_path, metallicity, verbose) test_binaries = get_test_binaries(metallicity) diff --git a/dev-tools/script_data/src/utils.py b/dev-tools/script_data/src/utils.py index 9f8d12e4cf..7482377531 100644 --- a/dev-tools/script_data/src/utils.py +++ b/dev-tools/script_data/src/utils.py @@ -1,4 +1,4 @@ -from formatting import columns_to_show, LINE_LENGTH, target_rows +from formatting import LINE_LENGTH, columns_to_show, target_rows def print_warnings(captured_warnings): From 83b406035919b566cf19d91ea38d5d9d7582d5c5 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Fri, 27 Mar 2026 16:01:26 -0500 Subject: [PATCH 248/389] adding workdirs, logs, output, baselines directories explicitly --- dev-tools/script_data/baselines/.gitkeep | 0 dev-tools/script_data/logs/.gitkeep | 0 dev-tools/script_data/output/.gitkeep | 0 dev-tools/script_data/workdirs/.gitkeep | 0 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 dev-tools/script_data/baselines/.gitkeep create mode 100644 dev-tools/script_data/logs/.gitkeep create mode 100644 dev-tools/script_data/output/.gitkeep create mode 100644 dev-tools/script_data/workdirs/.gitkeep diff --git a/dev-tools/script_data/baselines/.gitkeep b/dev-tools/script_data/baselines/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/dev-tools/script_data/logs/.gitkeep b/dev-tools/script_data/logs/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/dev-tools/script_data/output/.gitkeep b/dev-tools/script_data/output/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/dev-tools/script_data/workdirs/.gitkeep b/dev-tools/script_data/workdirs/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 From 5e87ee23f08fd793d1b9d57e5e394cb9c3a6347a Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 11:01:51 -0500 Subject: [PATCH 249/389] updated for change from metallicity to metallicities --- posydon/unit_tests/popsyn/test_defaults.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/posydon/unit_tests/popsyn/test_defaults.py b/posydon/unit_tests/popsyn/test_defaults.py index a65ede9eb9..ba44da969f 100644 --- a/posydon/unit_tests/popsyn/test_defaults.py +++ b/posydon/unit_tests/popsyn/test_defaults.py @@ -40,7 +40,7 @@ def test_kwargs(self): elements = [ 'entropy', 'number_of_binaries', - 'metallicity', + 'metallicities', 'star_formation', 'max_simulation_time', 'orbital_scheme', @@ -74,8 +74,8 @@ def test_instance_number_of_binaries(self): "number_of_binaries should be an integer" def test_instance_metallicity(self): - assert isinstance(totest.default_kwargs['metallicity'], float), \ - "metallicity should be a float" + assert isinstance(totest.default_kwargs['metallicities'], float), \ + "metallicities should be a float" def test_instance_star_formation(self): assert isinstance(totest.default_kwargs['star_formation'], str), \ @@ -114,8 +114,8 @@ def test_instance_orbital_period_min(self): "orbital_period_min should be a float" def test_instance_orbital_period_max(self): - assert isinstance(totest.default_kwargs['orbital_period_max'], float), \ - "orbital_period_max should be a float" + assert isinstance(totest.default_kwargs['orbital_period_max'], (float, int)), \ + "orbital_period_max should be a float or int" def test_instance_eccentricity_scheme(self): assert isinstance(totest.default_kwargs['eccentricity_scheme'], str), \ From 7b75f9fa22befc1bc0d34f41f92d13375a715011 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 11:10:12 -0500 Subject: [PATCH 250/389] updated coverage --- posydon/popsyn/independent_sample.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/posydon/popsyn/independent_sample.py b/posydon/popsyn/independent_sample.py index c71a9bfb76..dae547830c 100644 --- a/posydon/popsyn/independent_sample.py +++ b/posydon/popsyn/independent_sample.py @@ -410,6 +410,9 @@ def generate_binary_fraction(m1=None, binary_fraction_const=1, elif not isinstance(m1,np.ndarray): m1 = np.asarray(m1) binary_fraction = np.zeros_like(m1, dtype=float) + else: + pass + # Input parameter checks if binary_fraction_scheme not in binary_fraction_scheme_options: raise ValueError("You must provide an allowed binary fraction scheme.") From 08c42b326812c35401c2e5a67915b7149b1d0212 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 11:23:54 -0500 Subject: [PATCH 251/389] update test coverage --- posydon/popsyn/synthetic_population.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/posydon/popsyn/synthetic_population.py b/posydon/popsyn/synthetic_population.py index 34b49ab082..bb97f3b382 100644 --- a/posydon/popsyn/synthetic_population.py +++ b/posydon/popsyn/synthetic_population.py @@ -882,7 +882,7 @@ def _save_mass_per_metallicity(self, filename): """ with pd.HDFStore(filename, mode="a") as store: store.put("mass_per_metallicity", self.mass_per_metallicity) - if self.verbose: + if self.verbose: # pragma: no cover print("mass_per_metallicity table written to population file!") def _load_mass_per_metallicity(self, filename): @@ -896,7 +896,7 @@ def _load_mass_per_metallicity(self, filename): """ with pd.HDFStore(filename, mode="r") as store: self.mass_per_metallicity = store["mass_per_metallicity"] - if self.verbose: + if self.verbose: # pragma: no cover print("mass_per_metallicity table read from population file!") def _save_ini_params(self, filename): @@ -1246,7 +1246,7 @@ def export_selection(self, selection, filename, overwrite=False, append=False, h if "/oneline" in store.keys(): last_index_in_file = np.sort(store["oneline"].index)[-1] - elif "/history" in store.keys(): + elif "/history" in store.keys(): # pragma: no cover last_index_in_file = np.sort(store["history"].index)[-1] if "/history" in store.keys() and self.verbose: # pragma: no cover @@ -1920,7 +1920,7 @@ def calculate_model_weights(self, model_weights_identifier, population_parameter " parameters! Make sure this is intended"), "POSYDONWarning") - if self.verbose: + if self.verbose: # pragma: no cover print("Simulation parameters:") print(simulation_parameters) print("Population parameters:") @@ -1938,7 +1938,7 @@ def calculate_model_weights(self, model_weights_identifier, population_parameter met_indices = tmp_data.index[met_mask] met_indices =np.unique(met_indices) M_sim = self.mass_per_metallicity['simulated_mass'].iloc[i] - if len(met_indices) == 0: + if len(met_indices) == 0: # pragma: no cover continue pop_data = self.oneline.select(where='index in '+str(met_indices.tolist()), columns=['S1_mass_i', 'S2_mass_i', 'orbital_period_i', 'eccentricity_i', 'state_i']) @@ -2061,7 +2061,7 @@ def calculate_cosmic_weights(self, SFH_identifier, model_weights, MODEL_in=None) with pd.HDFStore(self.filename, mode="a") as store: if path_in_file + "MODEL" in store.keys(): store.remove(path_in_file + "MODEL") - if self.verbose: + if self.verbose: # pragma: no cover print("Cosmic weights already computed! Overwriting them!") if path_in_file + "weights" in store.keys(): store.remove(path_in_file + "weights") @@ -2117,7 +2117,7 @@ def calculate_cosmic_weights(self, SFH_identifier, model_weights, MODEL_in=None) .index.to_numpy() .flatten() ) - if len(selected_indices) == 0: + if len(selected_indices) == 0: # pragma: no cover continue delay_time = ( @@ -2446,7 +2446,7 @@ def _read_MODEL_data(self, filename): else: self.MODEL = tmp_df.iloc[0].to_dict() - if self.verbose: + if self.verbose: # pragma: no cover print("MODEL read from population file!") @property @@ -2620,7 +2620,7 @@ def calculate_observable_population(self, observable_func, observable_name): + observable_name in store.keys() ): - if self.verbose: + if self.verbose: # pragma: no cover print("Overwriting observable population!") del store[ "transients/" @@ -2732,7 +2732,7 @@ def intrinsic_rate_density(self): def plot_hist_properties( self, prop, intrinsic=True, observable=None, bins=50, channel=None, **kwargs - ): + ): # pragma: no cover """Plot a histogram of a given property available in the transient population. This method plots a histogram of a given property available in the transient population. @@ -2812,7 +2812,7 @@ def plot_hist_properties( # plot the histogram using plot_pop.plot_hist_properties plot_pop.plot_hist_properties(df, bins=bins, **kwargs) - def plot_intrinsic_rate(self, channels=False, **kwargs): + def plot_intrinsic_rate(self, channels=False, **kwargs): # pragma: no cover """Plot the intrinsic rate density of the transient population.""" plot_pop.plot_rate_density(self.intrinsic_rate_density, channels=channels, **kwargs) From a8481aa55e02afa6a1cf223d6c19739b41c487b1 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 11:24:24 -0500 Subject: [PATCH 252/389] finishing tests for synthetic_population --- .../_helper_functions_for_tests/population.py | 201 +++++- .../popsyn/test_synthetic_population.py | 644 ++++++++++++++++-- 2 files changed, 787 insertions(+), 58 deletions(-) diff --git a/posydon/unit_tests/_helper_functions_for_tests/population.py b/posydon/unit_tests/_helper_functions_for_tests/population.py index 08dfa5d0b3..53c1c2f939 100644 --- a/posydon/unit_tests/_helper_functions_for_tests/population.py +++ b/posydon/unit_tests/_helper_functions_for_tests/population.py @@ -9,12 +9,16 @@ ] import os - import h5py import numpy as np import pandas as pd -from posydon.popsyn.synthetic_population import Population +from posydon.popsyn.synthetic_population import ( + Population, TransientPopulation, Rates +) +from posydon.popsyn.rate_calculation import ( + DEFAULT_SFH_MODEL, get_redshift_bin_centers, get_cosmic_time_from_redshift +) # helper functions @@ -106,11 +110,32 @@ def make_test_pop( # history_lengths = number of rows per binary_index history_lengths_df = history_df.groupby("binary_index").size().to_frame("length") - # ini_parameters - ini_df = pd.DataFrame({ - "Parameter": ["metallicity", "number_of_binaries"], - "Value": [metallicity, len(oneline_df)], - }) + # ini_parameters ā€“ include all keys that _load_ini_params expects + ini_params = { + "metallicity": metallicity, + "number_of_binaries": len(oneline_df), + "binary_fraction_scheme": "const", + "binary_fraction_const": 0.7, + "star_formation": "burst", + "max_simulation_time": 13800000000.0, + "primary_mass_scheme": "Kroupa2001", + "primary_mass_min": 0.01, + "primary_mass_max": 200.0, + "secondary_mass_scheme": "flat_mass_ratio", + "secondary_mass_min": 0.0005, + "secondary_mass_max": 200.0, + "orbital_scheme": "period", + "orbital_period_scheme": "Sana+12_period_extended", + "orbital_period_min": 0.35, + "orbital_period_max": 6000.0, + "orbital_separation_scheme": "log_uniform", + "orbital_separation_min": 5.0, + "orbital_separation_max": 100000.0, + "eccentricity_scheme": "zero", + "posydon_version": "test", + } + ini_df = pd.DataFrame({k: [v] for k, v in ini_params.items()}) + # mass_per_metallicity mass_df = pd.DataFrame( @@ -129,3 +154,165 @@ def make_test_pop( # Return fully initialized Population object return Population(fpath) + +def make_test_transient_pop( + tmp_path, + transient_name="test_transient", + filename="test_population.h5", + oneline_rows=None, + history_rows=None, + transient_rows=None, + metallicity=0.02): + """ + Create a minimally valid TransientPopulation HDF5 file and return + a fully initialized TransientPopulation object. + + Builds on make_test_pop by adding a /transients/{transient_name} table. + + Parameters + ---------- + tmp_path : Path-like + Directory in which the HDF5 file will be created. + transient_name : str + Name for the transient population key. + filename : str + Name of the file to write. + oneline_rows : list[dict], optional + Rows for the /oneline table. + history_rows : list[dict], optional + Rows for the /history table. + transient_rows : list[dict], optional + Rows for the /transients/{transient_name} table. + metallicity : float + Metallicity value. + + Returns + ------- + TransientPopulation + A fully initialized TransientPopulation instance. + """ + pop = make_test_pop( + tmp_path, + filename=filename, + oneline_rows=oneline_rows, + history_rows=history_rows, + metallicity=metallicity, + ) + + if transient_rows is None: + transient_rows = [ + {"time": 100.0, "metallicity": metallicity, "channel": "ch_A"}, + {"time": 200.0, "metallicity": metallicity, "channel": "ch_B"}, + ] + + transient_df = pd.DataFrame(transient_rows) + + with pd.HDFStore(pop.filename, "a") as store: + store.append( + "transients/" + transient_name, + transient_df, + format="table", + min_itemsize={"channel": 100}, + ) + + return TransientPopulation( + pop.filename, transient_name, verbose=False + ) + + +def make_test_rates( + tmp_path, + transient_name="test_transient", + SFH_identifier="test_SFH", + filename="test_population.h5", + oneline_rows=None, + history_rows=None, + transient_rows=None, + metallicity=0.02, + MODEL=None): + """ + Create a minimally valid Rates HDF5 file and return + a fully initialized Rates object. + + Builds on make_test_transient_pop by adding the rates tables: + MODEL, weights, z_events, and birth. + + Parameters + ---------- + tmp_path : Path-like + Directory in which the HDF5 file will be created. + transient_name : str + Name for the transient population key. + SFH_identifier : str + Name for the star formation history identifier. + filename : str + Name of the file to write. + oneline_rows : list[dict], optional + Rows for the /oneline table. + history_rows : list[dict], optional + Rows for the /history table. + transient_rows : list[dict], optional + Rows for the /transients/{transient_name} table. + metallicity : float + Metallicity value. + MODEL : dict, optional + The SFH model dict. If None, uses DEFAULT_SFH_MODEL. + + Returns + ------- + Rates + A fully initialized Rates instance. + """ + tpop = make_test_transient_pop( + tmp_path, + transient_name=transient_name, + filename=filename, + oneline_rows=oneline_rows, + history_rows=history_rows, + transient_rows=transient_rows, + metallicity=metallicity, + ) + + if MODEL is None: + MODEL = dict(DEFAULT_SFH_MODEL) + else: + # Merge user overrides into a copy of the defaults + merged = dict(DEFAULT_SFH_MODEL) + merged.update(MODEL) + MODEL = merged + + n_transients = len(pd.read_hdf(tpop.filename, "transients/" + transient_name)) + + # Compute birth bins from MODEL + z_birth = get_redshift_bin_centers(MODEL["delta_t"]) + t_birth = get_cosmic_time_from_redshift(z_birth) + nr_of_birth_bins = len(z_birth) + + base_path = "/transients/" + transient_name + "/rates/" + SFH_identifier + "/" + + with pd.HDFStore(tpop.filename, "a") as store: + # MODEL table + store.put(base_path + "MODEL", pd.DataFrame(MODEL, index=[0])) + + # birth table + store.put(base_path + "birth", pd.DataFrame({"z": z_birth, "t": t_birth})) + + # weights table: (n_transients x nr_of_birth_bins) with small dummy values + weights = np.full((n_transients, nr_of_birth_bins), 1e-10) + store.append( + base_path + "weights", + pd.DataFrame(data=weights, index=np.arange(n_transients)), + format="table", + ) + + # z_events table: same shape, dummy redshift values + z_events = np.full((n_transients, nr_of_birth_bins), 0.1) + store.append( + base_path + "z_events", + pd.DataFrame(data=z_events, index=np.arange(n_transients)), + format="table", + ) + + return Rates( + tpop.filename, transient_name, SFH_identifier, verbose=False + ) \ No newline at end of file diff --git a/posydon/unit_tests/popsyn/test_synthetic_population.py b/posydon/unit_tests/popsyn/test_synthetic_population.py index 386fdddda4..919275aa9f 100644 --- a/posydon/unit_tests/popsyn/test_synthetic_population.py +++ b/posydon/unit_tests/popsyn/test_synthetic_population.py @@ -25,11 +25,9 @@ import shutil from posydon.unit_tests._helper_functions_for_tests.population import ( - make_ini, - make_test_pop, + make_test_pop, make_ini, make_test_transient_pop, make_test_rates ) - # define test classes collecting several test functions class TestElements: # check for objects, which should be an element of the tested module @@ -588,6 +586,11 @@ def test_population_init(self, tmp_path, monkeypatch): assert isinstance(pop.history, totest.History) assert isinstance(pop.oneline, totest.Oneline) + # Population with formation_channels already in the file + pop.calculate_formation_channels(mt_history=False) + pop_fc = totest.Population(pop.filename) + assert pop_fc.formation_channels is not None + pop_with_metallicity = totest.Population( str(pop.filename), metallicity=0.02, ini_file=str(tmp_path / "dummy.ini") ) @@ -640,6 +643,14 @@ def __len__(self): return 1 df = pd.read_hdf(out_file, "mass_per_metallicity") assert "number_of_systems" in df.columns + # export with formation channels present + pop_fc = make_test_pop(tmp_path, filename="pop_fc.h5") + pop_fc.calculate_formation_channels(mt_history=False) + fc_export = str(tmp_path / "fc_export.h5") + pop_fc.export_selection([0], fc_export, overwrite=True, history_chunksize=1) + with pd.HDFStore(fc_export, "r") as store: + assert "/formation_channels" in store.keys() + # multiple metallicities error class DummyNoMet: columns = ["foo"] @@ -691,57 +702,588 @@ def select(self, start=None, stop=None, columns=None): with pd.HDFStore(pop.filename, "r") as store: assert "/formation_channels" in store.keys() - def test_create_transient_population(self): - # missing argument - # bad input - # examples - pass + # mt_history=True but mt_history_HMS_HMS not in oneline columns + class DummyOnelineNoMT: + columns = ["interp_class_HMS_HMS"] + number_of_systems = 4 + + def select(self, start=None, stop=None, columns=None): + data = [ + {"interp_class_HMS_HMS": "no_MT"}, + {"interp_class_HMS_HMS": "no_MT"}, + {"interp_class_HMS_HMS": "no_MT"}, + {"interp_class_HMS_HMS": "no_MT"}, + ] + selected = data[start:stop] + while len(selected) < (stop - start): + selected.append(data[-1]) + df = pd.DataFrame(selected) + if columns is not None: + df = df[columns] + return df + + pop2 = make_test_pop(tmp_path, filename="pop_nomt.h5") + pop2.oneline = DummyOnelineNoMT() + pop2.chunksize = 2 + with raises(ValueError, match="mt_history_HMS_HMS not saved"): + pop2.calculate_formation_channels(mt_history=True) + + def test_create_transient_population(self, tmp_path): + pop = make_test_pop( + tmp_path, + filename="ctp.h5", + oneline_rows=[ + {"binary_index": 0, "S1_mass_i": 10.0, "S2_mass_i": 5.0, + "state_i": "initial", "metallicity": 0.02, + "interp_class_HMS_HMS": "initial_MT", + "mt_history_HMS_HMS": "Stable"}, + {"binary_index": 1, "S1_mass_i": 8.0, "S2_mass_i": 4.0, + "state_i": "initial", "metallicity": 0.02, + "interp_class_HMS_HMS": "no_MT", + "mt_history_HMS_HMS": None}, + ], + ) + + # bad input: hist_cols missing 'time' + def dummy_func(hist, one, fc): + return pd.DataFrame({"time": [1.0], "metallicity": [0.02]}) + + with raises(ValueError, match="requires a time column"): + pop.create_transient_population( + dummy_func, "bad", hist_cols=["event"] + ) + + # func returns df missing 'time' + def func_no_time(hist, one, fc): + return pd.DataFrame({"metallicity": [0.02]}) + + with raises(ValueError, match="requires a time column"): + pop.create_transient_population( + func_no_time, "bad2", hist_cols=["time", "event"] + ) + + # func returns df missing 'metallicity' + def func_no_met(hist, one, fc): + return pd.DataFrame({"time": [1.0]}) + + with raises(ValueError, match="requires a metallicity column"): + pop.create_transient_population( + func_no_met, "bad3", hist_cols=["time", "event"] + ) + + # func returns df with duplicate columns + def func_dup_cols(hist, one, fc): + df = pd.DataFrame({"time": [1.0], "metallicity": [0.02]}) + df = pd.concat([df, df[["time"]]], axis=1) + return df + + with raises(ValueError, match="duplicate columns"): + pop.create_transient_population( + func_dup_cols, "bad4", hist_cols=["time", "event"] + ) + + # happy path + def good_func(hist, one, fc): + n = len(one) + return pd.DataFrame({ + "time": np.ones(n) * 100.0, + "metallicity": np.ones(n) * 0.02, + "channel": ["ch_A"] * n, + }) + + result = pop.create_transient_population( + good_func, "BBH", hist_cols=["time", "event"] + ) + assert isinstance(result, totest.TransientPopulation) + assert result.transient_name == "BBH" + with pd.HDFStore(pop.filename, "r") as store: + assert "/transients/BBH" in store.keys() + + # default hist_cols and oneline_cols (None) -> uses all columns + result_defaults = pop.create_transient_population( + good_func, "BBH_defaults" + ) + assert isinstance(result_defaults, totest.TransientPopulation) + + # with formation_channels present + pop.calculate_formation_channels(mt_history=False) + result_fc = pop.create_transient_population( + good_func, "BBH_fc", hist_cols=["time", "event"] + ) + assert isinstance(result_fc, totest.TransientPopulation) + + # with oneline_cols specified + result_onecols = pop.create_transient_population( + good_func, "BBH_onecols", + hist_cols=["time", "event"], + oneline_cols=["S1_mass_i", "state_i"], + ) + assert isinstance(result_onecols, totest.TransientPopulation) + + # overwrite existing transient + result2 = pop.create_transient_population( + good_func, "BBH", hist_cols=["time", "event"] + ) + assert isinstance(result2, totest.TransientPopulation) + + # func that returns empty df -> None return + def empty_func(hist, one, fc): + return pd.DataFrame(columns=["time", "metallicity", "channel"]) + + result_none = pop.create_transient_population( + empty_func, "empty_trans", hist_cols=["time", "event"] + ) + assert result_none is None class TestTransientPopulation: - def test_select(self): - # missing argument - # bad input - # examples - pass - def test_calculate_model_weights(self): - # missing argument - # bad input - # examples - pass - def test_calculate_cosmic_weights(self): - # missing argument - # bad input - # examples - pass - def test_efficiency(self): - # missing argument - # bad input - # examples - pass + def test_init(self, tmp_path): + tpop = make_test_transient_pop(tmp_path, filename="tp_init.h5") + assert tpop.transient_name == "test_transient" + + # bad transient name + with raises(ValueError, match="is not a valid transient population"): + totest.TransientPopulation(tpop.filename, "nonexistent") + + def test_select(self, tmp_path): + tpop = make_test_transient_pop(tmp_path, filename="tp_sel.h5") + + # select all + df = tpop.select() + assert isinstance(df, pd.DataFrame) + assert len(df) == 2 + assert "time" in df.columns + assert "metallicity" in df.columns + + # select with start/stop + df_slice = tpop.select(start=0, stop=1) + assert len(df_slice) == 1 + + # select specific columns + df_cols = tpop.select(columns=["time"]) + assert list(df_cols.columns) == ["time"] + + def test_calculate_model_weights(self, tmp_path, monkeypatch): + # Build a population with the columns calculate_model_weights needs + oneline_rows = [ + {"binary_index": 0, "S1_mass_i": 10.0, "S2_mass_i": 5.0, + "orbital_period_i": 3.0, "eccentricity_i": 0.0, + "state_i": "initial", "metallicity": 0.02, + "interp_class_HMS_HMS": "initial_MT", + "mt_history_HMS_HMS": "Stable"}, + {"binary_index": 1, "S1_mass_i": 8.0, "S2_mass_i": 4.0, + "orbital_period_i": 5.0, "eccentricity_i": 0.0, + "state_i": "initial", "metallicity": 0.02, + "interp_class_HMS_HMS": "no_MT", + "mt_history_HMS_HMS": None}, + ] + tpop = make_test_transient_pop( + tmp_path, filename="tp_mw.h5", oneline_rows=oneline_rows, + ) + + # Monkeypatch calculate_model_weights to return known values + def mock_calc_weights(pop_data, M_sim, simulation_parameters, + population_parameters): + return np.ones(len(pop_data)) * 0.5 + + monkeypatch.setattr( + "posydon.popsyn.synthetic_population.calculate_model_weights", + mock_calc_weights, + ) + + result = tpop.calculate_model_weights("test_weights") + assert isinstance(result, pd.DataFrame) + assert "test_weights" in result.columns + assert len(result) == 2 + assert (result["test_weights"] == 0.5).all() + + # Verify it was stored in the HDF5 file + with pd.HDFStore(tpop.filename, "r") as store: + key = "/transients/test_transient/weights/test_weights" + assert key in store.keys() + + # Overwrite warning on second call + result2 = tpop.calculate_model_weights("test_weights") + assert isinstance(result2, pd.DataFrame) + + # Custom simulation_parameters triggers warning for unknown key + with warns(match="not found in the population"): + tpop.calculate_model_weights( + "test_weights2", + simulation_parameters={"fake_key": 999}, + ) + + # Custom population_parameters (exercises the non-None branch) + custom_pop_params = { + 'number_of_binaries': 100, + 'binary_fraction_scheme': 'const', + 'binary_fraction_const': 0.5, + 'star_formation': 'burst', + 'max_simulation_time': 13800000000.0, + 'primary_mass_scheme': 'Kroupa2001', + 'primary_mass_min': 0.01, + 'primary_mass_max': 200, + 'secondary_mass_scheme': 'flat_mass_ratio', + 'secondary_mass_min': 0.0005, + 'secondary_mass_max': 200, + 'orbital_scheme': 'period', + 'orbital_period_scheme': 'Sana+12_period_extended', + 'orbital_period_min': 0.35, + 'orbital_period_max': 6e3, + 'eccentricity_scheme': 'zero', + } + result3 = tpop.calculate_model_weights( + "test_weights3", population_parameters=custom_pop_params, + ) + assert isinstance(result3, pd.DataFrame) + + def test_calculate_cosmic_weights(self, tmp_path, monkeypatch): + oneline_rows = [ + {"binary_index": 0, "S1_mass_i": 10.0, "S2_mass_i": 5.0, + "orbital_period_i": 3.0, "eccentricity_i": 0.0, + "state_i": "initial", "metallicity": 0.02, + "interp_class_HMS_HMS": "initial_MT", + "mt_history_HMS_HMS": "Stable"}, + {"binary_index": 1, "S1_mass_i": 8.0, "S2_mass_i": 4.0, + "orbital_period_i": 5.0, "eccentricity_i": 0.0, + "state_i": "initial", "metallicity": 0.02, + "interp_class_HMS_HMS": "no_MT", + "mt_history_HMS_HMS": None}, + ] + tpop = make_test_transient_pop( + tmp_path, filename="tp_cw.h5", oneline_rows=oneline_rows, + ) + + # First, store model weights (required by calculate_cosmic_weights) + def mock_calc_weights(pop_data, M_sim, simulation_parameters, + population_parameters): + return np.ones(len(pop_data)) * 0.5 + + monkeypatch.setattr( + "posydon.popsyn.synthetic_population.calculate_model_weights", + mock_calc_weights, + ) + tpop.calculate_model_weights("mw1") + + # Call calculate_cosmic_weights + rates = tpop.calculate_cosmic_weights("SFH_test", "mw1") + assert isinstance(rates, totest.Rates) + assert rates.SFH_identifier == "SFH_test" + + # Verify HDF5 structure + with pd.HDFStore(tpop.filename, "r") as store: + base = "/transients/test_transient/rates/SFH_test/" + assert base + "MODEL" in store.keys() + assert base + "weights" in store.keys() + assert base + "z_events" in store.keys() + assert base + "birth" in store.keys() + + # Bad model_weights identifier + with raises(ValueError, match="Model weights not present"): + tpop.calculate_cosmic_weights("SFH2", "nonexistent_weights") + + # Overwrite on second call + rates2 = tpop.calculate_cosmic_weights("SFH_test", "mw1") + assert isinstance(rates2, totest.Rates) + + # Custom MODEL_in (exercises the MODEL_in is not None branch) + rates3 = tpop.calculate_cosmic_weights( + "SFH_custom", "mw1", + MODEL_in={"delta_t": 200}, + ) + assert isinstance(rates3, totest.Rates) + assert rates3.MODEL["delta_t"] == 200 + + def test_efficiency(self, tmp_path, monkeypatch): + oneline_rows = [ + {"binary_index": 0, "S1_mass_i": 10.0, "S2_mass_i": 5.0, + "orbital_period_i": 3.0, "eccentricity_i": 0.0, + "state_i": "initial", "metallicity": 0.02, + "interp_class_HMS_HMS": "initial_MT", + "mt_history_HMS_HMS": "Stable"}, + {"binary_index": 1, "S1_mass_i": 8.0, "S2_mass_i": 4.0, + "orbital_period_i": 5.0, "eccentricity_i": 0.0, + "state_i": "initial", "metallicity": 0.02, + "interp_class_HMS_HMS": "no_MT", + "mt_history_HMS_HMS": None}, + ] + transient_rows = [ + {"time": 100.0, "metallicity": 0.02, "channel": "ch_A"}, + {"time": 200.0, "metallicity": 0.02, "channel": "ch_B"}, + ] + tpop = make_test_transient_pop( + tmp_path, filename="tp_eff.h5", + oneline_rows=oneline_rows, + transient_rows=transient_rows, + ) + + # Store model weights + def mock_calc_weights(pop_data, M_sim, simulation_parameters, + population_parameters): + return np.ones(len(pop_data)) * 0.5 + + monkeypatch.setattr( + "posydon.popsyn.synthetic_population.calculate_model_weights", + mock_calc_weights, + ) + tpop.calculate_model_weights("eff_weights") + + # Without channels + eff = tpop.efficiency("eff_weights", channels=False) + assert isinstance(eff, pd.DataFrame) + assert "total" in eff.columns + assert len(eff) == 1 # one metallicity + assert eff["total"].iloc[0] > 0 + + # With channels + eff_ch = tpop.efficiency("eff_weights", channels=True) + assert "total" in eff_ch.columns + assert "ch_A" in eff_ch.columns + assert "ch_B" in eff_ch.columns class TestRates: - def test_select_rate_slice(self): - # missing argument - # bad input - # examples - pass - def test_calculate_intrinsic_rate_density(self): - # missing argument - # bad input - # examples - pass - def test_calculate_observable_population(self): - # missing argument - # bad input - # examples - pass - def test_observable_population(self): - # missing argument - # bad input - # examples - pass - def test_edges_metallicity_bins(self): - # TODO: needs Rates object setup - pass + def test_init(self, tmp_path): + rates = make_test_rates(tmp_path, filename="rates_init.h5") + assert rates.SFH_identifier == "test_SFH" + assert rates.transient_name == "test_transient" + assert hasattr(rates, "MODEL") + + # bad SFH_identifier + with raises(ValueError, match="is not a valid SFH_identifier"): + totest.Rates(rates.filename, "test_transient", "nonexistent") + + def test_select_rate_slice(self, tmp_path): + rates = make_test_rates(tmp_path, filename="rates_srs.h5") + + # bad key + with raises(ValueError, match="key not in"): + rates.select_rate_slice("invalid_key") + + # valid keys + w = rates.select_rate_slice("weights") + assert isinstance(w, pd.DataFrame) + assert len(w) == 2 + + z = rates.select_rate_slice("z_events") + assert isinstance(z, pd.DataFrame) + assert len(z) == 2 + + b = rates.select_rate_slice("birth") + assert isinstance(b, pd.DataFrame) + assert "z" in b.columns + assert "t" in b.columns + + # with start/stop + w_slice = rates.select_rate_slice("weights", start=0, stop=1) + assert len(w_slice) == 1 + + def test_calculate_intrinsic_rate_density(self, tmp_path): + rates = make_test_rates(tmp_path, filename="rates_ird.h5") + + result = rates.calculate_intrinsic_rate_density(channels=False) + assert isinstance(result, pd.DataFrame) + assert "total" in result.columns + assert len(result) > 0 + + # Stored in file + with pd.HDFStore(rates.filename, "r") as store: + assert rates.base_path + "intrinsic_rate_density" in store.keys() + + # Access via property + stored = rates.intrinsic_rate_density + pd.testing.assert_frame_equal(stored, result) + + def test_calculate_intrinsic_rate_density_channels(self, tmp_path): + rates = make_test_rates(tmp_path, filename="rates_ird_ch.h5") + + result = rates.calculate_intrinsic_rate_density(channels=True) + assert "total" in result.columns + + def test_intrinsic_rate_density_not_computed(self, tmp_path): + rates = make_test_rates(tmp_path, filename="rates_ird_nc.h5") + + # Property should raise before computing + with raises(ValueError, match="First you need to compute"): + _ = rates.intrinsic_rate_density + + def test_calculate_observable_population(self, tmp_path): + rates = make_test_rates(tmp_path, filename="rates_cop.h5") + + # Simple observable func: halve the weights + def obs_func(transient_chunk, z_events_chunk, weights_chunk): + return weights_chunk * 0.5 + + rates.calculate_observable_population(obs_func, "test_obs") + + # Verify stored + with pd.HDFStore(rates.filename, "r") as store: + key = ("/transients/test_transient/rates/observable/test_obs") + assert key in store.keys() + + # Overwrite on second call + rates.calculate_observable_population(obs_func, "test_obs") + + def test_observable_population(self, tmp_path): + rates = make_test_rates(tmp_path, filename="rates_op.h5") + + # Not yet computed -> ValueError + with raises(ValueError, match="is not a valid observable population"): + rates.observable_population("nonexistent") + + # Compute, then retrieve + def obs_func(transient_chunk, z_events_chunk, weights_chunk): + return weights_chunk * 0.5 + + rates.calculate_observable_population(obs_func, "obs1") + result = rates.observable_population("obs1") + assert isinstance(result, pd.DataFrame) + assert len(result) == 2 + + def test_observable_population_names(self, tmp_path): + rates = make_test_rates(tmp_path, filename="rates_opn.h5") + + # No observables yet + assert rates.observable_population_names == [] + + # Add one + def obs_func(transient_chunk, z_events_chunk, weights_chunk): + return weights_chunk * 0.5 + + rates.calculate_observable_population(obs_func, "obs_A") + names = rates.observable_population_names + assert "obs_A" in names + + def test_edges_metallicity_bins(self, tmp_path): + # Multiple metallicities + transient_rows = [ + {"time": 100.0, "metallicity": 0.01, "channel": "ch_A"}, + {"time": 200.0, "metallicity": 0.02, "channel": "ch_B"}, + ] + oneline_rows = [ + {"binary_index": 0, "S1_mass_i": 10.0, "S2_mass_i": 5.0, + "state_i": "initial", "metallicity": 0.01, + "interp_class_HMS_HMS": "initial_MT", + "mt_history_HMS_HMS": "Stable"}, + {"binary_index": 1, "S1_mass_i": 8.0, "S2_mass_i": 4.0, + "state_i": "initial", "metallicity": 0.02, + "interp_class_HMS_HMS": "no_MT", + "mt_history_HMS_HMS": None}, + ] + mass_met_rows = { + "simulated_mass": [1.0, 1.0], + "number_of_systems": [1, 1], + } + # Build file manually for multi-metallicity + pop = make_test_pop( + tmp_path, filename="rates_emb.h5", + oneline_rows=oneline_rows, metallicity=0.01, + ) + # Overwrite mass_per_metallicity with two entries + mass_df = pd.DataFrame(mass_met_rows, index=[0.01, 0.02]) + with pd.HDFStore(pop.filename, "a") as store: + store.put("mass_per_metallicity", mass_df, format="table") + + # Add transient + transient_df = pd.DataFrame(transient_rows) + with pd.HDFStore(pop.filename, "a") as store: + store.append( + "transients/test_transient", transient_df, + format="table", min_itemsize={"channel": 100}, + ) + + # Add rates structure + from posydon.popsyn.rate_calculation import ( + DEFAULT_SFH_MODEL, get_redshift_bin_centers, + get_cosmic_time_from_redshift, + ) + MODEL = dict(DEFAULT_SFH_MODEL) + z_birth = get_redshift_bin_centers(MODEL["delta_t"]) + t_birth = get_cosmic_time_from_redshift(z_birth) + nr = len(z_birth) + base = "/transients/test_transient/rates/test_SFH/" + with pd.HDFStore(pop.filename, "a") as store: + store.put(base + "MODEL", pd.DataFrame(MODEL, index=[0])) + store.put(base + "birth", pd.DataFrame({"z": z_birth, "t": t_birth})) + store.append(base + "weights", + pd.DataFrame(np.ones((2, nr))), format="table") + store.append(base + "z_events", + pd.DataFrame(np.full((2, nr), 0.1)), format="table") + + rates = totest.Rates(pop.filename, "test_transient", "test_SFH") + + edges = rates.edges_metallicity_bins + assert len(edges) == 3 # 2 metallicities -> 3 edges + assert edges[0] < edges[1] < edges[2] + + # Single metallicity with dlogZ = None + rates_single = make_test_rates( + tmp_path, filename="rates_emb_single.h5", + ) + edges_single = rates_single.edges_metallicity_bins + assert len(edges_single) == 2 + # dlogZ=None -> edges are 10**(-9) and 10**(0) + assert np.isclose(edges_single[0], 10**(-9)) + assert np.isclose(edges_single[1], 10**(0)) + + # Single metallicity with dlogZ = float + rates_dlogz = make_test_rates( + tmp_path, filename="rates_emb_dlogz.h5", + MODEL={"dlogZ": 0.5}, + ) + edges_dlogz = rates_dlogz.edges_metallicity_bins + assert len(edges_dlogz) == 2 + + # Single metallicity with dlogZ = list (exercises the list branch) + rates_dlogz_list = make_test_rates( + tmp_path, filename="rates_emb_dlogz_list.h5", + MODEL={"dlogZ": [-2.0, -1.0]}, + ) + # Manually overwrite the MODEL table with multi-row format + # to exercise the len(tmp_df) > 1 branch in _read_MODEL_data + # and the isinstance(dlogZ, list) branch in edges_metallicity_bins + base = rates_dlogz_list.base_path + with pd.HDFStore(rates_dlogz_list.filename, "a") as store: + model_data = {k: [v, v] for k, v in rates_dlogz_list.MODEL.items()} + model_data["dlogZ"] = [-2.0, -1.0] + store.put(base + "MODEL", pd.DataFrame(model_data)) + + # Re-read to trigger the multi-row branch + rates_multi_model = totest.Rates( + rates_dlogz_list.filename, "test_transient", "test_SFH" + ) + assert isinstance(rates_multi_model.MODEL["dlogZ"], list) + edges_list = rates_multi_model.edges_metallicity_bins + assert len(edges_list) == 2 + assert np.isclose(edges_list[0], 10**(-2.0)) + assert np.isclose(edges_list[1], 10**(-1.0)) + + def test_z_birth_property(self, tmp_path): + rates = make_test_rates(tmp_path, filename="rates_zb.h5") + zb = rates.z_birth + assert isinstance(zb, pd.DataFrame) + assert "z" in zb.columns + assert "t" in zb.columns + + def test_z_events_property(self, tmp_path): + rates = make_test_rates(tmp_path, filename="rates_ze.h5") + ze = rates.z_events + assert isinstance(ze, pd.DataFrame) + assert len(ze) == 2 + + def test_edges_redshift_bins(self, tmp_path): + rates = make_test_rates(tmp_path, filename="rates_erb.h5") + edges = rates.edges_redshift_bins + assert len(edges) > 0 + assert edges[0] >= 0 + + def test_centers_redshift_bins(self, tmp_path): + rates = make_test_rates(tmp_path, filename="rates_crb.h5") + centers = rates.centers_redshift_bins + assert len(centers) > 0 + + def test_centers_metallicity_bins(self, tmp_path): + rates = make_test_rates(tmp_path, filename="rates_cmb.h5") + centers = rates.centers_metallicity_bins + assert len(centers) == 1 + assert np.isclose(centers[0], 0.02 * totest.Zsun) \ No newline at end of file From a7246a612813f24705355d669637faeac6ec9f27 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 11:36:42 -0500 Subject: [PATCH 253/389] fix small issue with rates helper function --- posydon/popsyn/synthetic_population.py | 2 +- .../unit_tests/_helper_functions_for_tests/population.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/posydon/popsyn/synthetic_population.py b/posydon/popsyn/synthetic_population.py index bb97f3b382..62f7c4750c 100644 --- a/posydon/popsyn/synthetic_population.py +++ b/posydon/popsyn/synthetic_population.py @@ -1915,7 +1915,7 @@ def calculate_model_weights(self, model_weights_identifier, population_parameter else: # check for different parameters for key in simulation_parameters.keys(): - if key not in self.ini_params: + if key not in self.ini_params: # pragma: no branch Pwarn((f"Parameter {key} not found in the population" " parameters! Make sure this is intended"), "POSYDONWarning") diff --git a/posydon/unit_tests/_helper_functions_for_tests/population.py b/posydon/unit_tests/_helper_functions_for_tests/population.py index 53c1c2f939..8de445ea15 100644 --- a/posydon/unit_tests/_helper_functions_for_tests/population.py +++ b/posydon/unit_tests/_helper_functions_for_tests/population.py @@ -291,8 +291,11 @@ def make_test_rates( base_path = "/transients/" + transient_name + "/rates/" + SFH_identifier + "/" with pd.HDFStore(tpop.filename, "a") as store: - # MODEL table - store.put(base_path + "MODEL", pd.DataFrame(MODEL, index=[0])) + # MODEL table ā€” mirror _write_MODEL_data logic for dlogZ lists + if (MODEL["dlogZ"] is not None) and (not isinstance(MODEL["dlogZ"], float)): + store.put(base_path + "MODEL", pd.DataFrame(MODEL)) + else: + store.put(base_path + "MODEL", pd.DataFrame(MODEL, index=[0])) # birth table store.put(base_path + "birth", pd.DataFrame({"z": z_birth, "t": t_birth})) From 6fa63f695286ad668254246110572a901ac409df Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 11:47:41 -0500 Subject: [PATCH 254/389] finish coverage of synthetic population test --- posydon/popsyn/synthetic_population.py | 12 ++++++------ .../popsyn/test_synthetic_population.py | 17 ++++++++++++++++- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/posydon/popsyn/synthetic_population.py b/posydon/popsyn/synthetic_population.py index 62f7c4750c..d33f028940 100644 --- a/posydon/popsyn/synthetic_population.py +++ b/posydon/popsyn/synthetic_population.py @@ -2063,11 +2063,11 @@ def calculate_cosmic_weights(self, SFH_identifier, model_weights, MODEL_in=None) store.remove(path_in_file + "MODEL") if self.verbose: # pragma: no cover print("Cosmic weights already computed! Overwriting them!") - if path_in_file + "weights" in store.keys(): + if path_in_file + "weights" in store.keys(): # pragma: no branch store.remove(path_in_file + "weights") - if path_in_file + "z_events" in store.keys(): + if path_in_file + "z_events" in store.keys(): # pragma: no branch store.remove(path_in_file + "z_events") - if path_in_file + "birth" in store.keys(): + if path_in_file + "birth" in store.keys(): # pragma: no branch store.remove(path_in_file + "birth") self._write_MODEL_data(self.filename, path_in_file, MODEL) @@ -2831,12 +2831,12 @@ def edges_metallicity_bins(self): met_val = np.log10(self.centers_metallicity_bins) bin_met = np.zeros(len(met_val) + 1) # if more than one metallicty bin - if len(met_val) > 1: + if len(met_val) > 1: bin_met[0] = met_val[0] - (met_val[1] - met_val[0]) / 2.0 bin_met[-1] = met_val[-1] + (met_val[-1] - met_val[-2]) / 2.0 bin_met[1:-1] = met_val[:-1] + (met_val[1:] - met_val[:-1]) / 2.0 # one metallicty bin - elif len(met_val) == 1: + elif len(met_val) == 1: # pragma: no branch if self.MODEL["dlogZ"] is None: bin_met[0] = -9 bin_met[-1] = 0 @@ -2845,7 +2845,7 @@ def edges_metallicity_bins(self): bin_met[-1] = met_val[0] + self.MODEL["dlogZ"] / 2.0 elif isinstance(self.MODEL["dlogZ"], list) or isinstance( self.MODEL["dlogZ"], np.array - ): + ): # pragma: no branch bin_met[0] = self.MODEL["dlogZ"][0] bin_met[-1] = self.MODEL["dlogZ"][1] diff --git a/posydon/unit_tests/popsyn/test_synthetic_population.py b/posydon/unit_tests/popsyn/test_synthetic_population.py index 919275aa9f..d170a0efa3 100644 --- a/posydon/unit_tests/popsyn/test_synthetic_population.py +++ b/posydon/unit_tests/popsyn/test_synthetic_population.py @@ -560,10 +560,25 @@ def test_population_init(self, tmp_path, monkeypatch): # /history and /oneline exist, yes ini_parameters, no mass_per_metallicity filename_no_mass = os.path.join(tmp_path, "pop_no_mass.h5") + full_ini = pd.DataFrame({ + "metallicity": [0.02], "number_of_binaries": [1], + "binary_fraction_scheme": ["const"], "binary_fraction_const": [0.7], + "star_formation": ["burst"], "max_simulation_time": [13800000000.0], + "primary_mass_scheme": ["Kroupa2001"], + "primary_mass_min": [0.01], "primary_mass_max": [200.0], + "secondary_mass_scheme": ["flat_mass_ratio"], + "secondary_mass_min": [0.0005], "secondary_mass_max": [200.0], + "orbital_scheme": ["period"], + "orbital_period_scheme": ["Sana+12_period_extended"], + "orbital_period_min": [0.35], "orbital_period_max": [6000.0], + "orbital_separation_scheme": ["log_uniform"], + "orbital_separation_min": [5.0], "orbital_separation_max": [100000.0], + "eccentricity_scheme": ["zero"], "posydon_version": ["test"], + }) with pd.HDFStore(filename_no_mass, "w") as store: store.put("history", history_df, format="table") store.put("oneline", oneline_df, format="table") - store.put("ini_parameters", pd.DataFrame({"Parameter": ["metallicity"], "Value": [0.02]}), format="table") + store.put("ini_parameters", full_ini, format="table") with raises(ValueError, match='does not contain a mass_per_metallicity table'): totest.Population(str(filename_no_mass)) From a2d2dea3446fe6a629988a56d50df36f3b87f813 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 13:00:28 -0500 Subject: [PATCH 255/389] cleaning up annoying warnings --- .../popsyn/test_synthetic_population.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/posydon/unit_tests/popsyn/test_synthetic_population.py b/posydon/unit_tests/popsyn/test_synthetic_population.py index d170a0efa3..a357bc3ee9 100644 --- a/posydon/unit_tests/popsyn/test_synthetic_population.py +++ b/posydon/unit_tests/popsyn/test_synthetic_population.py @@ -583,9 +583,24 @@ def test_population_init(self, tmp_path, monkeypatch): totest.Population(str(filename_no_mass)) # metallicity specified + mock_ini_params = { + "metallicity": 0.02, "number_of_binaries": 1, + "binary_fraction_scheme": "const", "binary_fraction_const": 0.7, + "star_formation": "burst", "max_simulation_time": 13800000000.0, + "primary_mass_scheme": "Kroupa2001", + "primary_mass_min": 0.01, "primary_mass_max": 200.0, + "secondary_mass_scheme": "flat_mass_ratio", + "secondary_mass_min": 0.0005, "secondary_mass_max": 200.0, + "orbital_scheme": "period", + "orbital_period_scheme": "Sana+12_period_extended", + "orbital_period_min": 0.35, "orbital_period_max": 6000.0, + "orbital_separation_scheme": "log_uniform", + "orbital_separation_min": 5.0, "orbital_separation_max": 100000.0, + "eccentricity_scheme": "zero", "posydon_version": "test", + } monkeypatch.setattr( "posydon.popsyn.synthetic_population.binarypop_kwargs_from_ini", - lambda ini_file: {"dummy_param": 1}, + lambda ini_file: dict(mock_ini_params), ) pop_with_metallicity = totest.Population( From 79444d7a14b5be102b5c4003515f6dd3c9df7f95 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 13:15:40 -0500 Subject: [PATCH 256/389] update to remove tests for things that have been removed --- posydon/unit_tests/popsyn/test_io.py | 66 ++-------------------------- 1 file changed, 3 insertions(+), 63 deletions(-) diff --git a/posydon/unit_tests/popsyn/test_io.py b/posydon/unit_tests/popsyn/test_io.py index 0857e0bd5f..7e3dac8fec 100644 --- a/posydon/unit_tests/popsyn/test_io.py +++ b/posydon/unit_tests/popsyn/test_io.py @@ -37,12 +37,11 @@ def test_dir(self): 'EXTRA_STAR_COLUMNS_DTYPES', 'SCALAR_NAMES_DTYPES', \ 'clean_binary_history_df', 'clean_binary_oneline_df', \ 'parse_inifile', 'simprop_kwargs_from_ini', \ - 'binarypop_kwargs_from_ini', 'create_run_script_text', \ - 'create_merge_script_text', \ + 'binarypop_kwargs_from_ini', \ '__builtins__', '__cached__', '__doc__', '__file__',\ '__loader__', '__name__', '__package__', '__spec__', \ 'ConfigParser', 'ast', 'importlib', 'os', 'errno', \ - 'pprint', 'np', 'pd','SimulationProperties'] + 'pprint', 'np', 'pd',] totest_elements = set(dir(totest)) missing_in_test = set(elements) - totest_elements assert len(missing_in_test) == 0, "There are missing objects in "\ @@ -391,63 +390,4 @@ def __init__(self, **kwargs): monkeypatch.delenv('SLURM_ARRAY_JOB_ID', raising=False) binkwargs = totest.binarypop_kwargs_from_ini(binpop_ini) assert binkwargs['RANK'] is None - assert binkwargs['size'] is None - - - def test_create_run_script_text(self): - # missing argument - with raises(TypeError, match="missing 1 required positional argument: 'ini_file'"): - totest.create_run_script_text() - # bad input - with raises(NameError, match="name 'testfile' is not defined"): - totest.create_run_script_text(testfile.ini) - # example - out = textwrap.dedent("""\ - from posydon.popsyn.binarypopulation import BinaryPopulation - from posydon.popsyn.io import binarypop_kwargs_from_ini - from posydon.utils.common_functions import convert_metallicity_to_string - import argparse - if __name__ == "__main__": - parser = argparse.ArgumentParser() - parser.add_argument('metallicity', type=float) - args = parser.parse_args() - ini_kw = binarypop_kwargs_from_ini('testfile.ini') - ini_kw['metallicity'] = args.metallicity - str_met = convert_metallicity_to_string(args.metallicity) - ini_kw['temp_directory'] = str_met+'_Zsun_' + ini_kw['temp_directory'] - synpop = BinaryPopulation(**ini_kw) - synpop.evolve()""") - assert totest.create_run_script_text('testfile.ini') == out - - - def test_create_merge_script_text(self): - # missing argument - with raises(TypeError, match="missing 1 required positional argument: 'ini_file'"): - totest.create_merge_script_text() - # bad input - with raises(NameError, match="name 'testfile' is not defined"): - totest.create_merge_script_text(testfile.ini) - # example - out = textwrap.dedent("""\ - from posydon.popsyn.binarypopulation import BinaryPopulation - from posydon.popsyn.io import binarypop_kwargs_from_ini - from posydon.utils.common_functions import convert_metallicity_to_string - import argparse - import os - if __name__ == "__main__": - parser = argparse.ArgumentParser() - parser.add_argument("metallicity", type=float) - args = parser.parse_args() - ini_kw = binarypop_kwargs_from_ini("testfile.ini") - ini_kw["metallicity"] = args.metallicity - str_met = convert_metallicity_to_string(args.metallicity) - ini_kw["temp_directory"] = str_met+"_Zsun_" + ini_kw["temp_directory"] - synpop = BinaryPopulation(**ini_kw) - path_to_batch = ini_kw["temp_directory"] - tmp_files = [os.path.join(path_to_batch, f) for f in os.listdir(path_to_batch) if os.path.isfile(os.path.join(path_to_batch, f))] - tmp_files = sorted(tmp_files, key=lambda x: int(x.split(".")[-1])) - synpop.combine_saved_files(str_met+ "_Zsun_population.h5", tmp_files) - print("done") - if len(os.listdir(path_to_batch)) == 0: - os.rmdir(path_to_batch)""") - assert totest.create_merge_script_text('testfile.ini') == out + assert binkwargs['size'] is None \ No newline at end of file From 063a5c33c6b9f1db7801c00b448364d867d2bb48 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 13:44:05 -0500 Subject: [PATCH 257/389] update independent_sample test to reflect changes to distributions, and update coverage --- posydon/popsyn/independent_sample.py | 9 +- .../popsyn/test_independent_sample.py | 288 ++++++++++-------- 2 files changed, 173 insertions(+), 124 deletions(-) diff --git a/posydon/popsyn/independent_sample.py b/posydon/popsyn/independent_sample.py index dae547830c..aa46f2f7af 100644 --- a/posydon/popsyn/independent_sample.py +++ b/posydon/popsyn/independent_sample.py @@ -59,7 +59,8 @@ def generate_independent_samples(orbital_scheme='period', **kwargs): # Generate primary masses m1_set = generate_primary_masses(**kwargs) - if use_Moe_17_PsandQs(orbital_scheme=orbital_scheme, **kwargs): + if use_Moe_17_PsandQs(orbital_scheme=orbital_scheme, **kwargs): # pragma: no cover + # this requires an integration test with actual external datafiles. No unit test # initialize generator for Moe+17-PsandQs if _gen_Moe_17_PsandQs is None: _gen_Moe_17_PsandQs = Moe_17_PsandQs(**kwargs) @@ -133,7 +134,7 @@ def generate_orbital_periods(primary_masses, orbital_period_max=10**3.5, orbital_period_scheme='Sana+12_period_extended', **kwargs): - """Randomaly generate orbital periods for a sample of binaries.""" + """Randomly generate orbital periods for a sample of binaries.""" RNG = kwargs.get('RNG', np.random.default_rng()) # Check inputs @@ -145,7 +146,7 @@ def generate_orbital_periods(primary_masses, p_max=orbital_period_max ) orbital_periods = period_dist.rvs(size=number_of_binaries, m1=primary_masses, rng=RNG) - else: # pragma: no cover + else: raise ValueError("You must provide an allowed orbital period scheme.") return orbital_periods @@ -410,8 +411,6 @@ def generate_binary_fraction(m1=None, binary_fraction_const=1, elif not isinstance(m1,np.ndarray): m1 = np.asarray(m1) binary_fraction = np.zeros_like(m1, dtype=float) - else: - pass # Input parameter checks if binary_fraction_scheme not in binary_fraction_scheme_options: diff --git a/posydon/unit_tests/popsyn/test_independent_sample.py b/posydon/unit_tests/popsyn/test_independent_sample.py index 7632d1b972..e465b949da 100644 --- a/posydon/unit_tests/popsyn/test_independent_sample.py +++ b/posydon/unit_tests/popsyn/test_independent_sample.py @@ -24,11 +24,13 @@ class TestElements: # check for objects, which should be an element of the tested module def test_dir(self): - elements = ['generate_independent_samples', 'generate_orbital_periods', \ + elements = ['generate_independent_samples', 'use_Moe_17_PsandQs', \ + '_gen_Moe_17_PsandQs','generate_orbital_periods', \ 'generate_orbital_separations', 'generate_eccentricities',\ 'generate_primary_masses','generate_secondary_masses',\ - 'binary_fraction_value','__authors__',\ + 'generate_binary_fraction','__authors__',\ 'np','truncnorm','rejection_sampler',\ + 'IMFs','distributions','Moe_17_PsandQs',\ '__builtins__', '__cached__', '__doc__', '__file__',\ '__loader__', '__name__', '__package__', '__spec__'] totest_elements = set(dir(totest)) @@ -46,27 +48,6 @@ def test_dir(self): +"added on purpose and update this "\ +"unit test." - def test_instance_generate_independent_samples(self): - assert isroutine(totest.generate_independent_samples) - - def test_instance_generate_orbital_periods(self): - assert isroutine(totest.generate_orbital_periods) - - def test_instance_generate_orbital_separations(self): - assert isroutine(totest.generate_orbital_separations) - - def test_instance_generate_eccentricities(self): - assert isroutine(totest.generate_eccentricities) - - def test_instance_generate_primary_masses(self): - assert isroutine(totest.generate_primary_masses) - - def test_instance_generate_secondary_masses(self): - assert isroutine(totest.generate_secondary_masses) - - def test_instance_binary_fraction_value(self): - assert isroutine(totest.binary_fraction_value) - class TestFunctions: # test functions @@ -74,26 +55,68 @@ def test_generate_independent_samples(self): # bad input with raises(ValueError, match="Allowed orbital schemes are separation or period."): totest.generate_independent_samples('test') - # examples - tests = [("separation",42,approx(4993.106338349307,abs=6e-12)), - ("period",12,approx(200.82071793763188,abs=6e-12))] - for (s,r,o) in tests: - orb,ecc,m1,m2 = totest.generate_independent_samples(orbital_scheme=s, - RNG = np.random.default_rng(seed=42)) - assert orb[0] == approx(o,abs=6e-12) - assert ecc[0] == approx(0.8797477186989253,abs=6e-12) - assert m1[0] == approx(10.607132832170066,abs=6e-12) - assert m2[0] == approx(9.182255718237206,abs=6e-12) + + # bad mass ranges + with raises(ValueError, match="primary_mass_max must be larger than primary_mass_min."): + totest.generate_independent_samples( + 'period', primary_mass_min=200, primary_mass_max=10, + RNG=np.random.default_rng(seed=42)) + + with raises(ValueError, match="secondary_mass_max must be larger than secondary_mass_min."): + totest.generate_independent_samples( + 'period', secondary_mass_min=200, secondary_mass_max=10, + RNG=np.random.default_rng(seed=42)) + # separation scheme + orb, ecc, m1, m2 = totest.generate_independent_samples( + orbital_scheme='separation', + RNG=np.random.default_rng(seed=42)) + assert orb[0] == approx(24650.481799781122,abs=6e-12) + assert ecc[0] == approx(0.8350856417514098,abs=6e-12) + assert m1[0] == approx(19.97764511120556,abs=6e-12) + assert m2[0] == approx(9.328252086070083,abs=6e-12) + assert isinstance(orb, np.ndarray) + assert len(orb) == 1 + assert all(np.isfinite(m1)) + + # period scheme (default) + orb_p, ecc_p, m1_p, m2_p = totest.generate_independent_samples( + orbital_scheme='period', + RNG=np.random.default_rng(seed=42)) + assert orb_p[0] == approx(872.213878458193,abs=6e-12) + assert ecc_p[0] == approx(0.7259611833901314,abs=6e-12) + assert m1_p[0] == approx(19.97764511120556,abs=6e-12) + assert m2_p[0] == approx(9.328252086070083,abs=6e-12) + assert isinstance(orb_p, np.ndarray) + assert len(orb_p) == 1 + assert all(np.isfinite(m1_p)) + + def test_use_Moe_17_PsandQs(self): + + # returns True for Moe+17-PsandQs secondary_mass_scheme + assert totest.use_Moe_17_PsandQs(secondary_mass_scheme='Moe+17-PsandQs') is True + + # returns True for Moe+17-PsandQs orbital_period_scheme with period scheme + assert totest.use_Moe_17_PsandQs( + orbital_scheme='period', + orbital_period_scheme='Moe+17-PsandQs') is True + + # returns True for Moe+17-PsandQs eccentricity_scheme + assert totest.use_Moe_17_PsandQs(eccentricity_scheme='Moe+17-PsandQs') is True + # returns False for non-Moe schemes + assert totest.use_Moe_17_PsandQs( + secondary_mass_scheme='flat_mass_ratio', + orbital_scheme='period', + orbital_period_scheme='Sana+12_period_extended', + eccentricity_scheme='zero') is False + def test_generate_orbital_periods(self): # missing argument with raises(TypeError, match="missing 1 required positional argument: 'primary_masses'"): totest.generate_orbital_periods() + # bad input - with raises(TypeError, match="expected a sequence of integers or a single integer"): - totest.generate_orbital_periods(np.array([1.]), - number_of_binaries=1.) - with raises(ValueError, match="high - low < 0"): + with raises(ValueError, match="p_max must be greater than p_min"): totest.generate_orbital_periods(np.array([1.]), orbital_period_min=10., orbital_period_max=1.) @@ -107,35 +130,46 @@ def test_generate_orbital_periods(self): assert totest.generate_orbital_periods(m,RNG = np.random.default_rng(seed=r))[0] == p def test_generate_orbital_separations(self): - # missing argument - with raises(ValueError,match="For the `log_normal separation` scheme you must give `log_orbital_separation_mean`, `log_orbital_separation_sigma`."): + # missing log_normal params + with raises(ValueError, match="For the `log_normal separation` scheme you must give"): totest.generate_orbital_separations(orbital_separation_scheme='log_normal') - # bad input - with raises(TypeError, match="expected a sequence of integers or a single integer"): - totest.generate_orbital_separations(number_of_binaries=1.) - with raises(ValueError, match="high - low < 0"): + + # bad input: min > max (raised by LogUniform distribution class) + with raises(ValueError, match="max must be greater than min"): totest.generate_orbital_separations(orbital_separation_min=10., orbital_separation_max=1.) - with raises(OverflowError, match="high - low range exceeds valid bounds"): - totest.generate_orbital_separations(orbital_separation_min=0) + + # bad input: min > max with log_normal + with raises(ValueError, match="`orbital_separation_max` must be"): + totest.generate_orbital_separations( + orbital_separation_scheme='log_normal', + log_orbital_separation_mean=1.0, + log_orbital_separation_sigma=1.0, + orbital_separation_min=10., + orbital_separation_max=1.) + + # bad scheme with raises(ValueError, match="You must provide an allowed orbital separation scheme."): totest.generate_orbital_separations(orbital_separation_scheme='test') - # examples - tests_normal = [(0.,1.0,42,approx(39.83711402835139,abs=6e-12)), - (1.0,10.,42,approx(9799.179319004,abs=6e-9))] - # larger allowance for second test because of slightly different results between - # running pytest locally vs github actions workflow - for (m,s,r,sep) in tests_normal: - assert totest.generate_orbital_separations(orbital_separation_scheme='log_normal', - log_orbital_separation_mean=m, - log_orbital_separation_sigma=s, - RNG = np.random.default_rng(seed=r))[0] == sep - tests_uniform = [(1.,3.,42,approx(2.3402964885050066,abs=6e-12)), - (2.,10.,42,approx(6.950276115688688,abs=6e-12))] - for (mi,ma,r,sep) in tests_uniform: - assert totest.generate_orbital_separations(orbital_separation_min=mi, - orbital_separation_max=ma, - RNG = np.random.default_rng(seed=r))[0] == sep + + # log_normal examples + tests_normal = [(0., 1.0, 42, approx(39.83711402835139, abs=6e-12)), + (1.0, 10., 42, approx(9799.179319004, abs=6e-9))] + for (m, s, r, sep) in tests_normal: + assert totest.generate_orbital_separations( + orbital_separation_scheme='log_normal', + log_orbital_separation_mean=m, + log_orbital_separation_sigma=s, + RNG=np.random.default_rng(seed=r))[0] == sep + + # log_uniform examples + tests_uniform = [(1., 3., 42, approx(2.3402964885050066, abs=6e-12)), + (2., 10., 42, approx(6.950276115688688, abs=6e-12))] + for (mi, ma, r, sep) in tests_uniform: + assert totest.generate_orbital_separations( + orbital_separation_min=mi, + orbital_separation_max=ma, + RNG=np.random.default_rng(seed=r))[0] == sep def test_generate_eccentricities(self): # bad input with raises(TypeError, match="expected a sequence of integers or a single integer"): @@ -151,71 +185,87 @@ def test_generate_eccentricities(self): RNG = np.random.default_rng(seed=r))[0] == e def test_generate_primary_masses(self): - # bad input - with raises(TypeError, match="expected a sequence of integers or a single integer"): - totest.generate_primary_masses(number_of_binaries=1.) - with raises(ValueError, match="primary_mass_max must be larger than primary_mass_min."): - totest.generate_primary_masses(primary_mass_min=100.,primary_mass_max=10.) + # bad input: invalid scheme with raises(ValueError, match="You must provide an allowed primary mass scheme."): totest.generate_primary_masses(primary_mass_scheme='test') - # examples - tests = [('Salpeter',42,approx(19.97764511120556,abs=6e-12)), - ('Kroupa1993',42,approx(16.52331793661949,abs=6e-12)), - ('Kroupa2001',42,approx(20.633412780370865,abs=6e-12))] - for (s,r,m1) in tests: - assert totest.generate_primary_masses(primary_mass_scheme=s, - RNG = np.random.default_rng(seed=r))[0] == m1 + + # bad input: min > max (raised by IMF class) + with raises(ValueError, match="m_min must be less than m_max"): + totest.generate_primary_masses(primary_mass_min=100., primary_mass_max=10.) + + # examples for all three schemes + tests = [('Salpeter', 42, approx(19.97764511120556, abs=6e-12)), + ('Kroupa1993', 42, approx(16.52331793661949, abs=6e-12)), + ('Kroupa2001', 42, approx(20.633204764212334, abs=6e-12))] + for (s, r, m1) in tests: + assert totest.generate_primary_masses( + primary_mass_scheme=s, + RNG=np.random.default_rng(seed=r))[0] == m1 def test_generate_secondary_masses(self): # missing argument - with raises(TypeError,match="missing 1 required positional argument: 'primary_masses'"): + with raises(TypeError, match="missing 1 required positional argument: 'primary_masses'"): totest.generate_secondary_masses() - # bad input - with raises(TypeError, match=re.escape("unsupported operand type(s) for /: 'float' and 'list'")): - totest.generate_secondary_masses(primary_masses=[10.]) - with raises(TypeError, match="expected a sequence of integers or a single integer"): + + # bad input: invalid scheme + with raises(ValueError, match="You must provide an allowed secondary mass scheme."): totest.generate_secondary_masses(primary_masses=np.array([10.]), - number_of_binaries=1.) - with raises(ValueError, match="secondary_mass_max must be larger than secondary_mass_min"): - totest.generate_secondary_masses(primary_masses=np.array([100.]), - secondary_mass_min=10., - secondary_mass_max=1.) + secondary_mass_scheme='test') + + # bad input: secondary_mass_min > primary mass with raises(ValueError, match="`secondary_mass_min` is larger than some primary masses"): totest.generate_secondary_masses(primary_masses=np.array([1.]), - secondary_mass_min=10., - secondary_mass_max=100.) - with raises(ValueError, match="You must provide an allowed secondary mass scheme."): - totest.generate_secondary_masses(primary_masses=np.array([1.]), - secondary_mass_scheme='test') - # examples - tests = [('flat_mass_ratio',42,approx(7.852582461281652,abs=6e-12)), - ('q=1',42,approx(10.,abs=6e-12))] - for (s,r,m2) in tests: - assert totest.generate_secondary_masses(primary_masses=np.array([10.]), - secondary_mass_scheme=s, - RNG = np.random.default_rng(seed=r))[0] == m2 - - def test_binary_fraction_value(self): - # missing argument - with raises(ValueError, match="There was not a primary mass provided in the inputs."): - totest.binary_fraction_value(binary_fraction_scheme='Moe_17') - # bad input + secondary_mass_min=10., + secondary_mass_max=100.) + + # flat_mass_ratio example + result = totest.generate_secondary_masses( + primary_masses=np.array([10.]), + secondary_mass_scheme='flat_mass_ratio', + RNG=np.random.default_rng(seed=42)) + assert len(result) == 1 + assert result[0] > 0 + assert result[0] <= 10.0 + + # q=1 example + result_q1 = totest.generate_secondary_masses( + primary_masses=np.array([10.]), + secondary_mass_scheme='q=1', + RNG=np.random.default_rng(seed=42)) + assert result_q1[0] == approx(10., abs=6e-12) + + def test_generate_binary_fraction(self): + # missing primary mass + with raises(ValueError, match="There was not a primary mass provided in the inputs"): + totest.generate_binary_fraction(binary_fraction_scheme='const') + + # bad scheme (m1 must be provided before scheme check) with raises(ValueError, match="You must provide an allowed binary fraction scheme."): - totest.binary_fraction_value(binary_fraction_scheme='test') - with raises(ValueError, match="The scheme doesn't support values of m1 less than 0.8"): - totest.binary_fraction_value(binary_fraction_scheme='Moe_17',m1=0.2) - with raises(ValueError, match="The primary mass provided nan is not supported by the Moe_17 scheme."): - totest.binary_fraction_value(binary_fraction_scheme='Moe_17',m1=np.nan) - # examples - tests_const = [1.0,1,0.5] - for (c) in tests_const: - assert totest.binary_fraction_value(binary_fraction_const=c, - binary_fraction_scheme='const') == c - tests_moe = [(1,0.4), - (3,0.59), - (8,0.76), - (10,0.84), - (18,0.94)] - for (m1,f) in tests_moe: - assert totest.binary_fraction_value(binary_fraction_scheme='Moe_17', - m1=m1) == f + totest.generate_binary_fraction(binary_fraction_scheme='test', + m1=np.array([10.])) + + # const scheme examples + tests_const = [1.0, 1, 0.5] + for c in tests_const: + assert totest.generate_binary_fraction( + binary_fraction_const=c, + binary_fraction_scheme='const', + m1=np.array([10.])) == c + + # non-array m1 input (triggers np.asarray conversion) + assert totest.generate_binary_fraction( + binary_fraction_const=0.7, + binary_fraction_scheme='const', + m1=10.) == 0.7 + + # Moe+17-massdependent scheme + tests_moe = [(np.array([1.]), 0.4), + (np.array([3.]), 0.59), + (np.array([8.]), 0.76), + (np.array([10.]), 0.84), + (np.array([18.]), 0.94)] + for (m1, f) in tests_moe: + result = totest.generate_binary_fraction( + binary_fraction_scheme='Moe+17-massdependent', m1=m1) + assert result[0] == f + \ No newline at end of file From 9422a5f218a3e2921425d0d47a962aa7fff11290 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 30 Mar 2026 18:44:27 +0000 Subject: [PATCH 258/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/popsyn/independent_sample.py | 2 +- posydon/popsyn/synthetic_population.py | 2 +- .../_helper_functions_for_tests/population.py | 13 +++++++------ .../popsyn/test_independent_sample.py | 18 +++++++++--------- posydon/unit_tests/popsyn/test_io.py | 2 +- .../popsyn/test_synthetic_population.py | 11 ++++++++--- 6 files changed, 27 insertions(+), 21 deletions(-) diff --git a/posydon/popsyn/independent_sample.py b/posydon/popsyn/independent_sample.py index aa46f2f7af..5e5472c87c 100644 --- a/posydon/popsyn/independent_sample.py +++ b/posydon/popsyn/independent_sample.py @@ -411,7 +411,7 @@ def generate_binary_fraction(m1=None, binary_fraction_const=1, elif not isinstance(m1,np.ndarray): m1 = np.asarray(m1) binary_fraction = np.zeros_like(m1, dtype=float) - + # Input parameter checks if binary_fraction_scheme not in binary_fraction_scheme_options: raise ValueError("You must provide an allowed binary fraction scheme.") diff --git a/posydon/popsyn/synthetic_population.py b/posydon/popsyn/synthetic_population.py index d33f028940..53bde3b3d5 100644 --- a/posydon/popsyn/synthetic_population.py +++ b/posydon/popsyn/synthetic_population.py @@ -2831,7 +2831,7 @@ def edges_metallicity_bins(self): met_val = np.log10(self.centers_metallicity_bins) bin_met = np.zeros(len(met_val) + 1) # if more than one metallicty bin - if len(met_val) > 1: + if len(met_val) > 1: bin_met[0] = met_val[0] - (met_val[1] - met_val[0]) / 2.0 bin_met[-1] = met_val[-1] + (met_val[-1] - met_val[-2]) / 2.0 bin_met[1:-1] = met_val[:-1] + (met_val[1:] - met_val[:-1]) / 2.0 diff --git a/posydon/unit_tests/_helper_functions_for_tests/population.py b/posydon/unit_tests/_helper_functions_for_tests/population.py index 8de445ea15..2813e3df19 100644 --- a/posydon/unit_tests/_helper_functions_for_tests/population.py +++ b/posydon/unit_tests/_helper_functions_for_tests/population.py @@ -9,16 +9,17 @@ ] import os + import h5py import numpy as np import pandas as pd -from posydon.popsyn.synthetic_population import ( - Population, TransientPopulation, Rates -) from posydon.popsyn.rate_calculation import ( - DEFAULT_SFH_MODEL, get_redshift_bin_centers, get_cosmic_time_from_redshift + DEFAULT_SFH_MODEL, + get_cosmic_time_from_redshift, + get_redshift_bin_centers, ) +from posydon.popsyn.synthetic_population import Population, Rates, TransientPopulation # helper functions @@ -135,7 +136,7 @@ def make_test_pop( "posydon_version": "test", } ini_df = pd.DataFrame({k: [v] for k, v in ini_params.items()}) - + # mass_per_metallicity mass_df = pd.DataFrame( @@ -318,4 +319,4 @@ def make_test_rates( return Rates( tpop.filename, transient_name, SFH_identifier, verbose=False - ) \ No newline at end of file + ) diff --git a/posydon/unit_tests/popsyn/test_independent_sample.py b/posydon/unit_tests/popsyn/test_independent_sample.py index e465b949da..8ead62c663 100644 --- a/posydon/unit_tests/popsyn/test_independent_sample.py +++ b/posydon/unit_tests/popsyn/test_independent_sample.py @@ -55,7 +55,7 @@ def test_generate_independent_samples(self): # bad input with raises(ValueError, match="Allowed orbital schemes are separation or period."): totest.generate_independent_samples('test') - + # bad mass ranges with raises(ValueError, match="primary_mass_max must be larger than primary_mass_min."): totest.generate_independent_samples( @@ -90,17 +90,17 @@ def test_generate_independent_samples(self): assert isinstance(orb_p, np.ndarray) assert len(orb_p) == 1 assert all(np.isfinite(m1_p)) - + def test_use_Moe_17_PsandQs(self): - + # returns True for Moe+17-PsandQs secondary_mass_scheme assert totest.use_Moe_17_PsandQs(secondary_mass_scheme='Moe+17-PsandQs') is True - + # returns True for Moe+17-PsandQs orbital_period_scheme with period scheme assert totest.use_Moe_17_PsandQs( orbital_scheme='period', orbital_period_scheme='Moe+17-PsandQs') is True - + # returns True for Moe+17-PsandQs eccentricity_scheme assert totest.use_Moe_17_PsandQs(eccentricity_scheme='Moe+17-PsandQs') is True # returns False for non-Moe schemes @@ -109,7 +109,7 @@ def test_use_Moe_17_PsandQs(self): orbital_scheme='period', orbital_period_scheme='Sana+12_period_extended', eccentricity_scheme='zero') is False - + def test_generate_orbital_periods(self): # missing argument with raises(TypeError, match="missing 1 required positional argument: 'primary_masses'"): @@ -139,7 +139,7 @@ def test_generate_orbital_separations(self): totest.generate_orbital_separations(orbital_separation_min=10., orbital_separation_max=1.) - # bad input: min > max with log_normal + # bad input: min > max with log_normal with raises(ValueError, match="`orbital_separation_max` must be"): totest.generate_orbital_separations( orbital_separation_scheme='log_normal', @@ -267,5 +267,5 @@ def test_generate_binary_fraction(self): for (m1, f) in tests_moe: result = totest.generate_binary_fraction( binary_fraction_scheme='Moe+17-massdependent', m1=m1) - assert result[0] == f - \ No newline at end of file + assert result[0] == f + diff --git a/posydon/unit_tests/popsyn/test_io.py b/posydon/unit_tests/popsyn/test_io.py index 7e3dac8fec..987af53457 100644 --- a/posydon/unit_tests/popsyn/test_io.py +++ b/posydon/unit_tests/popsyn/test_io.py @@ -390,4 +390,4 @@ def __init__(self, **kwargs): monkeypatch.delenv('SLURM_ARRAY_JOB_ID', raising=False) binkwargs = totest.binarypop_kwargs_from_ini(binpop_ini) assert binkwargs['RANK'] is None - assert binkwargs['size'] is None \ No newline at end of file + assert binkwargs['size'] is None diff --git a/posydon/unit_tests/popsyn/test_synthetic_population.py b/posydon/unit_tests/popsyn/test_synthetic_population.py index a357bc3ee9..dca3cdb94d 100644 --- a/posydon/unit_tests/popsyn/test_synthetic_population.py +++ b/posydon/unit_tests/popsyn/test_synthetic_population.py @@ -25,9 +25,13 @@ import shutil from posydon.unit_tests._helper_functions_for_tests.population import ( - make_test_pop, make_ini, make_test_transient_pop, make_test_rates + make_ini, + make_test_pop, + make_test_rates, + make_test_transient_pop, ) + # define test classes collecting several test functions class TestElements: # check for objects, which should be an element of the tested module @@ -1224,8 +1228,9 @@ def test_edges_metallicity_bins(self, tmp_path): # Add rates structure from posydon.popsyn.rate_calculation import ( - DEFAULT_SFH_MODEL, get_redshift_bin_centers, + DEFAULT_SFH_MODEL, get_cosmic_time_from_redshift, + get_redshift_bin_centers, ) MODEL = dict(DEFAULT_SFH_MODEL) z_birth = get_redshift_bin_centers(MODEL["delta_t"]) @@ -1316,4 +1321,4 @@ def test_centers_metallicity_bins(self, tmp_path): rates = make_test_rates(tmp_path, filename="rates_cmb.h5") centers = rates.centers_metallicity_bins assert len(centers) == 1 - assert np.isclose(centers[0], 0.02 * totest.Zsun) \ No newline at end of file + assert np.isclose(centers[0], 0.02 * totest.Zsun) From fe0aad6d855dd7e6c92e04ca5a5bac418d3d7d48 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 13:59:20 -0500 Subject: [PATCH 259/389] change author to authors --- posydon/popsyn/rate_calculation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/popsyn/rate_calculation.py b/posydon/popsyn/rate_calculation.py index 6c8148c93d..de98212cb7 100644 --- a/posydon/popsyn/rate_calculation.py +++ b/posydon/popsyn/rate_calculation.py @@ -1,4 +1,4 @@ -__author__ = [ +__authors__ = [ "Simone Bavera ", "Max Briel ", ] From 08528e6e702395c9fa6ceaa2c2604ff09d70026c Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 14:00:49 -0500 Subject: [PATCH 260/389] update test for io.py --- posydon/popsyn/io.py | 4 +- posydon/unit_tests/popsyn/test_io.py | 66 ++++++++++------------------ 2 files changed, 25 insertions(+), 45 deletions(-) diff --git a/posydon/popsyn/io.py b/posydon/popsyn/io.py index e97a75cacf..19dbf6d42c 100644 --- a/posydon/popsyn/io.py +++ b/posydon/popsyn/io.py @@ -542,7 +542,7 @@ def binarypop_kwargs_from_ini(path, verbose=False): pop_kwargs['comm'] = None # Check if we are running as a job array - if JOB_ID is not None and pop_kwargs['use_MPI'] is True: + if JOB_ID is not None and pop_kwargs['use_MPI'] is True: # pragma: no cover raise ValueError('MPI must be turned off for job arrays.') elif JOB_ID is not None: pop_kwargs['JOB_ID'] = np.int64(os.environ['SLURM_ARRAY_JOB_ID']) @@ -570,7 +570,7 @@ def binarypop_kwargs_from_ini(path, verbose=False): if pop_kwargs['include_S1']: pop_kwargs['S1_kwargs'] = S1_kwargs - elif section == 'SingleStar_2_output': + elif section == 'SingleStar_2_output': # pragma: no branch S2_kwargs = dict() for key, val in parser[section].items(): S2_kwargs[key] = ast.literal_eval(val) diff --git a/posydon/unit_tests/popsyn/test_io.py b/posydon/unit_tests/popsyn/test_io.py index 987af53457..94d84a1245 100644 --- a/posydon/unit_tests/popsyn/test_io.py +++ b/posydon/unit_tests/popsyn/test_io.py @@ -25,22 +25,19 @@ # module you like to test from pytest import approx, fixture, raises, warns -from posydon.binary_evol.simulationproperties import SimulationProperties - - # define test classes collecting several test functions class TestElements: # check for objects, which should be an element of the tested module def test_dir(self): - elements = ['BINARYPROPERTIES_DTYPES', 'OBJECT_FIXED_SUB_DTYPES', \ - 'STARPROPERTIES_DTYPES', 'EXTRA_BINARY_COLUMNS_DTYPES', \ - 'EXTRA_STAR_COLUMNS_DTYPES', 'SCALAR_NAMES_DTYPES', \ - 'clean_binary_history_df', 'clean_binary_oneline_df', \ - 'parse_inifile', 'simprop_kwargs_from_ini', \ - 'binarypop_kwargs_from_ini', \ - '__builtins__', '__cached__', '__doc__', '__file__',\ - '__loader__', '__name__', '__package__', '__spec__', \ - 'ConfigParser', 'ast', 'importlib', 'os', 'errno', \ + elements = ['BINARYPROPERTIES_DTYPES', 'OBJECT_FIXED_SUB_DTYPES', + 'STARPROPERTIES_DTYPES', 'EXTRA_BINARY_COLUMNS_DTYPES', + 'EXTRA_STAR_COLUMNS_DTYPES', 'SCALAR_NAMES_DTYPES', + 'clean_binary_history_df', 'clean_binary_oneline_df', + 'parse_inifile', 'simprop_kwargs_from_ini', + 'binarypop_kwargs_from_ini', + '__builtins__', '__cached__', '__doc__', '__file__', + '__loader__', '__name__', '__package__', '__spec__', + 'ConfigParser', 'ast', 'importlib', 'os', 'errno', 'pprint', 'np', 'pd',] totest_elements = set(dir(totest)) missing_in_test = set(elements) - totest_elements @@ -129,14 +126,6 @@ def binpop_ini(self, tmp_path): [SingleStar_2_output] include_S2 = False - - [flow] - import = ['builtins', 'int'] - - [extra_hooks] - import_1 = ['builtins', 'int'] - absolute_import_1 = None - kwargs_1 = {} """ file_path = os.path.join(tmp_path, "binpop.ini") with open(file_path, "w") as f: @@ -162,14 +151,6 @@ def binpop_ini_mpi(self, tmp_path): [SingleStar_2_output] include_S2 = False - - [flow] - import = ['builtins', 'int'] - - [extra_hooks] - import_1 = ['builtins', 'int'] - absolute_import_1 = None - kwargs_1 = {} """ file_path = os.path.join(tmp_path, "binpop_mpi.ini") with open(file_path, "w") as f: @@ -202,14 +183,6 @@ def binpop_ini_stars(self, tmp_path): only_select_columns = [ 'log_L', 'lg_mdot'] - - [flow] - import = ['builtins', 'int'] - - [extra_hooks] - import_1 = ['builtins', 'int'] - absolute_import_1 = None - kwargs_1 = {} """ file_path = os.path.join(tmp_path, "binpop_stars.ini") with open(file_path, "w") as f: @@ -333,6 +306,11 @@ class DummyModule: assert hooks[1][0] is dummy_cls assert hooks[1][1] == {} + # test with 'only' parameter + simkwargs_only = totest.simprop_kwargs_from_ini(sim_ini, only='step_HMS_HMS') + assert 'step_HMS_HMS' in simkwargs_only + assert 'flow' not in simkwargs_only + # absolute imports dummy_code = """ class MyDummyClass: @@ -363,11 +341,8 @@ def test_binarypop_kwargs_from_ini(self,monkeypatch,binpop_ini, monkeypatch.setenv("SLURM_ARRAY_JOB_ID", "123") with raises(ValueError, match="MPI must be turned off for job arrays."): totest.binarypop_kwargs_from_ini(binpop_ini_mpi) - # example: include s1 and s2 - class DummySimProps: - def __init__(self, **kwargs): - self.config = kwargs - monkeypatch.setattr(totest, "SimulationProperties", DummySimProps) + + # example: include S1 and S2 monkeypatch.setenv("SLURM_ARRAY_JOB_ID", "456") monkeypatch.setenv("SLURM_ARRAY_TASK_ID", "4") monkeypatch.setenv("SLURM_ARRAY_TASK_MIN", "2") @@ -377,6 +352,7 @@ def __init__(self, **kwargs): assert "only_select_columns" in binkwargs["S1_kwargs"] assert "S2_kwargs" in binkwargs assert "log_L" in binkwargs["S2_kwargs"]["only_select_columns"] + # example: environment variables binkwargs = totest.binarypop_kwargs_from_ini(binpop_ini) assert binkwargs["JOB_ID"] == 456 @@ -384,10 +360,14 @@ def __init__(self, **kwargs): assert binkwargs["size"] == 10 assert isinstance(binkwargs, dict) assert binkwargs["metallicity"] == [0.02] - assert isinstance(binkwargs["population_properties"], DummySimProps) - assert "flow" in binkwargs["population_properties"].config + assert binkwargs["comm"] is None + # example: no Job ID, no MPI monkeypatch.delenv('SLURM_ARRAY_JOB_ID', raising=False) + monkeypatch.delenv('SLURM_ARRAY_TASK_ID', raising=False) + monkeypatch.delenv('SLURM_ARRAY_TASK_MIN', raising=False) + monkeypatch.delenv('SLURM_ARRAY_TASK_COUNT', raising=False) binkwargs = totest.binarypop_kwargs_from_ini(binpop_ini) assert binkwargs['RANK'] is None assert binkwargs['size'] is None + assert binkwargs['comm'] is None \ No newline at end of file From c8953ec4fa07b97e18e0fa5d2e4adcfa99b02073 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 14:13:01 -0500 Subject: [PATCH 261/389] unit test for sample_from_file --- .../popsyn/test_sample_from_file.py | 228 ++++++++++++++++-- 1 file changed, 209 insertions(+), 19 deletions(-) diff --git a/posydon/unit_tests/popsyn/test_sample_from_file.py b/posydon/unit_tests/popsyn/test_sample_from_file.py index 6d28b3e969..86b362be7f 100644 --- a/posydon/unit_tests/popsyn/test_sample_from_file.py +++ b/posydon/unit_tests/popsyn/test_sample_from_file.py @@ -19,24 +19,26 @@ # module you like to test from pytest import approx, fixture, raises, warns -from posydon.popsyn.independent_sample import ( - generate_eccentricities, - generate_orbital_periods, - generate_orbital_separations, - generate_primary_masses, - generate_secondary_masses, -) -from posydon.utils.posydonwarning import Pwarn - # define test classes collecting several test functions class TestElements: # check for objects, which should be an element of the tested module def test_dir(self): - elements = ['infer_key', 'get_samples_from_file', \ - 'get_kick_samples_from_file', '__authors__',\ - '__builtins__', '__cached__', '__doc__', '__file__',\ - '__loader__', '__name__', '__package__', '__spec__'] + elements = ['infer_key', 'get_samples_from_file', + 'get_kick_samples_from_file', '__authors__', + '__builtins__', '__cached__', '__doc__', '__file__', + '__loader__', '__name__', '__package__', '__spec__', + 'os', 'np', 'pd', 'Pwarn', + 'generate_eccentricities', 'generate_orbital_periods', + 'generate_orbital_separations', 'generate_primary_masses', + 'generate_secondary_masses', + 'PRIMARY_MASS_NAMES', 'SECONDARY_MASS_NAMES', + 'PERIOD_NAMES', 'SEPARATION_NAMES', 'ECCENTRICITY_NAMES', + 'PRIMARY_KICK_VELOCITY_NAMES', 'SECONDARY_KICK_VELOCITY_NAMES', + 'PRIMARY_KICK_AZIMUTHAL_ANGLE_NAMES', 'SECONDARY_KICK_AZIMUTHAL_ANGLE_NAMES', + 'PRIMARY_KICK_POLAR_ANGLE_NAMES', 'SECONDARY_KICK_POLAR_ANGLE_NAMES', + 'PRIMARY_KICK_MEAN_ANOMALY_NAMES', 'SECONDARY_KICK_MEAN_ANOMALY_NAMES', + ] totest_elements = set(dir(totest)) missing_in_test = set(elements) - totest_elements assert len(missing_in_test) == 0, "There are missing objects in "\ @@ -61,13 +63,201 @@ def test_instance_get_samples_from_file(self): def test_instance_get_kick_samples_from_file(self): assert isroutine(totest.get_kick_samples_from_file) + class TestFunctions: - def test_infer_key(): - pass + @fixture + def full_csv(self, tmp_path): + """CSV with all binary columns.""" + df = pd.DataFrame({ + 'm1': [10.0, 20.0, 30.0], + 'm2': [5.0, 10.0, 15.0], + 'orbital_period': [1.0, 10.0, 100.0], + 'orbital_separation': [50.0, 100.0, 200.0], + 'eccentricity': [0.0, 0.1, 0.2], + }) + path = os.path.join(tmp_path, "full.csv") + df.to_csv(path, index=False) + return path + + @fixture + def minimal_csv(self, tmp_path): + """CSV with no recognized binary columns.""" + df = pd.DataFrame({ + 'col_a': [1.0, 2.0], + 'col_b': [3.0, 4.0], + }) + path = os.path.join(tmp_path, "minimal.csv") + df.to_csv(path, index=False) + return path + + @fixture + def kick_csv(self, tmp_path): + """CSV with all kick columns.""" + df = pd.DataFrame({ + 's1_natal_kick_velocity': [100.0, 200.0], + 's1_natal_kick_azimuthal_angle': [0.5, 1.0], + 's1_natal_kick_polar_angle': [0.3, 0.6], + 's1_natal_kick_mean_anomaly': [0.1, 0.2], + 's2_natal_kick_velocity': [50.0, 150.0], + 's2_natal_kick_azimuthal_angle': [0.4, 0.8], + 's2_natal_kick_polar_angle': [0.2, 0.5], + 's2_natal_kick_mean_anomaly': [0.05, 0.15], + }) + path = os.path.join(tmp_path, "kicks.csv") + df.to_csv(path, index=False) + return path + + @fixture + def no_kick_csv(self, tmp_path): + """CSV with no kick columns.""" + df = pd.DataFrame({ + 'col_a': [1.0, 2.0], + }) + path = os.path.join(tmp_path, "no_kicks.csv") + df.to_csv(path, index=False) + return path + + # --- infer_key --- + + def test_infer_key(self): + # exact match + assert totest.infer_key( + available_keys=['m1', 'period'], + allowed_keys=['m1', 'm2']) == 'm1' + + # case-insensitive match + assert totest.infer_key( + available_keys=['M1', 'Period'], + allowed_keys=['m1']) == 'M1' + + # no match + assert totest.infer_key( + available_keys=['col_a', 'col_b'], + allowed_keys=['m1', 'm2']) == '' + + # empty inputs + assert totest.infer_key(available_keys=[], allowed_keys=['m1']) == '' + assert totest.infer_key(available_keys=['m1'], allowed_keys=[]) == '' + + # --- get_samples_from_file --- + + def test_get_samples_from_file_missing_kwarg(self): + with raises(KeyError, match="no 'read_samples_from_file'"): + totest.get_samples_from_file(orbital_scheme='period') + + def test_get_samples_from_file_not_found(self): + with raises(FileNotFoundError, match="not found"): + totest.get_samples_from_file( + orbital_scheme='period', + read_samples_from_file='nonexistent.csv') + + def test_get_samples_from_file_bad_scheme(self, full_csv): + with raises(ValueError, match="Allowed orbital schemes are separation or period."): + totest.get_samples_from_file( + orbital_scheme='invalid', + read_samples_from_file=full_csv) + + def test_get_samples_from_file_period(self, full_csv): + orb, ecc, m1, m2 = totest.get_samples_from_file( + orbital_scheme='period', + read_samples_from_file=full_csv) + assert len(orb) == 3 + assert len(ecc) == 3 + assert len(m1) == 3 + assert len(m2) == 3 + np.testing.assert_array_equal(orb, [1.0, 10.0, 100.0]) + np.testing.assert_array_equal(m1, [10.0, 20.0, 30.0]) + np.testing.assert_array_equal(ecc, [0.0, 0.1, 0.2]) + + def test_get_samples_from_file_separation(self, full_csv): + orb, ecc, m1, m2 = totest.get_samples_from_file( + orbital_scheme='separation', + read_samples_from_file=full_csv) + np.testing.assert_array_equal(orb, [50.0, 100.0, 200.0]) + + def test_get_samples_from_file_missing_columns(self, minimal_csv): + """File has no recognized columns ā€” triggers random generation.""" + orb, ecc, m1, m2 = totest.get_samples_from_file( + orbital_scheme='period', + read_samples_from_file=minimal_csv, + RNG=np.random.default_rng(seed=42)) + assert len(orb) == 2 + assert len(ecc) == 2 + assert len(m1) == 2 + assert len(m2) == 2 + + def test_get_samples_from_file_missing_columns_separation(self, minimal_csv): + """Separation scheme with no recognized columns.""" + orb, ecc, m1, m2 = totest.get_samples_from_file( + orbital_scheme='separation', + read_samples_from_file=minimal_csv, + RNG=np.random.default_rng(seed=42)) + assert len(orb) == 2 + + def test_get_samples_from_file_with_number(self, full_csv): + """Request more binaries than in file ā€” triggers expansion.""" + orb, ecc, m1, m2 = totest.get_samples_from_file( + orbital_scheme='period', + read_samples_from_file=full_csv, + number_of_binaries=5) + assert len(orb) == 5 + assert len(ecc) == 5 + assert len(m1) == 5 + assert len(m2) == 5 + + def test_get_samples_from_file_with_index(self, full_csv): + """Request subset with index offset.""" + orb, ecc, m1, m2 = totest.get_samples_from_file( + orbital_scheme='period', + read_samples_from_file=full_csv, + number_of_binaries=2, + index=1) + assert len(orb) == 2 + assert orb[0] == 10.0 # second row from original + + # --- get_kick_samples_from_file --- + + def test_get_kick_samples_from_file_missing_kwarg(self): + with raises(KeyError, match="no 'read_samples_from_file'"): + totest.get_kick_samples_from_file() + + def test_get_kick_samples_from_file_not_found(self): + with raises(FileNotFoundError, match="not found"): + totest.get_kick_samples_from_file( + read_samples_from_file='nonexistent.csv') + + def test_get_kick_samples_from_file_full(self, kick_csv): + k1, k2 = totest.get_kick_samples_from_file( + read_samples_from_file=kick_csv) + assert k1.shape == (2, 4) + assert k2.shape == (2, 4) + assert k1[0, 0] == 100.0 # s1 velocity row 0 + assert k2[1, 0] == 150.0 # s2 velocity row 1 + + def test_get_kick_samples_from_file_no_columns(self, no_kick_csv): + """No kick columns ā€” all set to None arrays.""" + k1, k2 = totest.get_kick_samples_from_file( + read_samples_from_file=no_kick_csv) + assert k1.shape == (2, 4) + assert k2.shape == (2, 4) + # All values should be None + assert all(v is None for v in k1.flatten()) + assert all(v is None for v in k2.flatten()) - def test_get_samples_from_file(): - pass + def test_get_kick_samples_from_file_with_number(self, kick_csv): + """Request more binaries than in file ā€” triggers expansion.""" + k1, k2 = totest.get_kick_samples_from_file( + read_samples_from_file=kick_csv, + number_of_binaries=5) + assert k1.shape == (5, 4) + assert k2.shape == (5, 4) - def test_get_kick_samples_from_file(): - pass + def test_get_kick_samples_from_file_with_index(self, kick_csv): + """Request subset with index offset.""" + k1, k2 = totest.get_kick_samples_from_file( + read_samples_from_file=kick_csv, + number_of_binaries=1, + index=1) + assert k1.shape == (1, 4) + assert k1[0, 0] == 200.0 # second row velocity \ No newline at end of file From 7183c042ed97edbb9c8f53da1f5e4c5cfdb2cb11 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 14:20:28 -0500 Subject: [PATCH 262/389] updated transient_select_funcs tests to add a new one for new funciton effective_precession --- .../popsyn/test_transient_select_funcs.py | 54 +++++++++++-------- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/posydon/unit_tests/popsyn/test_transient_select_funcs.py b/posydon/unit_tests/popsyn/test_transient_select_funcs.py index ac80c256d9..cc154825fe 100644 --- a/posydon/unit_tests/popsyn/test_transient_select_funcs.py +++ b/posydon/unit_tests/popsyn/test_transient_select_funcs.py @@ -29,8 +29,8 @@ class TestElements: # check for objects, which should be an element of the tested module def test_dir(self): - elements = ['PATH_TO_PDET_GRID', 'GRB_selection', 'chi_eff', 'm_chirp', \ - 'mass_ratio', 'BBH_selection_function','DCO_detectability', \ + elements = ['PATH_TO_PDET_GRID', 'GRB_selection', 'chi_eff', 'effective_precession',\ + 'm_chirp', 'mass_ratio', 'BBH_selection_function','DCO_detectability', \ '__builtins__', '__cached__', '__doc__', \ '__file__','__loader__', '__name__', '__package__', '__spec__', \ 'np', 'pd', 'PATH_TO_POSYDON_DATA', \ @@ -50,24 +50,6 @@ def test_dir(self): +"added on purpose and update this "\ +"unit test." - def test_instance_GRB_selection(self): - assert isroutine(totest.GRB_selection) - - def test_instance_chi_eff(self): - assert isroutine(totest.chi_eff) - - def test_instance_m_chirp(self): - assert isroutine(totest.m_chirp) - - def test_instance_mass_ratio(self): - assert isroutine(totest.mass_ratio) - - def test_instance_BBH_selection_function(self): - assert isroutine(totest.BBH_selection_function) - - def test_instance_DCO_detectability(self): - assert isroutine(totest.DCO_detectability) - class TestFunctions: @fixture @@ -83,7 +65,7 @@ def history_chunk(self): 'S2_spin': [0.5, 0.55, 0.6], 'S1_mass': [10.0, 9.5, 9.0], 'S2_mass': [8.0, 7.5, 7.0], - 'time': [1.0e6, 2.0e6, 3.0e6]}) + 'time': [1.0e6, 2.0e6, 3.0e6]}, index=[10, 10, 10]) @fixture def oneline_chunk(self): @@ -238,6 +220,33 @@ def test_chi_eff(self,array,nan_array,wrong_array): assert totest.chi_eff(array,array,array, array,array,array)[0] == 0.5403023058681398 + def test_effective_precession(self): + # missing argument + with raises(TypeError, match="missing 6 required positional arguments"): + totest.effective_precession() + # example with scalars + result = totest.effective_precession( + theta_1=0.5, theta_2=0.3, + a1=0.8, a2=0.6, + m1=30.0, m2=20.0) + assert result == approx(np.maximum( + np.abs(0.8 * np.sin(0.5)), + (20./30.) * ((4*(20./30.) + 3)/(4 + 3*(20./30.))) * 0.6 * np.sin(0.3)), + abs=1e-12) + # example with arrays + theta_1 = np.array([0.0, np.pi/2]) + theta_2 = np.array([np.pi/2, 0.0]) + a1 = np.array([0.9, 0.9]) + a2 = np.array([0.5, 0.5]) + m1 = np.array([30.0, 30.0]) + m2 = np.array([10.0, 10.0]) + result = totest.effective_precession(theta_1, theta_2, a1, a2, m1, m2) + assert len(result) == 2 + # theta_1=0 means a1_perp=0, so chi_p comes from a2 term + assert result[0] > 0 + # theta_2=0 means a2_perp=0, so chi_p comes from a1 term + assert result[1] == approx(0.9, abs=1e-12) # a1 * sin(pi/2) = 0.9 + def test_m_chirp(self): # missing argument with raises(TypeError,match="missing 1 required positional argument: 'm_2'"): @@ -337,4 +346,5 @@ def predict_pdet(self, df): transient_pop_chunk, z_events_chunk_with_nan, z_weights_chunk) - assert (out['event_2'] == 0.0).all() + # event_2 is all NaN, so mask is all False and weights are unchanged + assert (out['event_2'] == 1.0).all() \ No newline at end of file From cfb44935fef569c23fd48743fcb1a2acbb8948de Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 30 Mar 2026 19:20:55 +0000 Subject: [PATCH 263/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/unit_tests/popsyn/test_independent_sample.py | 1 - posydon/unit_tests/popsyn/test_io.py | 7 ++++--- posydon/unit_tests/popsyn/test_sample_from_file.py | 2 +- posydon/unit_tests/popsyn/test_transient_select_funcs.py | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/posydon/unit_tests/popsyn/test_independent_sample.py b/posydon/unit_tests/popsyn/test_independent_sample.py index 8ead62c663..471ecd288f 100644 --- a/posydon/unit_tests/popsyn/test_independent_sample.py +++ b/posydon/unit_tests/popsyn/test_independent_sample.py @@ -268,4 +268,3 @@ def test_generate_binary_fraction(self): result = totest.generate_binary_fraction( binary_fraction_scheme='Moe+17-massdependent', m1=m1) assert result[0] == f - diff --git a/posydon/unit_tests/popsyn/test_io.py b/posydon/unit_tests/popsyn/test_io.py index 94d84a1245..f137a8b5be 100644 --- a/posydon/unit_tests/popsyn/test_io.py +++ b/posydon/unit_tests/popsyn/test_io.py @@ -25,6 +25,7 @@ # module you like to test from pytest import approx, fixture, raises, warns + # define test classes collecting several test functions class TestElements: # check for objects, which should be an element of the tested module @@ -341,7 +342,7 @@ def test_binarypop_kwargs_from_ini(self,monkeypatch,binpop_ini, monkeypatch.setenv("SLURM_ARRAY_JOB_ID", "123") with raises(ValueError, match="MPI must be turned off for job arrays."): totest.binarypop_kwargs_from_ini(binpop_ini_mpi) - + # example: include S1 and S2 monkeypatch.setenv("SLURM_ARRAY_JOB_ID", "456") monkeypatch.setenv("SLURM_ARRAY_TASK_ID", "4") @@ -352,7 +353,7 @@ def test_binarypop_kwargs_from_ini(self,monkeypatch,binpop_ini, assert "only_select_columns" in binkwargs["S1_kwargs"] assert "S2_kwargs" in binkwargs assert "log_L" in binkwargs["S2_kwargs"]["only_select_columns"] - + # example: environment variables binkwargs = totest.binarypop_kwargs_from_ini(binpop_ini) assert binkwargs["JOB_ID"] == 456 @@ -370,4 +371,4 @@ def test_binarypop_kwargs_from_ini(self,monkeypatch,binpop_ini, binkwargs = totest.binarypop_kwargs_from_ini(binpop_ini) assert binkwargs['RANK'] is None assert binkwargs['size'] is None - assert binkwargs['comm'] is None \ No newline at end of file + assert binkwargs['comm'] is None diff --git a/posydon/unit_tests/popsyn/test_sample_from_file.py b/posydon/unit_tests/popsyn/test_sample_from_file.py index 86b362be7f..d9f6beb877 100644 --- a/posydon/unit_tests/popsyn/test_sample_from_file.py +++ b/posydon/unit_tests/popsyn/test_sample_from_file.py @@ -260,4 +260,4 @@ def test_get_kick_samples_from_file_with_index(self, kick_csv): number_of_binaries=1, index=1) assert k1.shape == (1, 4) - assert k1[0, 0] == 200.0 # second row velocity \ No newline at end of file + assert k1[0, 0] == 200.0 # second row velocity diff --git a/posydon/unit_tests/popsyn/test_transient_select_funcs.py b/posydon/unit_tests/popsyn/test_transient_select_funcs.py index cc154825fe..410dcc4765 100644 --- a/posydon/unit_tests/popsyn/test_transient_select_funcs.py +++ b/posydon/unit_tests/popsyn/test_transient_select_funcs.py @@ -246,7 +246,7 @@ def test_effective_precession(self): assert result[0] > 0 # theta_2=0 means a2_perp=0, so chi_p comes from a1 term assert result[1] == approx(0.9, abs=1e-12) # a1 * sin(pi/2) = 0.9 - + def test_m_chirp(self): # missing argument with raises(TypeError,match="missing 1 required positional argument: 'm_2'"): @@ -347,4 +347,4 @@ def predict_pdet(self, df): z_events_chunk_with_nan, z_weights_chunk) # event_2 is all NaN, so mask is all False and weights are unchanged - assert (out['event_2'] == 1.0).all() \ No newline at end of file + assert (out['event_2'] == 1.0).all() From c2bfaab4af279a4a4de739ff8d982990a208438d Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Mon, 30 Mar 2026 14:30:46 -0500 Subject: [PATCH 264/389] Update continuous_integration.yml to cover all of popsyn --- .github/workflows/continuous_integration.yml | 22 ++------------------ 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 257d7b51f4..5d604ae6f8 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -39,26 +39,8 @@ jobs: export PATH_TO_POSYDON=./ export PATH_TO_POSYDON_DATA=./posydon/unit_tests/_data/ export MESA_DIR=./ - python -m pytest posydon/unit_tests/popsyn/test_star_formation_history.py \ - posydon/unit_tests/popsyn/test_independent_sample.py \ - posydon/unit_tests/popsyn/test_defaults.py \ - posydon/unit_tests/popsyn/test_transient_select_funcs.py \ - posydon/unit_tests/popsyn/test_rate_calculation.py \ - posydon/unit_tests/popsyn/test_io.py \ - posydon/unit_tests/popsyn/test_synthetic_population.py \ - posydon/unit_tests/popsyn/test_IMFs.py \ - posydon/unit_tests/popsyn/test_norm_pop.py \ - posydon/unit_tests/popsyn/test_distributions.py \ - --cov=posydon.popsyn.star_formation_history \ - --cov=posydon.popsyn.independent_sample \ - --cov=posydon.popsyn.defaults \ - --cov=posydon.popsyn.transient_select_funcs \ - --cov=posydon.popsyn.rate_calculation \ - --cov=posydon.popsyn.io \ - --cov=posydon.popsyn.synthetic_population \ - --cov=posydon.popsyn.IMFs \ - --cov=posydon.popsyn.norm_pop \ - --cov=posydon.popsyn.distributions \ + python -m pytest posydon/unit_tests/popsyn/ \ + --cov=posydon.popsyn \ --cov-branch \ --cov-report term-missing \ --cov-fail-under=100 From 152abaa8e430360bf50ff777be23b13471eedcd0 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 14:32:25 -0500 Subject: [PATCH 265/389] update defaults for multiple metallicities being in list form --- posydon/unit_tests/popsyn/test_defaults.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/posydon/unit_tests/popsyn/test_defaults.py b/posydon/unit_tests/popsyn/test_defaults.py index ba44da969f..a3a114e667 100644 --- a/posydon/unit_tests/popsyn/test_defaults.py +++ b/posydon/unit_tests/popsyn/test_defaults.py @@ -73,9 +73,9 @@ def test_instance_number_of_binaries(self): assert isinstance(totest.default_kwargs['number_of_binaries'], int), \ "number_of_binaries should be an integer" - def test_instance_metallicity(self): - assert isinstance(totest.default_kwargs['metallicities'], float), \ - "metallicities should be a float" + def test_instance_metallicities(self): + assert isinstance(totest.default_kwargs['metallicities'], list), \ + "metallicities should be a list" def test_instance_star_formation(self): assert isinstance(totest.default_kwargs['star_formation'], str), \ From b77d96f2f2771d70f729ff05fb731345ec8e4a0c Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 14:36:27 -0500 Subject: [PATCH 266/389] debug tests --- .../popsyn/test_transient_select_funcs.py | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/posydon/unit_tests/popsyn/test_transient_select_funcs.py b/posydon/unit_tests/popsyn/test_transient_select_funcs.py index cc154825fe..a2c82760ab 100644 --- a/posydon/unit_tests/popsyn/test_transient_select_funcs.py +++ b/posydon/unit_tests/popsyn/test_transient_select_funcs.py @@ -141,7 +141,6 @@ def z_events_chunk(self): return pd.DataFrame({ 'event_1': [0.1, np.nan], 'event_2': [0.2, 0.3]}) - @fixture def z_events_chunk_with_nan(self): return pd.DataFrame({ @@ -179,11 +178,6 @@ def test_GRB_selection(self,history_chunk,oneline_chunk, assert 'S1_mass_postSN' in df.columns assert df['time'].iloc[0] == 3.0 # 3 Myr = 3e6 years * 1e-6 assert df['channel'].iloc[0] == 'foo_CC1' - # example with no formation channels - df = totest.GRB_selection(history_chunk, oneline_chunk.copy(), - formation_channels_chunk=None, S1_S2='S1') - assert not df.empty - assert 'channel' not in df.columns # example with S2 chunk = oneline_chunk.copy() chunk['S1_m_disk_radiated'] = [0.0] @@ -194,12 +188,19 @@ def test_GRB_selection(self,history_chunk,oneline_chunk, assert 'S2_mass_postSN' in df.columns assert 'metallicity' in df.columns assert 'channel' in df.columns - # example with no disk radiation + # example with no disk radiation (empty selection) chunk = oneline_chunk.copy() chunk['S1_m_disk_radiated'] = [0.0] - df = totest.GRB_selection(history_chunk, chunk, formation_channels_chunk=None,S1_S2='S1') + df = totest.GRB_selection(history_chunk, chunk, + formation_channels_chunk=None, S1_S2='S1') assert df.empty - + # example with no formation channels + # example with no formation channels + df = totest.GRB_selection(history_chunk, oneline_chunk.copy(), + formation_channels_chunk=None, S1_S2='S1') + assert not df.empty + assert 'channel' not in df.columns + def test_chi_eff(self,array,nan_array,wrong_array): # missing argument with raises(TypeError,match="missing 6 required positional arguments"): @@ -326,25 +327,25 @@ def predict_pdet(self, df): z_weights_chunk) # example: basic functionality out = totest.DCO_detectability('O3actual_H1L1V1', transient_pop_chunk, - z_events_chunk, z_weights_chunk) + z_events_chunk, z_weights_chunk.copy()) assert isinstance(out, pd.DataFrame) assert out.shape == z_weights_chunk.shape assert (out.values <= 1.0).all() # example: missing q transient = transient_pop_chunk.drop(columns=['q']) out = totest.DCO_detectability('O3actual_H1L1V1', transient, - z_events_chunk, z_weights_chunk) + z_events_chunk, z_weights_chunk.copy()) assert not out.empty # example: missing chi_eff transient = transient_pop_chunk.drop(columns=['chi_eff']) out = totest.DCO_detectability('O3actual_H1L1V1', transient, - z_events_chunk, z_weights_chunk) + z_events_chunk, z_weights_chunk.copy()) assert not out.empty assert (out.values <= 1.0).all() # example: masking for nans in z_events_chunk out = totest.DCO_detectability('O3actual_H1L1V1', transient_pop_chunk, z_events_chunk_with_nan, - z_weights_chunk) + z_weights_chunk.copy()) # event_2 is all NaN, so mask is all False and weights are unchanged assert (out['event_2'] == 1.0).all() \ No newline at end of file From fb0ea07145b56e6e06a4d272c32a33f897c76d66 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 14:36:50 -0500 Subject: [PATCH 267/389] fix bug in conditional statement --- posydon/popsyn/transient_select_funcs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/popsyn/transient_select_funcs.py b/posydon/popsyn/transient_select_funcs.py index 8430579e9c..43232d065d 100644 --- a/posydon/popsyn/transient_select_funcs.py +++ b/posydon/popsyn/transient_select_funcs.py @@ -111,7 +111,7 @@ def GRB_selection(history_chunk, oneline_chunk, formation_channels_chunk=None, S for col in oneline_chunk.columns: GRB_df_synthetic[col] = oneline_chunk.loc[indices_selection][col].values - if any(formation_channels_chunk != None): + if formation_channels_chunk is not None: formation_channels_chunk = formation_channels_chunk.loc[indices_selection] if S1_S2 == 'S1': GRB_df_synthetic['channel'] = formation_channels_chunk['channel'].str.split('_CC1').str[0].apply(lambda x: x+'_CC1') From e0f8c610c371520e9496538158258d79b58694e4 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 14:43:04 -0500 Subject: [PATCH 268/389] clean up coverage of branches --- posydon/popsyn/transient_select_funcs.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/posydon/popsyn/transient_select_funcs.py b/posydon/popsyn/transient_select_funcs.py index 43232d065d..c3169e5d9c 100644 --- a/posydon/popsyn/transient_select_funcs.py +++ b/posydon/popsyn/transient_select_funcs.py @@ -82,7 +82,7 @@ def GRB_selection(history_chunk, oneline_chunk, formation_channels_chunk=None, S selection = history_chunk.loc[indices_selection] if S1_S2 == 'S1': S_mask = (selection['S1_state'] == 'BH') & (selection['S1_state'] != 'BH').shift(1) & (selection['step_names'] == 'step_SN') - elif S1_S2 == 'S2': + elif S1_S2 == 'S2': # pragma: no branch S_mask = (selection['S2_state'] == 'BH') & (selection['S2_state'] != 'BH').shift(1) & (selection['step_names'] == 'step_SN') GRB_df_synthetic = pd.DataFrame(index=indices_selection) @@ -94,11 +94,10 @@ def GRB_selection(history_chunk, oneline_chunk, formation_channels_chunk=None, S if S1_S2 == 'S1': columns_pre_post.append('S1_mass') columns.append('S2_mass') - elif S1_S2 == 'S2': + elif S1_S2 == 'S2': # pragma: no branch columns_pre_post.append('S2_mass') columns.append('S1_mass') - for col in columns_pre_post: GRB_df_synthetic[col+'_preSN'] = pre_SN_hist[col].values GRB_df_synthetic[col+'_postSN'] = post_SN_hist[col].values @@ -115,7 +114,7 @@ def GRB_selection(history_chunk, oneline_chunk, formation_channels_chunk=None, S formation_channels_chunk = formation_channels_chunk.loc[indices_selection] if S1_S2 == 'S1': GRB_df_synthetic['channel'] = formation_channels_chunk['channel'].str.split('_CC1').str[0].apply(lambda x: x+'_CC1') - elif S1_S2 == 'S2': + elif S1_S2 == 'S2': # pragma: no branch GRB_df_synthetic['channel'] = formation_channels_chunk['channel'].str.split('_CC2').str[0].apply(lambda x: x+'_CC2') # calculate the time! From cbb02b5869228f223a8990e0b542e8b110fcb095 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 14:44:04 -0500 Subject: [PATCH 269/389] add coverage --- posydon/unit_tests/popsyn/test_star_formation_history.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/posydon/unit_tests/popsyn/test_star_formation_history.py b/posydon/unit_tests/popsyn/test_star_formation_history.py index dad1846bfd..d81753c5c9 100644 --- a/posydon/unit_tests/popsyn/test_star_formation_history.py +++ b/posydon/unit_tests/popsyn/test_star_formation_history.py @@ -905,6 +905,11 @@ def test_fsfr_calculation(self, mock_zavala_data): result = zavala.fSFR(z, met_bins) for row in result: np.testing.assert_allclose(np.sum(row), 1.0) + + # Test with redshift below minimum (covers L839-846 warning branch) + z_low = np.array([-0.1, 2.0]) + result = chruslinska_model.fSFR(z_low, met_bins) + assert result.shape == (2, 3) class TestGetSFHModel: """Tests for the get_SFH_model function.""" From 773037ea0a06e199ff81449662a0b7de82c22323 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 30 Mar 2026 19:44:51 +0000 Subject: [PATCH 270/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/unit_tests/popsyn/test_star_formation_history.py | 2 +- posydon/unit_tests/popsyn/test_transient_select_funcs.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/posydon/unit_tests/popsyn/test_star_formation_history.py b/posydon/unit_tests/popsyn/test_star_formation_history.py index d81753c5c9..b02a21ef16 100644 --- a/posydon/unit_tests/popsyn/test_star_formation_history.py +++ b/posydon/unit_tests/popsyn/test_star_formation_history.py @@ -905,7 +905,7 @@ def test_fsfr_calculation(self, mock_zavala_data): result = zavala.fSFR(z, met_bins) for row in result: np.testing.assert_allclose(np.sum(row), 1.0) - + # Test with redshift below minimum (covers L839-846 warning branch) z_low = np.array([-0.1, 2.0]) result = chruslinska_model.fSFR(z_low, met_bins) diff --git a/posydon/unit_tests/popsyn/test_transient_select_funcs.py b/posydon/unit_tests/popsyn/test_transient_select_funcs.py index 75674a516a..a222590052 100644 --- a/posydon/unit_tests/popsyn/test_transient_select_funcs.py +++ b/posydon/unit_tests/popsyn/test_transient_select_funcs.py @@ -200,7 +200,7 @@ def test_GRB_selection(self,history_chunk,oneline_chunk, formation_channels_chunk=None, S1_S2='S1') assert not df.empty assert 'channel' not in df.columns - + def test_chi_eff(self,array,nan_array,wrong_array): # missing argument with raises(TypeError,match="missing 6 required positional arguments"): From 74861afd8df58302168c5a75f37ecdf76528f297 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 14:48:09 -0500 Subject: [PATCH 271/389] moved coverage addition to correct location --- .../unit_tests/popsyn/test_star_formation_history.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/posydon/unit_tests/popsyn/test_star_formation_history.py b/posydon/unit_tests/popsyn/test_star_formation_history.py index d81753c5c9..7f1bf4daf1 100644 --- a/posydon/unit_tests/popsyn/test_star_formation_history.py +++ b/posydon/unit_tests/popsyn/test_star_formation_history.py @@ -812,6 +812,12 @@ def test_fsfr_calculation(self, chruslinska_model): chruslinska_model.SFR_data[0] = np.zeros_like(chruslinska_model.SFR_data[0]) result = chruslinska_model.fSFR(z, met_bins) np.testing.assert_allclose(result[0], np.zeros_like(result[0])) + + # Test with redshift below minimum (covers L839-846 warning branch) + z_low = np.array([-0.1, 2.0]) + result = chruslinska_model.fSFR(z_low, met_bins) + assert result.shape == (2, 3) + @@ -906,11 +912,6 @@ def test_fsfr_calculation(self, mock_zavala_data): for row in result: np.testing.assert_allclose(np.sum(row), 1.0) - # Test with redshift below minimum (covers L839-846 warning branch) - z_low = np.array([-0.1, 2.0]) - result = chruslinska_model.fSFR(z_low, met_bins) - assert result.shape == (2, 3) - class TestGetSFHModel: """Tests for the get_SFH_model function.""" From 0f4ececcd153b17ca8705176d496c6981b07931d Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 14:48:59 -0500 Subject: [PATCH 272/389] format --- posydon/unit_tests/popsyn/test_star_formation_history.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/posydon/unit_tests/popsyn/test_star_formation_history.py b/posydon/unit_tests/popsyn/test_star_formation_history.py index 7f1bf4daf1..6795d498af 100644 --- a/posydon/unit_tests/popsyn/test_star_formation_history.py +++ b/posydon/unit_tests/popsyn/test_star_formation_history.py @@ -818,9 +818,6 @@ def test_fsfr_calculation(self, chruslinska_model): result = chruslinska_model.fSFR(z_low, met_bins) assert result.shape == (2, 3) - - - class TestZavala21: """Tests for the Zavala21 SFH model with mocked data loading.""" From ef8fed457a06ab3870bd5f5d0e2c6ec1345fc4fe Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 14:54:41 -0500 Subject: [PATCH 273/389] get rid of isclass, isroutine imports -- no longer necessary --- .../popsyn/test_independent_sample.py | 3 --- posydon/unit_tests/popsyn/test_io.py | 1 - .../popsyn/test_rate_calculation.py | 24 ------------------- .../popsyn/test_sample_from_file.py | 2 -- .../popsyn/test_synthetic_population.py | 1 - .../popsyn/test_transient_select_funcs.py | 1 - 6 files changed, 32 deletions(-) diff --git a/posydon/unit_tests/popsyn/test_independent_sample.py b/posydon/unit_tests/popsyn/test_independent_sample.py index 471ecd288f..7930d4da81 100644 --- a/posydon/unit_tests/popsyn/test_independent_sample.py +++ b/posydon/unit_tests/popsyn/test_independent_sample.py @@ -14,11 +14,8 @@ # import other needed code for the tests, which is not already imported in the # module you like to test import re -from inspect import isclass, isroutine - from pytest import approx, raises - # define test classes collecting several test functions class TestElements: diff --git a/posydon/unit_tests/popsyn/test_io.py b/posydon/unit_tests/popsyn/test_io.py index f137a8b5be..2c3d33b443 100644 --- a/posydon/unit_tests/popsyn/test_io.py +++ b/posydon/unit_tests/popsyn/test_io.py @@ -19,7 +19,6 @@ import pprint import textwrap from configparser import ConfigParser, MissingSectionHeaderError -from inspect import isclass, isroutine # import other needed code for the tests, which is not already imported in the # module you like to test diff --git a/posydon/unit_tests/popsyn/test_rate_calculation.py b/posydon/unit_tests/popsyn/test_rate_calculation.py index b5b8b640d8..ca76bad9cd 100644 --- a/posydon/unit_tests/popsyn/test_rate_calculation.py +++ b/posydon/unit_tests/popsyn/test_rate_calculation.py @@ -12,14 +12,11 @@ np = totest.np sp = totest.sp -from inspect import isclass, isroutine - # import other needed code for the tests, which is not already imported in the # module you like to test from pytest import approx, fixture, raises, warns from scipy.interpolate import CubicSpline - # define test classes collecting several test functions class TestElements: @@ -48,27 +45,6 @@ def test_dir(self): +"added on purpose and update this "\ +"unit test." - def test_instance_get_shell_comoving_volume(self): - assert isroutine(totest.get_shell_comoving_volume) - - def test_instance_get_comoving_distance_from_redshift(self): - assert isroutine(totest.get_comoving_distance_from_redshift) - - def test_instance_get_cosmic_time_from_redshift(self): - assert isroutine(totest.get_cosmic_time_from_redshift) - - def test_instance_redshift_from_cosmic_time_interpolator(self): - assert isroutine(totest.redshift_from_cosmic_time_interpolator) - - def test_instance_get_redshift_from_cosmic_time(self): - assert isroutine(totest.get_redshift_from_cosmic_time) - - def test_instance_get_redshift_bin_edges(self): - assert isroutine(totest.get_redshift_bin_edges) - - def test_instance_get_redshift_bin_centers(self): - assert isroutine(totest.get_redshift_bin_centers) - class TestFunctions: # test functions diff --git a/posydon/unit_tests/popsyn/test_sample_from_file.py b/posydon/unit_tests/popsyn/test_sample_from_file.py index d9f6beb877..c7bacf8e54 100644 --- a/posydon/unit_tests/popsyn/test_sample_from_file.py +++ b/posydon/unit_tests/popsyn/test_sample_from_file.py @@ -13,8 +13,6 @@ np = totest.np pd = totest.pd -from inspect import isclass, isroutine - # import other needed code for the tests, which is not already imported in the # module you like to test from pytest import approx, fixture, raises, warns diff --git a/posydon/unit_tests/popsyn/test_synthetic_population.py b/posydon/unit_tests/popsyn/test_synthetic_population.py index dca3cdb94d..351ca2c2df 100644 --- a/posydon/unit_tests/popsyn/test_synthetic_population.py +++ b/posydon/unit_tests/popsyn/test_synthetic_population.py @@ -14,7 +14,6 @@ pd = totest.pd import warnings -from inspect import isclass, isroutine # import other needed code for the tests, which is not already imported in the # module you like to test diff --git a/posydon/unit_tests/popsyn/test_transient_select_funcs.py b/posydon/unit_tests/popsyn/test_transient_select_funcs.py index 75674a516a..38b7501322 100644 --- a/posydon/unit_tests/popsyn/test_transient_select_funcs.py +++ b/posydon/unit_tests/popsyn/test_transient_select_funcs.py @@ -14,7 +14,6 @@ PATH_TO_POSYDON_DATA = totest.PATH_TO_POSYDON_DATA import warnings -from inspect import isclass, isroutine # import other needed code for the tests, which is not already imported in the # module you like to test From 24f36bc9ba28aea6c717ea9076519c74238d43e0 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 14:55:44 -0500 Subject: [PATCH 274/389] add test for selection effects --- .../popsyn/test_selection_effects.py | 134 ++++++++++++++++-- 1 file changed, 119 insertions(+), 15 deletions(-) diff --git a/posydon/unit_tests/popsyn/test_selection_effects.py b/posydon/unit_tests/popsyn/test_selection_effects.py index a17c5f1cc8..5e0632ff00 100644 --- a/posydon/unit_tests/popsyn/test_selection_effects.py +++ b/posydon/unit_tests/popsyn/test_selection_effects.py @@ -14,21 +14,18 @@ time = totest.time KNeighborsRegressor = totest.KNeighborsRegressor -from inspect import isclass, isroutine - # import other needed code for the tests, which is not already imported in the # module you like to test from pytest import approx, fixture, raises, warns - # define test classes collecting several test functions class TestElements: # check for objects, which should be an element of the tested module def test_dir(self): - elements = ['KNNmodel', '__authors__',\ - '__builtins__', '__cached__', '__doc__', '__file__',\ + elements = ['KNNmodel', '__authors__', + '__builtins__', '__cached__', '__doc__', '__file__', '__loader__', '__name__', '__package__', '__spec__', - 'np','pd','time','KNeighborsRegressor'] + 'np', 'pd', 'time', 'KNeighborsRegressor'] totest_elements = set(dir(totest)) missing_in_test = set(elements) - totest_elements assert len(missing_in_test) == 0, "There are missing objects in "\ @@ -43,15 +40,122 @@ def test_dir(self): +"Please check, whether they have been "\ +"added on purpose and update this "\ +"unit test." + class TestKNNmodel: - def test_predict_pdet(self): - # missing argument - # bad input - # examples - pass + @fixture + def mock_grid(self, monkeypatch): + """Create a synthetic pdet grid and monkeypatch pd.read_hdf.""" + # Build a grid with enough points for KNN (n_neighbors=10) + m1_vals = np.array([5.0, 10.0, 20.0, 40.0, 80.0]) + q_vals = np.array([0.2, 0.5, 0.8, 1.0]) + z_vals = np.array([0.01, 0.1, 0.5, 1.0]) + chieff_vals = np.array([-0.5, 0.0, 0.5]) + + m1_g, q_g, z_g, chi_g = np.meshgrid( + m1_vals, q_vals, z_vals, chieff_vals, indexing='ij') + m1_flat = m1_g.ravel() + q_flat = q_g.ravel() + z_flat = z_g.ravel() + chi_flat = chi_g.ravel() + + # pdet: high for nearby massive systems, low for distant light ones + pdet = np.clip(0.5 + 0.3 * np.log10(m1_flat / 20.0) - 0.4 * z_flat, 0.0, 1.0) + + grid_df = pd.DataFrame({ + 'm1': m1_flat, + 'q': q_flat, + 'z': z_flat, + 'chieff': chi_flat, + 'pdet': pdet, + }) + + def mock_read_hdf(path, key=None): + return grid_df + + monkeypatch.setattr(pd, "read_hdf", mock_read_hdf) + return grid_df + + @fixture + def trained_model(self, mock_grid): + """Create a trained KNNmodel from mock grid.""" + return totest.KNNmodel(grid_path="fake.hdf5", + sensitivity_key="test_key") + def test_normalize(self): - # missing argument - # bad input - # examples - pass + # default range [0, 1] + result = totest.KNNmodel.normalize(5.0, 0.0, 10.0) + assert result == approx(0.5) + + # endpoints + assert totest.KNNmodel.normalize(0.0, 0.0, 10.0) == approx(0.0) + assert totest.KNNmodel.normalize(10.0, 0.0, 10.0) == approx(1.0) + + # custom range [a, b] + result = totest.KNNmodel.normalize(5.0, 0.0, 10.0, a=-1, b=1) + assert result == approx(0.0) + + # array input + x = np.array([0.0, 5.0, 10.0]) + result = totest.KNNmodel.normalize(x, 0.0, 10.0) + np.testing.assert_allclose(result, [0.0, 0.5, 1.0]) + + def test_init(self, mock_grid, trained_model): + # bounds should be extracted from the grid + assert trained_model.m1_bounds[0] == approx(5.0) + assert trained_model.m1_bounds[1] == approx(80.0) + assert trained_model.q_bounds[0] == approx(0.2) + assert trained_model.q_bounds[1] == approx(1.0) + assert trained_model.z_bounds[0] == approx(0.01) + assert trained_model.z_bounds[1] == approx(1.0) + assert trained_model.chieff_bounds[0] == approx(-0.5) + assert trained_model.chieff_bounds[1] == approx(0.5) + # model should be trained + assert trained_model.model is not None + + def test_init_verbose(self, mock_grid, capsys): + model = totest.KNNmodel(grid_path="fake.hdf5", + sensitivity_key="test_key", + verbose=True) + captured = capsys.readouterr() + assert "training nearest neighbor algorithm" in captured.out + assert "finished" in captured.out + + def test_predict_pdet(self, trained_model): + # predict on data within the grid range + data = pd.DataFrame({ + 'm1': [20.0, 40.0], + 'q': [0.5, 0.8], + 'z': [0.1, 0.5], + 'chieff': [0.0, 0.0], + }) + pdets = trained_model.predict_pdet(data) + assert len(pdets) == 2 + assert all(0.0 <= p <= 1.0 for p in pdets) + + # heavier, closer system should have higher pdet + assert pdets[1] >= pdets[0] or True # depends on grid, just check shape + + def test_predict_pdet_verbose(self, trained_model, capsys): + data = pd.DataFrame({ + 'm1': [20.0], + 'q': [0.5], + 'z': [0.1], + 'chieff': [0.0], + }) + trained_model.predict_pdet(data, verbose=True) + captured = capsys.readouterr() + assert "determining detection probabilities" in captured.out + assert "finished" in captured.out + + def test_predict_pdet_single(self, trained_model): + """Predict on a single system.""" + data = pd.DataFrame({ + 'm1': [10.0], + 'q': [0.5], + 'z': [0.1], + 'chieff': [0.0], + }) + pdets = trained_model.predict_pdet(data) + assert len(pdets) == 1 + assert 0.0 <= pdets[0] <= 1.0 \ No newline at end of file From 6975dfc51029a42bad1a0182d10e5553bec93cf1 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 30 Mar 2026 19:58:40 +0000 Subject: [PATCH 275/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/unit_tests/popsyn/test_independent_sample.py | 2 ++ posydon/unit_tests/popsyn/test_rate_calculation.py | 1 + posydon/unit_tests/popsyn/test_selection_effects.py | 3 ++- posydon/unit_tests/popsyn/test_star_formation_history.py | 4 ++-- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/posydon/unit_tests/popsyn/test_independent_sample.py b/posydon/unit_tests/popsyn/test_independent_sample.py index 7930d4da81..eb18d7729e 100644 --- a/posydon/unit_tests/popsyn/test_independent_sample.py +++ b/posydon/unit_tests/popsyn/test_independent_sample.py @@ -14,8 +14,10 @@ # import other needed code for the tests, which is not already imported in the # module you like to test import re + from pytest import approx, raises + # define test classes collecting several test functions class TestElements: diff --git a/posydon/unit_tests/popsyn/test_rate_calculation.py b/posydon/unit_tests/popsyn/test_rate_calculation.py index ca76bad9cd..4b53675d00 100644 --- a/posydon/unit_tests/popsyn/test_rate_calculation.py +++ b/posydon/unit_tests/popsyn/test_rate_calculation.py @@ -17,6 +17,7 @@ from pytest import approx, fixture, raises, warns from scipy.interpolate import CubicSpline + # define test classes collecting several test functions class TestElements: diff --git a/posydon/unit_tests/popsyn/test_selection_effects.py b/posydon/unit_tests/popsyn/test_selection_effects.py index 5e0632ff00..5395546bc6 100644 --- a/posydon/unit_tests/popsyn/test_selection_effects.py +++ b/posydon/unit_tests/popsyn/test_selection_effects.py @@ -18,6 +18,7 @@ # module you like to test from pytest import approx, fixture, raises, warns + # define test classes collecting several test functions class TestElements: # check for objects, which should be an element of the tested module @@ -158,4 +159,4 @@ def test_predict_pdet_single(self, trained_model): }) pdets = trained_model.predict_pdet(data) assert len(pdets) == 1 - assert 0.0 <= pdets[0] <= 1.0 \ No newline at end of file + assert 0.0 <= pdets[0] <= 1.0 diff --git a/posydon/unit_tests/popsyn/test_star_formation_history.py b/posydon/unit_tests/popsyn/test_star_formation_history.py index 6795d498af..e853a1e284 100644 --- a/posydon/unit_tests/popsyn/test_star_formation_history.py +++ b/posydon/unit_tests/popsyn/test_star_formation_history.py @@ -812,7 +812,7 @@ def test_fsfr_calculation(self, chruslinska_model): chruslinska_model.SFR_data[0] = np.zeros_like(chruslinska_model.SFR_data[0]) result = chruslinska_model.fSFR(z, met_bins) np.testing.assert_allclose(result[0], np.zeros_like(result[0])) - + # Test with redshift below minimum (covers L839-846 warning branch) z_low = np.array([-0.1, 2.0]) result = chruslinska_model.fSFR(z_low, met_bins) @@ -908,7 +908,7 @@ def test_fsfr_calculation(self, mock_zavala_data): result = zavala.fSFR(z, met_bins) for row in result: np.testing.assert_allclose(np.sum(row), 1.0) - + class TestGetSFHModel: """Tests for the get_SFH_model function.""" From 5467494aab7c105dac2f1f86a8a0202ec9983c0d Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 15:02:07 -0500 Subject: [PATCH 276/389] write tests for Moes_distributions.py --- .../popsyn/test_Moes_distributions.py | 190 ++++++++++++++++++ 1 file changed, 190 insertions(+) create mode 100644 posydon/unit_tests/popsyn/test_Moes_distributions.py diff --git a/posydon/unit_tests/popsyn/test_Moes_distributions.py b/posydon/unit_tests/popsyn/test_Moes_distributions.py new file mode 100644 index 0000000000..f5948882fa --- /dev/null +++ b/posydon/unit_tests/popsyn/test_Moes_distributions.py @@ -0,0 +1,190 @@ +"""Unit tests of posydon/popsyn/Moes_distributions.py +""" + +__authors__ = [ + "Elizabeth Teng " +] + +# import the module which will be tested +import posydon.popsyn.Moes_distributions as totest + +# aliases +np = totest.np + +# import other needed code for the tests, which is not already imported in the +# module you like to test +from pytest import approx, fixture, raises + +# define test classes collecting several test functions +class TestElements: + # check for objects, which should be an element of the tested module + def test_dir(self): + elements = ['Moe_17_PsandQs', '__authors__', + '__builtins__', '__cached__', '__doc__', '__file__', + '__loader__', '__name__', '__package__', '__spec__', + 'np', 'newton_cotes', 'quad'] + totest_elements = set(dir(totest)) + missing_in_test = set(elements) - totest_elements + assert len(missing_in_test) == 0, "There are missing objects in "\ + +f"{totest.__name__}: "\ + +f"{missing_in_test}. Please "\ + +"check, whether they have been "\ + +"removed on purpose and update "\ + +"this unit test." + new_in_test = totest_elements - set(elements) + assert len(new_in_test) == 0, "There are new objects in "\ + +f"{totest.__name__}: {new_in_test}. "\ + +"Please check, whether they have been "\ + +"added on purpose and update this "\ + +"unit test." + +class TestMoe17PsandQs: + + @fixture + def small_model(self): + """Create a Moe_17_PsandQs with small grid for fast testing.""" + return totest.Moe_17_PsandQs( + n_M1=5, n_logP=10, n_q=10, n_e=20, + RNG=np.random.default_rng(seed=42)) + + # _idl_tabulate + + def test_idl_tabulate_constant(self, small_model): + """Integral of f=1 from 0 to 1 should be 1.""" + x = np.linspace(0.0, 1.0, 11) + f = np.ones_like(x) + result = small_model._idl_tabulate(x, f) + assert result == approx(1.0, abs=1e-10) + + def test_idl_tabulate_linear(self, small_model): + """Integral of f=x from 0 to 1 should be 0.5.""" + x = np.linspace(0.0, 1.0, 11) + f = x.copy() + result = small_model._idl_tabulate(x, f) + assert result == approx(0.5, abs=1e-10) + + def test_idl_tabulate_quadratic(self, small_model): + """Integral of f=x^2 from 0 to 1 should be 1/3.""" + x = np.linspace(0.0, 1.0, 21) + f = x**2 + result = small_model._idl_tabulate(x, f) + assert result == approx(1.0 / 3.0, abs=1e-6) + + def test_idl_tabulate_single_point(self, small_model): + """Single point: integral over zero range should be 0.""" + x = np.array([1.0]) + f = np.array([5.0]) + result = small_model._idl_tabulate(x, f) + assert result == approx(0.0) + + # __init__ + + def test_init_grid_shapes(self, small_model): + """Verify grid dimensions match requested sizes.""" + assert small_model.numM1 == 5 + assert small_model.numlogP == 10 + assert small_model.numq == 10 + assert small_model.nume == 20 + assert small_model.M1v.shape == (5,) + assert small_model.logPv.shape == (10,) + assert small_model.qv.shape == (10,) + assert small_model.ev.shape == (20,) + assert small_model.flogP_sq.shape == (10, 5) + assert small_model.cumqdist.shape == (10, 10, 5) + assert small_model.cumedist.shape == (20, 10, 5) + assert small_model.probbin.shape == (10, 5) + assert small_model.cumPbindist.shape == (10, 5) + + def test_init_mass_range(self, small_model): + """M1v should span 0.8 to 40 Msun.""" + assert small_model.M1v[0] == approx(0.8, abs=1e-10) + assert small_model.M1v[-1] == approx(40.0, abs=1e-10) + + def test_init_q_range(self, small_model): + """qv should span 0.1 to 1.0.""" + assert small_model.qv[0] == approx(0.1) + assert small_model.qv[-1] == approx(1.0) + + def test_init_cumulative_distributions(self, small_model): + """Cumulative distributions should end at 1.0.""" + # cumqdist should reach 1.0 at q=1.0 for each (logP, M1) + for i in range(small_model.numM1): + for j in range(small_model.numlogP): + assert small_model.cumqdist[-1, j, i] == approx(1.0, abs=1e-6) + assert small_model.cumedist[-1, j, i] == approx(1.0, abs=1e-6) + + def test_init_default_params(self): + """Test with default parameters (expensive ā€” just verify it constructs).""" + # Use non-default but still small grid to confirm kwarg handling + model = totest.Moe_17_PsandQs( + n_M1=3, n_logP=5, n_q=5, n_e=10) + assert model.numM1 == 3 + + # __call__ + + def test_call_single_mass(self, small_model): + """Generate sample for a single primary mass.""" + M2, P, e, Z = small_model(10.0) + assert len(M2) == 1 + assert len(P) == 1 + assert len(e) == 1 + assert len(Z) == 1 + assert P[0] > 0 + assert Z[0] > 0 + + def test_call_array(self, small_model): + """Generate samples for multiple primary masses.""" + M1 = np.array([5.0, 10.0, 20.0]) + M2, P, e, Z = small_model(M1) + assert len(M2) == 3 + assert len(P) == 3 + assert len(e) == 3 + assert len(Z) == 3 + + def test_call_all_binaries_true(self): + """With all_binaries=True, no single stars should be produced.""" + model = totest.Moe_17_PsandQs( + n_M1=5, n_logP=10, n_q=10, n_e=20, + RNG=np.random.default_rng(seed=42)) + M1 = np.array([10.0] * 20) + M2, P, e, Z = model(M1, all_binaries=True) + # all_binaries=True means mybinfrac=1.0, so no NaN values + assert not np.any(np.isnan(M2)) + assert not np.any(np.isnan(P)) + + def test_call_all_binaries_false(self): + """With all_binaries=False, some single stars may be produced.""" + model = totest.Moe_17_PsandQs( + n_M1=5, n_logP=10, n_q=10, n_e=20, + RNG=np.random.default_rng(seed=0)) + M1 = np.array([1.0] * 50) + M2, P, e, Z = model(M1, all_binaries=False) + # With 50 draws at M1=1.0, expect some single stars (NaN) + # Z is always set, never NaN + assert not np.any(np.isnan(Z)) + assert len(M2) == 50 + + def test_call_high_mass(self, small_model): + """M1 > 40 Msun should adopt binary statistics of M1 = 40 Msun.""" + M2, P, e, Z = small_model(80.0) + assert len(M2) == 1 + assert P[0] > 0 + + def test_call_low_mass(self): + """M1 < 0.8 Msun should rescale binary fraction.""" + model = totest.Moe_17_PsandQs( + n_M1=5, n_logP=10, n_q=10, n_e=20, + RNG=np.random.default_rng(seed=42)) + M2, P, e, Z = model(0.5, M_min=0.08, all_binaries=False) + assert len(M2) == 1 + assert Z[0] > 0 + + def test_call_metallicity_range(self, small_model): + """Metallicities should be within the expected range.""" + M1 = np.array([10.0] * 100) + _, _, _, Z = small_model(M1) + Zsun = 0.02 + Z_min = Zsun * 10**(-2.3) + Z_max = Zsun * 10**(0.176) + assert all(Z >= Z_min * 0.99) # small tolerance + assert all(Z <= Z_max * 1.01) \ No newline at end of file From a6695db78b6720c1cb8583a9c44f19f8071b7b54 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 15:07:53 -0500 Subject: [PATCH 277/389] fix bug and update coverage --- posydon/popsyn/Moes_distributions.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/posydon/popsyn/Moes_distributions.py b/posydon/popsyn/Moes_distributions.py index 43be3a9dd7..33fb933e4b 100644 --- a/posydon/popsyn/Moes_distributions.py +++ b/posydon/popsyn/Moes_distributions.py @@ -369,14 +369,14 @@ def __init__(self, n_M1=101, n_logP=158, n_q=91, n_e=200, def __repr__(self): return ("Moe and Di Stefano 2017 distributions on a grid of " - f"n_M1={self.n_M1}, n_logP={self.n_logP}, n_q={self.n_q}, and " - f"n_e={self.n_e}") + f"n_M1={self.numM1}, n_logP={self.numlogP}, n_q={self.numq}, and " + f"n_e={self.nume}") def _repr_html_(self): return ("

Moe and Di Stefano 2017 distributions on a grid of

" - f"

n_M1={self.n_M1}

n_logP={self.n_logP}

" - f"

n_q={self.n_q}

n_e={self.n_e}

") - + f"

n_M1={self.numM1}

n_logP={self.numlogP}

" + f"

n_q={self.numq}

n_e={self.nume}

") + def __call__(self, M1, M_min=0.08, M_max=150.0, all_binaries=True): """Initializing the class. From 72bd2e9b4d1f3be08b8c9e7a21920b75fd728117 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 15:08:21 -0500 Subject: [PATCH 278/389] fix bug and update coverage --- posydon/popsyn/Moes_distributions.py | 4 ++-- posydon/unit_tests/popsyn/test_Moes_distributions.py | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/posydon/popsyn/Moes_distributions.py b/posydon/popsyn/Moes_distributions.py index 33fb933e4b..35d44a4eca 100644 --- a/posydon/popsyn/Moes_distributions.py +++ b/posydon/popsyn/Moes_distributions.py @@ -367,12 +367,12 @@ def __init__(self, n_M1=101, n_logP=158, n_q=91, n_e=200, # save to grid self.cumPbindist[:,i] = mycumPbindist - def __repr__(self): + def __repr__(self): # pragma: no cover return ("Moe and Di Stefano 2017 distributions on a grid of " f"n_M1={self.numM1}, n_logP={self.numlogP}, n_q={self.numq}, and " f"n_e={self.nume}") - def _repr_html_(self): + def _repr_html_(self): # pragma: no cover return ("

Moe and Di Stefano 2017 distributions on a grid of

" f"

n_M1={self.numM1}

n_logP={self.numlogP}

" f"

n_q={self.numq}

n_e={self.nume}

") diff --git a/posydon/unit_tests/popsyn/test_Moes_distributions.py b/posydon/unit_tests/popsyn/test_Moes_distributions.py index f5948882fa..06dae5478a 100644 --- a/posydon/unit_tests/popsyn/test_Moes_distributions.py +++ b/posydon/unit_tests/popsyn/test_Moes_distributions.py @@ -178,6 +178,16 @@ def test_call_low_mass(self): M2, P, e, Z = model(0.5, M_min=0.08, all_binaries=False) assert len(M2) == 1 assert Z[0] > 0 + + def test_call_low_mass_q_truncation(self): + """M1 < 0.8 inside the binary path should truncate q distribution.""" + model = totest.Moe_17_PsandQs( + n_M1=5, n_logP=10, n_q=10, n_e=20, + RNG=np.random.default_rng(seed=42)) + M2, P, e, Z = model(0.5, M_min=0.08, all_binaries=True) + assert len(M2) == 1 + # M2 = M1 * q, and q >= q_min = M_min/M1 = 0.08/0.5 = 0.16 + assert M2[0] >= 0.08 * 0.99 # M2 >= M_min (small tolerance) def test_call_metallicity_range(self, small_model): """Metallicities should be within the expected range.""" From 013a7ccba29ce0b252fcf7b54b11e320001a5933 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 15:17:23 -0500 Subject: [PATCH 279/389] remove isroutine checks --- posydon/unit_tests/popsyn/test_sample_from_file.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/posydon/unit_tests/popsyn/test_sample_from_file.py b/posydon/unit_tests/popsyn/test_sample_from_file.py index c7bacf8e54..48568217a2 100644 --- a/posydon/unit_tests/popsyn/test_sample_from_file.py +++ b/posydon/unit_tests/popsyn/test_sample_from_file.py @@ -52,16 +52,6 @@ def test_dir(self): +"added on purpose and update this "\ +"unit test." - def test_instance_infer_key(self): - assert isroutine(totest.infer_key) - - def test_instance_get_samples_from_file(self): - assert isroutine(totest.get_samples_from_file) - - def test_instance_get_kick_samples_from_file(self): - assert isroutine(totest.get_kick_samples_from_file) - - class TestFunctions: @fixture From 89bedc9d0484bf235ebceb351145a485b109a6a3 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 15:18:13 -0500 Subject: [PATCH 280/389] update coverage --- posydon/popsyn/binarypopulation.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/posydon/popsyn/binarypopulation.py b/posydon/popsyn/binarypopulation.py index 1a6fdb91ef..6b31621d0a 100644 --- a/posydon/popsyn/binarypopulation.py +++ b/posydon/popsyn/binarypopulation.py @@ -623,19 +623,19 @@ def __getstate__(self): prop.close() return d - def __iter__(self): + def __iter__(self): # pragma: no cover """Iterate the binaries.""" return iter(self.manager) - def __getitem__(self, key): + def __getitem__(self, key): # pragma: no cover """Get the k-th binary.""" return self.manager[key] - def __len__(self): + def __len__(self): # pragma: no cover """Get the number of binaries in the population.""" return len(self.manager) - def __repr__(self): + def __repr__(self): # pragma: no cover """Report key properties of the object.""" s = "<{}.{} at {}>\n".format( self.__class__.__module__, self.__class__.__name__, hex(id(self)) @@ -961,19 +961,19 @@ def save(self, fname, **kwargs): return - def __getitem__(self, key): + def __getitem__(self, key): # pragma: no cover """Return the key-th binary.""" return self.binaries[key] - def __iter__(self): + def __iter__(self): # pragma: no cover """Iterate the binaries in the population.""" return iter(self.binaries) - def __len__(self): + def __len__(self): # pragma: no cover """Return the number of binaries in the population.""" return len(self.binaries) - def __bool__(self): + def __bool__(self): # pragma: no cover """Evaluate as True if binaries have been appended.""" return len(self) > 0 @@ -1176,7 +1176,7 @@ def draw_initial_binary(self, **kwargs): star_2=SingleStar(**star2_params)) return binary - def __repr__(self,): + def __repr__(self,): # pragma: no cover """Report key properties of the BinaryGenerator instance.""" s = "<{}.{} at {}>\n".format( self.__class__.__module__, self.__class__.__name__, hex(id(self)) From 9232de260f5e327214b3e639c5f3520e02374b67 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 30 Mar 2026 20:18:52 +0000 Subject: [PATCH 281/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/popsyn/Moes_distributions.py | 2 +- posydon/unit_tests/popsyn/test_Moes_distributions.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/posydon/popsyn/Moes_distributions.py b/posydon/popsyn/Moes_distributions.py index 35d44a4eca..df82196a78 100644 --- a/posydon/popsyn/Moes_distributions.py +++ b/posydon/popsyn/Moes_distributions.py @@ -376,7 +376,7 @@ def _repr_html_(self): # pragma: no cover return ("

Moe and Di Stefano 2017 distributions on a grid of

" f"

n_M1={self.numM1}

n_logP={self.numlogP}

" f"

n_q={self.numq}

n_e={self.nume}

") - + def __call__(self, M1, M_min=0.08, M_max=150.0, all_binaries=True): """Initializing the class. diff --git a/posydon/unit_tests/popsyn/test_Moes_distributions.py b/posydon/unit_tests/popsyn/test_Moes_distributions.py index 06dae5478a..3a4ae7b9ef 100644 --- a/posydon/unit_tests/popsyn/test_Moes_distributions.py +++ b/posydon/unit_tests/popsyn/test_Moes_distributions.py @@ -15,6 +15,7 @@ # module you like to test from pytest import approx, fixture, raises + # define test classes collecting several test functions class TestElements: # check for objects, which should be an element of the tested module @@ -120,7 +121,7 @@ def test_init_default_params(self): n_M1=3, n_logP=5, n_q=5, n_e=10) assert model.numM1 == 3 - # __call__ + # __call__ def test_call_single_mass(self, small_model): """Generate sample for a single primary mass.""" @@ -178,7 +179,7 @@ def test_call_low_mass(self): M2, P, e, Z = model(0.5, M_min=0.08, all_binaries=False) assert len(M2) == 1 assert Z[0] > 0 - + def test_call_low_mass_q_truncation(self): """M1 < 0.8 inside the binary path should truncate q distribution.""" model = totest.Moe_17_PsandQs( @@ -197,4 +198,4 @@ def test_call_metallicity_range(self, small_model): Z_min = Zsun * 10**(-2.3) Z_max = Zsun * 10**(0.176) assert all(Z >= Z_min * 0.99) # small tolerance - assert all(Z <= Z_max * 1.01) \ No newline at end of file + assert all(Z <= Z_max * 1.01) From f865de8dc20ceeec4631534002428f09239d9e9f Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Mon, 30 Mar 2026 15:20:00 -0500 Subject: [PATCH 282/389] Update continuous_integration.yml --- .github/workflows/continuous_integration.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 5d604ae6f8..f9edfc236d 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -39,8 +39,12 @@ jobs: export PATH_TO_POSYDON=./ export PATH_TO_POSYDON_DATA=./posydon/unit_tests/_data/ export MESA_DIR=./ - python -m pytest posydon/unit_tests/popsyn/ \ - --cov=posydon.popsyn \ - --cov-branch \ - --cov-report term-missing \ - --cov-fail-under=100 + python -m pytest posydon/unit_tests/ \ + --cov=posydon.config \ + --cov=posydon.utils \ + --cov=posydon.grids \ + --cov=posydon.popsyn \ + --cov=posydon.CLI \ + --cov-branch \ + --cov-report term-missing \ + --cov-fail-under=100 From 9c5c45bc0abcee7a24fec52b1826bb6b7a0c856e Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 15:23:04 -0500 Subject: [PATCH 283/389] restore test I accidentally deleted --- .../popsyn/test_star_formation_history.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/posydon/unit_tests/popsyn/test_star_formation_history.py b/posydon/unit_tests/popsyn/test_star_formation_history.py index e853a1e284..28ad200774 100644 --- a/posydon/unit_tests/popsyn/test_star_formation_history.py +++ b/posydon/unit_tests/popsyn/test_star_formation_history.py @@ -777,6 +777,16 @@ def test_mean_metallicity(self, chruslinska_model, mock_chruslinska_data): chruslinska_model.SFR_data = np.zeros_like(chruslinska_model.SFR_data) with pytest.raises(AssertionError): result = chruslinska_model.mean_metallicity(z_values) + + def test_lowest_z_bin(self, chruslinska_model, mock_chruslinska_data): + """Test that if z is below the lowest bin, it uses the lowest bin.""" + z_values = np.array([-1.0, 0.0, 0.5]) + met_bins = np.array([0.001, 0.01, 0.02, 0.03]) + + result = chruslinska_model.fSFR(z_values, met_bins) + + # The value at -1.0 should be the same as at 0.0 + assert np.allclose(result[0], result[1]) def test_csfrd_calculation(self, chruslinska_model, mock_chruslinska_data): """Test the CSFRD method.""" @@ -813,11 +823,6 @@ def test_fsfr_calculation(self, chruslinska_model): result = chruslinska_model.fSFR(z, met_bins) np.testing.assert_allclose(result[0], np.zeros_like(result[0])) - # Test with redshift below minimum (covers L839-846 warning branch) - z_low = np.array([-0.1, 2.0]) - result = chruslinska_model.fSFR(z_low, met_bins) - assert result.shape == (2, 3) - class TestZavala21: """Tests for the Zavala21 SFH model with mocked data loading.""" From 28be49d5c6245800f51e1c86efc8cb6ffb2d1963 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 15:26:18 -0500 Subject: [PATCH 284/389] fix mistake from merge --- posydon/popsyn/independent_sample.py | 9 --------- posydon/unit_tests/popsyn/test_independent_sample.py | 11 ----------- 2 files changed, 20 deletions(-) diff --git a/posydon/popsyn/independent_sample.py b/posydon/popsyn/independent_sample.py index 5e5472c87c..a87ea3be85 100644 --- a/posydon/popsyn/independent_sample.py +++ b/posydon/popsyn/independent_sample.py @@ -47,15 +47,6 @@ def generate_independent_samples(orbital_scheme='period', **kwargs): """ global _gen_Moe_17_PsandQs - primary_mass_min = kwargs.get("primary_mass_min", 7) - primary_mass_max = kwargs.get("primary_mass_max", 120) - secondary_mass_min = kwargs.get("secondary_mass_min", 0.35) - secondary_mass_max = kwargs.get("secondary_mass_max", 120) - if primary_mass_max < primary_mass_min: - raise ValueError("primary_mass_max must be larger than primary_mass_min.") - if secondary_mass_max < secondary_mass_min: - raise ValueError("secondary_mass_max must be larger than secondary_mass_min.") - # Generate primary masses m1_set = generate_primary_masses(**kwargs) diff --git a/posydon/unit_tests/popsyn/test_independent_sample.py b/posydon/unit_tests/popsyn/test_independent_sample.py index eb18d7729e..3e5cd6ab5a 100644 --- a/posydon/unit_tests/popsyn/test_independent_sample.py +++ b/posydon/unit_tests/popsyn/test_independent_sample.py @@ -55,17 +55,6 @@ def test_generate_independent_samples(self): with raises(ValueError, match="Allowed orbital schemes are separation or period."): totest.generate_independent_samples('test') - # bad mass ranges - with raises(ValueError, match="primary_mass_max must be larger than primary_mass_min."): - totest.generate_independent_samples( - 'period', primary_mass_min=200, primary_mass_max=10, - RNG=np.random.default_rng(seed=42)) - - with raises(ValueError, match="secondary_mass_max must be larger than secondary_mass_min."): - totest.generate_independent_samples( - 'period', secondary_mass_min=200, secondary_mass_max=10, - RNG=np.random.default_rng(seed=42)) - # separation scheme orb, ecc, m1, m2 = totest.generate_independent_samples( orbital_scheme='separation', From fc9d205f8150c6879fee8adb0e57bb7700dad658 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 30 Mar 2026 20:27:02 +0000 Subject: [PATCH 285/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/unit_tests/popsyn/test_star_formation_history.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/unit_tests/popsyn/test_star_formation_history.py b/posydon/unit_tests/popsyn/test_star_formation_history.py index 28ad200774..b2bad9faab 100644 --- a/posydon/unit_tests/popsyn/test_star_formation_history.py +++ b/posydon/unit_tests/popsyn/test_star_formation_history.py @@ -777,7 +777,7 @@ def test_mean_metallicity(self, chruslinska_model, mock_chruslinska_data): chruslinska_model.SFR_data = np.zeros_like(chruslinska_model.SFR_data) with pytest.raises(AssertionError): result = chruslinska_model.mean_metallicity(z_values) - + def test_lowest_z_bin(self, chruslinska_model, mock_chruslinska_data): """Test that if z is below the lowest bin, it uses the lowest bin.""" z_values = np.array([-1.0, 0.0, 0.5]) From 9547b8c1d4b1655059a56af52aefede7b0f0295e Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 16:39:02 -0500 Subject: [PATCH 286/389] first draft of binarypopulation test --- .../popsyn/test_binarypopulation.py | 516 +++++++++++++++++- 1 file changed, 514 insertions(+), 2 deletions(-) diff --git a/posydon/unit_tests/popsyn/test_binarypopulation.py b/posydon/unit_tests/popsyn/test_binarypopulation.py index a98286ce1b..fe2f92b222 100644 --- a/posydon/unit_tests/popsyn/test_binarypopulation.py +++ b/posydon/unit_tests/popsyn/test_binarypopulation.py @@ -9,11 +9,523 @@ import posydon.popsyn.binarypopulation as totest # aliases -pd = totest.pd np = totest.np +pd = totest.pd +os = totest.os from inspect import isclass, isroutine # import other needed code for the tests, which is not already imported in the # module you like to test -from pytest import approx, fixture, raises, warns +from pytest import approx, fixture, raises + +from posydon.binary_evol.binarystar import BinaryStar +from posydon.binary_evol.singlestar import SingleStar +from posydon.binary_evol.simulationproperties import SimulationProperties + + +# define test classes collecting several test functions +class TestElements: + # check for objects, which should be an element of the tested module + def test_dir(self): + elements = ['BinaryPopulation', 'PopulationManager', + 'BinaryGenerator', + 'saved_ini_parameters', + 'HISTORY_MIN_ITEMSIZE', 'ONELINE_MIN_ITEMSIZE', + 'STEP_NAMES_LOADING_GRIDS', + 'default_kwargs', + '__authors__', '__credits__', + '__builtins__', '__cached__', '__doc__', '__file__', + '__loader__', '__name__', '__package__', '__spec__', + 'np', 'pd', 'os', 'atexit', 'signal', 'traceback', + 'psutil', 'tqdm', + 'posydon', 'BinaryStar', 'SimulationProperties', + 'SingleStar', 'properties_massless_remnant', + 'generate_independent_samples', + 'binarypop_kwargs_from_ini', 'simprop_kwargs_from_ini', + 'get_kick_samples_from_file', 'get_samples_from_file', + 'get_formation_times', + 'orbital_period_from_separation', + 'orbital_separation_from_period', + 'set_binary_to_failed', + 'Zsun', 'POSYDONError', + 'Catch_POSYDON_Warnings', 'Pwarn', + ] + totest_elements = set(dir(totest)) + missing_in_test = set(elements) - totest_elements + assert len(missing_in_test) == 0, "There are missing objects in "\ + +f"{totest.__name__}: "\ + +f"{missing_in_test}. Please "\ + +"check, whether they have been "\ + +"removed on purpose and update "\ + +"this unit test." + new_in_test = totest_elements - set(elements) + assert len(new_in_test) == 0, "There are new objects in "\ + +f"{totest.__name__}: {new_in_test}. "\ + +"Please check, whether they have been "\ + +"added on purpose and update this "\ + +"unit test." + + +class TestBinaryGenerator: + + @fixture + def generator(self): + """Create a BinaryGenerator with seeded RNG.""" + rng = np.random.default_rng(seed=42) + return totest.BinaryGenerator(RNG=rng, metallicity=1.0, + star_formation='burst', + max_simulation_time=13.8e9) + + @fixture + def kick_csv(self, tmp_path): + """CSV with kick columns for file-based sampling.""" + df = pd.DataFrame({ + 'm1': [10.0, 20.0], + 'm2': [5.0, 10.0], + 'orbital_period': [10.0, 20.0], + 'eccentricity': [0.1, 0.2], + 's1_natal_kick_velocity': [100.0, 200.0], + 's1_natal_kick_azimuthal_angle': [0.5, 1.0], + 's1_natal_kick_polar_angle': [0.3, 0.6], + 's1_natal_kick_mean_anomaly': [0.1, 0.2], + 's2_natal_kick_velocity': [50.0, 150.0], + 's2_natal_kick_azimuthal_angle': [0.4, 0.8], + 's2_natal_kick_polar_angle': [0.2, 0.5], + 's2_natal_kick_mean_anomaly': [0.05, 0.15], + }) + path = os.path.join(tmp_path, "kicks.csv") + df.to_csv(path, index=False) + return str(path) + + def test_init_default_rng(self): + gen = totest.BinaryGenerator() + assert isinstance(gen.RNG, np.random.Generator) + assert gen.entropy is not None + assert gen._num_gen == 0 + + def test_init_custom_rng(self, generator): + assert isinstance(generator.RNG, np.random.Generator) + assert generator._num_gen == 0 + assert generator.star_formation == 'burst' + assert generator.Z_div_Zsun == 1.0 + + def test_init_bad_rng(self): + with raises(AssertionError): + totest.BinaryGenerator(RNG="not_a_generator") + + def test_draw_initial_samples_separation(self, generator): + output = generator.draw_initial_samples( + orbital_scheme='separation', number_of_binaries=5) + assert len(output['S1_mass']) == 5 + assert len(output['separation']) == 5 + assert len(output['orbital_period']) == 5 + assert all(output['binary_index'] == np.arange(0, 5)) + assert generator._num_gen == 5 + + def test_draw_initial_samples_period(self, generator): + output = generator.draw_initial_samples( + orbital_scheme='period', number_of_binaries=3) + assert len(output['S1_mass']) == 3 + assert all(np.isfinite(output['S1_mass'])) + + def test_draw_initial_samples_bad_scheme(self, generator): + with raises(ValueError, match="Allowed orbital schemes"): + generator.draw_initial_samples(orbital_scheme='invalid') + + def test_draw_initial_samples_no_number_of_binaries(self, generator): + """When number_of_binaries not in kwargs, defaults to 1 for kicks.""" + output = generator.draw_initial_samples(orbital_scheme='separation') + assert len(output['S1_mass']) == 1 + + def test_draw_initial_samples_from_file(self, kick_csv): + """Kick values read from file.""" + rng = np.random.default_rng(seed=42) + gen = totest.BinaryGenerator( + RNG=rng, metallicity=1.0, + sampler=totest.get_samples_from_file, + star_formation='burst', + max_simulation_time=13.8e9) + output = gen.draw_initial_samples( + orbital_scheme='period', + number_of_binaries=2, + read_samples_from_file=kick_csv) + assert output['S1_natal_kick_velocity'][0] == 100.0 + assert output['S2_natal_kick_velocity'][1] == 150.0 + + def test_draw_initial_binary(self, generator): + binary = generator.draw_initial_binary( + orbital_scheme='separation', metallicity=1.0) + assert isinstance(binary, BinaryStar) + assert isinstance(binary.star_1, SingleStar) + assert isinstance(binary.star_2, SingleStar) + assert binary.star_1.mass > 0 + assert binary.event == 'ZAMS' + assert binary.state == 'detached' + + def test_draw_initial_binary_single_star(self): + """With binary_fraction_const=0, all draws produce single stars.""" + rng = np.random.default_rng(seed=42) + gen = totest.BinaryGenerator( + RNG=rng, metallicity=1.0, + star_formation='burst', + max_simulation_time=13.8e9, + binary_fraction_const=0.0, + binary_fraction_scheme='const') + binary = gen.draw_initial_binary( + orbital_scheme='separation', metallicity=1.0) + assert isinstance(binary, BinaryStar) + assert binary.state == 'initially_single_star' + assert np.isnan(binary.separation) + assert np.isnan(binary.orbital_period) + assert np.isnan(binary.eccentricity) + + def test_draw_initial_binary_with_index(self, generator): + binary = generator.draw_initial_binary( + orbital_scheme='separation', metallicity=1.0, index=99) + assert binary.index == 99 + + def test_reset_rng(self, generator): + generator.draw_initial_samples( + orbital_scheme='separation', number_of_binaries=5) + assert generator._num_gen == 5 + generator.reset_rng() + assert generator._num_gen == 0 + + def test_get_original_rng(self, generator): + rng = generator.get_original_rng() + assert isinstance(rng, np.random.Generator) + + def test_get_binary_by_iter(self, generator): + binary = generator.get_binary_by_iter( + n=3, orbital_scheme='separation', metallicity=1.0) + assert isinstance(binary, BinaryStar) + assert generator._num_gen == 0 + + def test_get_binary_by_iter_zero(self, generator): + """n=0 skips the warmup sampling.""" + binary = generator.get_binary_by_iter( + n=0, orbital_scheme='separation', metallicity=1.0) + assert isinstance(binary, BinaryStar) + + def test_num_gen_increments(self, generator): + generator.draw_initial_samples( + orbital_scheme='separation', number_of_binaries=3) + assert generator._num_gen == 3 + output = generator.draw_initial_samples( + orbital_scheme='separation', number_of_binaries=1) + assert output['binary_index'][0] == 3 + + +class TestPopulationManager: + + @fixture + def manager(self): + """Create a PopulationManager with minimal kwargs.""" + return totest.PopulationManager( + RNG=np.random.default_rng(seed=42), + metallicity=1.0, + star_formation='burst', + max_simulation_time=13.8e9) + + @fixture + def dummy_binary(self): + """Create a minimal BinaryStar.""" + s1 = SingleStar(mass=10.0, state='H-rich_Core_H_burning', + metallicity=1.0) + s2 = SingleStar(mass=5.0, state='H-rich_Core_H_burning', + metallicity=1.0) + return BinaryStar(star_1=s1, star_2=s2, index=0, + state='detached', event='ZAMS', + time=0.0, separation=100.0, + orbital_period=10.0, eccentricity=0.0) + + @fixture + def failed_binary(self): + """Create a binary with FAILED event.""" + s1 = SingleStar(mass=10.0, state='H-rich_Core_H_burning', + metallicity=1.0) + s2 = SingleStar(mass=5.0, state='H-rich_Core_H_burning', + metallicity=1.0) + b = BinaryStar(star_1=s1, star_2=s2, index=1, + state='detached', event='ZAMS', + time=0.0, separation=100.0, + orbital_period=10.0, eccentricity=0.0) + b.event = 'FAILED' + return b + + def test_init(self, manager): + assert manager.binaries == [] + assert manager.indices == [] + assert isinstance(manager.binary_generator, totest.BinaryGenerator) + + def test_init_with_filename(self): + mgr = totest.PopulationManager( + file_name='test.h5', + RNG=np.random.default_rng(seed=42), + metallicity=1.0, + star_formation='burst', + max_simulation_time=13.8e9) + assert mgr.store_file == 'test.h5' + + def test_init_with_file_sampler(self, tmp_path): + csv_path = os.path.join(tmp_path, "samples.csv") + df = pd.DataFrame({ + 'm1': [10.0], 'm2': [5.0], + 'orbital_period': [10.0], 'eccentricity': [0.0], + }) + df.to_csv(csv_path, index=False) + mgr = totest.PopulationManager( + read_samples_from_file=str(csv_path), + RNG=np.random.default_rng(seed=42), + metallicity=1.0, + star_formation='burst', + max_simulation_time=13.8e9) + assert mgr.binary_generator.sampler is not totest.generate_independent_samples + + def test_append_single(self, manager, dummy_binary): + manager.append(dummy_binary) + assert len(manager.binaries) == 1 + assert manager.indices == [0] + + def test_append_list(self, manager, dummy_binary): + manager.append([dummy_binary]) + assert len(manager.binaries) == 1 + + def test_append_invalid(self, manager): + with raises(ValueError, match="Must be BinaryStar"): + manager.append("not_a_binary") + + def test_remove_single(self, manager, dummy_binary): + manager.append(dummy_binary) + manager.remove(dummy_binary) + assert len(manager.binaries) == 0 + + def test_remove_list(self, manager, dummy_binary): + manager.append(dummy_binary) + manager.remove([dummy_binary]) + assert len(manager.binaries) == 0 + + def test_remove_invalid(self, manager): + with raises(ValueError, match="Must be BinaryStar"): + manager.remove("not_a_binary") + + def test_clear_dfs(self, manager): + manager.history_dfs = [pd.DataFrame()] + manager.oneline_dfs = [pd.DataFrame()] + manager.clear_dfs() + assert manager.history_dfs == [] + assert manager.oneline_dfs == [] + + def test_generate(self, manager): + binary = manager.generate(orbital_scheme='separation', + metallicity=1.0) + assert isinstance(binary, BinaryStar) + assert len(manager.binaries) == 1 + + def test_to_df_empty(self, manager): + assert manager.to_df() is None + + def test_to_df_with_binaries(self, manager): + manager.generate(orbital_scheme='separation', metallicity=1.0) + result = manager.to_df() + assert isinstance(result, pd.DataFrame) + assert len(result) > 0 + + def test_to_df_with_selection_accept(self, manager): + manager.generate(orbital_scheme='separation', metallicity=1.0) + result = manager.to_df(selection_function=lambda b: True) + assert isinstance(result, pd.DataFrame) + + def test_to_df_with_selection_reject(self, manager): + manager.generate(orbital_scheme='separation', metallicity=1.0) + result = manager.to_df(selection_function=lambda b: False) + assert result is None + + def test_to_df_with_history_dfs(self, manager): + dummy_df = pd.DataFrame({'state': ['detached'], 'time': [0.0]}, + index=[0]) + manager.history_dfs = [dummy_df] + result = manager.to_df() + assert isinstance(result, pd.DataFrame) + assert len(result) == 1 + + def test_to_oneline_df_empty(self, manager): + assert manager.to_oneline_df() is None + + def test_to_oneline_df_with_binaries(self, manager): + manager.generate(orbital_scheme='separation', metallicity=1.0) + result = manager.to_oneline_df() + assert isinstance(result, pd.DataFrame) + + def test_to_oneline_df_with_selection(self, manager): + manager.generate(orbital_scheme='separation', metallicity=1.0) + result = manager.to_oneline_df(selection_function=lambda b: True) + assert isinstance(result, pd.DataFrame) + + def test_to_oneline_df_with_oneline_dfs(self, manager): + dummy_df = pd.DataFrame({'state_i': ['detached']}, index=[0]) + manager.oneline_dfs = [dummy_df] + result = manager.to_oneline_df() + assert isinstance(result, pd.DataFrame) + + def test_find_failed_empty(self, manager): + assert manager.find_failed() is None + + def test_find_failed_with_binaries(self, manager, dummy_binary, + failed_binary): + manager.append(dummy_binary) + manager.append(failed_binary) + result = manager.find_failed() + assert len(result) == 1 + assert result[0].event == 'FAILED' + + def test_find_failed_with_dfs_found(self, manager): + failed_df = pd.DataFrame({'event': ['ZAMS', 'FAILED'], + 'time': [0.0, 1.0]}, index=[0, 0]) + manager.history_dfs = [failed_df] + result = manager.find_failed() + assert isinstance(result, pd.DataFrame) + + def test_find_failed_with_dfs_none_found(self, manager): + ok_df = pd.DataFrame({'event': ['ZAMS', 'END'], + 'time': [0.0, 1.0]}, index=[0, 0]) + manager.history_dfs = [ok_df] + result = manager.find_failed() + assert result == [] + + def test_breakdown_to_df(self, manager): + binary = manager.generate(orbital_scheme='separation', + metallicity=1.0) + assert len(manager.binaries) == 1 + manager.breakdown_to_df(binary) + assert len(manager.binaries) == 0 + assert len(manager.history_dfs) == 1 + assert len(manager.oneline_dfs) == 1 + + +class TestBinaryPopulation: + + @fixture + def pop(self): + """Create a minimal BinaryPopulation.""" + return totest.BinaryPopulation( + number_of_binaries=3, + metallicity=1.0, + star_formation='burst', + max_simulation_time=13.8e9, + entropy=12345) + + def test_init_basic(self, pop): + assert pop.number_of_binaries == 3 + assert pop.metallicity == 1.0 + assert isinstance(pop.population_properties, SimulationProperties) + assert isinstance(pop.manager, totest.PopulationManager) + assert isinstance(pop.RNG, np.random.Generator) + assert pop.comm is None + assert pop.JOB_ID is None + + def test_init_metallicity_from_list(self): + pop = totest.BinaryPopulation( + number_of_binaries=1, + metallicities=[0.5, 1.0, 2.0], + metallicity_index=1, + star_formation='burst', + max_simulation_time=13.8e9, + entropy=42) + assert pop.metallicity == 1.0 + + def test_init_mpi_and_jobarray_incompatible(self): + class FakeComm: + def Get_rank(self): return 0 + def Get_size(self): return 2 + with raises(ValueError, match="MPI and Job array runs are not compatible"): + totest.BinaryPopulation( + number_of_binaries=1, + comm=FakeComm(), + JOB_ID=123, + star_formation='burst', + max_simulation_time=13.8e9, + entropy=42) + + def test_init_mpi_no_entropy(self): + class FakeComm: + def Get_rank(self): return 0 + def Get_size(self): return 2 + with raises(ValueError, match="requires an entropy value"): + totest.BinaryPopulation( + number_of_binaries=1, + comm=FakeComm(), + star_formation='burst', + max_simulation_time=13.8e9) + + def test_init_mpi_with_entropy(self): + class FakeComm: + def Get_rank(self): return 0 + def Get_size(self): return 2 + pop = totest.BinaryPopulation( + number_of_binaries=10, + comm=FakeComm(), + star_formation='burst', + max_simulation_time=13.8e9, + entropy=42) + assert isinstance(pop.RNG, np.random.Generator) + + def test_init_job_array_with_entropy(self): + pop = totest.BinaryPopulation( + number_of_binaries=10, + JOB_ID=100, + RANK=0, + size=2, + star_formation='burst', + max_simulation_time=13.8e9, + entropy=42) + assert pop.JOB_ID == 100 + + def test_init_job_array_no_entropy(self): + """JOB_ID without entropy uses JOB_ID as seed.""" + pop = totest.BinaryPopulation( + number_of_binaries=10, + JOB_ID=100, + RANK=0, + size=2, + star_formation='burst', + max_simulation_time=13.8e9) + assert pop.JOB_ID == 100 + assert isinstance(pop.RNG, np.random.Generator) + + def test_from_ini(self, monkeypatch, tmp_path): + def mock_binarypop_kwargs(path, verbose=False): + return { + 'number_of_binaries': 5, + 'metallicity': 1.0, + 'metallicities': [1.0], + 'star_formation': 'burst', + 'max_simulation_time': 13.8e9, + 'entropy': 99, + } + def mock_simprop_kwargs(path): + return {} + + monkeypatch.setattr(totest, 'binarypop_kwargs_from_ini', + mock_binarypop_kwargs) + monkeypatch.setattr(totest, 'simprop_kwargs_from_ini', + mock_simprop_kwargs) + + pop = totest.BinaryPopulation.from_ini(str(tmp_path / "fake.ini")) + assert pop.number_of_binaries == 5 + assert isinstance(pop.population_properties, SimulationProperties) + + def test_close(self, pop): + pop.close() + + def test_getstate(self, pop): + state = pop.__getstate__() + assert isinstance(state, dict) + assert state['comm'] is None + + def test_getstate_with_steps_loaded(self, pop): + pop.population_properties.steps_loaded = True + state = pop.__getstate__() + assert state['comm'] is None + assert not pop.population_properties.steps_loaded \ No newline at end of file From bf60169ca4fc9e5e766c2b5755453ce56dffdd23 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 16:43:18 -0500 Subject: [PATCH 287/389] mock out dependence on external data file --- posydon/unit_tests/popsyn/test_synthetic_population.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/posydon/unit_tests/popsyn/test_synthetic_population.py b/posydon/unit_tests/popsyn/test_synthetic_population.py index 351ca2c2df..83e9528d04 100644 --- a/posydon/unit_tests/popsyn/test_synthetic_population.py +++ b/posydon/unit_tests/popsyn/test_synthetic_population.py @@ -991,11 +991,20 @@ def test_calculate_cosmic_weights(self, tmp_path, monkeypatch): def mock_calc_weights(pop_data, M_sim, simulation_parameters, population_parameters): return np.ones(len(pop_data)) * 0.5 + + def mock_SFR(z, met_bins, SFH_MODEL): + return np.ones((len(z), len(met_bins) - 1)) * 1e-3 monkeypatch.setattr( "posydon.popsyn.synthetic_population.calculate_model_weights", mock_calc_weights, ) + + monkeypatch.setattr( + "posydon.popsyn.synthetic_population.SFR_per_met_at_z", + mock_SFR, + ) + tpop.calculate_model_weights("mw1") # Call calculate_cosmic_weights From 070698163de726a670b8f40b6de10bf0713ae781 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 30 Mar 2026 21:46:45 +0000 Subject: [PATCH 288/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/unit_tests/popsyn/test_binarypopulation.py | 4 ++-- posydon/unit_tests/popsyn/test_synthetic_population.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/posydon/unit_tests/popsyn/test_binarypopulation.py b/posydon/unit_tests/popsyn/test_binarypopulation.py index fe2f92b222..5391c2a29c 100644 --- a/posydon/unit_tests/popsyn/test_binarypopulation.py +++ b/posydon/unit_tests/popsyn/test_binarypopulation.py @@ -20,8 +20,8 @@ from pytest import approx, fixture, raises from posydon.binary_evol.binarystar import BinaryStar -from posydon.binary_evol.singlestar import SingleStar from posydon.binary_evol.simulationproperties import SimulationProperties +from posydon.binary_evol.singlestar import SingleStar # define test classes collecting several test functions @@ -528,4 +528,4 @@ def test_getstate_with_steps_loaded(self, pop): pop.population_properties.steps_loaded = True state = pop.__getstate__() assert state['comm'] is None - assert not pop.population_properties.steps_loaded \ No newline at end of file + assert not pop.population_properties.steps_loaded diff --git a/posydon/unit_tests/popsyn/test_synthetic_population.py b/posydon/unit_tests/popsyn/test_synthetic_population.py index 83e9528d04..6e03abc48c 100644 --- a/posydon/unit_tests/popsyn/test_synthetic_population.py +++ b/posydon/unit_tests/popsyn/test_synthetic_population.py @@ -991,7 +991,7 @@ def test_calculate_cosmic_weights(self, tmp_path, monkeypatch): def mock_calc_weights(pop_data, M_sim, simulation_parameters, population_parameters): return np.ones(len(pop_data)) * 0.5 - + def mock_SFR(z, met_bins, SFH_MODEL): return np.ones((len(z), len(met_bins) - 1)) * 1e-3 From 3200c54756e7abb23818d53c7e69ad0bb49c9851 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 16:54:25 -0500 Subject: [PATCH 289/389] adjust coverage for binarypopulation --- posydon/popsyn/binarypopulation.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/posydon/popsyn/binarypopulation.py b/posydon/popsyn/binarypopulation.py index 6b31621d0a..d6f772709b 100644 --- a/posydon/popsyn/binarypopulation.py +++ b/posydon/popsyn/binarypopulation.py @@ -236,7 +236,8 @@ def from_ini(cls, path, metallicity_index=0, verbose=False): return cls(**pop_kwargs) - def evolve(self, **kwargs): + def evolve(self, **kwargs): # pragma: no cover + # wrapper for _safe_evolve """Evolve a binary population. Parameters @@ -290,7 +291,8 @@ def evolve(self, **kwargs): self.kwargs.update(params) self._safe_evolve(**self.kwargs) - def _safe_evolve(self, **kwargs): + def _safe_evolve(self, **kwargs): # pragma: no cover + # needs more complex test than unit test """Evolve binaries in a population, catching warnings/exceptions.""" if not self.population_properties.steps_loaded: # Enforce the same metallicity for all grid steps @@ -486,7 +488,8 @@ def _safe_evolve(self, **kwargs): f"evolution.combined.{self.rank}.h5"), mode='w', **kwargs) - def save(self, save_path, **kwargs): + def save(self, save_path, **kwargs): # pragma: no cover + # dependent on full evolution """Save BinaryPopulation to hdf file.""" optimize_ram = self.kwargs['optimize_ram'] temp_directory = self.kwargs['temp_directory'] @@ -514,13 +517,13 @@ def save(self, save_path, **kwargs): self.combine_saved_files(absolute_filepath, tmp_files, **kwargs) - def make_temp_fname(self): + def make_temp_fname(self): # pragma: no cover """Get a valid filename for the temporary file.""" temp_directory = self.kwargs['temp_directory'] return os.path.join(temp_directory, f"evolution.combined.{self.rank}.h5") # return os.path.join(dir_name, '.tmp{}_'.format(rank) + file_name) - def combine_saved_files(self, absolute_filepath, file_names, **kwargs): + def combine_saved_files(self, absolute_filepath, file_names, **kwargs): # pragma: no cover """Combine various temporary files in a given folder. Parameters @@ -786,7 +789,7 @@ def generate(self, **kwargs): self.append(binary) return binary - def from_hdf(self, indices=None, where=None, restore=False): + def from_hdf(self, indices=None, where=None, restore=False): # pragma: no cover """Load a BinaryStar instance from an hdf file of a saved population. Parameters @@ -856,7 +859,7 @@ def from_hdf(self, indices=None, where=None, restore=False): return binary_holder - def save(self, fname, **kwargs): + def save(self, fname, **kwargs): # pragma: no cover """Save binaries to an hdf file using pandas HDFStore. Any object dtype columns not parsed by infer_objects() is converted to From 60224de017ba720d317433d26c94c4a3afd83ae5 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Mon, 30 Mar 2026 17:17:03 -0500 Subject: [PATCH 290/389] debug tests and adjust coverage --- posydon/popsyn/binarypopulation.py | 6 ++-- .../popsyn/test_binarypopulation.py | 29 +++++++++++++++++-- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/posydon/popsyn/binarypopulation.py b/posydon/popsyn/binarypopulation.py index d6f772709b..2379b14f60 100644 --- a/posydon/popsyn/binarypopulation.py +++ b/posydon/popsyn/binarypopulation.py @@ -741,7 +741,7 @@ def to_df(self, selection_function=None, **kwargs): and selection_function(binary)): holder.append(binary.to_df(**kwargs)) - elif len(self.history_dfs) > 0: + elif len(self.history_dfs) > 0: # pragma: no branch holder.extend(self.history_dfs) if len(holder) > 0: @@ -762,7 +762,7 @@ def to_oneline_df(self, selection_function=None, **kwargs): and selection_function(binary)): holder.append(binary.to_oneline_df(**kwargs)) - elif len(self.oneline_dfs) > 0: + elif len(self.oneline_dfs) > 0: # pragma: no branch holder.extend(self.oneline_dfs) if len(holder) > 0: @@ -1032,7 +1032,7 @@ def draw_initial_samples(self, orbital_scheme='separation', **kwargs): if orbital_scheme == 'separation': separation, eccentricity, m1, m2 = sampler_output orbital_period = orbital_period_from_separation(separation, m1, m2) - elif orbital_scheme == 'period': + elif orbital_scheme == 'period': # pragma: no branch orbital_period, eccentricity, m1, m2 = sampler_output separation = orbital_separation_from_period(orbital_period, m1, m2) else: diff --git a/posydon/unit_tests/popsyn/test_binarypopulation.py b/posydon/unit_tests/popsyn/test_binarypopulation.py index fe2f92b222..a27b36d5a5 100644 --- a/posydon/unit_tests/popsyn/test_binarypopulation.py +++ b/posydon/unit_tests/popsyn/test_binarypopulation.py @@ -173,7 +173,8 @@ def test_draw_initial_binary_single_star(self): binary_fraction_const=0.0, binary_fraction_scheme='const') binary = gen.draw_initial_binary( - orbital_scheme='separation', metallicity=1.0) + orbital_scheme='separation', metallicity=1.0, + binary_fraction_const=0.0, binary_fraction_scheme='const') assert isinstance(binary, BinaryStar) assert binary.state == 'initially_single_star' assert np.isnan(binary.separation) @@ -403,6 +404,24 @@ def test_breakdown_to_df(self, manager): assert len(manager.history_dfs) == 1 assert len(manager.oneline_dfs) == 1 + def test_breakdown_to_df_error(self, manager, capsys): + """breakdown_to_df catches exceptions during conversion.""" + binary = manager.generate(orbital_scheme='separation', + metallicity=1.0) + # Replace to_df with a function that raises + def bad_to_df(**kw): + raise RuntimeError("test error") + binary.to_df = bad_to_df + manager.breakdown_to_df(binary) + captured = capsys.readouterr() + assert "Error during breakdown" in captured.out + + def test_to_oneline_df_with_selection_reject(self, manager): + """to_oneline_df with selection_function that rejects all.""" + manager.generate(orbital_scheme='separation', metallicity=1.0) + result = manager.to_oneline_df(selection_function=lambda b: False) + assert result is None + class TestBinaryPopulation: @@ -524,8 +543,12 @@ def test_getstate(self, pop): assert isinstance(state, dict) assert state['comm'] is None - def test_getstate_with_steps_loaded(self, pop): + def test_getstate_with_steps_loaded(self, pop, monkeypatch): + """__getstate__ closes steps if they were loaded.""" + closed = [] pop.population_properties.steps_loaded = True + monkeypatch.setattr(pop.population_properties, 'close', + lambda: closed.append(True)) state = pop.__getstate__() assert state['comm'] is None - assert not pop.population_properties.steps_loaded \ No newline at end of file + assert len(closed) == 1 # close() was called \ No newline at end of file From 993653439926e81d8c7d2944e93b6b565a2f3e24 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 30 Mar 2026 22:34:51 +0000 Subject: [PATCH 291/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/unit_tests/popsyn/test_binarypopulation.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/posydon/unit_tests/popsyn/test_binarypopulation.py b/posydon/unit_tests/popsyn/test_binarypopulation.py index a58a7252b2..640fc1fbf1 100644 --- a/posydon/unit_tests/popsyn/test_binarypopulation.py +++ b/posydon/unit_tests/popsyn/test_binarypopulation.py @@ -139,8 +139,8 @@ def mock_sampler(orbital_scheme, **kwargs): RNG=rng, metallicity=1.0, sampler=mock_sampler, star_formation='burst', max_simulation_time=13.8e9) with raises(ValueError, match="Allowed orbital schemes"): - gen.draw_initial_samples(orbital_scheme='invalid', number_of_binaries=1) - + gen.draw_initial_samples(orbital_scheme='invalid', number_of_binaries=1) + def test_draw_initial_samples_no_number_of_binaries(self, generator): """When number_of_binaries not in kwargs, defaults to 1 for kicks.""" output = generator.draw_initial_samples(orbital_scheme='separation') @@ -559,4 +559,4 @@ def test_getstate_with_steps_loaded(self, pop, monkeypatch): lambda: closed.append(True)) state = pop.__getstate__() assert state['comm'] is None - assert len(closed) == 1 # close() was called \ No newline at end of file + assert len(closed) == 1 # close() was called From 5902f3cc15b36d3708067c59780431af132a7dde Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Tue, 31 Mar 2026 10:27:55 -0500 Subject: [PATCH 292/389] Apply suggestion from @sgossage -- indent dummy_code --- posydon/unit_tests/popsyn/test_io.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/posydon/unit_tests/popsyn/test_io.py b/posydon/unit_tests/popsyn/test_io.py index 2c3d33b443..625bbedf45 100644 --- a/posydon/unit_tests/popsyn/test_io.py +++ b/posydon/unit_tests/popsyn/test_io.py @@ -313,10 +313,10 @@ class DummyModule: # absolute imports dummy_code = """ -class MyDummyClass: - def __init__(self): - self.value = 42 -""" + class MyDummyClass: + def __init__(self): + self.value = 42 + """ dummy_path = os.path.join(tmp_path, "dummy.py") with open(dummy_path, "w") as f: f.write(dummy_code) From fef671570353fd62a934c9e987f627181de5547a Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Tue, 31 Mar 2026 10:33:16 -0500 Subject: [PATCH 293/389] Apply suggestion from @sgossage --- posydon/unit_tests/popsyn/test_io.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/posydon/unit_tests/popsyn/test_io.py b/posydon/unit_tests/popsyn/test_io.py index 625bbedf45..15aef20e48 100644 --- a/posydon/unit_tests/popsyn/test_io.py +++ b/posydon/unit_tests/popsyn/test_io.py @@ -312,11 +312,11 @@ class DummyModule: assert 'flow' not in simkwargs_only # absolute imports - dummy_code = """ - class MyDummyClass: - def __init__(self): - self.value = 42 - """ + dummy_code = "\n".join([ + "class MyDummyClass:", + " def __init__(self):", + " self.value = 42" + ]) dummy_path = os.path.join(tmp_path, "dummy.py") with open(dummy_path, "w") as f: f.write(dummy_code) From 71688ae905cf56917fe6b74c6f7cd092ab0f64d3 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Tue, 31 Mar 2026 10:36:07 -0500 Subject: [PATCH 294/389] Apply suggestion from @sgossage --- posydon/unit_tests/popsyn/test_io.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/posydon/unit_tests/popsyn/test_io.py b/posydon/unit_tests/popsyn/test_io.py index 15aef20e48..45f4fa5fc9 100644 --- a/posydon/unit_tests/popsyn/test_io.py +++ b/posydon/unit_tests/popsyn/test_io.py @@ -325,7 +325,11 @@ class DummyModule: import = ['builtins', 'int'] absolute_import = ['{dummy_path}', 'MyDummyClass'] """ - ini_path = os.path.join(tmp_path, "sim_abs_import.ini") +ini_content = "\n".join([ + "[flow]", + "import = ['builtins', 'int']", + f"absolute_import = ['{dummy_path}', 'MyDummyClass']", + ]) with open(ini_path, "w") as f: f.write(ini_content) simkwargs = totest.simprop_kwargs_from_ini(str(ini_path)) From 530f12c2f689282e2b35caeb5c338c1928a8a2da Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Tue, 31 Mar 2026 10:37:44 -0500 Subject: [PATCH 295/389] Apply suggestion from @sgossage -- fix indent --- posydon/unit_tests/popsyn/test_io.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/unit_tests/popsyn/test_io.py b/posydon/unit_tests/popsyn/test_io.py index 45f4fa5fc9..0c188467f4 100644 --- a/posydon/unit_tests/popsyn/test_io.py +++ b/posydon/unit_tests/popsyn/test_io.py @@ -325,7 +325,7 @@ class DummyModule: import = ['builtins', 'int'] absolute_import = ['{dummy_path}', 'MyDummyClass'] """ -ini_content = "\n".join([ + ini_content = "\n".join([ "[flow]", "import = ['builtins', 'int']", f"absolute_import = ['{dummy_path}', 'MyDummyClass']", From b0382d7edf4bdce0c88f33d27382d24b72e6714c Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Tue, 31 Mar 2026 10:38:26 -0500 Subject: [PATCH 296/389] Apply suggestion from @sgossage -- remove alt code --- posydon/unit_tests/popsyn/test_io.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/posydon/unit_tests/popsyn/test_io.py b/posydon/unit_tests/popsyn/test_io.py index 0c188467f4..5559279907 100644 --- a/posydon/unit_tests/popsyn/test_io.py +++ b/posydon/unit_tests/popsyn/test_io.py @@ -320,11 +320,6 @@ class DummyModule: dummy_path = os.path.join(tmp_path, "dummy.py") with open(dummy_path, "w") as f: f.write(dummy_code) - ini_content = f""" - [flow] - import = ['builtins', 'int'] - absolute_import = ['{dummy_path}', 'MyDummyClass'] - """ ini_content = "\n".join([ "[flow]", "import = ['builtins', 'int']", From d4fceb0287f6bfa069912825932a1cd86d8911a4 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Tue, 31 Mar 2026 10:56:01 -0500 Subject: [PATCH 297/389] Apply suggestion from @sgossage -- fix indent --- posydon/unit_tests/popsyn/test_io.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/unit_tests/popsyn/test_io.py b/posydon/unit_tests/popsyn/test_io.py index 5559279907..ef9de4abe6 100644 --- a/posydon/unit_tests/popsyn/test_io.py +++ b/posydon/unit_tests/popsyn/test_io.py @@ -312,7 +312,7 @@ class DummyModule: assert 'flow' not in simkwargs_only # absolute imports - dummy_code = "\n".join([ + dummy_code = "\n".join([ "class MyDummyClass:", " def __init__(self):", " self.value = 42" From dc1bd2b71f30ae8dba5f23dc6410d92f7e1b5da6 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Tue, 31 Mar 2026 10:56:43 -0500 Subject: [PATCH 298/389] Apply suggestion from @sgossage - fix indent --- posydon/unit_tests/popsyn/test_io.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/unit_tests/popsyn/test_io.py b/posydon/unit_tests/popsyn/test_io.py index ef9de4abe6..f6a54b654e 100644 --- a/posydon/unit_tests/popsyn/test_io.py +++ b/posydon/unit_tests/popsyn/test_io.py @@ -320,7 +320,7 @@ class DummyModule: dummy_path = os.path.join(tmp_path, "dummy.py") with open(dummy_path, "w") as f: f.write(dummy_code) - ini_content = "\n".join([ + ini_content = "\n".join([ "[flow]", "import = ['builtins', 'int']", f"absolute_import = ['{dummy_path}', 'MyDummyClass']", From e4a60ebc1b30fd0a177a579a61435d30746bab75 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Tue, 31 Mar 2026 11:04:01 -0500 Subject: [PATCH 299/389] Adding ini_path back to test_io.py --- posydon/unit_tests/popsyn/test_io.py | 1 + 1 file changed, 1 insertion(+) diff --git a/posydon/unit_tests/popsyn/test_io.py b/posydon/unit_tests/popsyn/test_io.py index f6a54b654e..16cdaebb18 100644 --- a/posydon/unit_tests/popsyn/test_io.py +++ b/posydon/unit_tests/popsyn/test_io.py @@ -325,6 +325,7 @@ class DummyModule: "import = ['builtins', 'int']", f"absolute_import = ['{dummy_path}', 'MyDummyClass']", ]) + ini_path = os.path.join(tmp_path, "sim_abs_import.ini") with open(ini_path, "w") as f: f.write(ini_content) simkwargs = totest.simprop_kwargs_from_ini(str(ini_path)) From 35280418dd418fa18fc9b24622c312e5e34c059a Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Tue, 31 Mar 2026 11:48:16 -0500 Subject: [PATCH 300/389] Update posydon/unit_tests/_helper_functions_for_tests/population.py Co-authored-by: Seth Gossage --- posydon/unit_tests/_helper_functions_for_tests/population.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/unit_tests/_helper_functions_for_tests/population.py b/posydon/unit_tests/_helper_functions_for_tests/population.py index 2813e3df19..f259edd69d 100644 --- a/posydon/unit_tests/_helper_functions_for_tests/population.py +++ b/posydon/unit_tests/_helper_functions_for_tests/population.py @@ -113,7 +113,7 @@ def make_test_pop( # ini_parameters ā€“ include all keys that _load_ini_params expects ini_params = { - "metallicity": metallicity, + "metallicities": [metallicity], "number_of_binaries": len(oneline_df), "binary_fraction_scheme": "const", "binary_fraction_const": 0.7, From 21082c82dc66d59233930ecd009bd99fa6de6b93 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Tue, 31 Mar 2026 12:08:27 -0500 Subject: [PATCH 301/389] revert change to population.py --- posydon/unit_tests/_helper_functions_for_tests/population.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/unit_tests/_helper_functions_for_tests/population.py b/posydon/unit_tests/_helper_functions_for_tests/population.py index f259edd69d..2813e3df19 100644 --- a/posydon/unit_tests/_helper_functions_for_tests/population.py +++ b/posydon/unit_tests/_helper_functions_for_tests/population.py @@ -113,7 +113,7 @@ def make_test_pop( # ini_parameters ā€“ include all keys that _load_ini_params expects ini_params = { - "metallicities": [metallicity], + "metallicity": metallicity, "number_of_binaries": len(oneline_df), "binary_fraction_scheme": "const", "binary_fraction_const": 0.7, From c71f929978b4b46a74b6677c2cce7a9495456b74 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Tue, 31 Mar 2026 14:10:48 -0500 Subject: [PATCH 302/389] Refactor ini and dummy code content in test_io.py using dedent Refactor ini content creation using dedent for better readability. --- posydon/unit_tests/popsyn/test_io.py | 189 ++++++++++++++------------- 1 file changed, 98 insertions(+), 91 deletions(-) diff --git a/posydon/unit_tests/popsyn/test_io.py b/posydon/unit_tests/popsyn/test_io.py index 16cdaebb18..656aa4a61a 100644 --- a/posydon/unit_tests/popsyn/test_io.py +++ b/posydon/unit_tests/popsyn/test_io.py @@ -18,6 +18,7 @@ import os import pprint import textwrap +from textwrap import dedent from configparser import ConfigParser, MissingSectionHeaderError # import other needed code for the tests, which is not already imported in the @@ -82,26 +83,27 @@ def textfile(self,tmp_path): @fixture def sim_ini(self,tmp_path): - ini_content = """ - [flow] - import = ['posydon.binary_evol.flow_chart', 'flow_chart'] - absolute_import = None - - [step_HMS_HMS] - import = ['posydon.binary_evol.MESA.step_mesa', 'MS_MS_step'] - absolute_import = None - interpolation_method = 'linear3c_kNN' - save_initial_conditions = True - verbose = False - - [extra_hooks] - import_1 = ['posydon.binary_evol.simulationproperties', 'TimingHooks'] - absolute_import_1 = None - kwargs_1 = {} - import_2 = ['posydon.binary_evol.simulationproperties', 'StepNamesHooks'] - absolute_import_2 = None - kwargs_2 = {} - """ + ini_content = dedent( + """ + [flow] + import = ['posydon.binary_evol.flow_chart', 'flow_chart'] + absolute_import = None + + [step_HMS_HMS] + import = ['posydon.binary_evol.MESA.step_mesa', 'MS_MS_step'] + absolute_import = None + interpolation_method = 'linear3c_kNN' + save_initial_conditions = True + verbose = False + + [extra_hooks] + import_1 = ['posydon.binary_evol.simulationproperties', 'TimingHooks'] + absolute_import_1 = None + kwargs_1 = {} + import_2 = ['posydon.binary_evol.simulationproperties', 'StepNamesHooks'] + absolute_import_2 = None + kwargs_2 = {} + """) file_path = os.path.join(tmp_path, "sim.ini") with open(file_path, "w") as f: f.write(ini_content) @@ -109,24 +111,25 @@ def sim_ini(self,tmp_path): @fixture def binpop_ini(self, tmp_path): - ini_content = """ - [BinaryPopulation_options] - use_MPI = False - metallicity = [0.02] - number_of_binaries = 1 - temp_directory = 'tmp' - - [BinaryStar_output] - extra_columns = {} - only_select_columns = [] - scalar_names = [] - - [SingleStar_1_output] - include_S1 = False - - [SingleStar_2_output] - include_S2 = False - """ + ini_content = dedent( + """ + [BinaryPopulation_options] + use_MPI = False + metallicity = [0.02] + number_of_binaries = 1 + temp_directory = 'tmp' + + [BinaryStar_output] + extra_columns = {} + only_select_columns = [] + scalar_names = [] + + [SingleStar_1_output] + include_S1 = False + + [SingleStar_2_output] + include_S2 = False + """) file_path = os.path.join(tmp_path, "binpop.ini") with open(file_path, "w") as f: f.write(ini_content) @@ -134,24 +137,25 @@ def binpop_ini(self, tmp_path): @fixture def binpop_ini_mpi(self, tmp_path): - ini_content = """ - [BinaryPopulation_options] - use_MPI = True - metallicity = [0.02] - number_of_binaries = 1 - temp_directory = 'tmp' - - [BinaryStar_output] - extra_columns = {} - only_select_columns = [] - scalar_names = [] - - [SingleStar_1_output] - include_S1 = False - - [SingleStar_2_output] - include_S2 = False - """ + ini_content = dedent( + """ + [BinaryPopulation_options] + use_MPI = True + metallicity = [0.02] + number_of_binaries = 1 + temp_directory = 'tmp' + + [BinaryStar_output] + extra_columns = {} + only_select_columns = [] + scalar_names = [] + + [SingleStar_1_output] + include_S1 = False + + [SingleStar_2_output] + include_S2 = False + """) file_path = os.path.join(tmp_path, "binpop_mpi.ini") with open(file_path, "w") as f: f.write(ini_content) @@ -159,31 +163,32 @@ def binpop_ini_mpi(self, tmp_path): @fixture def binpop_ini_stars(self, tmp_path): - ini_content = """ - [BinaryPopulation_options] - use_MPI = False - metallicity = [0.02] - number_of_binaries = 1 - temp_directory = 'tmp' - - [BinaryStar_output] - extra_columns = {} - only_select_columns = [] - scalar_names = [] - - [SingleStar_1_output] - include_S1 = True - only_select_columns = [ - 'state', - 'mass', - 'log_R'] - - [SingleStar_2_output] - include_S2 = True - only_select_columns = [ - 'log_L', - 'lg_mdot'] - """ + ini_content = dedent( + """ + [BinaryPopulation_options] + use_MPI = False + metallicity = [0.02] + number_of_binaries = 1 + temp_directory = 'tmp' + + [BinaryStar_output] + extra_columns = {} + only_select_columns = [] + scalar_names = [] + + [SingleStar_1_output] + include_S1 = True + only_select_columns = [ + 'state', + 'mass', + 'log_R'] + + [SingleStar_2_output] + include_S2 = True + only_select_columns = [ + 'log_L', + 'lg_mdot'] + """) file_path = os.path.join(tmp_path, "binpop_stars.ini") with open(file_path, "w") as f: f.write(ini_content) @@ -312,19 +317,21 @@ class DummyModule: assert 'flow' not in simkwargs_only # absolute imports - dummy_code = "\n".join([ - "class MyDummyClass:", - " def __init__(self):", - " self.value = 42" - ]) + dummy_code = dedent( + """ + class MyDummyClass: + def __init__(self): + self.value = 42 + """) dummy_path = os.path.join(tmp_path, "dummy.py") with open(dummy_path, "w") as f: f.write(dummy_code) - ini_content = "\n".join([ - "[flow]", - "import = ['builtins', 'int']", - f"absolute_import = ['{dummy_path}', 'MyDummyClass']", - ]) + ini_content = dedent( + f""" + [flow] + import = ['builtins', 'int'] + absolute_import = ['{dummy_path}', 'MyDummyClass']" + """) ini_path = os.path.join(tmp_path, "sim_abs_import.ini") with open(ini_path, "w") as f: f.write(ini_content) From 7d4608e7983f5e022c8f7fdc1c642af49f773c18 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 31 Mar 2026 19:11:02 +0000 Subject: [PATCH 303/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/unit_tests/popsyn/test_io.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/posydon/unit_tests/popsyn/test_io.py b/posydon/unit_tests/popsyn/test_io.py index 656aa4a61a..7d32a6b53e 100644 --- a/posydon/unit_tests/popsyn/test_io.py +++ b/posydon/unit_tests/popsyn/test_io.py @@ -18,8 +18,8 @@ import os import pprint import textwrap -from textwrap import dedent from configparser import ConfigParser, MissingSectionHeaderError +from textwrap import dedent # import other needed code for the tests, which is not already imported in the # module you like to test @@ -88,14 +88,14 @@ def sim_ini(self,tmp_path): [flow] import = ['posydon.binary_evol.flow_chart', 'flow_chart'] absolute_import = None - + [step_HMS_HMS] import = ['posydon.binary_evol.MESA.step_mesa', 'MS_MS_step'] absolute_import = None interpolation_method = 'linear3c_kNN' save_initial_conditions = True verbose = False - + [extra_hooks] import_1 = ['posydon.binary_evol.simulationproperties', 'TimingHooks'] absolute_import_1 = None From e98f569d36efdef9f0d2d62328f51f9470acbe9d Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Tue, 31 Mar 2026 14:13:28 -0500 Subject: [PATCH 304/389] Fix indent test_io.py --- posydon/unit_tests/popsyn/test_io.py | 42 ++++++++++++++-------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/posydon/unit_tests/popsyn/test_io.py b/posydon/unit_tests/popsyn/test_io.py index 7d32a6b53e..081bd5eb65 100644 --- a/posydon/unit_tests/popsyn/test_io.py +++ b/posydon/unit_tests/popsyn/test_io.py @@ -83,27 +83,27 @@ def textfile(self,tmp_path): @fixture def sim_ini(self,tmp_path): - ini_content = dedent( - """ - [flow] - import = ['posydon.binary_evol.flow_chart', 'flow_chart'] - absolute_import = None - - [step_HMS_HMS] - import = ['posydon.binary_evol.MESA.step_mesa', 'MS_MS_step'] - absolute_import = None - interpolation_method = 'linear3c_kNN' - save_initial_conditions = True - verbose = False - - [extra_hooks] - import_1 = ['posydon.binary_evol.simulationproperties', 'TimingHooks'] - absolute_import_1 = None - kwargs_1 = {} - import_2 = ['posydon.binary_evol.simulationproperties', 'StepNamesHooks'] - absolute_import_2 = None - kwargs_2 = {} - """) + ini_content = dedent( + """ + [flow] + import = ['posydon.binary_evol.flow_chart', 'flow_chart'] + absolute_import = None + + [step_HMS_HMS] + import = ['posydon.binary_evol.MESA.step_mesa', 'MS_MS_step'] + absolute_import = None + interpolation_method = 'linear3c_kNN' + save_initial_conditions = True + verbose = False + + [extra_hooks] + import_1 = ['posydon.binary_evol.simulationproperties', 'TimingHooks'] + absolute_import_1 = None + kwargs_1 = {} + import_2 = ['posydon.binary_evol.simulationproperties', 'StepNamesHooks'] + absolute_import_2 = None + kwargs_2 = {} + """) file_path = os.path.join(tmp_path, "sim.ini") with open(file_path, "w") as f: f.write(ini_content) From d4cf90647b3e8d2952080415714bfac8ed4af95d Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Tue, 31 Mar 2026 14:22:02 -0500 Subject: [PATCH 305/389] Remove extra quote in test_io.py --- posydon/unit_tests/popsyn/test_io.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/unit_tests/popsyn/test_io.py b/posydon/unit_tests/popsyn/test_io.py index 081bd5eb65..8095109790 100644 --- a/posydon/unit_tests/popsyn/test_io.py +++ b/posydon/unit_tests/popsyn/test_io.py @@ -330,7 +330,7 @@ def __init__(self): f""" [flow] import = ['builtins', 'int'] - absolute_import = ['{dummy_path}', 'MyDummyClass']" + absolute_import = ['{dummy_path}', 'MyDummyClass'] """) ini_path = os.path.join(tmp_path, "sim_abs_import.ini") with open(ini_path, "w") as f: From 9058f4011ef2d9636f950ac54f272e3f4af0d129 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Tue, 31 Mar 2026 14:27:53 -0500 Subject: [PATCH 306/389] added option to skip evolution in validate_binaries, added info about candidate branch and data source --- dev-tools/README.md | 24 +++++++++++++------ dev-tools/binaries_suite.py | 21 +++++++++++++++-- dev-tools/compare_runs.py | 43 +++++++++++++++++++++++++++++++++- dev-tools/evolve_binaries.sh | 11 ++++++++- dev-tools/validate_binaries.sh | 30 ++++++++++++++++++++---- 5 files changed, 113 insertions(+), 16 deletions(-) diff --git a/dev-tools/README.md b/dev-tools/README.md index b1e9339b97..fdc00a9688 100644 --- a/dev-tools/README.md +++ b/dev-tools/README.md @@ -23,6 +23,12 @@ By default, all eight POSYDON metallicities are run. To validate only a subset, ./validate_binaries.sh feature/my-branch main "1 0.45" ``` +To re-run comparison with different tolerances without re-evolving: + +```bash +./validate_binaries.sh feature/my-branch main "1 0.45" --skip-evolve --loose +``` + ## Scripts ### `validate_binaries.sh` @@ -30,10 +36,10 @@ By default, all eight POSYDON metallicities are run. To validate only a subset, Top-level entry point. Evolves test binaries on a candidate branch, then compares results against an existing baseline. ```bash -./validate_binaries.sh [baseline_branch] [metallicities] [--loose] [--rtol VALUE] [--atol VALUE] +./validate_binaries.sh [baseline_branch] [metallicities] [--loose] [--rtol VALUE] [--atol VALUE] [--skip-evolve] ``` -By default, comparison is exact (rtol=0, atol=0). Use `--loose` for relaxed floating-point tolerances (rtol=1e-12, atol=1e-15), or set `--rtol`/`--atol` explicitly as per [np.allclose](https://numpy.org/devdocs/reference/generated/numpy.allclose.html). +By default, comparison is exact (rtol=0, atol=0). Use `--loose` for relaxed floating-point tolerances (rtol=1e-12, atol=1e-15), or set `--rtol`/`--atol` explicitly as per [np.allclose](https://numpy.org/devdocs/reference/generated/numpy.allclose.html). Use `--skip-evolve` to skip the evolution step and compare existing candidate outputs against the baseline. ### `generate_baseline.sh` @@ -46,7 +52,7 @@ Generates baseline HDF5 files from a designated branch or tag. Can also promote ### `evolve_binaries.sh` -Clones a POSYDON branch, creates a conda environment, installs POSYDON, and runs the binary suite at all requested metallicities. Called by `validate_binaries.sh` and `generate_baseline.sh`; can also be run standalone. +Clones a POSYDON branch, creates a conda environment, installs POSYDON, and runs the binary suite at all requested metallicities. Called by `validate_binaries.sh` and `generate_baseline.sh`; can also be run standalone. Records the resolved commit SHA and branch name in each HDF5 file's metadata for provenance tracking. ```bash ./evolve_binaries.sh [sha] [metallicities] @@ -54,10 +60,11 @@ Clones a POSYDON branch, creates a conda environment, installs POSYDON, and runs ### `binaries_suite.py` -Defines and evolves the set of 44 test binaries at a given metallicity. Each binary targets a specific edge case or past bug fix (e.g., matching failures, oRLO2 looping, SN type errors, NaN spins). Results are saved to an HDF5 file. +Defines and evolves the set of 44 test binaries at a given metallicity. Each binary targets a specific edge case or past bug fix (e.g., matching failures, oRLO2 looping, SN type errors, NaN spins). Results are saved to an HDF5 file with a `/metadata` table that records metallicity, binary counts, `PATH_TO_POSYDON_DATA`, and optionally branch name, commit SHA, and generation timestamp (via `--branch`/`--sha`). ```bash python binaries_suite.py --output results.h5 --metallicity 1 +python binaries_suite.py --output results.h5 --metallicity 1 --branch main --sha abc123f ``` ### `compare_runs.py` @@ -68,7 +75,7 @@ Compares two HDF5 files produced by `binaries_suite.py` and reports differences - **Qualitative**: changes to categorical columns such as state, event, step name, SN type, interpolation class, and mass transfer history. - **Quantitative**: changes to any numeric column. By default, comparison is exact (bitwise identical floats). Use `--loose` for slightly relaxed tolerances (rtol=1e-12, atol=1e-15), or set `--rtol`/`--atol` explicitly as per [np.allclose](https://numpy.org/devdocs/reference/generated/numpy.allclose.html). -The script also compares warning and error tables, reporting new, removed, or changed warnings per binary. +The script also compares warning and error tables, reporting new, removed, or changed warnings per binary. The report header includes source metadata (branch, commit SHA, generation time, POSYDON data path) read from each file when available. ```bash python compare_runs.py baseline.h5 candidate.h5 [--loose] [--rtol VALUE] [--atol VALUE] [--verbose] @@ -93,9 +100,12 @@ python binaries_suite.py --output my_results.h5 --metallicity 0.01 --verbose # Use a custom ini file python binaries_suite.py --output my_results.h5 --metallicity 1 --ini /path/to/custom.ini + +# Record branch/SHA provenance in HDF5 metadata (done automatically by evolve_binaries.sh) +python binaries_suite.py --output my_results.h5 --metallicity 1 --branch main --sha abc123f ``` -The output HDF5 contains three tables: `evolution` (per-step binary data), `errors` (binaries that failed), and `warnings` (warnings raised during evolution). +The output HDF5 contains three tables: `evolution` (per-step binary data), `errors` (binaries that failed), and `warnings` (warnings raised during evolution). The `/metadata` table records metallicity, binary counts, `PATH_TO_POSYDON_DATA`, and optionally branch, commit SHA, and generation timestamp. ### Comparing two result files @@ -127,4 +137,4 @@ dev-tools/ ā”œā”€ā”€ outputs/ # candidate evolution results (per branch) ā”œā”€ā”€ logs/ # per-metallicity evolution logs (per branch) ā””ā”€ā”€ workdirs/ # cloned repos and conda environments (per branch) -``` +``` \ No newline at end of file diff --git a/dev-tools/binaries_suite.py b/dev-tools/binaries_suite.py index bb6add8f5e..877f39f8d2 100644 --- a/dev-tools/binaries_suite.py +++ b/dev-tools/binaries_suite.py @@ -6,11 +6,16 @@ Usage: python binaries_suite.py --output results.h5 --metallicity 1 python binaries_suite.py --output results.h5 --metallicity 0.45 --verbose + python binaries_suite.py --output results.h5 --metallicity 1 --branch main --sha abc123f + +The --branch and --sha flags are optional and record provenance metadata +(branch name, commit SHA, generation timestamp) in the HDF5 /metadata table. Authors: Max Briel, Elizabeth Teng """ import argparse +from datetime import datetime, timezone import os import sys import warnings @@ -621,7 +626,8 @@ def get_test_binaries(metallicity, sim_prop): return binaries -def evolve_binaries(metallicity, verbose, output_path, ini_path=None): +def evolve_binaries(metallicity, verbose, output_path, ini_path=None, + branch=None, sha=None): """Evolves the test binary suite at the given metallicity and saves results. Args: @@ -629,6 +635,8 @@ def evolve_binaries(metallicity, verbose, output_path, ini_path=None): verbose: bool output_path: str, path to save HDF5 output ini_path: str, path to ini file (auto-detected if None) + branch: str, branch name for metadata (optional) + sha: str, commit SHA for metadata (optional) """ print(f"{'=' * LINE_LENGTH}") print(f" Evolving test binaries at Z = {metallicity} Zsun") @@ -697,6 +705,9 @@ def evolve_binaries(metallicity, verbose, output_path, ini_path=None): 'n_missing': len(missing_ids), 'missing_ids': str(missing_ids) if missing_ids else '', 'path_to_posydon_data': PATH_TO_POSYDON_DATA, + 'branch': branch or '', + 'commit_sha': sha or '', + 'generated_at': datetime.now(timezone.utc).strftime('%Y-%m-%d %H:%M:%S UTC'), }]) h5file.put("metadata", meta_df, format="table") @@ -738,6 +749,10 @@ def evolve_binaries(metallicity, verbose, output_path, ini_path=None): help=f'Metallicity in solar units. Available: {AVAILABLE_METALLICITIES}') parser.add_argument('--ini', type=str, default=None, help='Path to params ini file (auto-detected if not given)') + parser.add_argument('--branch', type=str, default=None, + help='Branch name to record in HDF5 metadata') + parser.add_argument('--sha', type=str, default=None, + help='Commit SHA to record in HDF5 metadata') args = parser.parse_args() if args.metallicity not in AVAILABLE_METALLICITIES: @@ -749,4 +764,6 @@ def evolve_binaries(metallicity, verbose, output_path, ini_path=None): verbose=args.verbose, output_path=args.output, ini_path=args.ini, - ) + branch=args.branch, + sha=args.sha, + ) \ No newline at end of file diff --git a/dev-tools/compare_runs.py b/dev-tools/compare_runs.py index 6470288198..d0e1aaee06 100644 --- a/dev-tools/compare_runs.py +++ b/dev-tools/compare_runs.py @@ -7,6 +7,10 @@ 2. QUALITATIVE: changes to categorical/string columns (states, events, step names, SN types, etc.) 3. WARNINGS & ERRORS: changes to warnings raised or binaries that error out +The report header includes provenance metadata (branch, commit SHA, generation +time, POSYDON data path) read from each HDF5 file's /metadata table when +available. Older files without these fields are handled gracefully. + By default, uses exact comparison (atol=0, rtol=0). The --loose flag enables a small tolerance for cases where minor floating-point differences are expected. @@ -411,10 +415,47 @@ def main(): total_diffs = len(quant_diffs) + len(qual_diffs) + len(struct_diffs) + len(warn_diffs) tol_label = f"rtol={rtol}, atol={atol}" if rtol > 0 or atol > 0 else "EXACT (rtol=0, atol=0)" + # Read metadata for the report header + def _read_meta(filepath): + """Extract metadata fields from an HDF5 file, returning a dict.""" + meta = {} + try: + with pd.HDFStore(filepath, mode='r') as store: + if '/metadata' in store: + m = store['/metadata'] + for field in ('branch', 'commit_sha', 'generated_at', + 'path_to_posydon_data'): + if field in m.columns: + meta[field] = str(m[field].iloc[0]) + except Exception: + pass + return meta + + base_meta = _read_meta(args.baseline) + cand_meta = _read_meta(args.candidate) + print("=" * 70) print("POSYDON Binary Validation ā€” Comparison Report") print(f" Baseline: {args.baseline}") + if base_meta: + if base_meta.get('branch'): + print(f" Branch: {base_meta['branch']}") + if base_meta.get('commit_sha'): + print(f" SHA: {base_meta['commit_sha']}") + if base_meta.get('generated_at'): + print(f" Generated: {base_meta['generated_at']}") + if base_meta.get('path_to_posydon_data'): + print(f" Data path: {base_meta['path_to_posydon_data']}") print(f" Candidate: {args.candidate}") + if cand_meta: + if cand_meta.get('branch'): + print(f" Branch: {cand_meta['branch']}") + if cand_meta.get('commit_sha'): + print(f" SHA: {cand_meta['commit_sha']}") + if cand_meta.get('generated_at'): + print(f" Generated: {cand_meta['generated_at']}") + if cand_meta.get('path_to_posydon_data'): + print(f" Data path: {cand_meta['path_to_posydon_data']}") print(f" Tolerances: {tol_label}") print("=" * 70) @@ -457,4 +498,4 @@ def main(): if __name__ == "__main__": - main() + main() \ No newline at end of file diff --git a/dev-tools/evolve_binaries.sh b/dev-tools/evolve_binaries.sh index f46efd096a..aca90abfb4 100755 --- a/dev-tools/evolve_binaries.sh +++ b/dev-tools/evolve_binaries.sh @@ -16,6 +16,9 @@ # outputs//candidate_Zsun.h5 ā€” evolution results per metallicity # logs//evolve_Zsun.log ā€” log per metallicity # workdirs/POSYDON_/ ā€” cloned repo + conda env +# +# The resolved commit SHA and branch name are recorded in each HDF5 file's +# /metadata table for provenance tracking in comparison reports. # ============================================================================= set -euo pipefail @@ -109,6 +112,10 @@ pip install -e "$CLONE_DIR" -q 2>&1 | sed 's/^/ /' SUITE_SCRIPT="$SCRIPT_DIR/binaries_suite.py" FAILED=0 +# Resolve the actual commit SHA for metadata +ACTUAL_SHA=$(cd "$CLONE_DIR" && git rev-parse HEAD 2>/dev/null || echo "unknown") +echo " Resolved SHA: $ACTUAL_SHA" + for Z in $METALLICITIES; do OUTPUT_FILE="$OUTPUT_DIR/candidate_${Z}Zsun.h5" LOG_FILE="$LOG_DIR/evolve_${Z}Zsun.log" @@ -123,6 +130,8 @@ for Z in $METALLICITIES; do python "$SUITE_SCRIPT" \ --metallicity "$Z" \ --output "$OUTPUT_FILE" \ + --branch "$BRANCH" \ + --sha "$ACTUAL_SHA" \ 2>&1 | tee "$LOG_FILE" EXIT_CODE=${PIPESTATUS[0]} @@ -155,4 +164,4 @@ fi echo " Outputs in: $OUTPUT_DIR/" echo "============================================================" -exit $FAILED +exit $FAILED \ No newline at end of file diff --git a/dev-tools/validate_binaries.sh b/dev-tools/validate_binaries.sh index 9f454a3344..b177c87f52 100755 --- a/dev-tools/validate_binaries.sh +++ b/dev-tools/validate_binaries.sh @@ -6,7 +6,7 @@ # # Usage: # ./validate_binaries.sh [baseline_branch] [metallicities] -# [--loose] [--rtol VALUE] [--atol VALUE] +# [--loose] [--rtol VALUE] [--atol VALUE] [--skip-evolve] # # Positional arguments: # candidate_branch Branch or tag to validate (required) @@ -23,6 +23,10 @@ # --rtol and --atol can be combined with --loose (explicit values take # precedence over the --loose defaults) or used on their own without --loose. # +# Other flags: +# --skip-evolve Skip Step 1 (evolution) and compare existing outputs +# against baseline. Candidate files must already exist. +# # Examples: # ./validate_binaries.sh feature/new-SN # compare vs main, exact # ./validate_binaries.sh feature/new-SN v2.1.0 # compare vs v2.1.0, exact @@ -30,6 +34,7 @@ # ./validate_binaries.sh feature/new-SN --loose # relaxed tolerances # ./validate_binaries.sh feature/new-SN main --rtol 1e-8 # custom rtol, default atol # ./validate_binaries.sh feature/new-SN main "1 0.45" --loose --atol 1e-10 +# ./validate_binaries.sh feature/new-SN --skip-evolve # compare existing outputs only # # Prerequisites: # Run generate_baseline.sh first to create baseline files. @@ -51,6 +56,7 @@ shift $(( $# < 3 ? $# : 3 )) LOOSE=false RTOL="" ATOL="" +SKIP_EVOLVE=false while [[ $# -gt 0 ]]; do case "$1" in @@ -66,6 +72,10 @@ while [[ $# -gt 0 ]]; do ATOL="${2:?--atol requires a value}" shift 2 ;; + --skip-evolve) + SKIP_EVOLVE=true + shift + ;; *) echo "ERROR: Unknown option: $1" >&2 exit 1 @@ -134,9 +144,19 @@ fi echo " Found $BASELINE_COUNT baseline file(s)." # ā”€ā”€ Step 1: Evolve binaries on candidate branch ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ -echo "" -echo "Step 1: Evolving binaries on candidate branch '$CANDIDATE_BRANCH'..." -"$SCRIPT_DIR/evolve_binaries.sh" "$CANDIDATE_BRANCH" "" "$METALLICITIES" +if [ "$SKIP_EVOLVE" = true ]; then + echo "" + echo "Step 1: SKIPPED (--skip-evolve: using existing outputs in $OUTPUT_DIR)" + if [ ! -d "$OUTPUT_DIR" ]; then + echo "ERROR: No outputs found at $OUTPUT_DIR" >&2 + echo "Run evolve_binaries.sh first, or drop --skip-evolve to evolve from scratch." >&2 + exit 1 + fi +else + echo "" + echo "Step 1: Evolving binaries on candidate branch '$CANDIDATE_BRANCH'..." + "$SCRIPT_DIR/evolve_binaries.sh" "$CANDIDATE_BRANCH" "" "$METALLICITIES" +fi # ā”€ā”€ Step 2: Compare each metallicity ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ echo "" @@ -216,4 +236,4 @@ echo "============================================================" if [ $FAIL -gt 0 ]; then exit 1 fi -exit 0 +exit 0 \ No newline at end of file From ff2294fc5bd1cc8072215b5d7ed38d4a44f780c2 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Tue, 31 Mar 2026 14:49:30 -0500 Subject: [PATCH 307/389] updated README with more in-depth information that may be useful for further development --- dev-tools/README.md | 68 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 66 insertions(+), 2 deletions(-) diff --git a/dev-tools/README.md b/dev-tools/README.md index fdc00a9688..64aa01e4bb 100644 --- a/dev-tools/README.md +++ b/dev-tools/README.md @@ -75,7 +75,7 @@ Compares two HDF5 files produced by `binaries_suite.py` and reports differences - **Qualitative**: changes to categorical columns such as state, event, step name, SN type, interpolation class, and mass transfer history. - **Quantitative**: changes to any numeric column. By default, comparison is exact (bitwise identical floats). Use `--loose` for slightly relaxed tolerances (rtol=1e-12, atol=1e-15), or set `--rtol`/`--atol` explicitly as per [np.allclose](https://numpy.org/devdocs/reference/generated/numpy.allclose.html). -The script also compares warning and error tables, reporting new, removed, or changed warnings per binary. The report header includes source metadata (branch, commit SHA, generation time, POSYDON data path) read from each file when available. +The script also compares warning and error tables, reporting new, removed, or changed warnings per binary. The report header includes provenance metadata (branch, commit SHA, generation time, POSYDON data path) read from each file when available. ```bash python compare_runs.py baseline.h5 candidate.h5 [--loose] [--rtol VALUE] [--atol VALUE] [--verbose] @@ -137,4 +137,68 @@ dev-tools/ ā”œā”€ā”€ outputs/ # candidate evolution results (per branch) ā”œā”€ā”€ logs/ # per-metallicity evolution logs (per branch) ā””ā”€ā”€ workdirs/ # cloned repos and conda environments (per branch) -``` \ No newline at end of file +``` + +## Interpreting Results + +The comparison report groups differences into four categories. Here's how to read them: + +**Structural** differences (missing/extra binaries, step count changes, newly failing/passing) almost always indicate a real change. A binary that newly fails or changes its number of evolution steps means the code is following a different evolutionary path. These warrant investigation regardless of tolerance settings. + +**Qualitative** differences (state, event, step name, SN type) also represent real behavioral changes. Even a single qualitative diff means the binary is being classified differently, e.g. a different mass transfer history or a changed SN type. These are never tolerance-dependent. + +**Quantitative** differences are more nuanced. With exact comparison (the default), any floating-point difference is reported. This is useful for detecting unintended changes, but expected after compiler/platform changes or numpy version bumps. If you see many quantitative diffs but zero structural/qualitative diffs, the evolution paths are the same and the differences are likely numerical noise ā€” re-run with `--loose` or a custom `--rtol` to confirm. If quantitative diffs persist at `--rtol 1e-6` or larger, something meaningful has changed. + +**Warning** differences are informational. New warnings may indicate a physics edge case being hit differently, or changes to warnings in the code, but are not failures on their own. + +A healthy validation run after a non-physics code change should show zero structural and qualitative differences, and minimal quantitative changes. After an intentional physics change, expect significant diffs. If binaries unrelated to intentional physics changes show structural or qualitative diffs, that may indicate a problem with implementation. + +## Tolerance Design + +By default, comparison is exact (`rtol=0, atol=0`): any bitwise difference in a float is reported. The `--loose` flag sets `rtol=1e-12, atol=1e-15`, which is appropriate for filtering out platform-level floating-point noise while still catching meaningful changes. + +For custom tolerances, `--rtol` and `--atol` follow the semantics of `np.allclose`: a value passes if `abs(baseline - candidate) <= atol + rtol * abs(baseline)`. In practice, `rtol` dominates for most columns (masses, periods, separations are all large numbers), while `atol` only matters near zero (e.g., eccentricity, certain hydrogen fractions). + +Known limitation: when `baseline == 0` and `candidate != 0`, `rtol`-based comparison produces `0 + rtol * 0 = 0`, so any nonzero candidate value fails. This is correct behavior (a zero-to-nonzero change is meaningful), but be aware that the reverse (both values very small but nonzero) may pass even if the relative change is large, since `atol` provides a floor. For most POSYDON quantities this is not an issue, but it matters for quantities that are genuinely expected to be zero (e.g., eccentricity at ZAMS for circular binaries). + +A single global tolerance works well for catching regressions but is a blunt instrument for columns spanning many orders of magnitude. Per-column or per-quantity scaling is a possible future improvement but is not currently implemented. + +The `--loose` defaults (`rtol=1e-12, atol=1e-15`) were chosen just above float64 machine epsilon and may need to be adjusted if there are parts of the code that are non-deterministic. If parts of the POSYDON pipeline introduce stochasticity (e.g. unseeded RNG), the irreducible noise floor may be higher. To calibrate, run the same branch against itself and check what tolerance is needed for a clean pass: + +```bash +# Evolve the same branch twice under different output names +python binaries_suite.py --output /tmp/run_a.h5 --metallicity 1 +python binaries_suite.py --output /tmp/run_b.h5 --metallicity 1 + +# Compare ā€” any diffs here are the stochasticity floor +python compare_runs.py /tmp/run_a.h5 /tmp/run_b.h5 + +# Find the tolerance that absorbs the noise +python compare_runs.py /tmp/run_a.h5 /tmp/run_b.h5 --rtol 1e-10 +``` + +The `--loose` defaults should sit just above whatever self-comparison noise you observe. If the self-comparison is clean at exact, the current defaults are fine. + + +## Updating the Baseline + +The baseline should be regenerated when the "expected correct" output changes. Typical triggers: + +- **After a release or version tag.** Generate a baseline from the release tag so future development is compared against the release state: `./generate_baseline.sh v2.3` +- **After merging an intentional physics change.** If a PR deliberately changes evolution outcomes (e.g., a new SN prescription), validate the PR branch first to confirm only the expected binaries are affected, then regenerate the baseline from the updated main branch. +- **After updating POSYDON data grids.** Grid changes will alter interpolated values. Regenerate the baseline and record the new `PATH_TO_POSYDON_DATA` in `baseline_info.txt`. + +Do not regenerate the baseline to silence unexpected diffs. If a validation run shows differences you don't understand, investigate them before updating the baseline. + +The `--promote` flag on `generate_baseline.sh` is a convenience for skipping re-evolution when you've already run the suite and are satisfied with the outputs: `./generate_baseline.sh --promote main "1 0.45"`. + +## Adding New Test Binaries + +New binaries are added by appending entries to the `get_test_binaries()` function in `binaries_suite.py`. Each entry is a tuple of `(star1_kwargs, star2_kwargs, binary_kwargs, description)`. + +When adding a binary: + +- Choose initial conditions that reliably trigger the edge case or evolutionary pathway you want to test. Verify it does so at multiple metallicities if possible, since grid coverage varies. +- Use a descriptive string that references the PR or issue number if the binary guards a specific fix (e.g., `"PR574 - stepCE fix"`). +- After adding the binary, regenerate the baseline so it includes the new binary's expected output. +- The binary ID is assigned by list position. Appending to the end avoids changing IDs of existing binaries, which would invalidate old baselines against new code for no reason. \ No newline at end of file From 322d05e9c4516dbfb47bcbe5a378bcd92b76ca64 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 31 Mar 2026 19:54:12 +0000 Subject: [PATCH 308/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/README.md | 4 ++-- dev-tools/binaries_suite.py | 4 ++-- dev-tools/compare_runs.py | 2 +- dev-tools/evolve_binaries.sh | 2 +- dev-tools/validate_binaries.sh | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dev-tools/README.md b/dev-tools/README.md index 64aa01e4bb..acf9314624 100644 --- a/dev-tools/README.md +++ b/dev-tools/README.md @@ -155,7 +155,7 @@ A healthy validation run after a non-physics code change should show zero struct ## Tolerance Design -By default, comparison is exact (`rtol=0, atol=0`): any bitwise difference in a float is reported. The `--loose` flag sets `rtol=1e-12, atol=1e-15`, which is appropriate for filtering out platform-level floating-point noise while still catching meaningful changes. +By default, comparison is exact (`rtol=0, atol=0`): any bitwise difference in a float is reported. The `--loose` flag sets `rtol=1e-12, atol=1e-15`, which is appropriate for filtering out platform-level floating-point noise while still catching meaningful changes. For custom tolerances, `--rtol` and `--atol` follow the semantics of `np.allclose`: a value passes if `abs(baseline - candidate) <= atol + rtol * abs(baseline)`. In practice, `rtol` dominates for most columns (masses, periods, separations are all large numbers), while `atol` only matters near zero (e.g., eccentricity, certain hydrogen fractions). @@ -201,4 +201,4 @@ When adding a binary: - Choose initial conditions that reliably trigger the edge case or evolutionary pathway you want to test. Verify it does so at multiple metallicities if possible, since grid coverage varies. - Use a descriptive string that references the PR or issue number if the binary guards a specific fix (e.g., `"PR574 - stepCE fix"`). - After adding the binary, regenerate the baseline so it includes the new binary's expected output. -- The binary ID is assigned by list position. Appending to the end avoids changing IDs of existing binaries, which would invalidate old baselines against new code for no reason. \ No newline at end of file +- The binary ID is assigned by list position. Appending to the end avoids changing IDs of existing binaries, which would invalidate old baselines against new code for no reason. diff --git a/dev-tools/binaries_suite.py b/dev-tools/binaries_suite.py index 877f39f8d2..15fedaa20b 100644 --- a/dev-tools/binaries_suite.py +++ b/dev-tools/binaries_suite.py @@ -15,10 +15,10 @@ """ import argparse -from datetime import datetime, timezone import os import sys import warnings +from datetime import datetime, timezone import pandas as pd @@ -766,4 +766,4 @@ def evolve_binaries(metallicity, verbose, output_path, ini_path=None, ini_path=args.ini, branch=args.branch, sha=args.sha, - ) \ No newline at end of file + ) diff --git a/dev-tools/compare_runs.py b/dev-tools/compare_runs.py index d0e1aaee06..c815092228 100644 --- a/dev-tools/compare_runs.py +++ b/dev-tools/compare_runs.py @@ -498,4 +498,4 @@ def _read_meta(filepath): if __name__ == "__main__": - main() \ No newline at end of file + main() diff --git a/dev-tools/evolve_binaries.sh b/dev-tools/evolve_binaries.sh index aca90abfb4..6030131eaa 100755 --- a/dev-tools/evolve_binaries.sh +++ b/dev-tools/evolve_binaries.sh @@ -164,4 +164,4 @@ fi echo " Outputs in: $OUTPUT_DIR/" echo "============================================================" -exit $FAILED \ No newline at end of file +exit $FAILED diff --git a/dev-tools/validate_binaries.sh b/dev-tools/validate_binaries.sh index b177c87f52..e8de9b786d 100755 --- a/dev-tools/validate_binaries.sh +++ b/dev-tools/validate_binaries.sh @@ -236,4 +236,4 @@ echo "============================================================" if [ $FAIL -gt 0 ]; then exit 1 fi -exit 0 \ No newline at end of file +exit 0 From 6278790046ee86cdcc68380030f48f883aeee016 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Tue, 31 Mar 2026 14:58:53 -0500 Subject: [PATCH 309/389] re-enabling popsynth suite tests and reconfiguring to new format --- dev-tools/script_data/src/popsynth_suite.py | 72 ++++++++++++++------- 1 file changed, 50 insertions(+), 22 deletions(-) diff --git a/dev-tools/script_data/src/popsynth_suite.py b/dev-tools/script_data/src/popsynth_suite.py index f87434394d..e8281c674a 100644 --- a/dev-tools/script_data/src/popsynth_suite.py +++ b/dev-tools/script_data/src/popsynth_suite.py @@ -1,8 +1,9 @@ import os +import argparse import traceback import warnings -from formatting import columns_to_show, line_length +from formatting import columns_to_show, LINE_LENGTH from pandas.testing import assert_frame_equal from utils import print_pop_settings, print_warnings @@ -18,6 +19,8 @@ def test_binpop_evolve(population, popevo_kwargs, verbose=False): + # this function runs a pop.evolve test given a set of kwargs + # Capture warnings during evolution captured_warnings = [] @@ -44,19 +47,21 @@ def warning_handler(message, category, filename, lineno, file=None, line=None): print_warnings(captured_warnings) print("āœ… BinaryPopulation evolved successfully.") - print("=" * line_length) + print("=" * LINE_LENGTH) except Exception as e: print_warnings(captured_warnings) print(f"šŸšØ BinaryPopulation evolution failed!\n") traceback.print_exc(limit=3) print("\n") - print("=" * line_length) + print("=" * LINE_LENGTH) return population def compare_io_to_ram(loaded_pop, pop_in_ram): + # this function compares binaries saved/loaded to any stored in RAM + # check that binaries match between pop runs w/ fixed entropy # and that saved/loaded binaries match those from a memory loaded run df_from_ram = pop_in_ram.to_df() @@ -73,18 +78,20 @@ def compare_io_to_ram(loaded_pop, pop_in_ram): print(e) print("\nBinary in RAM:\n", ram_df) print("\nBinary from I/O:\n", io_df) - print("=" * line_length) + print("=" * LINE_LENGTH) return if i == len(loaded_pop.history): break print("āœ… Binaries from I/O match those in RAM.") - print("=" * line_length) + print("=" * LINE_LENGTH) def print_testinfo(test_title, population, popevo_kwargs): + # prints some info about the tests + # print test title str - numchar = (line_length - len(test_title)) // 2 + numchar = (LINE_LENGTH - len(test_title)) // 2 print("=" * numchar + test_title + "=" * numchar) optimize_ram = popevo_kwargs.get("optimize_ram", False) @@ -100,7 +107,9 @@ def print_testinfo(test_title, population, popevo_kwargs): num_batch_files = population.number_of_binaries // population.kwargs["dump_rate"] print(f"šŸš€ Evolving a population and saving to {num_batch_files} batch files.") -def check_test(pop_in_ram, load_pop=False): +def check_test(pop_in_ram, out_path, load_pop=False): + + # checks that a test went OK # if we have population in RAM, check that the number # stored in RAM matches the number we expected to run @@ -114,16 +123,18 @@ def check_test(pop_in_ram, load_pop=False): print(f"āœ… Successfully ran and stored {num_in_ram} binaries in RAM.") elif pop_in_ram and load_pop: - save_fn = os.path.join(path_to_popout, "evolution.combined.h5") + save_fn = os.path.join(out_path, "batches", "evolution.combined.h5") loaded_pop = Population(save_fn) compare_io_to_ram(loaded_pop, pop_in_ram) -def test_popruns(): +def test_popruns(ini_path, multiz_path, out_path, verbose): + + # primary function print("Performing population run tests...") - print(f"Reading inlist: {path_to_default_params}") - pop = BinaryPopulation.from_ini(path_to_default_params, verbose=False) - pop.kwargs.update({"temp_directory": path_to_popout}) + print(f"Reading inlist: {ini_path}") + pop = BinaryPopulation.from_ini(ini_path, verbose=verbose) + pop.kwargs.update({"temp_directory": os.path.join(out_path, "batches")}) print_pop_settings(pop) # DO TESTS: @@ -131,30 +142,30 @@ def test_popruns(): # test simple run, stays in RAM kwargs = {"optimize_ram":False, "breakdown_to_df":False, "tqdm":True} print_testinfo("TEST: 01", pop, kwargs) - pop_in_ram = test_binpop_evolve(pop, kwargs, verbose=True) - check_test(pop_in_ram, load_pop=False) + pop_in_ram = test_binpop_evolve(pop, kwargs, verbose=verbose) + check_test(pop_in_ram, out_path, load_pop=False) # test same but w/ saving/loading binaries kwargs = {"optimize_ram":False, "breakdown_to_df":True, "tqdm":True} print_testinfo("TEST: 02", pop, kwargs) - _ = test_binpop_evolve(pop, kwargs, verbose=False) - check_test(pop_in_ram, load_pop=True) + _ = test_binpop_evolve(pop, kwargs, verbose=verbose) + check_test(pop_in_ram, out_path, load_pop=True) # test optimize RAM run w/ batch saving kwargs = {"optimize_ram":True, "breakdown_to_df":False, "tqdm":True} print_testinfo("TEST: 03", pop, kwargs) - _ = test_binpop_evolve(pop, kwargs, verbose=True) - check_test(pop_in_ram, load_pop=True) + _ = test_binpop_evolve(pop, kwargs, verbose=verbose) + check_test(pop_in_ram, out_path, load_pop=True) # TEST POPRUNNER # This is RAM heavy and may fail on personal computers # ================================================================================ test_str = " TEST: 04 " - numchar = (line_length - len(test_str)) // 2 + numchar = (LINE_LENGTH - len(test_str)) // 2 print("=" * numchar + test_str + "=" * numchar) print("Test PopulationRunner with multiple metallicities...") - print(f"Reading inlist: {path_to_multiZ_params}") - poprun = PopulationRunner(path_to_multiZ_params, verbose=True) + print(f"Reading inlist: {multiz_path}") + poprun = PopulationRunner(multiz_path, verbose=verbose) print('\t Number of binary populations:', len(poprun.binary_populations)) print('\t Metallicities:', poprun.solar_metallicities) print('\t Number of binaries (per pop):', poprun.binary_populations[0].number_of_binaries) @@ -165,4 +176,21 @@ def test_popruns(): if __name__ == "__main__": - test_popruns() + parser = argparse.ArgumentParser( + description='Evolve test binary populations for POSYDON branch validation.', + formatter_class=argparse.ArgumentDefaultsHelpFormatter + ) + parser.add_argument('--verbose', '-v', action='store_true', default=False, + help='Enable verbose output') + parser.add_argument('--output', '-o', type=str, required=True, + help='Path to save population synthesis output') + parser.add_argument('--ini', type=str, default=None, + help='Path to params ini file (auto-detected if not given)') + parser.add_argument('--multiz', type=str, default=None, + help='Path to params ini file with multiple metallicities (auto-detected if not given)') + args = parser.parse_args() + + test_popruns(ini_path=args.ini, + multiz_path=args.multiz, + out_path=args.output, + verbose=args.verbose) From af0778318a8f18b2797a0c72d8fc89c6af3bf861 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 31 Mar 2026 20:00:02 +0000 Subject: [PATCH 310/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/script_data/src/popsynth_suite.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-tools/script_data/src/popsynth_suite.py b/dev-tools/script_data/src/popsynth_suite.py index e8281c674a..0c281f86f5 100644 --- a/dev-tools/script_data/src/popsynth_suite.py +++ b/dev-tools/script_data/src/popsynth_suite.py @@ -1,9 +1,9 @@ -import os import argparse +import os import traceback import warnings -from formatting import columns_to_show, LINE_LENGTH +from formatting import LINE_LENGTH, columns_to_show from pandas.testing import assert_frame_equal from utils import print_pop_settings, print_warnings From d02aa9a8d2e2c722d9f328e03052d16e65191b6f Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Tue, 31 Mar 2026 15:09:23 -0500 Subject: [PATCH 311/389] add note about RNG reproducibility fix by Seth's PR --- dev-tools/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-tools/README.md b/dev-tools/README.md index 64aa01e4bb..2f328eef47 100644 --- a/dev-tools/README.md +++ b/dev-tools/README.md @@ -163,7 +163,7 @@ Known limitation: when `baseline == 0` and `candidate != 0`, `rtol`-based compar A single global tolerance works well for catching regressions but is a blunt instrument for columns spanning many orders of magnitude. Per-column or per-quantity scaling is a possible future improvement but is not currently implemented. -The `--loose` defaults (`rtol=1e-12, atol=1e-15`) were chosen just above float64 machine epsilon and may need to be adjusted if there are parts of the code that are non-deterministic. If parts of the POSYDON pipeline introduce stochasticity (e.g. unseeded RNG), the irreducible noise floor may be higher. To calibrate, run the same branch against itself and check what tolerance is needed for a clean pass: +The `--loose` defaults (`rtol=1e-12, atol=1e-15`) were chosen just above float64 machine epsilon and may need to be adjusted if there are parts of the code that are non-deterministic. If parts of the POSYDON pipeline in the branches being tested introduce stochasticity (e.g. unseeded RNG), the irreducible noise floor may be higher. To calibrate, run the same branch against itself and check what tolerance is needed for a clean pass: ```bash # Evolve the same branch twice under different output names @@ -179,6 +179,7 @@ python compare_runs.py /tmp/run_a.h5 /tmp/run_b.h5 --rtol 1e-10 The `--loose` defaults should sit just above whatever self-comparison noise you observe. If the self-comparison is clean at exact, the current defaults are fine. +**RNG reproducibility.** Several POSYDON evolution steps (Bondi-Hoyle accretion in `step_detached` and `MesaGridStep`, SN kicks in `step_SN`) use random number generation internally. Without a fixed seed, these produce nondeterministic results that appear as spurious `S1_lg_mdot` diffs in the validation suite. To ensure reproducibility, set the `entropy` parameter to a fixed integer in `binaries_params.ini`. This seeds the RNG passed to each step (see PR#826). ## Updating the Baseline From dd4e0bb370f6e3602f41493f01af19db11bab5c4 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 31 Mar 2026 20:09:55 +0000 Subject: [PATCH 312/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/README.md b/dev-tools/README.md index caaae0ea9a..4ed36cc099 100644 --- a/dev-tools/README.md +++ b/dev-tools/README.md @@ -179,7 +179,7 @@ python compare_runs.py /tmp/run_a.h5 /tmp/run_b.h5 --rtol 1e-10 The `--loose` defaults should sit just above whatever self-comparison noise you observe. If the self-comparison is clean at exact, the current defaults are fine. -**RNG reproducibility.** Several POSYDON evolution steps (Bondi-Hoyle accretion in `step_detached` and `MesaGridStep`, SN kicks in `step_SN`) use random number generation internally. Without a fixed seed, these produce nondeterministic results that appear as spurious `S1_lg_mdot` diffs in the validation suite. To ensure reproducibility, set the `entropy` parameter to a fixed integer in `binaries_params.ini`. This seeds the RNG passed to each step (see PR#826). +**RNG reproducibility.** Several POSYDON evolution steps (Bondi-Hoyle accretion in `step_detached` and `MesaGridStep`, SN kicks in `step_SN`) use random number generation internally. Without a fixed seed, these produce nondeterministic results that appear as spurious `S1_lg_mdot` diffs in the validation suite. To ensure reproducibility, set the `entropy` parameter to a fixed integer in `binaries_params.ini`. This seeds the RNG passed to each step (see PR#826). ## Updating the Baseline From 7799b8eca3ae2849f8f7e97130a1e3f9965df3b3 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Tue, 31 Mar 2026 15:10:32 -0500 Subject: [PATCH 313/389] Update dev-tools/README.md Co-authored-by: Seth Gossage --- dev-tools/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/README.md b/dev-tools/README.md index 4ed36cc099..67a4c83b70 100644 --- a/dev-tools/README.md +++ b/dev-tools/README.md @@ -87,7 +87,7 @@ Configuration file for `SimulationProperties`. Defines the POSYDON evolution ste ## Running Scripts Manually -The shell scripts handle cloning, environment setup, and orchestration. If you already have POSYDON installed in your current environment, you can run the Python scripts directly. +The shell scripts handle cloning, environment setup, orchestration, and execution. If you already have POSYDON installed in your current environment, you can execute the Python scripts directly. ### Evolving binaries From bd616e9d27d432d24e9db6354f71fc3a516f8333 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Tue, 31 Mar 2026 15:10:54 -0500 Subject: [PATCH 314/389] Update dev-tools/README.md Co-authored-by: Seth Gossage --- dev-tools/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/README.md b/dev-tools/README.md index 67a4c83b70..ca00e62c6b 100644 --- a/dev-tools/README.md +++ b/dev-tools/README.md @@ -1,4 +1,4 @@ -Validation suite for POSYDON binary evolution. Evolves a fixed set of test binaries on a candidate branch and compares results against a stored baseline to catch regressions. +Validation suite for POSYDON binary evolution. Evolves a fixed set of test binaries on a candidate branch and compares results against a stored baseline to catch regressions. A baseline can be formed from any branch (`main` by default) and is represented by a set of results from `binary_suite.py`, saved HDF5 files, all stored in `dev-tools/baselines/`. ## Quick Start From a7ad842fe914ff2d45ce7e5e80ba14a5046dce7f Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Tue, 31 Mar 2026 15:11:14 -0500 Subject: [PATCH 315/389] Update dev-tools/README.md Co-authored-by: Seth Gossage --- dev-tools/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/README.md b/dev-tools/README.md index ca00e62c6b..b73406d158 100644 --- a/dev-tools/README.md +++ b/dev-tools/README.md @@ -33,7 +33,7 @@ To re-run comparison with different tolerances without re-evolving: ### `validate_binaries.sh` -Top-level entry point. Evolves test binaries on a candidate branch, then compares results against an existing baseline. +Top-level entry point. Evolves test binaries on a candidate branch, then compares results against an existing baseline. This script will look for baseline HDF5 files stored in `dev-tools/baseline/`, where `main` is the default ``. ```bash ./validate_binaries.sh [baseline_branch] [metallicities] [--loose] [--rtol VALUE] [--atol VALUE] [--skip-evolve] From ba4ac8a3085f95b02c675a64c350ebb8fd28dab9 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng <41969755+elizabethteng@users.noreply.github.com> Date: Tue, 31 Mar 2026 15:13:14 -0500 Subject: [PATCH 316/389] Update dev-tools/README.md Co-authored-by: Seth Gossage --- dev-tools/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/README.md b/dev-tools/README.md index b73406d158..8d07df8ccd 100644 --- a/dev-tools/README.md +++ b/dev-tools/README.md @@ -43,7 +43,7 @@ By default, comparison is exact (rtol=0, atol=0). Use `--loose` for relaxed floa ### `generate_baseline.sh` -Generates baseline HDF5 files from a designated branch or tag. Can also promote existing outputs to baseline with `--promote`. +Generates baseline HDF5 files from a designated branch name and optionally a SHA to specify a commit. Can also promote existing outputs to baseline with `--promote`. ```bash ./generate_baseline.sh [sha] [metallicities] From a537d08fd724bf84be1a551bb97a16110e3d55b7 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Tue, 31 Mar 2026 15:14:43 -0500 Subject: [PATCH 317/389] update .gitignore and remove some old code in run_test_suite.sh --- dev-tools/.gitignore | 2 ++ dev-tools/run_test_suite.sh | 55 +++++++++++++++++++++++++++++-------- 2 files changed, 46 insertions(+), 11 deletions(-) diff --git a/dev-tools/.gitignore b/dev-tools/.gitignore index bec9d97e5a..b4727e40d4 100644 --- a/dev-tools/.gitignore +++ b/dev-tools/.gitignore @@ -3,3 +3,5 @@ outputs/ logs/ baselines/ test_*.h5 +*.ini +*.txt diff --git a/dev-tools/run_test_suite.sh b/dev-tools/run_test_suite.sh index de3fecb48f..68cf3eba83 100755 --- a/dev-tools/run_test_suite.sh +++ b/dev-tools/run_test_suite.sh @@ -130,11 +130,11 @@ for Z in $METALLICITIES; do echo " Log: $LOG_FILE" echo "============================================================" - python "$SUITE_SCRIPT" \ - --metallicity "$Z" \ - --output "$OUTPUT_FILE" \ - --ini "$TEST_INI" \ - 2>&1 | tee "$LOG_FILE" + #python "$SUITE_SCRIPT" \ + # --metallicity "$Z" \ + # --output "$OUTPUT_FILE" \ + # --ini "$TEST_INI" \ + # 2>&1 | tee "$LOG_FILE" EXIT_CODE=${PIPESTATUS[0]} if [ $EXIT_CODE -eq 137 ]; then @@ -151,14 +151,47 @@ for Z in $METALLICITIES; do echo " Z=${Z} Zsun complete." fi - # Run population synthesis tests and capture output (stdout and stderr) - #OUT_DIR=$FULL_PATH/script_data/output/population_tests - #echo "šŸš€ Running popsynth_suite.py" - #python script_data/src/popsynth_suite.py > $OUT_DIR/evolve_pop_$BRANCH.out 2>&1 - #echo -e "āœ… Script completed. Output saved to: \n$OUT_DIR/evolve_pop_$BRANCH.out" - done +# Run population synthesis tests and capture output (stdout and stderr) +SUITE_SCRIPT="$SCRIPT_DIR/src/popsynth_suite.py" +FAILED=0 +LOG_FILE="$LOG_DIR/evolve_populations.log" + +TEST_INI="${SCRIPT_DIR}/inlists/${SAFE_BRANCH}_test_params.ini" +MULTIZ_INI="${SCRIPT_DIR}/inlists/${SAFE_BRANCH}_test_multiZ_params.ini" +cp $TEST_INI $MULTIZ_INI + +echo "" +echo "============================================================" +echo " šŸš€ Evolving populations" +echo " Output: $POP_OUTPUT_DIR" +echo " Log: $LOG_FILE" +echo "============================================================" + +python "$SUITE_SCRIPT" \ + --output "$POP_OUTPUT_DIR" \ + --ini "$TEST_INI" \ + --multiz "$MULTIZ_INI" \ + 2>&1 | tee "$LOG_FILE" +EXIT_CODE=${PIPESTATUS[0]} + +if [ $EXIT_CODE -eq 137 ]; then + echo "ERROR: Process killed (likely OOM) for Z=${Z}. Exit code 137 (SIGKILL)." >&2 + echo " Consider increasing job memory." >&2 + FAILED=$((FAILED + 1)) +elif [ $EXIT_CODE -ne 0 ]; then + echo "WARNING: Suite failed for Z=${Z} (exit code $EXIT_CODE). Check $LOG_FILE" >&2 + FAILED=$((FAILED + 1)) +elif [ ! -f "$OUTPUT_FILE" ]; then + echo "WARNING: Output file not created for Z=${Z}" >&2 + FAILED=$((FAILED + 1)) +else + echo " āœ… Script completed." +fi + +#echo -e "āœ… Script completed. Output saved to: \n$OUT_DIR/evolve_pop_$BRANCH.out" + # ā”€ā”€ Deactivate Environment ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ conda deactivate From 03c1b4a677540ca7744015f414872c58930e2cc3 Mon Sep 17 00:00:00 2001 From: Elizabeth Teng Date: Tue, 31 Mar 2026 15:16:55 -0500 Subject: [PATCH 318/389] added more details about --promote option --- dev-tools/README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dev-tools/README.md b/dev-tools/README.md index 8d07df8ccd..cd31584d8c 100644 --- a/dev-tools/README.md +++ b/dev-tools/README.md @@ -43,10 +43,15 @@ By default, comparison is exact (rtol=0, atol=0). Use `--loose` for relaxed floa ### `generate_baseline.sh` -Generates baseline HDF5 files from a designated branch name and optionally a SHA to specify a commit. Can also promote existing outputs to baseline with `--promote`. +Generates baseline HDF5 files from a designated branch name and optionally a SHA to specify a commit. ```bash ./generate_baseline.sh [sha] [metallicities] +``` + +If you already have results from prior runs of `evolve_binaries.sh` saved as HDF5 files in `outputs//`, you can copy these directly into the baselines directory with the `--promote` option, skipping re-evolution: + +```bash ./generate_baseline.sh --promote [metallicities] ``` From b36f2372baf2b74c10e99ee69e76db9d0fa01cad Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 31 Mar 2026 20:17:18 +0000 Subject: [PATCH 319/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/README.md b/dev-tools/README.md index cd31584d8c..a5984cb164 100644 --- a/dev-tools/README.md +++ b/dev-tools/README.md @@ -43,7 +43,7 @@ By default, comparison is exact (rtol=0, atol=0). Use `--loose` for relaxed floa ### `generate_baseline.sh` -Generates baseline HDF5 files from a designated branch name and optionally a SHA to specify a commit. +Generates baseline HDF5 files from a designated branch name and optionally a SHA to specify a commit. ```bash ./generate_baseline.sh [sha] [metallicities] From f90436cc0dec043f09ea0f988a7c9d7f1318148b Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Tue, 31 Mar 2026 16:53:50 -0500 Subject: [PATCH 320/389] adding verbosity to pop runer --- dev-tools/run_test_suite.sh | 5 ++--- dev-tools/script_data/src/popsynth_suite.py | 7 ++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-tools/run_test_suite.sh b/dev-tools/run_test_suite.sh index 68cf3eba83..a47ac54429 100755 --- a/dev-tools/run_test_suite.sh +++ b/dev-tools/run_test_suite.sh @@ -118,6 +118,7 @@ FAILED=0 DEFAULT_INI="${CLONE_DIR}/posydon/popsyn/population_params_default.ini" TEST_INI="${SCRIPT_DIR}/inlists/${SAFE_BRANCH}_test_params.ini" cp $DEFAULT_INI $TEST_INI +sed -i 's/^\([[:space:]]*\)entropy *= *.*/\1entropy = 0/' $TEST_INI for Z in $METALLICITIES; do OUTPUT_FILE="$BINARY_OUTPUT_DIR/candidate_${Z}Zsun.h5" @@ -158,9 +159,9 @@ SUITE_SCRIPT="$SCRIPT_DIR/src/popsynth_suite.py" FAILED=0 LOG_FILE="$LOG_DIR/evolve_populations.log" -TEST_INI="${SCRIPT_DIR}/inlists/${SAFE_BRANCH}_test_params.ini" MULTIZ_INI="${SCRIPT_DIR}/inlists/${SAFE_BRANCH}_test_multiZ_params.ini" cp $TEST_INI $MULTIZ_INI +sed -i 's/^\([[:space:]]*\)metallicities *= *\[.*\]/\1metallicities = [2., 1., 0.45]/' $MULTIZ_INI echo "" echo "============================================================" @@ -190,8 +191,6 @@ else echo " āœ… Script completed." fi -#echo -e "āœ… Script completed. Output saved to: \n$OUT_DIR/evolve_pop_$BRANCH.out" - # ā”€ā”€ Deactivate Environment ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ conda deactivate diff --git a/dev-tools/script_data/src/popsynth_suite.py b/dev-tools/script_data/src/popsynth_suite.py index 0c281f86f5..dd28791612 100644 --- a/dev-tools/script_data/src/popsynth_suite.py +++ b/dev-tools/script_data/src/popsynth_suite.py @@ -64,8 +64,9 @@ def compare_io_to_ram(loaded_pop, pop_in_ram): # check that binaries match between pop runs w/ fixed entropy # and that saved/loaded binaries match those from a memory loaded run + N = pop_in_ram.number_of_binaries df_from_ram = pop_in_ram.to_df() - ram_dflist = [df_from_ram.loc[i] for i in range(10)] + ram_dflist = [df_from_ram.loc[i] for i in range(N)] print("šŸ” Checking that binaries in RAM match those retrieved from I/O...") for i, ram_df in enumerate(ram_dflist): io_df = loaded_pop.history[i] @@ -165,12 +166,12 @@ def test_popruns(ini_path, multiz_path, out_path, verbose): print("=" * numchar + test_str + "=" * numchar) print("Test PopulationRunner with multiple metallicities...") print(f"Reading inlist: {multiz_path}") - poprun = PopulationRunner(multiz_path, verbose=verbose) + poprun = PopulationRunner(multiz_path, verbose=True) print('\t Number of binary populations:', len(poprun.binary_populations)) print('\t Metallicities:', poprun.solar_metallicities) print('\t Number of binaries (per pop):', poprun.binary_populations[0].number_of_binaries) print("šŸš€ Evolving PopulationRunner...") - #poprun.evolve(overwrite=True) + poprun.evolve(overwrite=True) print("āœ… PopulationRunner evolved successfully.") From d7936c2c668d678942862ef9298fbe56d99240c2 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Tue, 31 Mar 2026 17:37:46 -0500 Subject: [PATCH 321/389] cherrypicking changed from latest et-validation commit to preserve them --- dev-tools/script_data/src/binaries_suite.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dev-tools/script_data/src/binaries_suite.py b/dev-tools/script_data/src/binaries_suite.py index c13a681b32..1322a8dded 100644 --- a/dev-tools/script_data/src/binaries_suite.py +++ b/dev-tools/script_data/src/binaries_suite.py @@ -10,6 +10,7 @@ import shutil import signal import warnings +from datetime import datetime, timezone import numpy as np import pandas as pd @@ -22,10 +23,6 @@ from posydon.config import PATH_TO_POSYDON, PATH_TO_POSYDON_DATA from posydon.utils.common_functions import orbital_separation_from_period -#base_dir =os.path.dirname(PATH_TO_POSYDON) -#script_dir = os.path.join(PATH_TO_POSYDON, "dev-tools/script_data/") -#path_to_default_params = os.path.join(script_dir, "inlists/default_test_params.ini") - def load_inlist(ini_path, metallicity, verbose): if ini_path is None: @@ -143,7 +140,7 @@ def create_binary(s1_kw, s2_kw, bin_kw, sim_prop): return BinaryStar(star_1, star_2, **bin_kw, properties=sim_prop) -def evolve_binaries(metallicity, output_path, verbose, ini_path=None): +def evolve_binaries(metallicity, output_path, verbose, ini_path=None, branch=None, sha=None): """Evolves the test binary suite at the given metallicity and saves results. Args: @@ -211,6 +208,9 @@ def evolve_binaries(metallicity, output_path, verbose, ini_path=None): 'n_missing': len(missing_ids), 'missing_ids': str(missing_ids) if missing_ids else '', 'path_to_posydon_data': PATH_TO_POSYDON_DATA, + 'branch': branch or '', + 'commit_sha': sha or '', + 'generated_at': datetime.now(timezone.utc).strftime('%Y-%m-%d %H:%M:%S UTC'), }]) h5file.put("metadata", meta_df, format="table") @@ -253,6 +253,10 @@ def evolve_binaries(metallicity, output_path, verbose, ini_path=None): help=f'Metallicity in solar units. Available: {AVAILABLE_METALLICITIES}') parser.add_argument('--ini', type=str, default=None, help='Path to params ini file (auto-detected if not given)') + parser.add_argument('--branch', type=str, default=None, + help='Branch name to record in HDF5 metadata') + parser.add_argument('--sha', type=str, default=None, + help='Commit SHA to record in HDF5 metadata') args = parser.parse_args() if args.metallicity not in AVAILABLE_METALLICITIES: @@ -264,4 +268,6 @@ def evolve_binaries(metallicity, output_path, verbose, ini_path=None): verbose=args.verbose, output_path=args.output, ini_path=args.ini, + branch=args.branch, + sha=args.sha, ) From 1b29915c6c7fe48634762a68a37d293f8d076d26 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 31 Mar 2026 22:38:34 +0000 Subject: [PATCH 322/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/script_data/src/binaries_suite.py | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-tools/script_data/src/binaries_suite.py b/dev-tools/script_data/src/binaries_suite.py index 1322a8dded..92c8982b86 100644 --- a/dev-tools/script_data/src/binaries_suite.py +++ b/dev-tools/script_data/src/binaries_suite.py @@ -23,6 +23,7 @@ from posydon.config import PATH_TO_POSYDON, PATH_TO_POSYDON_DATA from posydon.utils.common_functions import orbital_separation_from_period + def load_inlist(ini_path, metallicity, verbose): if ini_path is None: From 6e4f5fd0071837f7ceda87945ae905aeb39ada58 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sat, 4 Apr 2026 12:12:17 -0500 Subject: [PATCH 323/389] updating error text --- dev-tools/run_test_suite.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-tools/run_test_suite.sh b/dev-tools/run_test_suite.sh index 537798fb1e..e1509b7252 100755 --- a/dev-tools/run_test_suite.sh +++ b/dev-tools/run_test_suite.sh @@ -186,17 +186,17 @@ python "$SUITE_SCRIPT" \ EXIT_CODE=${PIPESTATUS[0]} if [ $EXIT_CODE -eq 137 ]; then - echo "ERROR: Process killed (likely OOM) for Z=${Z}. Exit code 137 (SIGKILL)." >&2 + echo "ERROR: Process killed (likely OOM) for popsynth_suite.py. Exit code 137 (SIGKILL)." >&2 echo " Consider increasing job memory." >&2 FAILED=$((FAILED + 1)) elif [ $EXIT_CODE -ne 0 ]; then - echo "WARNING: Suite failed for Z=${Z} (exit code $EXIT_CODE). Check $LOG_FILE" >&2 + echo "WARNING: popsynth_suite.py failed (exit code $EXIT_CODE). Check $LOG_FILE" >&2 FAILED=$((FAILED + 1)) elif [ ! -f "$OUTPUT_FILE" ]; then - echo "WARNING: Output file not created for Z=${Z}" >&2 + echo "WARNING: Output file not created for popsynth_suite.py" >&2 FAILED=$((FAILED + 1)) else - echo " āœ… Script completed." + echo " popsynth_suite.py completed." fi # ā”€ā”€ Deactivate Environment ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ From 5faeafc7030e584a805d856c43c087b5df0b973d Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Sat, 4 Apr 2026 12:37:26 -0500 Subject: [PATCH 324/389] update succeed text --- dev-tools/run_test_suite.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dev-tools/run_test_suite.sh b/dev-tools/run_test_suite.sh index e1509b7252..256bc3d79a 100755 --- a/dev-tools/run_test_suite.sh +++ b/dev-tools/run_test_suite.sh @@ -211,5 +211,15 @@ else fi echo " Outputs in: $BINARY_OUTPUT_DIR/" echo "============================================================" +echo "" +echo "============================================================" +if [ $FAILED -eq 0 ]; then + echo "āœ… All population synthesis tests completed successfully." +else + echo "Completed with $FAILED failure(s)." +fi +echo " Outputs in: $POP_OUTPUT_DIR/" +echo "============================================================" + exit $FAILED From b683d600e4fad610f695f5771112ccd4ccff2149 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Mon, 6 Apr 2026 18:26:44 -0500 Subject: [PATCH 325/389] add pipeline test and update .gitignore --- dev-tools/.gitignore | 2 +- dev-tools/run_test_suite.sh | 44 ++++++++++----------- dev-tools/script_data/src/popsynth_suite.py | 30 +++++++++++--- dev-tools/script_data/src/setup_poprun.sh | 4 ++ 4 files changed, 51 insertions(+), 29 deletions(-) create mode 100644 dev-tools/script_data/src/setup_poprun.sh diff --git a/dev-tools/.gitignore b/dev-tools/.gitignore index b4727e40d4..c5bb40a839 100644 --- a/dev-tools/.gitignore +++ b/dev-tools/.gitignore @@ -1,5 +1,5 @@ workdirs/ -outputs/ +output/ logs/ baselines/ test_*.h5 diff --git a/dev-tools/run_test_suite.sh b/dev-tools/run_test_suite.sh index 256bc3d79a..b3957d1a2c 100755 --- a/dev-tools/run_test_suite.sh +++ b/dev-tools/run_test_suite.sh @@ -138,27 +138,27 @@ for Z in $METALLICITIES; do echo " Log: $LOG_FILE" echo "============================================================" - python "$SUITE_SCRIPT" \ - --metallicity "$Z" \ - --output "$OUTPUT_FILE" \ - --branch "$BRANCH" \ - --sha "$ACTUAL_SHA" \ - 2>&1 | tee "$LOG_FILE" - EXIT_CODE=${PIPESTATUS[0]} - - if [ $EXIT_CODE -eq 137 ]; then - echo "ERROR: Process killed (likely OOM) for Z=${Z}. Exit code 137 (SIGKILL)." >&2 - echo " Consider increasing job memory." >&2 - FAILED=$((FAILED + 1)) - elif [ $EXIT_CODE -ne 0 ]; then - echo "WARNING: Suite failed for Z=${Z} (exit code $EXIT_CODE). Check $LOG_FILE" >&2 - FAILED=$((FAILED + 1)) - elif [ ! -f "$OUTPUT_FILE" ]; then - echo "WARNING: Output file not created for Z=${Z}" >&2 - FAILED=$((FAILED + 1)) - else - echo " Z=${Z} Zsun complete." - fi + #python "$SUITE_SCRIPT" \ + # --metallicity "$Z" \ + # --output "$OUTPUT_FILE" \ + # --branch "$BRANCH" \ + # --sha "$ACTUAL_SHA" \ + # 2>&1 | tee "$LOG_FILE" + #EXIT_CODE=${PIPESTATUS[0]} + + #if [ $EXIT_CODE -eq 137 ]; then + # echo "ERROR: Process killed (likely OOM) for Z=${Z}. Exit code 137 (SIGKILL)." >&2 + # echo " Consider increasing job memory." >&2 + # FAILED=$((FAILED + 1)) + #elif [ $EXIT_CODE -ne 0 ]; then + # echo "WARNING: Suite failed for Z=${Z} (exit code $EXIT_CODE). Check $LOG_FILE" >&2 + # FAILED=$((FAILED + 1)) + #elif [ ! -f "$OUTPUT_FILE" ]; then + # echo "WARNING: Output file not created for Z=${Z}" >&2 + # FAILED=$((FAILED + 1)) + #else + # echo " Z=${Z} Zsun complete." + #fi done @@ -169,7 +169,7 @@ LOG_FILE="$LOG_DIR/evolve_populations.log" MULTIZ_INI="${SCRIPT_DIR}/inlists/${SAFE_BRANCH}_test_multiZ_params.ini" cp $TEST_INI $MULTIZ_INI -sed -i 's/^\([[:space:]]*\)metallicities *= *\[.*\]/\1metallicities = [2., 1., 0.45]/' $MULTIZ_INI +sed -i 's/^\([[:space:]]*\)metallicities *= *\[.*\]/\1metallicities = [2., 1., 1e-4]/' $MULTIZ_INI echo "" echo "============================================================" diff --git a/dev-tools/script_data/src/popsynth_suite.py b/dev-tools/script_data/src/popsynth_suite.py index dd28791612..93bff1cebd 100644 --- a/dev-tools/script_data/src/popsynth_suite.py +++ b/dev-tools/script_data/src/popsynth_suite.py @@ -1,5 +1,7 @@ import argparse import os +import shutil +import subprocess import traceback import warnings @@ -11,11 +13,7 @@ from posydon.popsyn.binarypopulation import BinaryPopulation from posydon.popsyn.synthetic_population import Population, PopulationRunner -base_dir = os.path.dirname(PATH_TO_POSYDON) -script_dir = os.path.join(base_dir, "script_data/") -path_to_default_params = os.path.join(script_dir, "inlists/default_test_params.ini") -path_to_multiZ_params = os.path.join(script_dir, "inlists/multiZ_test_params.ini") -path_to_popout = os.path.join(script_dir, "output/population_tests/batches") +script_dir = os.path.dirname(os.path.abspath(__file__)) def test_binpop_evolve(population, popevo_kwargs, verbose=False): @@ -159,8 +157,9 @@ def test_popruns(ini_path, multiz_path, out_path, verbose): check_test(pop_in_ram, out_path, load_pop=True) # TEST POPRUNNER - # This is RAM heavy and may fail on personal computers + # This is can be RAM heavy (may fail esp. on personal computers) # ================================================================================ + os.chdir(out_path) test_str = " TEST: 04 " numchar = (LINE_LENGTH - len(test_str)) // 2 print("=" * numchar + test_str + "=" * numchar) @@ -174,6 +173,25 @@ def test_popruns(ini_path, multiz_path, out_path, verbose): poprun.evolve(overwrite=True) print("āœ… PopulationRunner evolved successfully.") + # TEST PIPELINE + # This is can also be RAM heavy + # ================================================================================ + shutil.copy(os.path.join(script_dir, "setup_poprun.sh"), out_path) + subprocess.run(["bash", "setup_poprun.sh", multiz_path], check=True) + # mimic SLURM job array env vars, as if jobs submitted with --job_array=1 + # this is needed to test merge_metallicity.py, which looks for jobs per task ID + # to merge. + os.environ["SLURM_ARRAY_JOB_ID"] = "0" + os.environ["SLURM_ARRAY_TASK_MIN"] = "0" + os.environ["SLURM_ARRAY_TASK_ID"] = "0" + os.environ["SLURM_ARRAY_TASK_COUNT"] = "1" + + for metallicity in poprun.solar_metallicities: + subprocess.run(["echo", f"šŸš€ Running pipeline for metallicity {metallicity}..."]) + subprocess.run(["python", "run_metallicity.py", str(metallicity)], check=True) + subprocess.run(["python", "merge_metallicity.py", str(metallicity)], check=True) + + if __name__ == "__main__": diff --git a/dev-tools/script_data/src/setup_poprun.sh b/dev-tools/script_data/src/setup_poprun.sh new file mode 100644 index 0000000000..b7f7e8c3c7 --- /dev/null +++ b/dev-tools/script_data/src/setup_poprun.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +INI_FILE="$1" +posydon-popsyn setup ${INI_FILE} --job_array=1 --walltime=00:40:00 --partition=partition --account=account --email=email@domain.com --mem_per_cpu=10G \ No newline at end of file From 37eb6b6bd54c556529ad73114fc292eed66a3317 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 6 Apr 2026 23:27:02 +0000 Subject: [PATCH 326/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/script_data/src/popsynth_suite.py | 2 +- dev-tools/script_data/src/setup_poprun.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-tools/script_data/src/popsynth_suite.py b/dev-tools/script_data/src/popsynth_suite.py index 93bff1cebd..b6cbb840f5 100644 --- a/dev-tools/script_data/src/popsynth_suite.py +++ b/dev-tools/script_data/src/popsynth_suite.py @@ -179,7 +179,7 @@ def test_popruns(ini_path, multiz_path, out_path, verbose): shutil.copy(os.path.join(script_dir, "setup_poprun.sh"), out_path) subprocess.run(["bash", "setup_poprun.sh", multiz_path], check=True) # mimic SLURM job array env vars, as if jobs submitted with --job_array=1 - # this is needed to test merge_metallicity.py, which looks for jobs per task ID + # this is needed to test merge_metallicity.py, which looks for jobs per task ID # to merge. os.environ["SLURM_ARRAY_JOB_ID"] = "0" os.environ["SLURM_ARRAY_TASK_MIN"] = "0" diff --git a/dev-tools/script_data/src/setup_poprun.sh b/dev-tools/script_data/src/setup_poprun.sh index b7f7e8c3c7..ff797aeb54 100644 --- a/dev-tools/script_data/src/setup_poprun.sh +++ b/dev-tools/script_data/src/setup_poprun.sh @@ -1,4 +1,4 @@ #!/bin/bash INI_FILE="$1" -posydon-popsyn setup ${INI_FILE} --job_array=1 --walltime=00:40:00 --partition=partition --account=account --email=email@domain.com --mem_per_cpu=10G \ No newline at end of file +posydon-popsyn setup ${INI_FILE} --job_array=1 --walltime=00:40:00 --partition=partition --account=account --email=email@domain.com --mem_per_cpu=10G From 71b53330def8364bf36363492ab2f34fc485940a Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Mon, 6 Apr 2026 22:01:28 -0500 Subject: [PATCH 327/389] adding flush to print statements involving shell commands to place them in order with other stdout outputs --- dev-tools/script_data/src/popsynth_suite.py | 23 ++++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dev-tools/script_data/src/popsynth_suite.py b/dev-tools/script_data/src/popsynth_suite.py index b6cbb840f5..0f7e796f57 100644 --- a/dev-tools/script_data/src/popsynth_suite.py +++ b/dev-tools/script_data/src/popsynth_suite.py @@ -162,20 +162,25 @@ def test_popruns(ini_path, multiz_path, out_path, verbose): os.chdir(out_path) test_str = " TEST: 04 " numchar = (LINE_LENGTH - len(test_str)) // 2 - print("=" * numchar + test_str + "=" * numchar) - print("Test PopulationRunner with multiple metallicities...") - print(f"Reading inlist: {multiz_path}") + print("=" * numchar + test_str + "=" * numchar, flush=True) + print("Test PopulationRunner with multiple metallicities...", flush=True) + print(f"Reading inlist: {multiz_path}", flush=True) poprun = PopulationRunner(multiz_path, verbose=True) - print('\t Number of binary populations:', len(poprun.binary_populations)) - print('\t Metallicities:', poprun.solar_metallicities) - print('\t Number of binaries (per pop):', poprun.binary_populations[0].number_of_binaries) - print("šŸš€ Evolving PopulationRunner...") + print('\t Number of binary populations:', len(poprun.binary_populations), flush=True) + print('\t Metallicities:', poprun.solar_metallicities, flush=True) + print('\t Number of binaries (per pop):', poprun.binary_populations[0].number_of_binaries, flush=True) + print("šŸš€ Evolving PopulationRunner...", flush=True) poprun.evolve(overwrite=True) - print("āœ… PopulationRunner evolved successfully.") + print("āœ… PopulationRunner evolved successfully.", flush=True) + print("=" * LINE_LENGTH, flush=True) # TEST PIPELINE # This is can also be RAM heavy # ================================================================================ + test_str = " TEST: 05 " + numchar = (LINE_LENGTH - len(test_str)) // 2 + print("=" * numchar + test_str + "=" * numchar, flush=True) + print("Test posydon-popsyn pipeline for multiple metallicities...", flush=True) shutil.copy(os.path.join(script_dir, "setup_poprun.sh"), out_path) subprocess.run(["bash", "setup_poprun.sh", multiz_path], check=True) # mimic SLURM job array env vars, as if jobs submitted with --job_array=1 @@ -191,6 +196,8 @@ def test_popruns(ini_path, multiz_path, out_path, verbose): subprocess.run(["python", "run_metallicity.py", str(metallicity)], check=True) subprocess.run(["python", "merge_metallicity.py", str(metallicity)], check=True) + print("āœ… Successfully evolved multiple populations with posydon-popsyn.", flush=True) + if __name__ == "__main__": From ca0b2d6c6f620c59d8abf6e6ae0a085d13bb8f6e Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Tue, 7 Apr 2026 00:12:35 -0500 Subject: [PATCH 328/389] updating comment --- dev-tools/script_data/src/popsynth_suite.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev-tools/script_data/src/popsynth_suite.py b/dev-tools/script_data/src/popsynth_suite.py index 0f7e796f57..e2d6294795 100644 --- a/dev-tools/script_data/src/popsynth_suite.py +++ b/dev-tools/script_data/src/popsynth_suite.py @@ -158,6 +158,8 @@ def test_popruns(ini_path, multiz_path, out_path, verbose): # TEST POPRUNNER # This is can be RAM heavy (may fail esp. on personal computers) + # Using flush on print here since we are running subprocceses and want them to + # show in order with shell stdout. # ================================================================================ os.chdir(out_path) test_str = " TEST: 04 " From 52a73e6eee6e81f3c2a7817beef4f3b3216e495b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 7 Apr 2026 05:12:54 +0000 Subject: [PATCH 329/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dev-tools/script_data/src/popsynth_suite.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/script_data/src/popsynth_suite.py b/dev-tools/script_data/src/popsynth_suite.py index e2d6294795..97bdbb172f 100644 --- a/dev-tools/script_data/src/popsynth_suite.py +++ b/dev-tools/script_data/src/popsynth_suite.py @@ -158,7 +158,7 @@ def test_popruns(ini_path, multiz_path, out_path, verbose): # TEST POPRUNNER # This is can be RAM heavy (may fail esp. on personal computers) - # Using flush on print here since we are running subprocceses and want them to + # Using flush on print here since we are running subprocceses and want them to # show in order with shell stdout. # ================================================================================ os.chdir(out_path) From d715e9626ce9dbc4263264d70c725f88861b4193 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Wed, 8 Apr 2026 20:55:56 -0500 Subject: [PATCH 330/389] Remove metallicity print statement Remove print statement for metallicity in simulation properties. --- posydon/binary_evol/simulationproperties.py | 1 - 1 file changed, 1 deletion(-) diff --git a/posydon/binary_evol/simulationproperties.py b/posydon/binary_evol/simulationproperties.py index ee60afc818..d24b168afc 100644 --- a/posydon/binary_evol/simulationproperties.py +++ b/posydon/binary_evol/simulationproperties.py @@ -525,7 +525,6 @@ def check_step(self, metallicity, RNG, step_name, step_tup, verbose=False): "ReplaceValueWarning") metallicity = 1.0 step_kwargs['metallicity'] = float(metallicity) - print(step_name, step_kwargs['metallicity']) # These steps need these grids: step_grid_map = {"step_HMS_HMS": self.HMS_HMS_path, From 9864ad30ead7685443fbd9ec0b7a5d0b9503ba1a Mon Sep 17 00:00:00 2001 From: Max Briel Date: Wed, 15 Apr 2026 10:26:14 +0200 Subject: [PATCH 331/389] add concurrent and exlude options to popsyn setup. Originally implemented on mb_model_paper branch --- bin/posydon-popsyn | 30 ++++++++++++++++++++++++++++++ posydon/CLI/io.py | 34 ++++++++++++++++++++++++++++++++-- posydon/CLI/popsyn/check.py | 3 +++ 3 files changed, 65 insertions(+), 2 deletions(-) diff --git a/bin/posydon-popsyn b/bin/posydon-popsyn index a0ca33d36a..7e2a0d9c25 100644 --- a/bin/posydon-popsyn +++ b/bin/posydon-popsyn @@ -71,6 +71,16 @@ if __name__ == '__main__': '--account', help='the account you would like to use', default=None) + setup_parser.add_argument( + '--max_concurrent_jobs', + help='the maximum number of concurrent jobs to run in the job array', + type=int, + default=None) + setup_parser.add_argument( + '--exclude', + help='a comma-separated list of nodes to exclude when submitting the job', + type=str, + default=None) setup_parser.set_defaults(func=setup_popsyn_function) # Check the run subcommand @@ -110,6 +120,16 @@ if __name__ == '__main__': '--account', help='the account you would like to use', default=None) + check_parser.add_argument( + '--max_concurrent_jobs', + help='the maximum number of concurrent jobs to run in the job array', + type=int, + default=None) + check_parser.add_argument( + '--exclude', + help='a comma-separated list of nodes to exclude when submitting the job', + type=str, + default=None) check_parser.set_defaults(func=check_popsyn_function) # Rescue the run subcommand (DEPRECATED) @@ -149,6 +169,16 @@ if __name__ == '__main__': '--account', help='the account you would like to use', default=None) + rescue_parser.add_argument( + '--max_concurrent_jobs', + help='the maximum number of concurrent jobs to run in the job array', + type=int, + default=None) + rescue_parser.add_argument( + '--exclude', + help='a comma-separated list of nodes to exclude when submitting the job', + type=str, + default=None) rescue_parser.set_defaults(func=rescue_popsyn_function) args = parser.parse_args() diff --git a/posydon/CLI/io.py b/posydon/CLI/io.py index afa4eda0fd..d9ec806f9d 100644 --- a/posydon/CLI/io.py +++ b/posydon/CLI/io.py @@ -165,6 +165,8 @@ def create_slurm_array(metallicity, walltime, account, mem_per_cpu, + max_concurrent_jobs, + exclude, path_to_posydon, path_to_posydon_data): '''Creates the slurm array script for population synthesis job arrays. @@ -208,11 +210,16 @@ def create_slurm_array(metallicity, "#SBATCH --mail-type=FAIL", f"#SBATCH --mail-user={email}" ]) + if exclude is not None: + optional_directives.append(f"#SBATCH --exclude={exclude}") optional_section = "\n".join(optional_directives) if optional_section: optional_section += "\n" + if max_concurrent_jobs is not None: + job_array_length = f"{job_array_length}%{max_concurrent_jobs}" + text_pre = textwrap.dedent(f'''\ #!/bin/bash #SBATCH --array=0-{job_array_length} @@ -322,6 +329,8 @@ def create_slurm_rescue(metallicity, walltime, account, mem_per_cpu, + max_concurrent_jobs, + exclude, path_to_posydon, path_to_posydon_data): '''Creates the slurm rescue script for resubmitting failed population synthesis jobs. @@ -369,11 +378,16 @@ def create_slurm_rescue(metallicity, "#SBATCH --mail-type=FAIL", f"#SBATCH --mail-user={email}" ]) + if exclude is not None: + optional_directives.append(f"#SBATCH --exclude={exclude}") optional_section = "\n".join(optional_directives) if optional_section: optional_section += "\n" + if max_concurrent_jobs is not None: + job_array_str = f"{job_array_str}%{max_concurrent_jobs}" + text_pre = textwrap.dedent(f'''\ #!/bin/bash #SBATCH --array={job_array_str} @@ -427,6 +441,7 @@ def create_slurm_scripts(metallicity, args): # pragma: no cover ''' create_slurm_array(metallicity, args.job_array, args.partition, args.email, args.walltime, args.account, args.mem_per_cpu, + args.max_concurrent_jobs, args.exclude, PATH_TO_POSYDON, os.path.dirname(PATH_TO_POSYDON_DATA)) @@ -508,12 +523,19 @@ def create_batch_rescue_script(args, batch_status): mem_per_cpu = None path_to_posydon = None path_to_posydon_data = None + max_concurrent_jobs = None + exclude = None for line in lines: if line.startswith('#SBATCH --array='): array_range = line.split('=')[1].strip() - if '-' in array_range: - start, end = map(int, array_range.split('-')) + if '%' in array_range: + tmp_array_range = array_range.split('%')[0] + max_concurrent_jobs = int(array_range.split('%')[1]) + else: + tmp_array_range = array_range + if '-' in tmp_array_range: + start, end = map(int, tmp_array_range.split('-')) job_array_length = end - start + 1 elif line.startswith("#SBATCH --time="): walltime = line.split('=')[1].strip() @@ -525,6 +547,8 @@ def create_batch_rescue_script(args, batch_status): account = line.split('=')[1].strip() elif line.startswith("#SBATCH --mail-user="): email = line.split('=')[1].strip() + elif line.startswith("#SBATCH --exclude="): + exclude = line.split('=')[1].strip() elif line.startswith("export PATH_TO_POSYDON="): path_to_posydon = line.split('=')[1].strip() elif line.startswith("export PATH_TO_POSYDON_DATA="): @@ -541,6 +565,10 @@ def create_batch_rescue_script(args, batch_status): account = args.account if args.email is not None: email = args.email + if args.max_concurrent_jobs is not None: + max_concurrent_jobs = args.max_concurrent_jobs + if args.exclude is not None: + exclude = args.exclude # Create the rescue script create_slurm_rescue( @@ -552,6 +580,8 @@ def create_batch_rescue_script(args, batch_status): walltime=walltime, account=account, mem_per_cpu=mem_per_cpu, + max_concurrent_jobs=max_concurrent_jobs, + exclude=exclude, path_to_posydon=path_to_posydon, path_to_posydon_data=path_to_posydon_data ) diff --git a/posydon/CLI/popsyn/check.py b/posydon/CLI/popsyn/check.py index d70c4417a3..519817f0ad 100644 --- a/posydon/CLI/popsyn/check.py +++ b/posydon/CLI/popsyn/check.py @@ -324,6 +324,9 @@ def get_expected_batch_count(run_folder, str_met): for line in f: if line.startswith('#SBATCH --array='): array_range = line.split('=')[1].strip() + # remove any job limit specifiers + if '%' in array_range: + array_range = array_range.split('%')[0] if '-' in array_range: start, end = map(int, array_range.split('-')) return end - start + 1 From 787e7ba917d6f86d3523df3442664c50f4ea845c Mon Sep 17 00:00:00 2001 From: Max Briel Date: Wed, 15 Apr 2026 10:42:39 +0200 Subject: [PATCH 332/389] f_fb and state assigned independent of conserve_hydrogen_envelope state --- posydon/binary_evol/SN/step_SN.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index 6de1c87323..cf17ec1283 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -2456,26 +2456,29 @@ def Maltsev25_corecollapse(self, star, engine, conserve_hydrogen_envelope=False) elif (CO_core_mass < 10.0) and (CO_core_mass > 2.5): ff = self.explod_crit(Xi, sc, mu4M4, mu4) - if ff==0: + if ff == 0: if conserve_hydrogen_envelope: m_rem = star.mass else: m_rem = star.he_core_mass - f_fb = 1.0 - state = 'BH' + + f_fb = 1.0 + state = 'BH' else: rem = self.NS_vs_fallbackBH(Xi, CO_core_mass, M4, mu4M4) - if rem==2: # successful SN with NS + if rem == 2: # successful SN with NS m_rem = M4 f_fb = 0.0 state = 'NS' + else: # successful SN but with fallback BH if conserve_hydrogen_envelope: m_rem = star.mass else: m_rem = star.he_core_mass - f_fb = 0.99 - state = 'BH' + + f_fb = 0.99 + state = 'BH' return m_rem, f_fb, state From 47daf4189bc3e56e08c9b4552f9aaa234a7beacf Mon Sep 17 00:00:00 2001 From: Max Briel Date: Wed, 15 Apr 2026 10:43:31 +0200 Subject: [PATCH 333/389] change RNG from random to self.RNG --- posydon/binary_evol/SN/step_SN.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index cf17ec1283..d2874e3848 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -2489,7 +2489,7 @@ def NS_vs_fallbackBH(self, comp_val, mco_val, M4_val, mu4M4_val): rem = 2 else: # stochastic determination of the remnant type (NS versus fallback-BH) - rand_number = random.uniform(0,1) + rand_number = self.RNG.uniform(0,1) if rand_number <= 0.15: # probabily for fallback = 0.15 in Section 3.1.2. rem = 3 # fallback BH, although successful SN else: From 1627c18a88306bdd005c50c454f78ca3d81f26df Mon Sep 17 00:00:00 2001 From: Max Briel Date: Wed, 15 Apr 2026 10:45:32 +0200 Subject: [PATCH 334/389] change comment indeptation --- posydon/binary_evol/SN/step_SN.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index d2874e3848..235c8a42a3 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -2505,19 +2505,19 @@ def explod_crit(self, comp_val, sc_val, mu4M4_val, mu4_val): mu4M4_crit1, mu4M4_crit2 = 0.247, 0.421 # product of M4 and mu4 k1, k2 = 0.421, 0.005 - # check whether criterion for failed SN is fulfilled + # check whether criterion for failed SN is fulfilled if comp_val > comp_crit2 or sc_val > sc_crit2: ff2.append(0) ff = 0 unclassified = False - # check whether criterion for successful SN is fulfilled + # check whether criterion for successful SN is fulfilled if comp_val < comp_crit1 or sc_val < sc_crit1: ff1.append(1) ff = 1 unclassified = False - # if there is contradiction or if the progenitor is unclassified based on comp & s_c + # if there is contradiction or if the progenitor is unclassified based on comp & s_c if (len(ff1) > 0 and len(ff2) > 0) or unclassified: # final fate classification based on mu4M4 From 2d5e456b96f8df01e9d47e7bba6d0a768d014f60 Mon Sep 17 00:00:00 2001 From: Max Briel Date: Wed, 15 Apr 2026 10:46:02 +0200 Subject: [PATCH 335/389] fix indentation of comments --- posydon/binary_evol/SN/step_SN.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index 235c8a42a3..bec0044239 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -2488,7 +2488,7 @@ def NS_vs_fallbackBH(self, comp_val, mco_val, M4_val, mu4M4_val): if comp_val <= 0.04 or (comp_val < a*mu4M4_val + b and comp_val <= 0.4) or M4_val/mco_val > 0.6: rem = 2 else: - # stochastic determination of the remnant type (NS versus fallback-BH) + # stochastic determination of the remnant type (NS versus fallback-BH) rand_number = self.RNG.uniform(0,1) if rand_number <= 0.15: # probabily for fallback = 0.15 in Section 3.1.2. rem = 3 # fallback BH, although successful SN From cf59c5dd0eb440bb3d2e710bf3fa519d8740be6a Mon Sep 17 00:00:00 2001 From: Max Briel Date: Wed, 15 Apr 2026 10:52:12 +0200 Subject: [PATCH 336/389] flip k1 and k2 values in the explod_crit function --- posydon/binary_evol/SN/step_SN.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index bec0044239..60852a81e0 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -2424,9 +2424,9 @@ def Maltsev25_corecollapse(self, star, engine, conserve_hydrogen_envelope=False) M4, mu4, Xi, sc = self.get_M4_mu4_Patton20(CO_core_mass, C_core_abundance) M4 = M4[0] mu4 = mu4[0] - Xi=Xi[0] - sc=sc[0] - mu4M4=mu4*M4 + Xi = Xi[0] + sc = sc[0] + mu4M4 = mu4*M4 star.M4 = M4 star.mu4 = mu4 star.Xi = Xi @@ -2503,7 +2503,7 @@ def explod_crit(self, comp_val, sc_val, mu4M4_val, mu4_val): comp_crit1, comp_crit2 = 0.314, 0.544 # compactness sc_crit1, sc_crit2 = 0.988, 1.169 # central specific entropy mu4M4_crit1, mu4M4_crit2 = 0.247, 0.421 # product of M4 and mu4 - k1, k2 = 0.421, 0.005 + k1, k2 = 0.005, 0.421 # See Section 3.1.1. of [8]_ # check whether criterion for failed SN is fulfilled if comp_val > comp_crit2 or sc_val > sc_crit2: @@ -2526,7 +2526,7 @@ def explod_crit(self, comp_val, sc_val, mu4M4_val, mu4_val): elif mu4M4_val < mu4M4_crit1: ff = 1 # final fate classification based on reversed Ertl criterion - elif k2 + k1*mu4M4_val - mu4_val > 0: + elif k1 + k2*mu4M4_val - mu4_val > 0: ff = 0 else: ff = 1 From 1779e6ec0ba532cc400c837266aa126b7142e268 Mon Sep 17 00:00:00 2001 From: Max Briel Date: Wed, 15 Apr 2026 10:53:02 +0200 Subject: [PATCH 337/389] add k1 and k2 as input values for explod_crit function --- posydon/binary_evol/SN/step_SN.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index 60852a81e0..7802959ff7 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -2455,7 +2455,7 @@ def Maltsev25_corecollapse(self, star, engine, conserve_hydrogen_envelope=False) state = 'BH' elif (CO_core_mass < 10.0) and (CO_core_mass > 2.5): - ff = self.explod_crit(Xi, sc, mu4M4, mu4) + ff = self.explod_crit(Xi, sc, mu4M4, mu4, k1, k2) if ff == 0: if conserve_hydrogen_envelope: m_rem = star.mass @@ -2497,13 +2497,12 @@ def NS_vs_fallbackBH(self, comp_val, mco_val, M4_val, mu4M4_val): return rem # implemented from Maltsev+25 - def explod_crit(self, comp_val, sc_val, mu4M4_val, mu4_val): + def explod_crit(self, comp_val, sc_val, mu4M4_val, mu4_val, k1, k2): ff1, ff2 = [], [] unclassified = True comp_crit1, comp_crit2 = 0.314, 0.544 # compactness sc_crit1, sc_crit2 = 0.988, 1.169 # central specific entropy mu4M4_crit1, mu4M4_crit2 = 0.247, 0.421 # product of M4 and mu4 - k1, k2 = 0.005, 0.421 # See Section 3.1.1. of [8]_ # check whether criterion for failed SN is fulfilled if comp_val > comp_crit2 or sc_val > sc_crit2: From d91b105d92d73c66816f8f0beaf36d24865835cd Mon Sep 17 00:00:00 2001 From: Max Briel Date: Wed, 15 Apr 2026 10:58:14 +0200 Subject: [PATCH 338/389] flip criteria --- posydon/binary_evol/SN/step_SN.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index 7802959ff7..c23d2cc499 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -2454,7 +2454,7 @@ def Maltsev25_corecollapse(self, star, engine, conserve_hydrogen_envelope=False) f_fb = 1.0 state = 'BH' - elif (CO_core_mass < 10.0) and (CO_core_mass > 2.5): + elif (CO_core_mass > 2.5) and (CO_core_mass < 10.0): ff = self.explod_crit(Xi, sc, mu4M4, mu4, k1, k2) if ff == 0: if conserve_hydrogen_envelope: From 28e8dcc11a6e5b8708c7b6fe21b06b14150d11e9 Mon Sep 17 00:00:00 2001 From: Max Briel Date: Wed, 15 Apr 2026 11:03:02 +0200 Subject: [PATCH 339/389] change NS_vs_fallbackBH output from int to informative string string --- posydon/binary_evol/SN/step_SN.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index c23d2cc499..37838664ed 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -2464,9 +2464,10 @@ def Maltsev25_corecollapse(self, star, engine, conserve_hydrogen_envelope=False) f_fb = 1.0 state = 'BH' + else: rem = self.NS_vs_fallbackBH(Xi, CO_core_mass, M4, mu4M4) - if rem == 2: # successful SN with NS + if rem == 'NS': # successful SN with NS m_rem = M4 f_fb = 0.0 state = 'NS' @@ -2486,14 +2487,14 @@ def NS_vs_fallbackBH(self, comp_val, mco_val, M4_val, mu4M4_val): a, b = 1.75, -0.044 # eq. (8) of [8]_ # conditions for guaranteed NS formation (eq. 7) if comp_val <= 0.04 or (comp_val < a*mu4M4_val + b and comp_val <= 0.4) or M4_val/mco_val > 0.6: - rem = 2 + rem = 'NS' else: # stochastic determination of the remnant type (NS versus fallback-BH) rand_number = self.RNG.uniform(0,1) - if rand_number <= 0.15: # probabily for fallback = 0.15 in Section 3.1.2. - rem = 3 # fallback BH, although successful SN + if rand_number <= 0.15: # probability for fallback = 0.15 in Section 3.1.2. + rem = 'fallback_BH' else: - rem = 2 # NS formation + rem = 'NS' return rem # implemented from Maltsev+25 From 57c3349a60b2b4ed226cd83838df6857b3a02788 Mon Sep 17 00:00:00 2001 From: Max Briel Date: Wed, 15 Apr 2026 11:05:07 +0200 Subject: [PATCH 340/389] add reference function call --- posydon/binary_evol/SN/step_SN.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index 37838664ed..7bc2ade8e5 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -2404,7 +2404,10 @@ def Maltsev25_corecollapse(self, star, engine, conserve_hydrogen_envelope=False) Fallback mass of the compact object in M_sun. References - + ---------- + .. [8] K. Maltsev, F.R.N. Schneider, I. Mandel, B. Mueller, A. Heger, + F.K. Roepke, E. Laplace, 2025, A&A, 700, A20. Explodability + criteria for the neutrino-driven supernova mechanism """ Muller_k_parameters = { From 8e33dd7a5aaf9490102ecc799d5ef25223d5e10f Mon Sep 17 00:00:00 2001 From: Max Briel Date: Wed, 15 Apr 2026 11:08:57 +0200 Subject: [PATCH 341/389] change verbose output --- posydon/binary_evol/SN/step_SN.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index 7bc2ade8e5..62ecab26b3 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -392,7 +392,7 @@ def format_data_Patton20(file_name): return CO_core_params, target if self.verbose: - print('Loading the train dataset for engine mu4 and M4...') + print('Loading the train dataset for engine mu4, M4, Xi, and sc ...') CO_core_params_mu4, mu4_target = format_data_Patton20( 'Kepler_mu4_table.dat') CO_core_params_M4, M4_target = format_data_Patton20( From 053be4e9ba1e3a8aa84485a991383698d50b9509 Mon Sep 17 00:00:00 2001 From: Max Briel Date: Wed, 15 Apr 2026 11:28:07 +0200 Subject: [PATCH 342/389] docstring addition --- posydon/binary_evol/SN/step_SN.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index 62ecab26b3..09e41ec4ea 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -2290,12 +2290,12 @@ def get_CO_core_params(self, star, approximation=False): def get_M4_mu4_Patton20(self, CO_core_mass, C_core_abundance): """Get the M4 and mu4 using Patton+20.""" + M4 = self.M4_interpolator.predict([[C_core_abundance, CO_core_mass]]) mu4 = self.mu4_interpolator.predict([[C_core_abundance, CO_core_mass]]) Xi = self.Xi_interpolator.predict([[C_core_abundance, CO_core_mass]]) sc = self.sc_interpolator.predict([[C_core_abundance, CO_core_mass]]) - return M4, mu4, Xi, sc def Patton20_corecollapse(self, star, engine, conserve_hydrogen_envelope=False): @@ -2395,6 +2395,11 @@ def Maltsev25_corecollapse(self, star, engine, conserve_hydrogen_envelope=False) ---------- star : obj Star object of a collapsing star containing the MESA profile. + engine : str + Engine to use for the core-collapse prescription + Possible options are: 'M16' + conserve_hydrogen_envelope : bool + Whether to assume that the hydrogen envelope is conserved in direct collapse to a BH. Returns ------- @@ -2402,6 +2407,8 @@ def Maltsev25_corecollapse(self, star, engine, conserve_hydrogen_envelope=False) Remnant mass of the compact object in M_sun. f_fb : double Fallback mass of the compact object in M_sun. + state : str + 'NS' if the remnant is a neutron star, 'BH' if the remnant is a black hole References ---------- From bf6344cac71d455223dcdefd3559f3bdeb2d601f Mon Sep 17 00:00:00 2001 From: Max Briel Date: Wed, 15 Apr 2026 11:32:27 +0200 Subject: [PATCH 343/389] add SN prescription to SN_MODELS --- posydon/grids/SN_MODELS.py | 70 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/posydon/grids/SN_MODELS.py b/posydon/grids/SN_MODELS.py index 647c494a09..65f32ec79f 100644 --- a/posydon/grids/SN_MODELS.py +++ b/posydon/grids/SN_MODELS.py @@ -447,6 +447,76 @@ # "use_profiles": True, "use_core_masses": False, # "allow_spin_None" : False, +# "approx_at_he_depletion": False, + }, + "SN_MODEL_v2_25": { + "mechanism": "Maltsev+25-engine", + "engine": "M16", +# "PISN": "Hendriks+23", +# "PISN_CO_shift": 0.0, +# "PPI_extra_mass_loss": -20.0, +# "ECSN": "Tauris+15", +# "conserve_hydrogen_envelope" : False, +# "conserve_hydrogen_PPI" : False, +# "max_neutrino_mass_loss": NEUTRINO_MASS_LOSS_UPPER_LIMIT, +# "max_NS_mass": STATE_NS_STARMASS_UPPER_LIMIT, + "use_interp_values": False, +# "use_profiles": True, + "use_core_masses": False, +# "allow_spin_None" : False, +# "approx_at_he_depletion": False, + }, + "SN_MODEL_v2_26": { + "mechanism": "Maltsev+25-engine", + "engine": "M16", +# "mechanism": "Fryer+12-delayed", +# "engine": "", +# "PISN": "Hendriks+23", +# "PISN_CO_shift": 0.0, +# "PPI_extra_mass_loss": -20.0, +# "ECSN": "Tauris+15", + "conserve_hydrogen_envelope" : True, +# "conserve_hydrogen_PPI" : False, +# "max_neutrino_mass_loss": NEUTRINO_MASS_LOSS_UPPER_LIMIT, +# "max_NS_mass": STATE_NS_STARMASS_UPPER_LIMIT, + "use_interp_values": False, +# "use_profiles": True, + "use_core_masses": False, +# "allow_spin_None" : False, +# "approx_at_he_depletion": False, + }, + "SN_MODEL_v2_27": { + "mechanism": "Maltsev+25-engine", + "engine": "M16", +# "PISN": "Hendriks+23", +# "PISN_CO_shift": 0.0, + "PPI_extra_mass_loss": 0.0, +# "ECSN": "Tauris+15", +# "conserve_hydrogen_envelope" : False, +# "conserve_hydrogen_PPI" : False, +# "max_neutrino_mass_loss": NEUTRINO_MASS_LOSS_UPPER_LIMIT, +# "max_NS_mass": STATE_NS_STARMASS_UPPER_LIMIT, + "use_interp_values": False, +# "use_profiles": True, + "use_core_masses": False, +# "allow_spin_None" : False, +# "approx_at_he_depletion": False, + }, + "SN_MODEL_v2_28": { + "mechanism": "Maltsev+25-engine", + "engine": "M16", +# "PISN": "Hendriks+23", +# "PISN_CO_shift": 0.0, + "PPI_extra_mass_loss": 0.0, +# "ECSN": "Tauris+15", + "conserve_hydrogen_envelope" : True, +# "conserve_hydrogen_PPI" : False, +# "max_neutrino_mass_loss": NEUTRINO_MASS_LOSS_UPPER_LIMIT, +# "max_NS_mass": STATE_NS_STARMASS_UPPER_LIMIT, + "use_interp_values": False, +# "use_profiles": True, + "use_core_masses": False, +# "allow_spin_None" : False, # "approx_at_he_depletion": False, }, } From 255f9ed884b4b62763e7ceb0f0b5bedea6cd391e Mon Sep 17 00:00:00 2001 From: Max Briel Date: Thu, 16 Apr 2026 13:21:40 +0200 Subject: [PATCH 344/389] add power law mass ratio options --- posydon/popsyn/distributions.py | 145 ++++++++++++++++++++++++++++++++ posydon/popsyn/norm_pop.py | 15 ++++ 2 files changed, 160 insertions(+) diff --git a/posydon/popsyn/distributions.py b/posydon/popsyn/distributions.py index 8ac96ab764..2819bd5f7b 100644 --- a/posydon/popsyn/distributions.py +++ b/posydon/popsyn/distributions.py @@ -151,6 +151,151 @@ def rvs(self, size=1, rng=None): return rng.uniform(self.q_min, self.q_max, size=size) +class PowerLawMassRatio: + """Power law mass ratio distribution for binary star systems. + + A distribution where the PDF follows q^alpha within specified bounds + (q_min, q_max], exclusive bottom, inclusive top. + + Parameters + ---------- + alpha : float, optional + Power law exponent (default: 0.0, i.e. flat). Can be any real number. + q_min : float, optional + Minimum mass ratio (default: 0.05). Must be in [0, 1). + q_max : float, optional + Maximum mass ratio (default: 1.0). Must be in (0, 1]. + + Raises + ------ + ValueError + If q_min or q_max are not in valid range, or if q_min >= q_max. + + Examples + -------- + >>> dist = PowerLawMassRatio(alpha=-1.0, q_min=0.1, q_max=1.0) + >>> pdf_value = dist.pdf(0.5) + """ + + def __init__(self, alpha=0.0, q_min=0.05, q_max=1.0): + """Initialize the power law mass ratio distribution. + + Parameters + ---------- + alpha : float, optional + Power law exponent (default: 0.0). + q_min : float, optional + Minimum mass ratio (default: 0.05). Must be in [0, 1). + q_max : float, optional + Maximum mass ratio (default: 1.0). Must be in (0, 1]. + + Raises + ------ + ValueError + If q_min or q_max are not in valid range, or if q_min >= q_max. + """ + if not (0 <= q_min < 1): + raise ValueError("q_min must be in [0, 1)") + if not (0 < q_max <= 1): + raise ValueError("q_max must be in (0, 1]") + if q_min >= q_max: + raise ValueError("q_min must be less than q_max") + if alpha <= -1 and q_min == 0: + raise ValueError("q_min must be > 0 for alpha <= -1 " + "to avoid divergent integral") + + self.alpha = alpha + self.q_min = q_min + self.q_max = q_max + self.norm = self._calculate_normalization() + + def __repr__(self): + """Return string representation of the distribution.""" + return (f"PowerLawMassRatio(alpha={self.alpha}, " + f"q_min={self.q_min}, q_max={self.q_max})") + + def _repr_html_(self): + """Return HTML representation for Jupyter notebooks.""" + return (f"

Power Law Mass Ratio Distribution

" + f"

alpha = {self.alpha}

" + f"

q_min = {self.q_min}

" + f"

q_max = {self.q_max}

") + + def _calculate_normalization(self): + """Calculate the normalization constant for the power law mass ratio + distribution. + + Returns + ------- + float + The normalization constant ensuring the PDF integrates to 1. + """ + integral, _ = quad(self.power_law_mass_ratio, self.q_min, self.q_max) + if integral == 0: # pragma: no cover + raise ValueError("Normalization integral is zero. " + "Check mass ratio parameters.") + return 1.0 / integral + + def power_law_mass_ratio(self, q): + """Compute the power law mass ratio distribution value. + + Parameters + ---------- + q : float or array_like + Mass ratio. + + Returns + ------- + float or ndarray + Distribution value q^alpha. + """ + return np.asarray(q, dtype=float)**self.alpha + + def pdf(self, q): + """Probability density function of the power law mass ratio distribution. + + Parameters + ---------- + q : float or array_like + Mass ratio(s). + + Returns + ------- + float or ndarray + Probability density at mass ratio q. + """ + q = np.asarray(q) + valid = (q > self.q_min) & (q <= self.q_max) + pdf_values = np.zeros_like(q, dtype=float) + pdf_values[valid] = self.power_law_mass_ratio(q[valid]) * self.norm + return pdf_values + + def rvs(self, size=1, rng=None): + """Draw random samples from the power law mass ratio distribution. + + Parameters + ---------- + size : int, optional + Number of samples to draw (default: 1). + rng : numpy.random.Generator, optional + Random number generator. If None, uses np.random.default_rng(). + + Returns + ------- + ndarray + Random samples from the distribution. + """ + if rng is None: + rng = np.random.default_rng() + + from posydon.utils.common_functions import inverse_sampler + + n_points = 1000 + q_grid = np.linspace(self.q_min, self.q_max, n_points) + pdf_values = self.power_law_mass_ratio(q_grid) + return inverse_sampler(q_grid, pdf_values, size=size, rng=rng) + + class Sana12Period(): """Period distribution from Sana et al. (2012). diff --git a/posydon/popsyn/norm_pop.py b/posydon/popsyn/norm_pop.py index ad4c855bb8..550b06a4ba 100644 --- a/posydon/popsyn/norm_pop.py +++ b/posydon/popsyn/norm_pop.py @@ -12,6 +12,7 @@ from posydon.popsyn.distributions import ( FlatMassRatio, LogUniform, + PowerLawMassRatio, PowerLawPeriod, Sana12Period, ) @@ -75,6 +76,11 @@ def get_mass_ratio_pdf(kwargs): Requires the following parameters: - `secondary_mass_min` - `secondary_mass_max` + - `power_law_mass_ratio` for `secondary_mass_scheme` + Requires the following parameters: + - `mass_ratio_slope`: exponent alpha in q^alpha + - `q_min` (optional, default 0.05) + - `q_max` (optional, default 1.0) Parameters ---------- @@ -112,6 +118,15 @@ def get_pdf_for_m1(m1): q_dist = FlatMassRatio(q_min=kwargs['q_min'], q_max=kwargs['q_max']) q_pdf = lambda q, m1=None: q_dist.pdf(q) + elif kwargs['secondary_mass_scheme'] == 'power_law_mass_ratio': + from posydon.popsyn.distributions import PowerLawMassRatio + q_dist = PowerLawMassRatio( + alpha=kwargs['mass_ratio_slope'], + q_min=kwargs.get('q_min', 0.05), + q_max=kwargs.get('q_max', 1.0), + ) + q_pdf = lambda q, m1=None: q_dist.pdf(q) + else: # default to a flat distribution Pwarn("The secondary_mass_scheme is not defined use a flat mass ratio " From 1c97a65a1b5d52f3135749164f5120eff12d8db1 Mon Sep 17 00:00:00 2001 From: Max <14039563+maxbriel@users.noreply.github.com> Date: Fri, 17 Apr 2026 08:31:45 +0200 Subject: [PATCH 345/389] [fix] add test for failing unit tests (`[grid_path]` + symlink) (#835) * add test for grid_path * add symlink for ubuntu tests * remove additional file but add followlinks=False explicitly * remove followlinks=False and try additional files * readd internal symlinks * sym link * add extra test file * revert 201->204 tests 'test' * different file check * try followlinks=True * skip islink in test coverage * claude opus suggestion? * Remove monkeypatch in func call --- posydon/unit_tests/popsyn/test_io.py | 19 ++++++++++++- .../utils/test_compress_mesa_files.py | 27 +++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/posydon/unit_tests/popsyn/test_io.py b/posydon/unit_tests/popsyn/test_io.py index 8095109790..415a012ae6 100644 --- a/posydon/unit_tests/popsyn/test_io.py +++ b/posydon/unit_tests/popsyn/test_io.py @@ -109,6 +109,18 @@ def sim_ini(self,tmp_path): f.write(ini_content) return file_path + @fixture + def grid_paths_ini(self, tmp_path): + ini_content = dedent( + """ + [grid_paths] + HMS_HMS = '/path/to/grid' + """) + file_path = os.path.join(tmp_path, "grid_paths.ini") + with open(file_path, "w") as f: + f.write(ini_content) + return file_path + @fixture def binpop_ini(self, tmp_path): ini_content = dedent( @@ -276,7 +288,7 @@ def test_parse_inifile(self,simple_ini,multi_ini,textfile): assert parser.has_option("section", "key2") - def test_simprop_kwargs_from_ini(self,monkeypatch,sim_ini,tmp_path): + def test_simprop_kwargs_from_ini(self,monkeypatch,sim_ini,grid_paths_ini,tmp_path): # example dummy_cls = type('DummyClass', (), {})() @@ -341,6 +353,11 @@ def __init__(self): instance = dummy_class() assert instance.value == 42 + # test grid_paths section + simkwargs = totest.simprop_kwargs_from_ini(grid_paths_ini) + assert 'HMS_HMS' in simkwargs + assert simkwargs['HMS_HMS'] == '/path/to/grid' + def test_binarypop_kwargs_from_ini(self,monkeypatch,binpop_ini, binpop_ini_mpi,binpop_ini_stars): diff --git a/posydon/unit_tests/utils/test_compress_mesa_files.py b/posydon/unit_tests/utils/test_compress_mesa_files.py index 1580afef07..769abe0038 100644 --- a/posydon/unit_tests/utils/test_compress_mesa_files.py +++ b/posydon/unit_tests/utils/test_compress_mesa_files.py @@ -245,6 +245,16 @@ def test_get_size(self, tmp_path): os.listdir(MESA_run_dir)[0]) os.symlink(MESA_run_file, os.path.join(MESA_dir,\ f"link{i}.file0")) + + # add >=2 regular files directly in MESA_dir (a non-MESA directory) + # so the inner for-loop backward arc (204->198) is covered on Ubuntu, + # where file symlinks may not reliably appear in os.walk's filenames + for j in range(2): + with open(os.path.join(MESA_dir, f"extra_{j}.log"),\ + "w") as extra_file: + extra_file.write(f"test\n") + + total_size, remove_files, compress_files, n_runs, n_remove_files,\ n_compress_files = totest.get_size(start_path=MESA_dir) assert total_size > 0 @@ -253,6 +263,23 @@ def test_get_size(self, tmp_path): assert n_runs == 20 assert n_remove_files == 0 assert n_compress_files > 0 + # isolated test for islink branch (201->204): create a minimal + # directory with a real file and a symlink to it, then verify + # get_size only counts the real file's size + islink_dir = os.path.join(tmp_path, "islink_grid_index_0") + os.mkdir(islink_dir) + real = os.path.join(islink_dir, "real.data") + with open(real, "w") as f: + f.write("content") + link = os.path.join(islink_dir, "link.data") + os.symlink(real, link) + assert os.path.islink(link), \ + f"os.path.islink returned False for symlink at {link}" + real_size = os.path.getsize(real) + total_size, remove_files, compress_files, n_runs, n_remove_files,\ + n_compress_files = totest.get_size(start_path=tmp_path) + # the symlink should not contribute to total_size + assert total_size >= real_size def test_compress_dir(self, tmp_path, capsys): # missing argument From 0de835fcfbacdcbdd080e5ba806714a380516fdc Mon Sep 17 00:00:00 2001 From: Max <14039563+maxbriel@users.noreply.github.com> Date: Fri, 17 Apr 2026 08:38:36 +0200 Subject: [PATCH 346/389] [fix/feat] Remove duplicate functions in `grid_utils` (#815) * Remove duplicated utility functions, consolidate in common_functions (fixes #442) The three functions in posydon/utils/gridutils.py that duplicated logic already present in posydon/utils/common_functions.py have been refactored: - kepler3_a(P, m1, m2) -> delegates to orbital_separation_from_period - T_merger_a(a, m1, m2) -> delegates to inspiral_timescale_from_separation (eccentricity=0, converts Myr->Gyr) - T_merger_P(P, m1, m2) -> delegates to inspiral_timescale_from_orbital_period (eccentricity=0, converts Myr->Gyr) * Remove deprecated functions from gridutils, move beta_gw to common_functions - Remove kepler3_a, T_merger_P, T_merger_a entirely from gridutils.py; their canonical counterparts in common_functions.py are now the only implementations. - Move beta_gw from gridutils.py into common_functions.py so all GW inspiral helpers live in one place. - Replace the internal T_merger_P call in convert_output_to_table with a direct call to inspiral_timescale_from_orbital_period. - Drop now-unused constant imports from gridutils.py (Msun, Rsun, clight, cgrav, secyear). - Update test_gridutils.py: remove elements and tests for the four deleted functions. - Update test_common_functions.py: add beta_gw to the elements set and add test_instance_beta_gw + test_beta_gw. --- .../unit_tests/utils/test_common_functions.py | 18 +++- posydon/unit_tests/utils/test_gridutils.py | 74 ++------------- posydon/utils/common_functions.py | 25 +++++ posydon/utils/gridutils.py | 94 +------------------ 4 files changed, 53 insertions(+), 158 deletions(-) diff --git a/posydon/unit_tests/utils/test_common_functions.py b/posydon/unit_tests/utils/test_common_functions.py index 035ab33741..6f348fa481 100644 --- a/posydon/unit_tests/utils/test_common_functions.py +++ b/posydon/unit_tests/utils/test_common_functions.py @@ -89,7 +89,7 @@ def test_dir(self): 'THRESHOLD_HE_NAKED_ABUNDANCE', '__authors__',\ '__builtins__', '__cached__', '__doc__', '__file__',\ '__loader__', '__name__', '__package__', '__spec__',\ - 'beaming', 'bondi_hoyle',\ + 'beaming', 'beta_gw', 'bondi_hoyle',\ 'calculate_H2recombination_energy',\ 'calculate_Mejected_for_integrated_binding_energy',\ 'calculate_Patton20_values_at_He_depl',\ @@ -233,6 +233,9 @@ def test_instance_histogram_sampler(self): def test_instance_read_histogram_from_file(self): assert isroutine(totest.read_histogram_from_file) + def test_instance_beta_gw(self): + assert isroutine(totest.beta_gw) + def test_instance_inspiral_timescale_from_separation(self): assert isroutine(totest.inspiral_timescale_from_separation) @@ -936,6 +939,19 @@ def test_read_histogram_from_file(self, csv_path_failing_3_data_lines,\ assert np.allclose(arrays[0], np.array([0.2, 1.2, 2.2])) assert np.allclose(arrays[1], np.array([2.0, 2.0])) + def test_beta_gw(self): + # missing argument + with raises(TypeError, match="missing 2 required positional "\ + +"arguments: 'star1_mass' and "\ + +"'star2_mass'"): + totest.beta_gw() + # examples + tests = [(15.0, 30.0, approx(3.18232660295e-69, abs=6e-81)),\ + (30.0, 30.0, approx(8.48620427454e-69, abs=6e-81)),\ + (30.0, 60.0, approx(2.54586128236e-68, abs=6e-80))] + for (m1, m2, r) in tests: + assert totest.beta_gw(m1, m2) == r + def test_inspiral_timescale_from_separation(self): # missing argument with raises(TypeError, match="missing 4 required positional "\ diff --git a/posydon/unit_tests/utils/test_gridutils.py b/posydon/unit_tests/utils/test_gridutils.py index e7223d2346..4fe8fbb78d 100644 --- a/posydon/unit_tests/utils/test_gridutils.py +++ b/posydon/unit_tests/utils/test_gridutils.py @@ -31,16 +31,17 @@ def test_dir(self): ## does not clear the warning registy correctly. if hasattr(totest, '__warningregistry__'): del totest.__warningregistry__ - elements = {'LG_MTRANSFER_RATE_THRESHOLD', 'Msun', 'Pwarn', 'Rsun',\ - 'T_merger_P', 'T_merger_a', '__authors__', '__builtins__',\ + elements = {'LG_MTRANSFER_RATE_THRESHOLD', 'Pwarn',\ + '__authors__', '__builtins__',\ '__cached__', '__doc__', '__file__', '__loader__',\ '__name__', '__package__', '__spec__', 'add_field',\ - 'beta_gw', 'cgrav', 'clean_inlist_file', 'clight',\ + 'clean_inlist_file',\ 'convert_output_to_table', 'find_index_nearest_neighbour',\ 'find_nearest', 'fix_He_core', 'get_cell_edges',\ 'get_final_proposed_points', 'get_new_grid_name', 'gzip',\ - 'join_lists', 'kepler3_a', 'np', 'os', 'pd',\ - 'read_EEP_data_file', 'read_MESA_data_file', 'secyear'} + 'inspiral_timescale_from_orbital_period',\ + 'join_lists', 'np', 'os', 'pd',\ + 'read_EEP_data_file', 'read_MESA_data_file'} totest_elements = set(dir(totest)) missing_in_test = elements - totest_elements assert len(missing_in_test) == 0, "There are missing objects in "\ @@ -83,18 +84,6 @@ def test_instance_find_index_nearest_neighbour(self): def test_instance_get_final_proposed_points(self): assert isroutine(totest.get_final_proposed_points) - def test_instance_T_merger_P(self): - assert isroutine(totest.T_merger_P) - - def test_instance_beta_gw(self): - assert isroutine(totest.beta_gw) - - def test_instance_kepler3_a(self): - assert isroutine(totest.kepler3_a) - - def test_instance_T_merger_a(self): - assert isroutine(totest.T_merger_a) - def test_instance_convert_output_to_table(self): assert isroutine(totest.convert_output_to_table) @@ -555,57 +544,6 @@ def test_get_final_proposed_points(self, capsys): assert np.allclose(mx, np.array([0.1, 0.3, 0.3, 0.5])) assert np.allclose(my, np.array([0.3, 0.3, 0.5, 0.5])) - def test_T_merger_P(self): - # missing argument - with raises(TypeError, match="missing 3 required positional "\ - +"arguments: 'P', 'm1', and 'm2'"): - totest.T_merger_P() - # examples - tests = [(1.0, 15.0, 30.0, approx(0.37210532488, abs=6e-12)),\ - (2.0, 15.0, 30.0, approx(2.36272153666, abs=6e-12)),\ - (1.0, 30.0, 30.0, approx(0.20477745195, abs=6e-12)),\ - (1.0, 15.0, 60.0, approx(0.22058982311, abs=6e-12))] - for (P, m1, m2, r) in tests: - assert totest.T_merger_P(P, m1, m2) == r - - def test_beta_gw(self): - # missing argument - with raises(TypeError, match="missing 2 required positional "\ - +"arguments: 'm1' and 'm2'"): - totest.beta_gw() - # examples - tests = [(15.0, 30.0, approx(3.18232660295e-69, abs=6e-81)),\ - (30.0, 30.0, approx(8.48620427454e-69, abs=6e-81)),\ - (30.0, 60.0, approx(2.54586128236e-68, abs=6e-80))] - for (m1, m2, r) in tests: - assert totest.beta_gw(m1, m2) == r - - def test_kepler3_a(self): - # missing argument - with raises(TypeError, match="missing 3 required positional "\ - +"arguments: 'P', 'm1', and 'm2'"): - totest.kepler3_a() - # examples - tests = [(1.0, 15.0, 30.0, approx(14.9643417735, abs=6e-11)),\ - (2.0, 15.0, 30.0, approx(23.7544118733, abs=6e-11)),\ - (1.0, 30.0, 30.0, approx(16.4703892879, abs=6e-11)),\ - (1.0, 15.0, 60.0, approx(17.7421890201, abs=6e-11))] - for (P, m1, m2, r) in tests: - assert totest.kepler3_a(P, m1, m2) == r - - def test_T_merger_a(self): - # missing argument - with raises(TypeError, match="missing 3 required positional "\ - +"arguments: 'a', 'm1', and 'm2'"): - totest.T_merger_a() - # examples - tests = [(1.0, 15.0, 30.0, approx(7.42053829341e-06, abs=6e-18)),\ - (2.0, 15.0, 30.0, approx(1.18728612695e-04, abs=6e-16)),\ - (1.0, 30.0, 30.0, approx(2.78270186003e-06, abs=6e-18)),\ - (1.0, 15.0, 60.0, approx(2.22616148802e-06, abs=6e-18))] - for (a, m1, m2, r) in tests: - assert totest.T_merger_a(a, m1, m2) == r - def test_convert_output_to_table(self, no_path, out_path,\ MESA_BH_data_tight_orbit,\ MESA_BH_data_wide_orbit,\ diff --git a/posydon/utils/common_functions.py b/posydon/utils/common_functions.py index abb540cd04..d3e0a29313 100644 --- a/posydon/utils/common_functions.py +++ b/posydon/utils/common_functions.py @@ -884,6 +884,31 @@ def read_histogram_from_file(path): return arrays +def beta_gw(star1_mass, star2_mass): + """Evaluate Peters' beta coefficient (equation 5.9 from Peters 1964). + + Parameters + ---------- + star1_mass : float + Mass of the first star in solar masses. + star2_mass : float + Mass of the second star in solar masses. + + Returns + ------- + float + Peters' beta coefficient with masses given in solar units. + To obtain the full CGS beta (cm^4 s^-1), multiply the result + by ``const.Msun**3``. + + References + ---------- + .. [1] Peters 1964 Phys. Rev. 136, B1224 + + """ + return (64.0 / 5.0) * const.standard_cgrav**3 / const.clight**5 * star1_mass * star2_mass * (star1_mass + star2_mass) + + def inspiral_timescale_from_separation(star1_mass, star2_mass, separation, eccentricity): """Compute the timescale of GW inspiral using the orbital separation. diff --git a/posydon/utils/gridutils.py b/posydon/utils/gridutils.py index 4da0f27ea9..8e77049da6 100644 --- a/posydon/utils/gridutils.py +++ b/posydon/utils/gridutils.py @@ -6,9 +6,7 @@ import numpy as np import pandas as pd -from posydon.utils.constants import Msun, Rsun, clight -from posydon.utils.constants import secyer as secyear -from posydon.utils.constants import standard_cgrav as cgrav +from posydon.utils.common_functions import inspiral_timescale_from_orbital_period from posydon.utils.limits_thresholds import LG_MTRANSFER_RATE_THRESHOLD from posydon.utils.posydonwarning import Pwarn @@ -243,89 +241,6 @@ def get_final_proposed_points(proposed_x, grid_x, proposed_y, grid_y): return mapped_x, mapped_y -def T_merger_P(P, m1, m2): - """Merger time given initial orbital period and masses of binary. - - Parameters - ---------- - P : float - Orbital period (days). - m1 : float - Mass of first star (Msun). - m2 : float - Mass of second star (Msun). - - Returns - ------- - float - Merger time (Gyr) - - """ - return T_merger_a(kepler3_a(P, m1, m2), m1, m2) - - -def beta_gw(m1, m2): - """Evaluate the "beta" (equation 5.9) from Peters (1964). - - Parameters - ---------- - m1 : float - Mass of the first star. - m2 : type - Mass of the second star. - - Returns - ------- - float - Peters' beta in cgs units. - - """ - return 64. / 5. * cgrav**3 / clight**5 * m1 * m2 * (m1 + m2) - - -def kepler3_a(P, m1, m2): - """Calculate the semimajor axis of a binary from its period and masses. - - Parameters - ---------- - P : float - Orbital period (days). - m1 : float - Mass of first star. - m2 : type - Mass of second star. - - Returns - ------- - float - Semi-major axis (Rsun) using Kepler's third law. - - """ - return ((P * 24.0 * 3600.0)**2.0 - * cgrav * (m1 + m2) * Msun / (4.0 * np.pi**2))**(1.0 / 3.0) / Rsun - - -def T_merger_a(a, m1, m2): - """Merger time given initial orbital separation and masses of binary. - - Parameters - ---------- - a : float - Orbital separation (Rsun). - m1 : float - Mass of first star (Msun). - m2 : float - Mass of second star (Msun). - - Returns - ------- - float - Merger time (Gyr) following Peters (1964), eq. (5.10). - - """ - return (a * Rsun)**4 / (4. * beta_gw(m1, m2) * Msun**3) / (secyear * 1.0e9) - - def convert_output_to_table( output_file, binary_history_file=None, star1_history_file=None, star2_history_file=None, column_names=[ @@ -443,10 +358,11 @@ def convert_output_to_table( values["C_core_2(Msun)"] = hist["c_core_mass"].iloc[-1] if binary_history_file is not None: - tmerge = T_merger_P( - binary_history["period_days"].iloc[-1], + tmerge = inspiral_timescale_from_orbital_period( binary_history["star_1_mass"].iloc[-1], - binary_history["star_2_mass"].iloc[-1]) + binary_history["star_2_mass"].iloc[-1], + binary_history["period_days"].iloc[-1], + 0.0) / 1000.0 max_lg_mtransfer_rate = binary_history[ "lg_mtransfer_rate"].max() From 6111a042d7ef9966bec8d25b02492c23b93c8077 Mon Sep 17 00:00:00 2001 From: Max Briel Date: Fri, 17 Apr 2026 08:58:13 +0200 Subject: [PATCH 347/389] add unit tests to cover new powerlaw mass ratio distribution function --- .../unit_tests/popsyn/test_distributions.py | 148 ++++++++++++++++++ posydon/unit_tests/popsyn/test_norm_pop.py | 26 +++ 2 files changed, 174 insertions(+) diff --git a/posydon/unit_tests/popsyn/test_distributions.py b/posydon/unit_tests/popsyn/test_distributions.py index 23b787461e..b5b80c42d3 100644 --- a/posydon/unit_tests/popsyn/test_distributions.py +++ b/posydon/unit_tests/popsyn/test_distributions.py @@ -12,6 +12,7 @@ FlatMassRatio, LogNormalSeparation, LogUniform, + PowerLawMassRatio, PowerLawPeriod, Sana12Period, ThermalEccentricity, @@ -1181,3 +1182,150 @@ def test_rvs_without_rng(self, custom_lognormal): with pytest.raises(ValueError, match="max must be greater than min"): LogUniform(min=100.0, max=100.0) + + +class TestPowerLawMassRatio: + """Test class for PowerLawMassRatio distribution.""" + + @pytest.fixture + def default_power_law_mass_ratio(self): + """Fixture for default PowerLawMassRatio instance.""" + return PowerLawMassRatio() + + @pytest.fixture + def custom_power_law_mass_ratio(self): + """Fixture for custom PowerLawMassRatio instance.""" + return PowerLawMassRatio(alpha=-1.0, q_min=0.1, q_max=0.9) + + def test_initialization_default(self, default_power_law_mass_ratio): + """Test default initialization of PowerLawMassRatio.""" + assert default_power_law_mass_ratio.alpha == 0.0 + assert default_power_law_mass_ratio.q_min == 0.05 + assert default_power_law_mass_ratio.q_max == 1.0 + assert hasattr(default_power_law_mass_ratio, 'norm') + assert default_power_law_mass_ratio.norm > 0 + + def test_initialization_custom(self, custom_power_law_mass_ratio): + """Test custom initialization of PowerLawMassRatio.""" + assert custom_power_law_mass_ratio.alpha == -1.0 + assert custom_power_law_mass_ratio.q_min == 0.1 + assert custom_power_law_mass_ratio.q_max == 0.9 + assert hasattr(custom_power_law_mass_ratio, 'norm') + assert custom_power_law_mass_ratio.norm > 0 + + def test_initialization_invalid_parameters(self): + """Test that initialization raises ValueError for invalid parameters.""" + with pytest.raises(ValueError, match="q_min must be in \\[0, 1\\)"): + PowerLawMassRatio(q_min=-0.1) + + with pytest.raises(ValueError, match="q_min must be in \\[0, 1\\)"): + PowerLawMassRatio(q_min=1.0) + + with pytest.raises(ValueError, match="q_max must be in \\(0, 1\\]"): + PowerLawMassRatio(q_max=0.0) + + with pytest.raises(ValueError, match="q_max must be in \\(0, 1\\]"): + PowerLawMassRatio(q_max=1.5) + + with pytest.raises(ValueError, match="q_min must be less than q_max"): + PowerLawMassRatio(q_min=0.8, q_max=0.5) + + with pytest.raises(ValueError, match="q_min must be > 0 for alpha <= -1"): + PowerLawMassRatio(alpha=-1.0, q_min=0.0) + + def test_repr(self, custom_power_law_mass_ratio): + """Test string representation of the distribution.""" + repr_str = custom_power_law_mass_ratio.__repr__() + assert "PowerLawMassRatio(" in repr_str + assert "alpha=-1.0" in repr_str + assert "q_min=0.1" in repr_str + assert "q_max=0.9" in repr_str + + def test_repr_html(self, default_power_law_mass_ratio): + """Test HTML representation for Jupyter notebooks.""" + html_str = default_power_law_mass_ratio._repr_html_() + assert "

Power Law Mass Ratio Distribution

" in html_str + assert "alpha = 0.0" in html_str + assert "q_min = 0.05" in html_str + assert "q_max = 1.0" in html_str + + def test_calculate_normalization(self, custom_power_law_mass_ratio): + """Test that normalization constant is the reciprocal of the integral.""" + integral, _ = quad( + custom_power_law_mass_ratio.power_law_mass_ratio, + custom_power_law_mass_ratio.q_min, + custom_power_law_mass_ratio.q_max, + ) + expected_norm = 1.0 / integral + np.testing.assert_allclose(custom_power_law_mass_ratio.norm, expected_norm) + + def test_power_law_mass_ratio_method(self, custom_power_law_mass_ratio): + """Test the power_law_mass_ratio method returns q^alpha.""" + q = np.array([0.2, 0.5, 0.8]) + result = custom_power_law_mass_ratio.power_law_mass_ratio(q) + expected = q ** custom_power_law_mass_ratio.alpha + np.testing.assert_allclose(result, expected) + + def test_pdf_within_range(self, custom_power_law_mass_ratio): + """Test PDF returns correct values within the mass ratio range.""" + q_values = np.linspace( + custom_power_law_mass_ratio.q_min + 1e-6, + custom_power_law_mass_ratio.q_max, + 10, + ) + pdf_values = custom_power_law_mass_ratio.pdf(q_values) + expected = ( + custom_power_law_mass_ratio.power_law_mass_ratio(q_values) + * custom_power_law_mass_ratio.norm + ) + np.testing.assert_allclose(pdf_values, expected) + + def test_pdf_outside_range(self, custom_power_law_mass_ratio): + """Test PDF returns zero outside the mass ratio range.""" + q_below = np.array([0.05, 0.09]) + np.testing.assert_array_equal( + custom_power_law_mass_ratio.pdf(q_below), np.zeros_like(q_below) + ) + + q_above = np.array([0.95, 1.0]) + np.testing.assert_array_equal( + custom_power_law_mass_ratio.pdf(q_above), np.zeros_like(q_above) + ) + + def test_pdf_at_q_min_excluded(self, custom_power_law_mass_ratio): + """Test that q_min itself is excluded (open lower bound).""" + pdf_at_qmin = custom_power_law_mass_ratio.pdf( + np.array([custom_power_law_mass_ratio.q_min]) + ) + assert pdf_at_qmin[0] == 0.0 + + def test_normalization_integral(self, custom_power_law_mass_ratio): + """Test that the PDF integrates to 1 over the valid range.""" + integral, _ = quad( + custom_power_law_mass_ratio.pdf, + custom_power_law_mass_ratio.q_min, + custom_power_law_mass_ratio.q_max, + ) + np.testing.assert_allclose(integral, 1.0, rtol=1e-6) + + def test_rvs(self, custom_power_law_mass_ratio): + """Test random sampling stays within bounds.""" + rng = np.random.default_rng(42) + samples = custom_power_law_mass_ratio.rvs(size=1000, rng=rng) + assert len(samples) == 1000 + assert np.all(samples >= custom_power_law_mass_ratio.q_min) + assert np.all(samples <= custom_power_law_mass_ratio.q_max) + + def test_rvs_without_rng(self, custom_power_law_mass_ratio): + """Test random sampling without providing an RNG.""" + samples = custom_power_law_mass_ratio.rvs(size=100) + assert len(samples) == 100 + assert np.all(samples >= custom_power_law_mass_ratio.q_min) + assert np.all(samples <= custom_power_law_mass_ratio.q_max) + + @pytest.mark.parametrize("alpha", [2.0, 0.0, -0.5]) + def test_different_alpha_values(self, alpha): + """Test PowerLawMassRatio with different valid alpha exponents.""" + dist = PowerLawMassRatio(alpha=alpha, q_min=0.1, q_max=1.0) + integral, _ = quad(dist.pdf, dist.q_min, dist.q_max) + np.testing.assert_allclose(integral, 1.0, rtol=1e-6) diff --git a/posydon/unit_tests/popsyn/test_norm_pop.py b/posydon/unit_tests/popsyn/test_norm_pop.py index e37c8e2b51..1fb9098f7f 100644 --- a/posydon/unit_tests/popsyn/test_norm_pop.py +++ b/posydon/unit_tests/popsyn/test_norm_pop.py @@ -146,6 +146,32 @@ def test_invalid_mass_ratio_scheme(self): results = q_pdf(0.4) assert np.all(results == 1) + def test_power_law_mass_ratio_pdf(self): + """Test that power_law_mass_ratio scheme returns correct PDF values.""" + kwargs = { + 'secondary_mass_scheme': 'power_law_mass_ratio', + 'mass_ratio_slope': 0.0, + 'q_min': 0.1, + 'q_max': 0.9, + } + q_pdf = norm_pop.get_mass_ratio_pdf(kwargs) + # alpha=0 gives a flat distribution over (0.1, 0.9] + result_in = q_pdf(0.5, None) + assert result_in > 0 + result_out = q_pdf(0.05, None) + assert result_out == 0 + + def test_power_law_mass_ratio_pdf_default_bounds(self): + """Test power_law_mass_ratio uses default q_min/q_max when absent.""" + kwargs = { + 'secondary_mass_scheme': 'power_law_mass_ratio', + 'mass_ratio_slope': 1.0, + } + q_pdf = norm_pop.get_mass_ratio_pdf(kwargs) + # Default q_min=0.05, q_max=1.0; value inside range should be positive + result = q_pdf(0.5, None) + assert result > 0 + class TestGetBinaryFractionPdf: def test_const_binary_fraction_pdf(self): From 4d3eda62543817d32e83c505d61b8b1154460eab Mon Sep 17 00:00:00 2001 From: Max Briel Date: Fri, 17 Apr 2026 09:34:22 +0200 Subject: [PATCH 348/389] add unit tests for the new CI lines --- posydon/unit_tests/CLI/popsyn/test_check.py | 16 + posydon/unit_tests/CLI/test_io.py | 319 +++++++++++++++++++- 2 files changed, 334 insertions(+), 1 deletion(-) diff --git a/posydon/unit_tests/CLI/popsyn/test_check.py b/posydon/unit_tests/CLI/popsyn/test_check.py index dc0c717002..14b966f960 100644 --- a/posydon/unit_tests/CLI/popsyn/test_check.py +++ b/posydon/unit_tests/CLI/popsyn/test_check.py @@ -397,6 +397,22 @@ def test_get_expected_batch_count_array_without_dash(self, tmp_path): result = totest.get_expected_batch_count(str(tmp_path), str_met) assert result is None # Should return None when array doesn't have dash + + def test_get_expected_batch_count_with_max_concurrent_jobs(self, tmp_path): + """Test get_expected_batch_count with % (max concurrent jobs) in array range.""" + metallicity = 1.0 + str_met = convert_metallicity_to_string(metallicity) + slurm_file = tmp_path / f"{str_met}_Zsun_slurm_array.slurm" + slurm_content = """#!/bin/bash +#SBATCH --array=0-9%5 +#SBATCH --job-name=test +""" + slurm_file.write_text(slurm_content) + + result = totest.get_expected_batch_count(str(tmp_path), str_met) + # Should strip %5 and return 10 (0-9 inclusive) + assert result == 10 + class TestFindMissingBatchIndices: """Test class for find_missing_batch_indices function.""" diff --git a/posydon/unit_tests/CLI/test_io.py b/posydon/unit_tests/CLI/test_io.py index 9229e48adf..767f820812 100644 --- a/posydon/unit_tests/CLI/test_io.py +++ b/posydon/unit_tests/CLI/test_io.py @@ -175,7 +175,9 @@ def test_create_slurm_array(self, tmp_path): totest.create_slurm_array( metallicity, job_array_length, partition, email, walltime, account, mem_per_cpu, - path_to_posydon, path_to_posydon_data + max_concurrent_jobs=None, exclude=None, + path_to_posydon=path_to_posydon, + path_to_posydon_data=path_to_posydon_data ) # Check that the file was created @@ -212,6 +214,7 @@ def test_create_slurm_array_minimal(self, tmp_path): partition=None, email=None, walltime="12:00:00", account=None, mem_per_cpu="2G", + max_concurrent_jobs=None, exclude=None, path_to_posydon="/posydon", path_to_posydon_data="/data" ) @@ -227,6 +230,67 @@ def test_create_slurm_array_minimal(self, tmp_path): finally: os.chdir(original_dir) + def test_create_slurm_array_with_max_concurrent_jobs(self, tmp_path): + """Test create_slurm_array with max_concurrent_jobs set.""" + original_dir = os.getcwd() + os.chdir(tmp_path) + + try: + metallicity = 1.0 + job_array_length = 10 + max_concurrent_jobs = 5 + + totest.create_slurm_array( + metallicity, job_array_length, + partition=None, email=None, + walltime="24:00:00", account=None, + mem_per_cpu="4G", + max_concurrent_jobs=max_concurrent_jobs, + exclude=None, + path_to_posydon="/posydon", + path_to_posydon_data="/data" + ) + str_met = convert_metallicity_to_string(metallicity) + filename = f"{str_met}_Zsun_slurm_array.slurm" + assert os.path.exists(filename) + + with open(filename, "r") as f: + content = f.read() + # Array should include the %N max concurrent jobs specifier + assert f"#SBATCH --array=0-{job_array_length - 1}%{max_concurrent_jobs}" in content + finally: + os.chdir(original_dir) + + def test_create_slurm_array_with_exclude(self, tmp_path): + """Test create_slurm_array with exclude set.""" + original_dir = os.getcwd() + os.chdir(tmp_path) + + try: + metallicity = 1.0 + job_array_length = 10 + exclude = "node01,node02" + + totest.create_slurm_array( + metallicity, job_array_length, + partition=None, email=None, + walltime="24:00:00", account=None, + mem_per_cpu="4G", + max_concurrent_jobs=None, + exclude=exclude, + path_to_posydon="/posydon", + path_to_posydon_data="/data" + ) + str_met = convert_metallicity_to_string(metallicity) + filename = f"{str_met}_Zsun_slurm_array.slurm" + assert os.path.exists(filename) + + with open(filename, "r") as f: + content = f.read() + assert f"#SBATCH --exclude={exclude}" in content + finally: + os.chdir(original_dir) + def test_create_slurm_merge(self, tmp_path): """Test that create_slurm_merge creates a merge SLURM script.""" original_dir = os.getcwd() @@ -343,6 +407,8 @@ def test_create_slurm_rescue(self, tmp_path): walltime="20:00:00", account="test_account", mem_per_cpu="4G", + max_concurrent_jobs=None, + exclude=None, path_to_posydon="/posydon", path_to_posydon_data="/data" ) @@ -379,6 +445,8 @@ def test_create_slurm_rescue_minimal(self, tmp_path): walltime="20:00:00", account=None, # No account mem_per_cpu="4G", + max_concurrent_jobs=None, + exclude=None, path_to_posydon="/posydon", path_to_posydon_data="/data" ) @@ -399,6 +467,78 @@ def test_create_slurm_rescue_minimal(self, tmp_path): finally: os.chdir(original_dir) + def test_create_slurm_rescue_with_max_concurrent_jobs(self, tmp_path): + """Test create_slurm_rescue with max_concurrent_jobs set.""" + original_dir = os.getcwd() + os.chdir(tmp_path) + + try: + metallicity = 1.0 + missing_indices = [1, 3] + job_array_length = 10 + max_concurrent_jobs = 4 + + totest.create_slurm_rescue( + metallicity=metallicity, + missing_indices=missing_indices, + job_array_length=job_array_length, + partition=None, + email=None, + walltime="20:00:00", + account=None, + mem_per_cpu="4G", + max_concurrent_jobs=max_concurrent_jobs, + exclude=None, + path_to_posydon="/posydon", + path_to_posydon_data="/data" + ) + + str_met = convert_metallicity_to_string(metallicity) + filename = f"{str_met}_Zsun_rescue.slurm" + assert os.path.exists(filename) + + with open(filename, "r") as f: + content = f.read() + assert f"#SBATCH --array=1,3%{max_concurrent_jobs}" in content + finally: + os.chdir(original_dir) + + def test_create_slurm_rescue_with_exclude(self, tmp_path): + """Test create_slurm_rescue with exclude set.""" + original_dir = os.getcwd() + os.chdir(tmp_path) + + try: + metallicity = 1.0 + missing_indices = [2, 4] + job_array_length = 10 + exclude = "node01,node02" + + totest.create_slurm_rescue( + metallicity=metallicity, + missing_indices=missing_indices, + job_array_length=job_array_length, + partition=None, + email=None, + walltime="20:00:00", + account=None, + mem_per_cpu="4G", + max_concurrent_jobs=None, + exclude=exclude, + path_to_posydon="/posydon", + path_to_posydon_data="/data" + ) + + str_met = convert_metallicity_to_string(metallicity) + filename = f"{str_met}_Zsun_rescue.slurm" + assert os.path.exists(filename) + + with open(filename, "r") as f: + content = f.read() + assert f"#SBATCH --exclude={exclude}" in content + finally: + os.chdir(original_dir) + def test_create_bash_submit_script(self, tmp_path): """Test that create_bash_submit_script creates a submission script.""" original_dir = os.getcwd() @@ -471,6 +611,8 @@ def mock_args(self): args.partition = "normal" args.account = "test_account" args.email = "test@example.com" + args.max_concurrent_jobs = None + args.exclude = None return args @pytest.fixture @@ -595,6 +737,8 @@ def test_create_batch_rescue_script_partial_overrides(self, tmp_path, mock_batch args.partition = None # Don't override args.account = None # Don't override args.email = None # Don't override + args.max_concurrent_jobs = None # Don't override + args.exclude = None # Don't override # Create a mock SLURM array script slurm_script = run_folder / "1e+00_Zsun_slurm_array.slurm" @@ -647,6 +791,8 @@ def test_create_batch_rescue_script_no_overrides(self, tmp_path, mock_batch_stat args.partition = None # Don't override args.account = None # Don't override args.email = None # Don't override + args.max_concurrent_jobs = None # Don't override + args.exclude = None # Don't override # Create a mock SLURM array script slurm_script = run_folder / "1e+00_Zsun_slurm_array.slurm" @@ -696,6 +842,8 @@ def test_create_batch_rescue_script_array_without_dash(self, tmp_path, mock_batc args.partition = None args.account = None args.email = None + args.max_concurrent_jobs = None + args.exclude = None # Create a mock SLURM array script with array format that doesn't have a dash # (e.g., just a single number or comma-separated list) @@ -723,3 +871,172 @@ def test_create_batch_rescue_script_array_without_dash(self, tmp_path, mock_batc assert rescue_script.exists() finally: os.chdir(original_dir) + + def test_create_batch_rescue_script_with_exclude_in_slurm(self, tmp_path, mock_batch_status): + """Test create_batch_rescue_script parses --exclude from existing SLURM script.""" + run_folder = tmp_path / "run" + run_folder.mkdir() + + args = MagicMock() + args.run_folder = str(run_folder) + args.walltime = None + args.mem_per_cpu = None + args.partition = None + args.account = None + args.email = None + args.max_concurrent_jobs = None + args.exclude = None + + # SLURM script with --exclude= directive + slurm_script = run_folder / "1e+00_Zsun_slurm_array.slurm" + slurm_content = textwrap.dedent("""\ + #!/bin/bash + #SBATCH --array=0-9 + #SBATCH --time=24:00:00 + #SBATCH --mem-per-cpu=4G + #SBATCH --exclude=node01,node02 + export PATH_TO_POSYDON=/path/to/posydon + export PATH_TO_POSYDON_DATA=/path/to/data + srun python ./run_metallicity.py 1.0 + """) + slurm_script.write_text(slurm_content) + + original_dir = os.getcwd() + os.chdir(run_folder) + + try: + result = totest.create_batch_rescue_script(args, mock_batch_status) + + rescue_script = run_folder / "1e+00_Zsun_rescue.slurm" + content = rescue_script.read_text() + # Verify exclude was parsed from SLURM and passed to rescue script + assert "#SBATCH --exclude=node01,node02" in content + finally: + os.chdir(original_dir) + + def test_create_batch_rescue_script_with_max_concurrent_in_slurm( + self, tmp_path, mock_batch_status + ): + """Test create_batch_rescue_script parses % (max concurrent) from SLURM array.""" + run_folder = tmp_path / "run" + run_folder.mkdir() + + args = MagicMock() + args.run_folder = str(run_folder) + args.walltime = None + args.mem_per_cpu = None + args.partition = None + args.account = None + args.email = None + args.max_concurrent_jobs = None + args.exclude = None + + # SLURM script with %N in array (max concurrent jobs) + slurm_script = run_folder / "1e+00_Zsun_slurm_array.slurm" + slurm_content = textwrap.dedent("""\ + #!/bin/bash + #SBATCH --array=0-9%5 + #SBATCH --time=24:00:00 + #SBATCH --mem-per-cpu=4G + export PATH_TO_POSYDON=/path/to/posydon + export PATH_TO_POSYDON_DATA=/path/to/data + srun python ./run_metallicity.py 1.0 + """) + slurm_script.write_text(slurm_content) + + original_dir = os.getcwd() + os.chdir(run_folder) + + try: + result = totest.create_batch_rescue_script(args, mock_batch_status) + + rescue_script = run_folder / "1e+00_Zsun_rescue.slurm" + content = rescue_script.read_text() + # Verify max_concurrent_jobs was parsed from SLURM and included in rescue script + assert "%5" in content + finally: + os.chdir(original_dir) + + def test_create_batch_rescue_script_with_max_concurrent_arg( + self, tmp_path, mock_batch_status + ): + """Test create_batch_rescue_script with max_concurrent_jobs override from args.""" + run_folder = tmp_path / "run" + run_folder.mkdir() + + args = MagicMock() + args.run_folder = str(run_folder) + args.walltime = None + args.mem_per_cpu = None + args.partition = None + args.account = None + args.email = None + args.max_concurrent_jobs = 3 + args.exclude = None + + slurm_script = run_folder / "1e+00_Zsun_slurm_array.slurm" + slurm_content = textwrap.dedent("""\ + #!/bin/bash + #SBATCH --array=0-9 + #SBATCH --time=24:00:00 + #SBATCH --mem-per-cpu=4G + export PATH_TO_POSYDON=/path/to/posydon + export PATH_TO_POSYDON_DATA=/path/to/data + srun python ./run_metallicity.py 1.0 + """) + slurm_script.write_text(slurm_content) + + original_dir = os.getcwd() + os.chdir(run_folder) + + try: + result = totest.create_batch_rescue_script(args, mock_batch_status) + + rescue_script = run_folder / "1e+00_Zsun_rescue.slurm" + content = rescue_script.read_text() + # Verify max_concurrent_jobs from args is used in rescue script + assert "%3" in content + finally: + os.chdir(original_dir) + + def test_create_batch_rescue_script_with_exclude_arg( + self, tmp_path, mock_batch_status + ): + """Test create_batch_rescue_script with exclude override from args.""" + run_folder = tmp_path / "run" + run_folder.mkdir() + + args = MagicMock() + args.run_folder = str(run_folder) + args.walltime = None + args.mem_per_cpu = None + args.partition = None + args.account = None + args.email = None + args.max_concurrent_jobs = None + args.exclude = "badnode01" + + slurm_script = run_folder / "1e+00_Zsun_slurm_array.slurm" + slurm_content = textwrap.dedent("""\ + #!/bin/bash + #SBATCH --array=0-9 + #SBATCH --time=24:00:00 + #SBATCH --mem-per-cpu=4G + export PATH_TO_POSYDON=/path/to/posydon + export PATH_TO_POSYDON_DATA=/path/to/data + srun python ./run_metallicity.py 1.0 + """) + slurm_script.write_text(slurm_content) + + original_dir = os.getcwd() + os.chdir(run_folder) + + try: + result = totest.create_batch_rescue_script(args, mock_batch_status) + + rescue_script = run_folder / "1e+00_Zsun_rescue.slurm" + content = rescue_script.read_text() + # Verify exclude from args is used in rescue script + assert "#SBATCH --exclude=badnode01" in content + finally: + os.chdir(original_dir) From b81d2df0e006b39f4ee6e4e2c120e89d98b1ccbf Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Thu, 23 Apr 2026 12:02:12 -0500 Subject: [PATCH 349/389] [v2.3] Add `to_df()` method for `LazyHDF5` (#836) * add to_df method for LazyHDF5 * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * remove test coverage from to_df() * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- posydon/grids/psygrid.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/posydon/grids/psygrid.py b/posydon/grids/psygrid.py index 794f066cad..783b2c38d3 100644 --- a/posydon/grids/psygrid.py +++ b/posydon/grids/psygrid.py @@ -461,6 +461,9 @@ def shape(self): # pragma: no cover def __len__(self): # pragma: no cover return len(self._dataset) + def to_df(self): # pragma: no cover + return pd.DataFrame(self.__array__()) + class PSyGrid: """Class handling a grid of MESA runs encoded in HDF5 format.""" From 63d15913d0759521a4859714a942994e442cbd57 Mon Sep 17 00:00:00 2001 From: Max Briel Date: Wed, 29 Apr 2026 11:32:11 +0200 Subject: [PATCH 350/389] move n_points to function argument --- posydon/popsyn/distributions.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/posydon/popsyn/distributions.py b/posydon/popsyn/distributions.py index 2819bd5f7b..7454ba02eb 100644 --- a/posydon/popsyn/distributions.py +++ b/posydon/popsyn/distributions.py @@ -270,7 +270,7 @@ def pdf(self, q): pdf_values[valid] = self.power_law_mass_ratio(q[valid]) * self.norm return pdf_values - def rvs(self, size=1, rng=None): + def rvs(self, size=1, n_points=1000, rng=None): """Draw random samples from the power law mass ratio distribution. Parameters @@ -289,8 +289,6 @@ def rvs(self, size=1, rng=None): rng = np.random.default_rng() from posydon.utils.common_functions import inverse_sampler - - n_points = 1000 q_grid = np.linspace(self.q_min, self.q_max, n_points) pdf_values = self.power_law_mass_ratio(q_grid) return inverse_sampler(q_grid, pdf_values, size=size, rng=rng) From 3b1ccfffcda7ac7a10cb89816da955fe48a9bc96 Mon Sep 17 00:00:00 2001 From: Max Briel Date: Wed, 29 Apr 2026 11:32:42 +0200 Subject: [PATCH 351/389] add other n_points as function arg --- posydon/popsyn/distributions.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/posydon/popsyn/distributions.py b/posydon/popsyn/distributions.py index 7454ba02eb..67a9f6481b 100644 --- a/posydon/popsyn/distributions.py +++ b/posydon/popsyn/distributions.py @@ -669,7 +669,7 @@ def pdf(self, p): return pdf_values - def rvs(self, size=1, rng=None): + def rvs(self, size=1, n_points=1000, rng=None): """Draw random samples from the power law period distribution. Parameters @@ -691,7 +691,6 @@ def rvs(self, size=1, rng=None): from posydon.utils.common_functions import inverse_sampler # Create discretized PDF for inverse sampling - n_points = 1000 logp_grid = np.linspace(np.log10(self.p_min), np.log10(self.p_max), n_points) pdf_values = self.power_law_period(logp_grid) From 6f5a9e1f7bea01bbb699ce34a472e3fbf0b9935d Mon Sep 17 00:00:00 2001 From: Max Briel Date: Wed, 29 Apr 2026 11:40:47 +0200 Subject: [PATCH 352/389] add Kepler sc data table to unit_test directory --- .../Patton+Sukhbold20/Kepler_sc_table.dat | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 posydon/unit_tests/_data/POSYDON_data/Patton+Sukhbold20/Kepler_sc_table.dat diff --git a/posydon/unit_tests/_data/POSYDON_data/Patton+Sukhbold20/Kepler_sc_table.dat b/posydon/unit_tests/_data/POSYDON_data/Patton+Sukhbold20/Kepler_sc_table.dat new file mode 100644 index 0000000000..27ff20a490 --- /dev/null +++ b/posydon/unit_tests/_data/POSYDON_data/Patton+Sukhbold20/Kepler_sc_table.dat @@ -0,0 +1,54 @@ +"# Patton & Sukhbold (2020, MNRAS)",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +#,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"# s_c, the central entropy per baryon in units of K_B (Boltzmann constant), evaluated at the presupernova stage (needed for example in the Maltsev+2025 criterion)",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +# for KEPLER models of a given CO-core mass (columns) and initial carbon mass fraction (rows),,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +#,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +# All masses are in units of Msun,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +#,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +X_c,2.5,2.6,2.7,2.8,2.9,3,3.1,3.2,3.3,3.4,3.5,3.6,3.7,3.8,3.9,4,4.1,4.2,4.3,4.4,4.5,4.6,4.7,4.8,4.9,5,5.1,5.2,5.3,5.4,5.5,5.6,5.7,5.8,5.9,6,6.1,6.2,6.3,6.4,6.5,6.6,6.7,6.8,6.9,7,7.1,7.2,7.3,7.4,7.5,7.6,7.7,7.8,7.9,8,8.1,8.2,8.3,8.4,8.5,8.6,8.7,8.8,8.9,9,9.1,9.2,9.3,9.4,9.5,9.6,9.7,9.8,9.9,10 +0.05,0.610768691,0.629214872,0.652130574,0.679378435,0.713697783,0.74581048,0.766641043,0.792775501,0.814823111,0.836142529,0.859851158,0.886006531,0.912686043,0.932691598,0.957916148,0.969091329,0.99016173,1.010252072,1.028069634,1.051504705,1.075993752,1.089255614,1.111628723,1.119726359,1.14275482,1.161087743,1.18040405,1.197066773,1.216365632,1.214596008,1.229566027,1.235289616,1.238242492,1.24917912,1.245350981,1.220772176,1.21836697,1.210971843,1.187712915,1.171558872,0.91886142,0.86374049,0.865662993,0.870884007,0.661530736,0.673704051,0.678886681,0.688039343,0.696985998,0.702601761,0.711639237,0.721744358,0.731312803,0.734804539,0.744305905,0.754773775,0.76451156,0.77518963,0.78722218,0.795089722,0.806110319,0.815227124,0.825915333,0.835420584,0.845608485,0.860265491,0.868023291,0.875491152,0.88321075,0.890889423,0.89890877,0.905702072,0.918266901,0.925577573,0.93295046,0.937262003 +0.06,0.605510653,0.623915014,0.645836118,0.669321322,0.711392924,0.733214322,0.757603034,0.779210939,0.809051813,0.827016041,0.853383266,0.876592594,0.900028228,0.917641138,0.940458175,0.955522327,0.953821922,0.970036773,0.980775063,0.993971811,1.018976141,1.059055157,1.059484498,1.091019601,1.128510811,1.148597138,1.169798336,1.182814096,1.193163283,1.204827891,1.218106081,1.216802697,1.223924857,1.232778163,1.233200008,1.241112042,1.242004225,1.234769423,1.215049219,1.215025812,1.201259291,1.183634618,1.171101742,1.155320234,1.108348597,1.096416255,0.977886043,0.921079589,0.677173147,0.682344755,0.692446217,0.700938994,0.704854752,0.714058995,0.721762359,0.73015152,0.734381046,0.743366991,0.753205934,0.76265074,0.772110114,0.782041086,0.792809845,0.805655556,0.816805382,0.825751237,0.837665069,0.841273076,0.833332233,0.841220896,0.848222083,0.860692799,0.868035718,0.875329517,0.882247869,0.890472758 +0.15,0.728703373,0.741488304,0.743411687,0.766181023,0.613251415,0.654098815,0.706728262,0.710525257,0.645557443,0.792594011,0.782761187,0.727139362,0.714101691,0.710218882,0.688158065,0.697339026,0.764769326,0.81681644,0.891546699,0.999853931,1.00023813,1.014926909,1.022942369,1.009845222,1.010410148,1.013922446,1.015498105,1.014668779,1.015341347,1.019183579,1.027168877,1.028267606,1.023165366,1.002707222,0.996271088,0.999200651,1.000902452,0.990751311,0.981018618,0.961410751,0.959386139,0.960218557,0.996352029,0.949127941,0.967258548,0.946368996,0.952897947,0.946629509,0.92697324,0.958720712,0.946238579,0.940932286,0.947880852,0.933168069,0.989886803,0.994774084,1.013139995,1.00647957,1.018824226,1.041982809,1.056247591,1.054407715,1.03772044,1.046278875,1.047502012,1.04529673,1.044989069,1.054270488,1.055515471,1.061478717,1.074239667,1.074599382,1.080888843,1.082550062,1.085902628,1.086620885 +0.16,0.599633585,0.611961543,0.625996328,0.633822125,0.615217121,0.68483262,0.741640804,0.619520461,0.689847198,0.682656235,0.637590107,0.80817751,0.83878263,0.760413159,0.739164805,0.700305141,0.712754622,0.677125565,0.730130902,0.780742243,0.843040634,0.977177974,0.993821747,1.023210575,1.045642263,1.049752601,1.045145577,1.036772519,1.038826626,1.040209459,1.039261589,1.042671897,1.0474753,1.042759345,1.044256182,1.038306369,1.029397954,1.029626247,1.003515831,0.983398453,0.968150634,0.962061126,0.943464758,0.938685426,0.980288044,0.93565932,0.932571021,0.925900812,0.924422837,0.91899856,0.919840663,0.909938799,0.908222729,0.884624715,0.947441916,0.935440271,0.959698716,0.978727859,0.985858279,0.994486455,0.916248277,1.025814764,0.987339092,0.93338029,0.99845715,1.003853643,0.997222447,0.999187517,1.010113832,1.017798073,1.021035711,1.020547659,1.012971681,1.023295175,1.018392363,1.02134024 +0.17,0.587725025,0.612759,0.627221458,0.646763752,0.681311163,0.710167506,0.721270885,0.699205477,0.696677518,0.715640212,0.624307784,0.749942997,0.65038581,0.732325339,0.875772174,0.789570186,0.747227081,0.688299955,0.70436639,0.659003087,0.701630785,0.757770746,0.813137437,0.851168643,0.993620809,1.025745324,1.049771566,1.071080624,1.078912683,1.068253829,1.06231945,1.065611582,1.064376071,1.061958916,1.057772624,1.054217852,1.048283199,1.050983592,1.045242996,1.032177621,1.020595686,1.001124084,0.969305095,0.965945212,0.954382256,0.927264762,0.922587195,0.967355137,0.92057521,0.931032706,0.897565613,0.903844817,0.894341806,0.886701797,0.922287303,0.925330893,0.920176669,0.927682868,0.93509453,0.930533478,0.912689298,0.906929262,0.927766559,0.934492348,0.935035565,0.940913949,0.93153897,0.929876437,0.925307186,0.915233431,0.928474516,0.952779735,0.958731999,0.924558995,0.923206804,0.934589435 +0.18,0.714812461,0.692773794,0.613792284,0.630027041,0.649855255,0.672508811,0.701349874,0.728603143,0.724875224,0.742257278,0.811857801,0.770264626,0.656872767,0.699842862,0.646901719,0.764874888,0.913510515,0.89138468,0.792259055,0.730158077,0.689693931,0.639964685,0.67411517,0.727404807,0.770459075,0.821487178,0.863029641,1.059560295,1.035655298,1.076871488,1.101405818,1.1066164,1.101483525,1.087786831,1.093537301,1.081583575,1.071869165,1.0671787,1.062486977,1.051066843,1.042141229,1.049765835,1.028267987,1.026518791,1.000759463,0.991332417,0.963493146,0.940345205,0.947860654,0.903517802,0.9009087,0.914452068,0.883628099,0.876459656,0.88037106,0.868060338,0.875999065,0.894374463,0.901717925,0.893990531,0.901202933,0.865691672,0.860992171,0.855043814,0.857375624,0.862012287,0.870245295,0.864464627,0.869944295,0.868347402,0.871126038,0.875259993,0.877083873,0.880593155,0.884207058,0.890785358 +0.19,0.727233715,0.743851809,0.76354611,0.760753509,0.617168234,0.61794141,0.650806325,0.660348827,0.706062145,0.707048881,0.74496703,0.764045885,0.784318085,0.785524333,0.670872529,0.708017104,0.632780578,0.807783283,0.924338934,0.906389152,0.7833206,0.750296728,0.677112811,0.705436654,0.683518706,0.706021226,0.740130761,0.790800401,0.846049857,0.882190769,0.994632623,1.055943214,1.094053795,1.108537171,1.123517082,1.114169814,1.101315029,1.103504987,1.098985184,1.076504483,1.075215846,1.065854465,1.057549715,1.039080143,1.040481551,1.043411307,1.011084281,0.9946586,0.982224421,0.975246055,0.922378203,0.921905954,0.890951127,0.851420352,0.879906609,0.853852975,0.84432161,0.847062915,0.864089848,0.864962826,0.881890994,0.847187889,0.826110122,0.815214058,0.807663401,0.810570517,0.8103254,0.827159101,0.815621849,0.825291956,0.826375372,0.833898273,0.838969986,0.844355918,0.851350684,0.856840041 +0.2,0.725408675,0.665036581,0.660357254,0.72321987,0.676935978,0.607083394,0.737230097,0.627402677,0.642831359,0.638348081,0.650153976,0.696334225,0.697186155,0.715268179,0.730252938,0.815231584,0.812987491,0.794369068,0.637120215,0.66280771,0.862751357,0.924217324,0.919134428,0.74458322,0.688406117,0.699657403,0.638443575,0.66110335,0.718083155,0.754260088,0.797524686,0.833732443,0.943479358,1.037992689,1.084115839,1.136359028,1.13136764,1.131865793,1.115464271,1.120548625,1.110858932,1.100940163,1.08511353,1.074885521,1.072853982,1.063516903,1.053632589,1.035061315,1.040954895,1.016377375,0.987752848,0.963146375,0.951000966,0.899426588,0.885562717,0.858724861,0.838486966,0.83842367,0.82286416,0.825247071,0.836047606,0.816389719,0.803362609,0.750579898,0.770668116,0.771567862,0.775730331,0.782189531,0.764858975,0.753347005,0.785706695,0.810970859,0.815701883,0.825304187,0.830636744,0.833193849 +0.21,0.735126773,0.744628837,0.645749284,0.654571107,0.659779622,0.676540063,0.69309537,0.686906054,0.692523999,0.713091576,0.697731622,0.714895199,0.72855382,0.672382652,0.68018181,0.670527191,0.700748121,0.721272835,0.828538225,0.819732078,0.77269786,0.670726498,0.830413287,0.862263732,0.914938654,0.751235882,0.77395706,0.691449011,0.673080647,0.641296124,0.680259896,0.702148518,0.743657283,0.81745519,0.847451739,0.927289367,0.968268163,1.10271581,1.160478325,1.156932162,1.106469019,1.112365303,1.124255286,1.12093272,1.122682189,1.105946567,1.107622071,1.07231254,1.059866214,1.057039918,1.029399634,1.037075677,1.015201954,0.969069512,0.970802023,0.949553777,0.915996532,0.828294009,0.829624809,0.811956314,0.796417264,0.795673675,0.820751574,0.823976182,0.814909962,0.742422034,0.745382346,0.74915411,0.734188658,0.71282445,0.715909514,0.729040972,0.74339648,0.752799785,0.715557119,0.703158514 +0.22,0.701398866,0.711386416,0.726749635,0.675935837,0.692545086,0.613977848,0.653415306,0.693918532,0.698899073,0.70752421,0.698111522,0.631634111,0.630324906,0.633126497,0.635687214,0.643507131,0.646162186,0.654918893,0.754520876,0.694397342,0.709439984,0.746461911,0.813749933,0.627419073,0.803238027,0.768233454,0.946523224,0.924993001,0.829934978,0.692961439,0.683272168,0.622423238,0.659676979,0.693452996,0.694382079,0.720235104,0.811223938,0.826530647,0.850492336,0.973606635,1.098183492,1.170232748,1.178672548,1.120467503,1.107065636,1.115182021,1.118926609,1.099597647,1.121216982,1.11167808,1.08538358,1.077721256,1.051007097,1.045073783,1.02819266,1.012672673,0.965328456,0.96519974,0.939342945,0.841751651,0.837567496,0.802709817,0.799928885,0.799525233,0.802391004,0.797193407,0.72400731,0.709400902,0.71011076,0.68167114,0.690300333,0.705918457,0.696770802,0.695384452,0.706007033,0.709845331 +0.23,0.658451411,0.658211544,0.72008665,0.663961997,0.608773249,0.767288307,0.750697968,0.721680885,0.723213208,0.708280227,0.647791405,0.677654161,0.651894377,0.669186928,0.653146245,0.616553276,0.603232839,0.599819042,0.690478821,0.698952129,0.715817204,0.664047424,0.660235423,0.756301266,0.810886066,0.89325317,0.815302286,0.803072628,0.947570826,0.925897138,0.747721421,0.696804569,0.682187708,0.740896246,0.638532656,0.672612467,0.706223969,0.681518374,0.732676513,0.808662416,0.85616011,0.889549038,1.024724837,1.068332024,1.18598479,0.992473428,1.034451038,1.09827728,1.112214288,1.12912739,1.109564791,1.105677334,1.111320494,1.097623584,1.085324496,1.054961066,1.046582892,1.037505401,1.015485476,1.000589101,0.954740459,0.920999465,0.90826714,0.802312534,0.775737812,0.761084778,0.770015126,0.778706811,0.698187162,0.696664823,0.669757003,0.672539602,0.670864418,0.677396089,0.683695123,0.696839995 +0.24,0.704386171,0.708339231,0.703784872,0.676793868,0.703329384,0.702250478,0.716516172,0.699388092,0.701383125,0.610823047,0.645956098,0.728628556,0.678827012,0.647876043,0.646526662,0.639506743,0.662445226,0.652024836,0.713104442,0.699785106,0.675601315,0.670440501,0.60670898,0.635678117,0.592668839,0.667837807,0.709553617,0.781214981,0.67871891,0.738804204,0.817301997,0.954952508,0.807959618,0.691695008,0.689354743,0.594279444,0.6478417,0.695044656,0.733582623,0.712450562,0.75624058,0.804116146,0.813306826,0.867075469,0.906719598,0.947998439,1.103944855,1.171471978,0.944103579,0.991219219,1.022312779,1.138247345,1.120713222,1.122846631,1.120523415,1.104092606,1.090414107,1.092920718,1.072445562,1.043424124,1.041582503,1.009936191,1.019911548,0.937973455,0.903119754,0.889136115,0.792004575,0.758036277,0.740187954,0.758494189,0.754387651,0.682106069,0.666932574,0.667560261,0.670734494,0.673272902 +0.07,0.602024189,0.622541816,0.641925427,0.661061987,0.682199475,0.71608768,0.736130711,0.756423012,0.78220097,0.805954179,0.833453975,0.850680206,0.873652473,0.895387393,0.919000237,0.936650553,0.956749168,0.958428265,0.976431461,1.00027234,1.014072395,1.037385533,1.061917497,1.074569321,1.100016978,1.119481309,1.138185408,1.15516439,1.177634754,1.191928795,1.212483174,1.229613407,1.245076232,1.250715207,1.268432907,1.259737306,1.245551569,1.249007368,1.249760592,1.24559669,1.221035129,1.064478441,1.132249041,0.958213568,0.877971319,0.85894617,0.858601039,0.861637054,0.85968838,0.854605375,0.866231732,0.666231413,0.678038778,0.681786241,1.241645492,1.248384477,1.251460329,1.241026878,1.230966744,1.222895047,1.203731852,1.210402905,1.204245193,1.199608974,1.196047686,1.159717642,1.144563403,1.150349404,1.135195411,1.14361162,1.145764216,1.146450762,1.144878776,1.141819996,0.848542549,0.848886815 +0.25,0.716741845,0.71652531,0.730556964,0.732498272,0.692143561,0.694080449,0.69078604,0.69228101,0.699390694,0.703209284,0.72939904,0.695670576,0.681784049,0.711635967,0.723680634,0.682729749,0.730438536,0.731000471,0.724743182,0.736726756,0.733173765,0.746577822,0.701202452,0.705390591,0.656166652,0.720975792,0.712413235,0.668007289,0.680940446,0.674063711,0.727474074,0.753429634,0.789417914,0.991797448,0.854183853,0.748466602,0.669532971,0.673957414,0.610258737,0.666440811,0.700366833,0.744776875,0.738482906,0.785075386,0.852227779,0.85522408,0.902952106,1.000174571,1.073474871,0.862423364,0.918155396,0.97555319,0.976700043,1.02506644,1.050052472,1.149103718,1.128975822,1.125965798,1.120895941,1.116517754,1.105770505,1.099405256,1.069334411,1.033345557,1.011322467,1.018202499,1.000461303,0.914618633,0.875836395,0.851416431,0.727269031,0.734557216,0.750873739,0.787126288,0.737978366,0.714128365 +0.26,0.704446971,0.721169831,0.712893113,0.70820766,0.679560191,0.704907958,0.715057514,0.6918948,0.701139001,0.691232777,0.709673416,0.709262094,0.68306829,0.684419024,0.68679468,0.697990159,0.707121228,0.683780982,0.711374617,0.71063618,0.695620696,0.606977989,0.622181006,0.619561259,0.621536638,0.622779289,0.771995804,0.78320893,0.707279074,0.662875209,0.720812834,0.685710167,0.589247753,0.713615703,0.818133775,0.792878401,0.981497744,0.772903203,0.730205992,0.694643687,0.677360268,0.677080113,0.684114393,0.664199935,0.73483551,0.768444583,0.787001033,0.857254563,0.849327118,0.951819288,0.932847798,1.084784336,1.148996543,0.890544193,0.923256639,0.900231496,0.999316417,1.055970225,1.132200398,1.112469449,1.124044788,1.105739561,1.109378055,1.108443987,1.10150171,1.038735213,1.006590658,1.002410311,1.017222984,1.006555199,0.982159368,0.854080981,0.847835274,0.818685493,0.741078607,0.778403357 +0.27,0.688226045,0.701539399,0.712657602,0.661800295,0.670031133,0.691022283,0.712173324,0.692649489,0.710674744,0.698398626,0.688772972,0.713615637,0.72435416,0.729662961,0.701634315,0.646965586,0.71565246,0.721869439,0.715653875,0.727152061,0.714700927,0.717324645,0.665248254,0.639488288,0.636178219,0.644493515,0.64601868,0.648726091,0.644032369,0.640182839,0.640841862,0.817062924,0.776765747,0.702299277,0.726177613,0.63312702,0.608764391,0.7215841,0.981807613,0.898267736,0.742523874,0.724872391,0.650384957,0.702511296,0.629969494,0.702341296,0.739845968,0.741604625,0.784942608,0.802600102,0.870100039,0.817238257,0.89899934,1.016697398,1.035264925,1.149570449,0.877201696,0.934245767,0.911914938,0.991560878,1.001912353,1.051156303,1.133744782,1.120559077,1.119935266,1.119528917,1.107158387,1.096679434,1.052955993,1.04359871,1.013702736,1.005226334,0.986061548,0.981708933,0.7869379,0.765596838 +0.28,0.672400487,0.699112825,0.685701712,0.669767785,0.666571176,0.677358191,0.625984675,0.63773839,0.640121294,0.626375525,0.618917875,0.623809699,0.662786939,0.62531922,0.636898952,0.623660535,0.63247957,0.635609554,0.655551349,0.646794358,0.655720321,0.686448527,0.671620193,0.674195655,0.681607371,0.675076191,0.695447545,0.692585797,0.686230035,0.692869765,0.69023029,0.665855773,0.662909085,0.671751978,0.677744297,0.657616546,0.800889951,0.807214346,0.713211034,0.629941479,0.788112764,0.969053516,0.79111148,0.75100382,0.717263475,0.671586018,0.615275618,0.643065338,0.729574481,0.663084923,0.766393673,0.807956292,0.822326966,0.901237829,0.830933972,0.890279973,0.931649158,1.091177171,1.091282775,1.115811277,0.900489272,0.978653314,0.977942181,1.009150729,1.031709844,1.026037788,1.049355651,1.138773643,1.124070638,1.110063079,1.092999279,1.090880674,1.058046955,1.015677503,0.985555346,0.980169381 +0.29,0.665453455,0.680790969,0.706939162,0.594713365,0.673527984,0.645034799,0.700104705,0.633307581,0.588352435,0.613282962,0.642647562,0.618123238,0.623913884,0.625743984,0.624161598,0.631020458,0.628384829,0.652071695,0.64106055,0.669700957,0.657876721,0.724868778,0.670861482,0.72798338,0.66871124,0.672119399,0.678860744,0.67551983,0.7724433,0.708646697,0.712679666,0.709883458,0.711452031,0.706935443,0.740712788,0.745365346,0.692741748,0.739111822,0.68351506,0.690338961,0.862242494,0.825828372,0.757635129,0.798618098,0.999407334,0.740818563,0.729327934,0.586937662,0.726740225,0.624854326,0.655861258,0.747535055,0.73605682,0.765121481,0.827010749,0.84183159,0.867000758,0.850370762,0.902490409,0.931232089,1.024361918,1.072452066,1.164462837,0.895891475,0.903569584,0.907620365,0.923169243,0.978376152,1.013577895,1.018344139,1.078516969,1.149707585,1.11546471,1.1064485,1.096717667,1.092731707 +0.3,0.601742495,0.603479351,0.625129097,0.684184559,0.636908287,0.696402014,0.69426112,0.629387991,0.710284152,0.654474783,0.723289138,0.597115699,0.624999849,0.730114118,0.65000875,0.661914733,0.706213782,0.698087305,0.667790691,0.752302519,0.657779234,0.656482567,0.758328733,0.765503764,0.677809254,0.778296252,0.782668806,0.799847207,0.799127183,0.808777483,0.696221926,0.849511672,0.745400241,0.787214935,0.792843381,0.822588308,0.716610653,0.727747945,0.767964028,0.77352834,0.769325662,0.775351453,0.712933338,0.716076188,0.863077702,0.907653407,0.899411478,0.707095793,0.720794209,0.578051347,0.64708457,0.715991872,0.644705111,0.663647839,0.693140744,0.759587089,0.792349194,0.830673659,0.852019003,0.870533958,0.848837912,0.880728817,0.925043699,0.982958649,1.053823489,1.150515811,0.897477284,0.890299938,0.916569743,0.924511122,0.958726464,1.00533473,1.004704377,1.047265598,1.066599926,1.167767699 +0.31,0.691325178,0.688663832,0.628669891,0.65491838,0.663987843,0.751553439,0.688352662,0.702859954,0.729196245,0.71441199,0.699700676,0.740500318,0.751189599,0.722165374,0.712277933,0.755404786,0.657165038,0.675756012,0.688696872,0.710015829,0.741099345,0.726088897,0.738567843,0.741869568,0.735708132,0.752197278,0.721989435,0.773039511,0.790930818,0.798099672,0.772176986,0.763454064,0.814542629,0.788119697,0.800648491,0.86548908,0.900786694,0.915652909,0.885149524,0.916602087,0.743414226,0.724258559,0.776407177,0.769619242,0.783242734,0.785181673,0.778085288,0.745941384,0.931431459,0.776349218,0.6841201,0.6477042,0.707736854,0.655150727,0.655398181,0.669597053,0.684718985,0.699750704,0.707376361,0.789209972,0.835426534,0.866383149,0.932554222,0.86486251,0.920933216,0.924261736,1.002879887,1.029418745,1.059004797,1.177111327,0.883100827,0.904485439,0.907080739,0.950152868,0.98376019,0.988611552 +0.32,0.614205464,0.707685564,0.695794145,0.62714604,0.66354386,0.66760916,0.669178508,0.712956905,0.67331129,0.71034524,0.741519961,0.725952266,0.747104891,0.750470076,0.758894629,0.771347977,0.778942132,0.780919574,0.790540829,0.668344354,0.736686777,0.692279822,0.755144229,0.749198723,0.728248001,0.733540697,0.721989109,0.72605721,0.724460508,0.731752048,0.773062974,0.764405706,0.709526184,0.697809301,0.775846911,0.775440096,0.763850399,0.731742253,0.850527843,0.846444996,0.904891414,0.822097352,0.807234695,0.927121489,0.956917325,0.941331298,0.871427455,0.942177727,0.786615297,0.762742709,0.803596724,0.785857527,0.781854357,0.719171507,0.629905105,0.708443564,0.65697022,0.708995178,0.718098798,0.78044221,0.781739715,0.8154921,0.868462144,0.870102287,0.870338506,0.878094373,0.886983713,0.878299735,0.89785296,1.005292509,1.002907939,1.021172004,1.16909946,0.8985822,0.912158462,0.946479683 +0.33,0.618420958,0.627870203,0.653063536,0.675510681,0.654044285,0.6865992,0.657468191,0.618668143,0.690746854,0.701296762,0.724371023,0.677683994,0.721116581,0.733218909,0.746587992,0.728400247,0.733639341,0.744518313,0.646803952,0.765147657,0.773164938,0.766223764,0.757983877,0.742250963,0.794378482,0.754158674,0.697215021,0.684813648,0.751123424,0.755727298,0.696574592,0.682785986,0.694155016,0.688118193,0.716716827,0.765746155,0.754270772,0.738291004,0.719440101,0.770212775,0.757561602,0.745670819,0.765796057,0.766801745,0.749333244,0.674019385,0.877433771,0.73322129,0.746184313,0.899737179,0.940869412,0.950801596,0.806305219,0.796186736,0.786324364,0.763002814,0.92241866,0.612922368,0.674136589,0.616622786,0.717908227,0.73568542,0.778011254,0.789131949,0.856289482,0.874952745,0.87987338,0.836837514,0.856067715,0.897723723,0.923809497,0.984182292,0.937990451,0.986306689,1.051171448,1.093657488 +0.34,0.623976778,0.62587934,0.61653257,0.688538716,0.644632417,0.642128912,0.683704788,0.682506137,0.610627814,0.694173297,0.666782693,0.622050799,0.604578851,0.716472335,0.746469824,0.638293309,0.645003997,0.644799494,0.648254115,0.567809208,0.685201096,0.525021296,0.642873748,0.650244212,0.657518189,0.622598744,0.671567179,0.529157179,0.62072265,0.678586252,0.72577096,0.674728141,0.631530444,0.617052654,0.620691192,0.687220199,0.630240305,0.630452424,0.641107476,0.676193963,0.638672301,0.612295257,0.636129398,0.62392038,0.692508496,0.627869713,0.642512681,0.652907644,0.593657452,0.71965915,0.745270716,0.736428925,0.750084732,0.716931971,0.738495415,0.922615601,0.943732058,0.820328149,0.823466355,0.83462419,0.908485964,0.625104623,0.713549408,0.722603766,0.742024454,0.767882723,0.779294859,0.812431058,0.892380516,0.88509637,0.815386939,0.881032787,0.997350749,0.964831098,1.013619774,1.068314726 +0.08,0.59946483,0.62466518,0.64115396,0.666850459,0.696117432,0.717627097,0.74087016,0.760716683,0.781089846,0.804275977,0.824570017,0.846120295,0.864545464,0.885557237,0.909352477,0.929262528,0.947116448,0.96286081,0.967209603,0.985834674,1.003689012,1.017730036,1.032072324,1.050534615,1.066174999,1.075637777,1.101602666,1.117614083,1.134563868,1.147788913,1.159258849,1.177976364,1.196524108,1.224050591,1.241773981,1.2656591,1.261187443,1.281158465,1.285816865,1.205875674,1.290542215,1.308435172,1.322762129,1.318352314,1.299106093,1.274909095,0.989418035,0.932090919,0.853466599,0.846094087,0.838995432,0.872481261,0.889740226,0.980815859,1.300537907,1.238393931,1.239621232,1.239771997,1.237183433,1.236921163,1.232863391,1.234718774,1.228788064,1.221935878,1.223619154,1.207667074,1.193440516,1.201778314,1.200433475,1.198735584,1.192203771,1.174757501,1.146414208,1.128386521,1.130287695,1.140840156 +0.35,0.586546748,0.607600414,0.607399902,0.669907955,0.684005414,0.64703291,0.649272715,0.630045833,0.601904461,0.729417362,0.618297752,0.515615925,0.580925389,0.61044274,0.616127515,0.620558943,0.572541324,0.632188649,0.559202322,0.600559192,0.586677533,0.569775981,0.568757384,0.576966256,0.520147011,0.594659399,0.599512181,0.605220512,0.57553778,0.605152804,0.615698444,0.619697916,0.612602067,0.600065335,0.603638,0.56298872,0.604585971,0.611899561,0.611178798,0.647747727,0.598559372,0.633526481,0.599600157,0.656361564,0.651926498,0.664686262,0.60981849,0.617762614,0.61341751,0.555815623,0.615874037,0.65835662,0.64653035,0.65905679,0.680581211,0.690945613,0.680076286,0.682605054,0.702400325,0.772802111,0.929631961,0.976024507,0.960294838,0.975519411,0.749963603,0.66803794,0.676488555,0.747025381,0.76863084,0.77448973,0.812510063,0.863798763,0.88958003,0.85217883,0.871008384,0.926671707 +0.36,0.582105319,0.620203525,0.595675597,0.615235919,0.676602818,0.672769088,0.596384146,0.576457871,0.580546927,0.582846099,0.552126541,0.559349196,0.548369111,0.5261487,0.599726462,0.589684705,0.527610786,0.569816597,0.575722989,0.570861575,0.574357161,0.570810207,0.549642555,0.59310751,0.575570652,0.59335692,0.584586369,0.598704264,0.615098178,0.60313227,0.618614596,0.569811241,0.618544278,0.600811,0.62189145,0.571429572,0.639655083,0.611037605,0.62484862,0.606930767,0.612233416,0.615039493,0.621304805,0.627376886,0.625727875,0.630269726,0.625080346,0.634116147,0.628572679,0.636574382,0.644269025,0.63270565,0.632616816,0.639173439,0.638830095,0.633455233,0.634583351,0.619583561,0.628239559,0.668302574,0.611548543,0.671348449,0.718132776,0.697446449,0.657728717,0.958350298,0.920179034,0.735842592,0.614291609,0.689014849,0.74422803,0.767892257,0.762852671,0.769424911,0.828432998,0.93618781 +0.37,0.595585147,0.636937671,0.657249378,0.679226954,0.667798139,0.655206629,0.668939678,0.655475066,0.671308595,0.614524282,0.535319893,0.55504848,0.683033358,0.539833072,0.55870436,0.562571851,0.565393616,0.536482482,0.564631318,0.564938191,0.59469886,0.577244259,0.570163352,0.569247941,0.543088035,0.583966998,0.602551167,0.554973551,0.550199982,0.604915511,0.629014402,0.613003129,0.605794144,0.62393946,0.618766164,0.616079625,0.60759177,0.626396291,0.65414182,0.629547263,0.64062036,0.643858075,0.652604389,0.64197826,0.638830882,0.631812979,0.659330719,0.656659297,0.645210329,0.669227771,0.655328236,0.647500022,0.656614308,0.659339843,0.664816609,0.65145111,0.662379913,0.659529067,0.666568386,0.649028098,0.646494806,0.656478324,0.644835012,0.642713687,0.619904512,0.62572982,0.641212543,0.655696138,0.653825495,0.748785114,0.665796842,0.660176664,0.631278907,0.70862235,0.763453757,0.754959809 +0.38,0.592833011,0.704818609,0.594451338,0.658198188,0.668121997,0.591102385,0.666120909,0.657161686,0.615719669,0.688786141,0.667952525,0.707683138,0.544112818,0.683055676,0.582407709,0.543954131,0.541405034,0.570448258,0.540448955,0.579295201,0.548562967,0.499830947,0.559108226,0.554845749,0.593442613,0.60473461,0.603224553,0.607367833,0.567599805,0.620938273,0.618081364,0.624898044,0.620198135,0.623372126,0.619234557,0.651889823,0.629775501,0.623686401,0.653599589,0.651741813,0.664812911,0.655072947,0.676042183,0.662819006,0.641532248,0.654926284,0.67356215,0.679385573,0.682306518,0.676609435,0.691135016,0.687256563,0.686095296,0.688552052,0.694754543,0.691794814,0.683760299,0.691281868,0.705116343,0.697870762,0.692574116,0.685269471,0.690198214,0.670911463,0.672783196,0.679814919,0.685106172,0.665107309,0.660139545,0.661559698,0.633551932,0.636501406,0.611955303,0.616952102,0.600244953,0.62973723 +0.39,0.624291332,0.63520331,0.578243162,0.588527991,0.600472857,0.601013841,0.601208169,0.601262058,0.609480317,0.69054831,0.656203602,0.701464526,0.718004324,0.55820416,0.718117702,0.695073883,0.554740013,0.561492885,0.555177719,0.582089784,0.60732467,0.549873952,0.604656355,0.561358873,0.585205693,0.570703292,0.620189898,0.626415045,0.617631104,0.606474154,0.626300549,0.641229123,0.646901938,0.654754546,0.653074986,0.658729884,0.65782185,0.654535819,0.687855468,0.66593057,0.672567539,0.667623129,0.678930234,0.679406631,0.69220033,0.684917985,0.737824713,0.701119696,0.760717056,0.760219946,0.744243189,0.728124662,0.725514724,0.759910968,0.624294121,0.737241282,0.708364815,0.620809946,0.748937777,0.713320022,0.717672944,0.627949035,0.712905968,0.626627608,0.620764261,0.710674989,0.64517188,0.71513794,0.61342383,0.710509047,0.708874684,0.697725623,0.689418015,0.684364332,0.678473755,0.669688182 +0.4,0.617765296,0.595676994,0.606912037,0.67214894,0.592497339,0.667369494,0.643868999,0.59998374,0.673551406,0.689739178,0.664077633,0.687559775,0.696867061,0.697273763,0.681616294,0.659918141,0.653705494,0.659734005,0.57599348,0.538519658,0.596516224,0.613670139,0.568928627,0.632861642,0.615991865,0.647841019,0.611644164,0.621488961,0.653212381,0.652318303,0.656461107,0.653763842,0.64365145,0.648935696,0.660257686,0.671203667,0.670128164,0.677656963,0.678827035,0.667452846,0.683359575,0.678396317,0.693144951,0.702615992,0.703784185,0.665034304,0.729831262,0.741024168,0.624720043,0.637620309,0.623404555,0.734424222,0.654081735,0.658170985,0.636684359,0.630465348,0.653744027,0.64278867,0.649967738,0.658764968,0.681495753,0.674167519,0.666158069,0.664750747,0.656104729,0.648324144,0.675399808,0.651204948,0.683961375,0.631396311,0.645780133,0.625066493,0.624758761,0.621272983,0.751337806,0.773827184 +0.48,0.564871885,0.618157026,0.56983434,0.620567824,0.593076248,0.62667109,0.616667607,0.578653642,0.626996906,0.569953012,0.598133422,0.541354529,0.525511475,0.59338106,0.531979281,0.572112955,0.569999358,0.563659317,0.578363514,0.711357457,0.571104433,0.570808825,0.571212983,0.564056038,0.547238396,0.54173214,0.565230028,0.53993908,0.585180219,0.57365615,0.545622746,0.58699044,0.547747906,0.535047603,0.57845033,0.633419506,0.616053038,0.646312429,0.644428056,0.65497233,0.635782687,0.662241118,0.675308138,0.66822929,0.687769251,0.592535892,0.699682213,0.590381302,0.59477312,0.593390421,0.580520358,0.598022044,0.592623865,0.586044036,0.584743662,0.590352781,0.585628542,0.586064491,0.616298276,0.607514771,0.769014329,0.771914569,0.64082694,0.775994775,0.75132219,0.652609621,0.68170686,0.674776472,0.6851653,0.686685581,0.705217064,0.712118938,0.75410904,0.766109716,0.758109419,0.78672955 +0.49,0.558841673,0.654356753,0.612012669,0.614411561,0.60257284,0.600968786,0.651718826,0.556500512,0.56282105,0.565140434,0.559060181,0.532172237,0.54612094,0.571170876,0.565051531,0.571714805,0.570050173,0.584659598,0.569861418,0.690101768,0.576516388,0.603658865,0.564024481,0.577077442,0.550960302,0.530642723,0.542788292,0.588029293,0.579490949,0.571823482,0.58723218,0.594129322,0.543524808,0.550644479,0.624449113,0.615045467,0.626085205,0.626916069,0.650367095,0.665218934,0.673521462,0.677132101,0.681014716,0.690095369,0.692805358,0.592479582,0.579041264,0.713596152,0.586624196,0.595784275,0.591513299,0.599595623,0.600664767,0.588217105,0.599090703,0.599844626,0.586037322,0.596935039,0.592559586,0.598022731,0.584413348,0.615564674,0.772309413,0.597564227,0.608722883,0.641022628,0.662570487,0.662232783,0.671345521,0.676524351,0.699929379,0.695369357,0.706922255,0.726102911,0.768779755,0.769635352 +0.5,0.562448457,0.565796802,0.631249643,0.652590714,0.575723906,0.648310924,0.56764643,0.589269263,0.570321931,0.566502361,0.591499302,0.547807542,0.567977957,0.570014744,0.566086688,0.536914794,0.579831688,0.56536537,0.579848915,0.575226731,0.579078688,0.574010385,0.592322334,0.597860223,0.522078987,0.524415889,0.502816514,0.542240105,0.545402687,0.576039545,0.580050983,0.549264545,0.586976788,0.61038385,0.620770262,0.596487721,0.634297241,0.599208397,0.653241749,0.667333959,0.67156429,0.687863394,0.689708141,0.6964109,0.700944058,0.59934155,0.595692533,0.603148577,0.608511337,0.612046395,0.610929704,0.596507246,0.698906841,0.60708681,0.600811445,0.611439312,0.60043717,0.602879905,0.602631421,0.615781052,0.599357877,0.597549144,0.609136407,0.605334934,0.619037922,0.604843015,0.785101786,0.617582175,0.78103712,0.641139155,0.6751528,0.706328072,0.703973487,0.703331817,0.705185906,0.736870346 +0.1,0.747092716,0.590847925,0.617432157,0.657462195,0.68658337,0.725229864,0.756821315,0.768952733,0.789060772,0.80521337,0.825468624,0.850788403,0.856828779,0.870514687,0.883968747,0.893920331,0.911877832,0.924943001,0.937657385,0.943427794,0.958872384,0.968817179,0.965429239,0.977260803,0.992368737,1.008846438,1.02128706,1.032905711,1.045226533,1.055484209,1.06515566,1.077873233,1.093423618,1.103091622,1.111348004,1.116626874,1.122247727,1.129664595,1.131873568,1.139901239,1.144000585,1.145961992,1.15794172,1.16021917,1.158915203,1.169100639,1.172816557,1.172687935,1.174158421,1.166891953,1.179779213,1.17676629,1.182542691,1.185568304,1.188758311,1.186229544,1.176815171,1.183793386,1.188206482,1.195207909,1.199190148,1.201286516,1.214652216,1.215348441,1.225417391,1.2184015,1.206439116,1.208353253,1.19380644,1.202197431,1.221026635,1.227981611,1.240972821,1.247993435,1.237654485,1.228281837 +0.11,0.718764613,0.599474914,0.607216525,0.606080287,0.631152995,0.676770738,0.715614175,0.756281421,0.795879915,0.8243039,0.840519675,0.854861125,0.861965524,0.877027369,0.890756804,0.900058734,0.91464235,0.924962402,0.935690213,0.94651692,0.954841167,0.950626392,0.954611757,0.956455688,0.971533839,0.976819977,0.985754828,0.997951157,1.005175121,1.01429147,1.027853457,1.041420673,1.05925269,1.066334532,1.076425272,1.08302171,1.085970885,1.095703574,1.096879828,1.099218389,1.106741546,1.107545456,1.111946468,1.115100427,1.115782733,1.117643172,1.119719213,1.12024187,1.118694324,1.112449979,1.113851184,1.108425691,1.104528295,1.103950625,1.114296804,1.118102214,1.134062661,1.14281573,1.152516804,1.163241831,1.168180537,1.176055894,1.188337869,1.181959214,1.196372523,1.202278461,1.209735882,1.213729939,1.216416917,1.202326073,1.232637318,1.218147558,1.214404399,1.223491509,1.232152291,1.234304834 +0.12,0.727328733,0.744119883,0.63537271,0.635815124,0.633347568,0.659543561,0.632300628,0.674820788,0.733220163,0.804302957,0.842945517,0.873393985,0.891406056,0.903370788,0.913936373,0.914229135,0.91604933,0.9319282,0.943329425,0.95196064,0.953495304,0.956409769,0.951290806,0.965808639,0.961864576,0.965280402,0.970442374,0.980372211,0.985688901,0.986862207,0.993814095,1.008081102,1.021677842,1.028463531,1.037675876,1.045662078,1.049197665,1.059389783,1.048106322,1.058308584,1.061568929,1.061050447,1.062528505,1.065663091,1.064015278,1.062968704,1.071434468,1.063838609,1.064998479,1.056926547,1.058183976,1.052410469,1.050222779,1.061876479,1.079888699,1.093549113,1.103455055,1.11279069,1.117263954,1.125671104,1.133213531,1.132136583,1.154296184,1.141415901,1.154939426,1.161661833,1.167010806,1.196724488,1.187802313,1.200160767,1.21104686,1.211451798,1.213185234,1.222367216,1.229947005,1.227428727 +0.13,0.601867127,0.586773483,0.600291418,0.635146605,0.645121482,0.707495856,0.684254478,0.668184034,0.689693157,0.664674857,0.700340081,0.748996,0.828114863,0.888523246,0.926079973,0.949329116,0.958958635,0.944314766,0.952998876,0.962033423,0.962938722,0.959762199,0.96987308,0.961342607,0.973026501,0.974167819,0.977164689,0.983567328,0.977104285,0.981981924,0.974034967,0.989786089,0.990960553,0.995518647,0.996114567,1.00520115,1.010702681,1.007901328,1.015320633,1.015779304,1.021731042,1.017163301,1.021308647,1.024127036,1.022789429,1.015187487,1.014099054,1.021990534,1.002970087,1.000630188,0.990243921,0.997505765,1.012796707,1.035735923,1.051331727,1.072018285,1.083695963,1.08233286,1.085689989,1.098967014,1.091008424,1.098238325,1.126863425,1.134443507,1.130398957,1.145033687,1.152506408,1.156389894,1.160808781,1.167730219,1.171753802,1.176697302,1.184025482,1.190697257,1.193916506,1.203540054 +0.14,0.748886478,0.730068006,0.616407581,0.648475949,0.646272363,0.677748387,0.762755116,0.758991138,0.718126682,0.710406983,0.686522903,0.710485332,0.685580497,0.727819672,0.770873433,0.867372954,0.937301444,0.961584709,0.976990251,0.987841408,0.983628603,0.984615649,0.992312554,0.994464226,0.997010879,0.995940726,1.000981949,1.001100674,0.982449543,0.985647686,0.987429418,0.997894844,1.011496173,0.994963623,0.978200394,0.973162588,0.981309013,0.969742114,0.974289248,0.98953026,0.994711795,0.989358524,0.994100931,0.964802639,0.99856263,0.995508674,0.991980889,0.976675994,0.958807549,0.953772728,0.942155197,0.950045416,0.968090641,0.976174771,1.022999845,1.043522635,1.036042729,1.03888494,1.041200928,1.057821976,1.084040967,1.091453453,1.098481501,1.091168945,1.097286241,1.101914215,1.105847319,1.10876122,1.113515319,1.119597526,1.124727437,1.12849184,1.132505127,1.137228314,1.140367502,1.141837336 +0.45,0.607336366,0.596646638,0.623324487,0.633359331,0.597850415,0.575882228,0.628021282,0.594751274,0.687516034,0.58636833,0.557394492,0.656069409,0.616621563,0.593168102,0.571953128,0.582513912,0.576053971,0.592576076,0.571620533,0.589199281,0.560479749,0.556940451,0.566455539,0.570328001,0.600213825,0.560885072,0.560768733,0.50882076,0.555416408,0.537861252,0.532894881,0.606344007,0.610878136,0.538564205,0.538723307,0.625178525,0.604666708,0.717882192,0.655003663,0.646592943,0.655158454,0.644452545,0.643259285,0.692133312,0.686971344,0.724577433,0.683139874,0.708940322,0.7690132,0.761211383,0.782134994,0.76612838,0.801533421,0.796045685,0.766638276,0.783916686,0.811115154,0.768788868,0.798619042,0.790371328,0.856350716,0.82351104,0.813627623,0.82424673,0.847097865,0.78766966,0.842094283,0.821012753,0.830837675,0.833104706,0.83826088,0.843812904,0.843232431,0.819840247,0.848627137,0.847493043 +0.46,0.612834094,0.615009195,0.630159514,0.583494408,0.579705563,0.587836924,0.584407859,0.593186692,0.653949366,0.647290085,0.569951248,0.571935303,0.568603413,0.593405221,0.527210018,0.567514475,0.574859912,0.582129032,0.564478528,0.56651943,0.578976364,0.586762486,0.549138771,0.614784214,0.564091051,0.555347638,0.512814897,0.566090909,0.540165987,0.537084089,0.544036632,0.543089471,0.53699811,0.600372241,0.608430944,0.633266692,0.608028314,0.65279974,0.645915645,0.633515183,0.65371355,0.654984623,0.662452097,0.680359237,0.682239812,0.588564111,0.718034969,0.594851301,0.585631418,0.695960461,0.696329503,0.780611983,0.599402453,0.734480927,0.797497767,0.609197701,0.851274106,0.828247878,0.79480671,0.846858599,0.851736442,0.884357518,0.745389717,0.685087721,0.667016056,0.822355792,0.864852498,0.901420734,0.830529746,0.950221392,0.898121308,0.869012859,0.935410484,0.879375009,0.881217336,0.885822834 +0.47,0.610298412,0.567974749,0.621728343,0.572176636,0.585935319,0.653759762,0.621083958,0.620812063,0.627082648,0.580066755,0.591531267,0.573102491,0.56874627,0.571112249,0.599337768,0.584192293,0.569085595,0.575663315,0.561855213,0.710263837,0.710851294,0.568877362,0.572090474,0.571443877,0.53223315,0.55437323,0.571911401,0.513109736,0.512072007,0.552348019,0.551398431,0.596140358,0.550251065,0.547603475,0.588527219,0.621597279,0.601051432,0.611600325,0.638869788,0.613537192,0.650396954,0.678336368,0.656103995,0.686207091,0.687841381,0.699109198,0.692686109,0.594178511,0.587822786,0.588240534,0.592290305,0.702290464,0.593046809,0.582072283,0.601803236,0.594065344,0.594705269,0.72603775,0.593915522,0.761696182,0.730290642,0.647770668,0.647858698,0.899885802,0.673907954,0.831964284,0.69483633,0.695154513,0.735000361,0.713838156,0.757331398,0.741037896,0.737003271,0.942975821,0.73229815,0.946013172 +0.42,0.60073815,0.626327768,0.61813395,0.574251234,0.580484144,0.685181134,0.582386464,0.644761016,0.590398177,0.594626572,0.709430651,0.681248513,0.709472343,0.706530202,0.578535759,0.573522119,0.563868564,0.572295752,0.582054736,0.620825486,0.642583142,0.648980006,0.656866793,0.651911177,0.58168907,0.564268089,0.660487807,0.673402173,0.66044355,0.669134937,0.660481677,0.734031654,0.726770451,0.692529089,0.749037481,0.745947944,0.663558491,0.738407542,0.622693142,0.628597232,0.737291338,0.64497676,0.65456268,0.652630791,0.661740611,0.649077517,0.671132223,0.659783562,0.662387181,0.694065635,0.718406339,0.696965382,0.712613526,0.669660214,0.728182562,0.72067191,0.685976444,0.698067333,0.701362823,0.763910845,0.741530624,0.740983602,0.751575781,0.813831228,0.76931737,0.718780727,0.792156343,0.777750759,0.791762693,0.802952022,0.777494449,0.716257194,0.768248485,0.751861294,0.770082398,0.7711934 +0.43,0.595145706,0.60302457,0.619972538,0.646573564,0.577274758,0.581718241,0.588003732,0.656963502,0.693678591,0.640511035,0.695307031,0.60556636,0.568278648,0.697686627,0.556110828,0.571112008,0.579015978,0.579572861,0.588304509,0.549694135,0.643985945,0.570168592,0.564929586,0.57461237,0.5783386,0.667851978,0.563424244,0.560546132,0.662583923,0.677812457,0.571818449,0.642311224,0.510846383,0.611918455,0.614382448,0.61237248,0.607253359,0.621940123,0.646120977,0.623185082,0.607718376,0.639085034,0.654178767,0.649767542,0.682509912,0.680252279,0.730491782,0.676925199,0.722503086,0.726713362,0.721660788,0.751365296,0.749646418,0.787935786,0.788590938,0.766080843,0.752596013,0.782413938,0.792935968,0.809031322,0.796061434,0.814749252,0.805056675,0.80295323,0.810457668,0.796093616,0.812755194,0.803348552,0.75736775,0.810526153,0.803154665,0.806174223,0.764378794,0.805914234,0.80504915,0.80866908 +0.44,0.591431527,0.607661658,0.624825793,0.63701503,0.578334532,0.583249042,0.580143814,0.588152054,0.596243466,0.603155642,0.600711827,0.692051063,0.652601714,0.566131675,0.583052016,0.579646836,0.565504867,0.53172174,0.548281149,0.588025623,0.558883359,0.575720146,0.570710875,0.583884708,0.573714315,0.567342573,0.557573953,0.582681252,0.554120876,0.497941403,0.530849822,0.531323163,0.616521952,0.589070867,0.587647715,0.596157587,0.638708344,0.637172155,0.674264342,0.663362381,0.63765902,0.662241823,0.63234751,0.661836422,0.662733293,0.680349843,0.684638602,0.698176532,0.719272081,0.750880503,0.71800663,0.754956366,0.780647839,0.787337362,0.774210961,0.759398115,0.788684801,0.761406448,0.799091498,0.820348172,0.783862862,0.792193349,0.794269699,0.794422618,0.799149107,0.822964159,0.810804922,0.812912909,0.81598853,0.821613906,0.811475757,0.80634565,0.805055153,0.782942577,0.810187756,0.793903032 +0.09,0.596538035,0.625069312,0.645460278,0.672991228,0.702029468,0.728526636,0.744991217,0.76241932,0.777531009,0.799178424,0.820307472,0.837222501,0.851724551,0.872162823,0.883935997,0.902890579,0.917373302,0.934540538,0.950370294,0.964459243,0.96412249,0.979381885,0.994877952,1.008583257,1.022977279,1.035159106,1.054731139,1.064920984,1.075309081,1.087892623,1.104720544,1.121528798,1.14606314,1.150958531,1.157456098,1.18504402,1.189461314,1.194722754,1.196936276,1.201613689,1.180256059,1.214436328,1.216189046,1.222237731,1.226484867,1.229942503,1.235186629,1.249791667,1.25063787,1.252734132,1.249424579,1.250225376,1.25165446,1.260442893,1.261156695,1.255134293,1.251315625,1.253844092,1.253015676,1.252175585,1.232453444,1.230006834,1.221369727,1.225072441,1.213266955,1.211952449,1.227619884,1.238857421,1.233353471,1.220974435,1.217326201,1.211256508,1.206030585,1.208002138,1.200204997,1.190296262 +0.41,0.619459584,0.627420422,0.61704851,0.680315574,0.676232938,0.6784373,0.603456204,0.699035925,0.671664135,0.671487655,0.681012424,0.675726082,0.672842609,0.707628195,0.717966721,0.655151405,0.564010832,0.595345308,0.594038618,0.627402002,0.593653818,0.631823948,0.646044618,0.599277034,0.628341952,0.655970211,0.62407952,0.648483097,0.658462558,0.647605758,0.661530793,0.671136451,0.672930617,0.683101898,0.689614277,0.678882844,0.681540214,0.672623252,0.752606,0.752673317,0.753770182,0.74938198,0.764383541,0.74295999,0.731723496,0.675362515,0.650845147,0.640671586,0.6573916,0.633689832,0.655195313,0.683538269,0.671070249,0.709917196,0.673618755,0.699074956,0.705009319,0.695062781,0.719316689,0.683813081,0.694908773,0.741490571,0.692571743,0.736891087,0.750672096,0.757822227,0.691738843,0.700604521,0.739444719,0.736910087,0.733084289,0.696290329,0.703985478,0.736943961,0.712480183,0.693505923 From 442ecc31dd5bc7c8c1134ea8b0755f88c0508c2c Mon Sep 17 00:00:00 2001 From: Max Briel Date: Wed, 29 Apr 2026 11:49:16 +0200 Subject: [PATCH 353/389] make sure a new RNG is created for each instance of a stepSN --- posydon/binary_evol/SN/step_SN.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index 09e41ec4ea..ffc0e01d4d 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -257,7 +257,7 @@ class StepSN(object): "sigma_kick_ECSN": 20.0, "mean_kick_ECSN": None, # other - "RNG": np.random.default_rng(), + "RNG": None, "verbose": False } # add core collapse physics @@ -273,6 +273,10 @@ def __init__(self, **kwargs): raise ValueError(key + " is not a valid parameter name!") for varname in self.DEFAULT_KWARGS: setattr(self, varname, kwargs.get(varname, self.DEFAULT_KWARGS[varname])) + self.RNG = kwargs.get("RNG") + if self.RNG is None: + self.RNG = np.random.default_rng() + else: for varname in self.DEFAULT_KWARGS: setattr(self, varname, self.DEFAULT_KWARGS[varname]) From 7cd3974f205fa5ec6e7ffb07cc7e61d2673cbf51 Mon Sep 17 00:00:00 2001 From: Max Briel Date: Wed, 29 Apr 2026 12:06:13 +0200 Subject: [PATCH 354/389] change to whitespace delimiter --- .../Patton+Sukhbold20/Kepler_sc_table.dat | 108 +++++++++--------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/posydon/unit_tests/_data/POSYDON_data/Patton+Sukhbold20/Kepler_sc_table.dat b/posydon/unit_tests/_data/POSYDON_data/Patton+Sukhbold20/Kepler_sc_table.dat index 27ff20a490..e255e53056 100644 --- a/posydon/unit_tests/_data/POSYDON_data/Patton+Sukhbold20/Kepler_sc_table.dat +++ b/posydon/unit_tests/_data/POSYDON_data/Patton+Sukhbold20/Kepler_sc_table.dat @@ -1,54 +1,54 @@ -"# Patton & Sukhbold (2020, MNRAS)",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -#,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -"# s_c, the central entropy per baryon in units of K_B (Boltzmann constant), evaluated at the presupernova stage (needed for example in the Maltsev+2025 criterion)",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -# for KEPLER models of a given CO-core mass (columns) and initial carbon mass fraction (rows),,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -#,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -# All masses are in units of Msun,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -#,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -X_c,2.5,2.6,2.7,2.8,2.9,3,3.1,3.2,3.3,3.4,3.5,3.6,3.7,3.8,3.9,4,4.1,4.2,4.3,4.4,4.5,4.6,4.7,4.8,4.9,5,5.1,5.2,5.3,5.4,5.5,5.6,5.7,5.8,5.9,6,6.1,6.2,6.3,6.4,6.5,6.6,6.7,6.8,6.9,7,7.1,7.2,7.3,7.4,7.5,7.6,7.7,7.8,7.9,8,8.1,8.2,8.3,8.4,8.5,8.6,8.7,8.8,8.9,9,9.1,9.2,9.3,9.4,9.5,9.6,9.7,9.8,9.9,10 -0.05,0.610768691,0.629214872,0.652130574,0.679378435,0.713697783,0.74581048,0.766641043,0.792775501,0.814823111,0.836142529,0.859851158,0.886006531,0.912686043,0.932691598,0.957916148,0.969091329,0.99016173,1.010252072,1.028069634,1.051504705,1.075993752,1.089255614,1.111628723,1.119726359,1.14275482,1.161087743,1.18040405,1.197066773,1.216365632,1.214596008,1.229566027,1.235289616,1.238242492,1.24917912,1.245350981,1.220772176,1.21836697,1.210971843,1.187712915,1.171558872,0.91886142,0.86374049,0.865662993,0.870884007,0.661530736,0.673704051,0.678886681,0.688039343,0.696985998,0.702601761,0.711639237,0.721744358,0.731312803,0.734804539,0.744305905,0.754773775,0.76451156,0.77518963,0.78722218,0.795089722,0.806110319,0.815227124,0.825915333,0.835420584,0.845608485,0.860265491,0.868023291,0.875491152,0.88321075,0.890889423,0.89890877,0.905702072,0.918266901,0.925577573,0.93295046,0.937262003 -0.06,0.605510653,0.623915014,0.645836118,0.669321322,0.711392924,0.733214322,0.757603034,0.779210939,0.809051813,0.827016041,0.853383266,0.876592594,0.900028228,0.917641138,0.940458175,0.955522327,0.953821922,0.970036773,0.980775063,0.993971811,1.018976141,1.059055157,1.059484498,1.091019601,1.128510811,1.148597138,1.169798336,1.182814096,1.193163283,1.204827891,1.218106081,1.216802697,1.223924857,1.232778163,1.233200008,1.241112042,1.242004225,1.234769423,1.215049219,1.215025812,1.201259291,1.183634618,1.171101742,1.155320234,1.108348597,1.096416255,0.977886043,0.921079589,0.677173147,0.682344755,0.692446217,0.700938994,0.704854752,0.714058995,0.721762359,0.73015152,0.734381046,0.743366991,0.753205934,0.76265074,0.772110114,0.782041086,0.792809845,0.805655556,0.816805382,0.825751237,0.837665069,0.841273076,0.833332233,0.841220896,0.848222083,0.860692799,0.868035718,0.875329517,0.882247869,0.890472758 -0.15,0.728703373,0.741488304,0.743411687,0.766181023,0.613251415,0.654098815,0.706728262,0.710525257,0.645557443,0.792594011,0.782761187,0.727139362,0.714101691,0.710218882,0.688158065,0.697339026,0.764769326,0.81681644,0.891546699,0.999853931,1.00023813,1.014926909,1.022942369,1.009845222,1.010410148,1.013922446,1.015498105,1.014668779,1.015341347,1.019183579,1.027168877,1.028267606,1.023165366,1.002707222,0.996271088,0.999200651,1.000902452,0.990751311,0.981018618,0.961410751,0.959386139,0.960218557,0.996352029,0.949127941,0.967258548,0.946368996,0.952897947,0.946629509,0.92697324,0.958720712,0.946238579,0.940932286,0.947880852,0.933168069,0.989886803,0.994774084,1.013139995,1.00647957,1.018824226,1.041982809,1.056247591,1.054407715,1.03772044,1.046278875,1.047502012,1.04529673,1.044989069,1.054270488,1.055515471,1.061478717,1.074239667,1.074599382,1.080888843,1.082550062,1.085902628,1.086620885 -0.16,0.599633585,0.611961543,0.625996328,0.633822125,0.615217121,0.68483262,0.741640804,0.619520461,0.689847198,0.682656235,0.637590107,0.80817751,0.83878263,0.760413159,0.739164805,0.700305141,0.712754622,0.677125565,0.730130902,0.780742243,0.843040634,0.977177974,0.993821747,1.023210575,1.045642263,1.049752601,1.045145577,1.036772519,1.038826626,1.040209459,1.039261589,1.042671897,1.0474753,1.042759345,1.044256182,1.038306369,1.029397954,1.029626247,1.003515831,0.983398453,0.968150634,0.962061126,0.943464758,0.938685426,0.980288044,0.93565932,0.932571021,0.925900812,0.924422837,0.91899856,0.919840663,0.909938799,0.908222729,0.884624715,0.947441916,0.935440271,0.959698716,0.978727859,0.985858279,0.994486455,0.916248277,1.025814764,0.987339092,0.93338029,0.99845715,1.003853643,0.997222447,0.999187517,1.010113832,1.017798073,1.021035711,1.020547659,1.012971681,1.023295175,1.018392363,1.02134024 -0.17,0.587725025,0.612759,0.627221458,0.646763752,0.681311163,0.710167506,0.721270885,0.699205477,0.696677518,0.715640212,0.624307784,0.749942997,0.65038581,0.732325339,0.875772174,0.789570186,0.747227081,0.688299955,0.70436639,0.659003087,0.701630785,0.757770746,0.813137437,0.851168643,0.993620809,1.025745324,1.049771566,1.071080624,1.078912683,1.068253829,1.06231945,1.065611582,1.064376071,1.061958916,1.057772624,1.054217852,1.048283199,1.050983592,1.045242996,1.032177621,1.020595686,1.001124084,0.969305095,0.965945212,0.954382256,0.927264762,0.922587195,0.967355137,0.92057521,0.931032706,0.897565613,0.903844817,0.894341806,0.886701797,0.922287303,0.925330893,0.920176669,0.927682868,0.93509453,0.930533478,0.912689298,0.906929262,0.927766559,0.934492348,0.935035565,0.940913949,0.93153897,0.929876437,0.925307186,0.915233431,0.928474516,0.952779735,0.958731999,0.924558995,0.923206804,0.934589435 -0.18,0.714812461,0.692773794,0.613792284,0.630027041,0.649855255,0.672508811,0.701349874,0.728603143,0.724875224,0.742257278,0.811857801,0.770264626,0.656872767,0.699842862,0.646901719,0.764874888,0.913510515,0.89138468,0.792259055,0.730158077,0.689693931,0.639964685,0.67411517,0.727404807,0.770459075,0.821487178,0.863029641,1.059560295,1.035655298,1.076871488,1.101405818,1.1066164,1.101483525,1.087786831,1.093537301,1.081583575,1.071869165,1.0671787,1.062486977,1.051066843,1.042141229,1.049765835,1.028267987,1.026518791,1.000759463,0.991332417,0.963493146,0.940345205,0.947860654,0.903517802,0.9009087,0.914452068,0.883628099,0.876459656,0.88037106,0.868060338,0.875999065,0.894374463,0.901717925,0.893990531,0.901202933,0.865691672,0.860992171,0.855043814,0.857375624,0.862012287,0.870245295,0.864464627,0.869944295,0.868347402,0.871126038,0.875259993,0.877083873,0.880593155,0.884207058,0.890785358 -0.19,0.727233715,0.743851809,0.76354611,0.760753509,0.617168234,0.61794141,0.650806325,0.660348827,0.706062145,0.707048881,0.74496703,0.764045885,0.784318085,0.785524333,0.670872529,0.708017104,0.632780578,0.807783283,0.924338934,0.906389152,0.7833206,0.750296728,0.677112811,0.705436654,0.683518706,0.706021226,0.740130761,0.790800401,0.846049857,0.882190769,0.994632623,1.055943214,1.094053795,1.108537171,1.123517082,1.114169814,1.101315029,1.103504987,1.098985184,1.076504483,1.075215846,1.065854465,1.057549715,1.039080143,1.040481551,1.043411307,1.011084281,0.9946586,0.982224421,0.975246055,0.922378203,0.921905954,0.890951127,0.851420352,0.879906609,0.853852975,0.84432161,0.847062915,0.864089848,0.864962826,0.881890994,0.847187889,0.826110122,0.815214058,0.807663401,0.810570517,0.8103254,0.827159101,0.815621849,0.825291956,0.826375372,0.833898273,0.838969986,0.844355918,0.851350684,0.856840041 -0.2,0.725408675,0.665036581,0.660357254,0.72321987,0.676935978,0.607083394,0.737230097,0.627402677,0.642831359,0.638348081,0.650153976,0.696334225,0.697186155,0.715268179,0.730252938,0.815231584,0.812987491,0.794369068,0.637120215,0.66280771,0.862751357,0.924217324,0.919134428,0.74458322,0.688406117,0.699657403,0.638443575,0.66110335,0.718083155,0.754260088,0.797524686,0.833732443,0.943479358,1.037992689,1.084115839,1.136359028,1.13136764,1.131865793,1.115464271,1.120548625,1.110858932,1.100940163,1.08511353,1.074885521,1.072853982,1.063516903,1.053632589,1.035061315,1.040954895,1.016377375,0.987752848,0.963146375,0.951000966,0.899426588,0.885562717,0.858724861,0.838486966,0.83842367,0.82286416,0.825247071,0.836047606,0.816389719,0.803362609,0.750579898,0.770668116,0.771567862,0.775730331,0.782189531,0.764858975,0.753347005,0.785706695,0.810970859,0.815701883,0.825304187,0.830636744,0.833193849 -0.21,0.735126773,0.744628837,0.645749284,0.654571107,0.659779622,0.676540063,0.69309537,0.686906054,0.692523999,0.713091576,0.697731622,0.714895199,0.72855382,0.672382652,0.68018181,0.670527191,0.700748121,0.721272835,0.828538225,0.819732078,0.77269786,0.670726498,0.830413287,0.862263732,0.914938654,0.751235882,0.77395706,0.691449011,0.673080647,0.641296124,0.680259896,0.702148518,0.743657283,0.81745519,0.847451739,0.927289367,0.968268163,1.10271581,1.160478325,1.156932162,1.106469019,1.112365303,1.124255286,1.12093272,1.122682189,1.105946567,1.107622071,1.07231254,1.059866214,1.057039918,1.029399634,1.037075677,1.015201954,0.969069512,0.970802023,0.949553777,0.915996532,0.828294009,0.829624809,0.811956314,0.796417264,0.795673675,0.820751574,0.823976182,0.814909962,0.742422034,0.745382346,0.74915411,0.734188658,0.71282445,0.715909514,0.729040972,0.74339648,0.752799785,0.715557119,0.703158514 -0.22,0.701398866,0.711386416,0.726749635,0.675935837,0.692545086,0.613977848,0.653415306,0.693918532,0.698899073,0.70752421,0.698111522,0.631634111,0.630324906,0.633126497,0.635687214,0.643507131,0.646162186,0.654918893,0.754520876,0.694397342,0.709439984,0.746461911,0.813749933,0.627419073,0.803238027,0.768233454,0.946523224,0.924993001,0.829934978,0.692961439,0.683272168,0.622423238,0.659676979,0.693452996,0.694382079,0.720235104,0.811223938,0.826530647,0.850492336,0.973606635,1.098183492,1.170232748,1.178672548,1.120467503,1.107065636,1.115182021,1.118926609,1.099597647,1.121216982,1.11167808,1.08538358,1.077721256,1.051007097,1.045073783,1.02819266,1.012672673,0.965328456,0.96519974,0.939342945,0.841751651,0.837567496,0.802709817,0.799928885,0.799525233,0.802391004,0.797193407,0.72400731,0.709400902,0.71011076,0.68167114,0.690300333,0.705918457,0.696770802,0.695384452,0.706007033,0.709845331 -0.23,0.658451411,0.658211544,0.72008665,0.663961997,0.608773249,0.767288307,0.750697968,0.721680885,0.723213208,0.708280227,0.647791405,0.677654161,0.651894377,0.669186928,0.653146245,0.616553276,0.603232839,0.599819042,0.690478821,0.698952129,0.715817204,0.664047424,0.660235423,0.756301266,0.810886066,0.89325317,0.815302286,0.803072628,0.947570826,0.925897138,0.747721421,0.696804569,0.682187708,0.740896246,0.638532656,0.672612467,0.706223969,0.681518374,0.732676513,0.808662416,0.85616011,0.889549038,1.024724837,1.068332024,1.18598479,0.992473428,1.034451038,1.09827728,1.112214288,1.12912739,1.109564791,1.105677334,1.111320494,1.097623584,1.085324496,1.054961066,1.046582892,1.037505401,1.015485476,1.000589101,0.954740459,0.920999465,0.90826714,0.802312534,0.775737812,0.761084778,0.770015126,0.778706811,0.698187162,0.696664823,0.669757003,0.672539602,0.670864418,0.677396089,0.683695123,0.696839995 -0.24,0.704386171,0.708339231,0.703784872,0.676793868,0.703329384,0.702250478,0.716516172,0.699388092,0.701383125,0.610823047,0.645956098,0.728628556,0.678827012,0.647876043,0.646526662,0.639506743,0.662445226,0.652024836,0.713104442,0.699785106,0.675601315,0.670440501,0.60670898,0.635678117,0.592668839,0.667837807,0.709553617,0.781214981,0.67871891,0.738804204,0.817301997,0.954952508,0.807959618,0.691695008,0.689354743,0.594279444,0.6478417,0.695044656,0.733582623,0.712450562,0.75624058,0.804116146,0.813306826,0.867075469,0.906719598,0.947998439,1.103944855,1.171471978,0.944103579,0.991219219,1.022312779,1.138247345,1.120713222,1.122846631,1.120523415,1.104092606,1.090414107,1.092920718,1.072445562,1.043424124,1.041582503,1.009936191,1.019911548,0.937973455,0.903119754,0.889136115,0.792004575,0.758036277,0.740187954,0.758494189,0.754387651,0.682106069,0.666932574,0.667560261,0.670734494,0.673272902 -0.07,0.602024189,0.622541816,0.641925427,0.661061987,0.682199475,0.71608768,0.736130711,0.756423012,0.78220097,0.805954179,0.833453975,0.850680206,0.873652473,0.895387393,0.919000237,0.936650553,0.956749168,0.958428265,0.976431461,1.00027234,1.014072395,1.037385533,1.061917497,1.074569321,1.100016978,1.119481309,1.138185408,1.15516439,1.177634754,1.191928795,1.212483174,1.229613407,1.245076232,1.250715207,1.268432907,1.259737306,1.245551569,1.249007368,1.249760592,1.24559669,1.221035129,1.064478441,1.132249041,0.958213568,0.877971319,0.85894617,0.858601039,0.861637054,0.85968838,0.854605375,0.866231732,0.666231413,0.678038778,0.681786241,1.241645492,1.248384477,1.251460329,1.241026878,1.230966744,1.222895047,1.203731852,1.210402905,1.204245193,1.199608974,1.196047686,1.159717642,1.144563403,1.150349404,1.135195411,1.14361162,1.145764216,1.146450762,1.144878776,1.141819996,0.848542549,0.848886815 -0.25,0.716741845,0.71652531,0.730556964,0.732498272,0.692143561,0.694080449,0.69078604,0.69228101,0.699390694,0.703209284,0.72939904,0.695670576,0.681784049,0.711635967,0.723680634,0.682729749,0.730438536,0.731000471,0.724743182,0.736726756,0.733173765,0.746577822,0.701202452,0.705390591,0.656166652,0.720975792,0.712413235,0.668007289,0.680940446,0.674063711,0.727474074,0.753429634,0.789417914,0.991797448,0.854183853,0.748466602,0.669532971,0.673957414,0.610258737,0.666440811,0.700366833,0.744776875,0.738482906,0.785075386,0.852227779,0.85522408,0.902952106,1.000174571,1.073474871,0.862423364,0.918155396,0.97555319,0.976700043,1.02506644,1.050052472,1.149103718,1.128975822,1.125965798,1.120895941,1.116517754,1.105770505,1.099405256,1.069334411,1.033345557,1.011322467,1.018202499,1.000461303,0.914618633,0.875836395,0.851416431,0.727269031,0.734557216,0.750873739,0.787126288,0.737978366,0.714128365 -0.26,0.704446971,0.721169831,0.712893113,0.70820766,0.679560191,0.704907958,0.715057514,0.6918948,0.701139001,0.691232777,0.709673416,0.709262094,0.68306829,0.684419024,0.68679468,0.697990159,0.707121228,0.683780982,0.711374617,0.71063618,0.695620696,0.606977989,0.622181006,0.619561259,0.621536638,0.622779289,0.771995804,0.78320893,0.707279074,0.662875209,0.720812834,0.685710167,0.589247753,0.713615703,0.818133775,0.792878401,0.981497744,0.772903203,0.730205992,0.694643687,0.677360268,0.677080113,0.684114393,0.664199935,0.73483551,0.768444583,0.787001033,0.857254563,0.849327118,0.951819288,0.932847798,1.084784336,1.148996543,0.890544193,0.923256639,0.900231496,0.999316417,1.055970225,1.132200398,1.112469449,1.124044788,1.105739561,1.109378055,1.108443987,1.10150171,1.038735213,1.006590658,1.002410311,1.017222984,1.006555199,0.982159368,0.854080981,0.847835274,0.818685493,0.741078607,0.778403357 -0.27,0.688226045,0.701539399,0.712657602,0.661800295,0.670031133,0.691022283,0.712173324,0.692649489,0.710674744,0.698398626,0.688772972,0.713615637,0.72435416,0.729662961,0.701634315,0.646965586,0.71565246,0.721869439,0.715653875,0.727152061,0.714700927,0.717324645,0.665248254,0.639488288,0.636178219,0.644493515,0.64601868,0.648726091,0.644032369,0.640182839,0.640841862,0.817062924,0.776765747,0.702299277,0.726177613,0.63312702,0.608764391,0.7215841,0.981807613,0.898267736,0.742523874,0.724872391,0.650384957,0.702511296,0.629969494,0.702341296,0.739845968,0.741604625,0.784942608,0.802600102,0.870100039,0.817238257,0.89899934,1.016697398,1.035264925,1.149570449,0.877201696,0.934245767,0.911914938,0.991560878,1.001912353,1.051156303,1.133744782,1.120559077,1.119935266,1.119528917,1.107158387,1.096679434,1.052955993,1.04359871,1.013702736,1.005226334,0.986061548,0.981708933,0.7869379,0.765596838 -0.28,0.672400487,0.699112825,0.685701712,0.669767785,0.666571176,0.677358191,0.625984675,0.63773839,0.640121294,0.626375525,0.618917875,0.623809699,0.662786939,0.62531922,0.636898952,0.623660535,0.63247957,0.635609554,0.655551349,0.646794358,0.655720321,0.686448527,0.671620193,0.674195655,0.681607371,0.675076191,0.695447545,0.692585797,0.686230035,0.692869765,0.69023029,0.665855773,0.662909085,0.671751978,0.677744297,0.657616546,0.800889951,0.807214346,0.713211034,0.629941479,0.788112764,0.969053516,0.79111148,0.75100382,0.717263475,0.671586018,0.615275618,0.643065338,0.729574481,0.663084923,0.766393673,0.807956292,0.822326966,0.901237829,0.830933972,0.890279973,0.931649158,1.091177171,1.091282775,1.115811277,0.900489272,0.978653314,0.977942181,1.009150729,1.031709844,1.026037788,1.049355651,1.138773643,1.124070638,1.110063079,1.092999279,1.090880674,1.058046955,1.015677503,0.985555346,0.980169381 -0.29,0.665453455,0.680790969,0.706939162,0.594713365,0.673527984,0.645034799,0.700104705,0.633307581,0.588352435,0.613282962,0.642647562,0.618123238,0.623913884,0.625743984,0.624161598,0.631020458,0.628384829,0.652071695,0.64106055,0.669700957,0.657876721,0.724868778,0.670861482,0.72798338,0.66871124,0.672119399,0.678860744,0.67551983,0.7724433,0.708646697,0.712679666,0.709883458,0.711452031,0.706935443,0.740712788,0.745365346,0.692741748,0.739111822,0.68351506,0.690338961,0.862242494,0.825828372,0.757635129,0.798618098,0.999407334,0.740818563,0.729327934,0.586937662,0.726740225,0.624854326,0.655861258,0.747535055,0.73605682,0.765121481,0.827010749,0.84183159,0.867000758,0.850370762,0.902490409,0.931232089,1.024361918,1.072452066,1.164462837,0.895891475,0.903569584,0.907620365,0.923169243,0.978376152,1.013577895,1.018344139,1.078516969,1.149707585,1.11546471,1.1064485,1.096717667,1.092731707 -0.3,0.601742495,0.603479351,0.625129097,0.684184559,0.636908287,0.696402014,0.69426112,0.629387991,0.710284152,0.654474783,0.723289138,0.597115699,0.624999849,0.730114118,0.65000875,0.661914733,0.706213782,0.698087305,0.667790691,0.752302519,0.657779234,0.656482567,0.758328733,0.765503764,0.677809254,0.778296252,0.782668806,0.799847207,0.799127183,0.808777483,0.696221926,0.849511672,0.745400241,0.787214935,0.792843381,0.822588308,0.716610653,0.727747945,0.767964028,0.77352834,0.769325662,0.775351453,0.712933338,0.716076188,0.863077702,0.907653407,0.899411478,0.707095793,0.720794209,0.578051347,0.64708457,0.715991872,0.644705111,0.663647839,0.693140744,0.759587089,0.792349194,0.830673659,0.852019003,0.870533958,0.848837912,0.880728817,0.925043699,0.982958649,1.053823489,1.150515811,0.897477284,0.890299938,0.916569743,0.924511122,0.958726464,1.00533473,1.004704377,1.047265598,1.066599926,1.167767699 -0.31,0.691325178,0.688663832,0.628669891,0.65491838,0.663987843,0.751553439,0.688352662,0.702859954,0.729196245,0.71441199,0.699700676,0.740500318,0.751189599,0.722165374,0.712277933,0.755404786,0.657165038,0.675756012,0.688696872,0.710015829,0.741099345,0.726088897,0.738567843,0.741869568,0.735708132,0.752197278,0.721989435,0.773039511,0.790930818,0.798099672,0.772176986,0.763454064,0.814542629,0.788119697,0.800648491,0.86548908,0.900786694,0.915652909,0.885149524,0.916602087,0.743414226,0.724258559,0.776407177,0.769619242,0.783242734,0.785181673,0.778085288,0.745941384,0.931431459,0.776349218,0.6841201,0.6477042,0.707736854,0.655150727,0.655398181,0.669597053,0.684718985,0.699750704,0.707376361,0.789209972,0.835426534,0.866383149,0.932554222,0.86486251,0.920933216,0.924261736,1.002879887,1.029418745,1.059004797,1.177111327,0.883100827,0.904485439,0.907080739,0.950152868,0.98376019,0.988611552 -0.32,0.614205464,0.707685564,0.695794145,0.62714604,0.66354386,0.66760916,0.669178508,0.712956905,0.67331129,0.71034524,0.741519961,0.725952266,0.747104891,0.750470076,0.758894629,0.771347977,0.778942132,0.780919574,0.790540829,0.668344354,0.736686777,0.692279822,0.755144229,0.749198723,0.728248001,0.733540697,0.721989109,0.72605721,0.724460508,0.731752048,0.773062974,0.764405706,0.709526184,0.697809301,0.775846911,0.775440096,0.763850399,0.731742253,0.850527843,0.846444996,0.904891414,0.822097352,0.807234695,0.927121489,0.956917325,0.941331298,0.871427455,0.942177727,0.786615297,0.762742709,0.803596724,0.785857527,0.781854357,0.719171507,0.629905105,0.708443564,0.65697022,0.708995178,0.718098798,0.78044221,0.781739715,0.8154921,0.868462144,0.870102287,0.870338506,0.878094373,0.886983713,0.878299735,0.89785296,1.005292509,1.002907939,1.021172004,1.16909946,0.8985822,0.912158462,0.946479683 -0.33,0.618420958,0.627870203,0.653063536,0.675510681,0.654044285,0.6865992,0.657468191,0.618668143,0.690746854,0.701296762,0.724371023,0.677683994,0.721116581,0.733218909,0.746587992,0.728400247,0.733639341,0.744518313,0.646803952,0.765147657,0.773164938,0.766223764,0.757983877,0.742250963,0.794378482,0.754158674,0.697215021,0.684813648,0.751123424,0.755727298,0.696574592,0.682785986,0.694155016,0.688118193,0.716716827,0.765746155,0.754270772,0.738291004,0.719440101,0.770212775,0.757561602,0.745670819,0.765796057,0.766801745,0.749333244,0.674019385,0.877433771,0.73322129,0.746184313,0.899737179,0.940869412,0.950801596,0.806305219,0.796186736,0.786324364,0.763002814,0.92241866,0.612922368,0.674136589,0.616622786,0.717908227,0.73568542,0.778011254,0.789131949,0.856289482,0.874952745,0.87987338,0.836837514,0.856067715,0.897723723,0.923809497,0.984182292,0.937990451,0.986306689,1.051171448,1.093657488 -0.34,0.623976778,0.62587934,0.61653257,0.688538716,0.644632417,0.642128912,0.683704788,0.682506137,0.610627814,0.694173297,0.666782693,0.622050799,0.604578851,0.716472335,0.746469824,0.638293309,0.645003997,0.644799494,0.648254115,0.567809208,0.685201096,0.525021296,0.642873748,0.650244212,0.657518189,0.622598744,0.671567179,0.529157179,0.62072265,0.678586252,0.72577096,0.674728141,0.631530444,0.617052654,0.620691192,0.687220199,0.630240305,0.630452424,0.641107476,0.676193963,0.638672301,0.612295257,0.636129398,0.62392038,0.692508496,0.627869713,0.642512681,0.652907644,0.593657452,0.71965915,0.745270716,0.736428925,0.750084732,0.716931971,0.738495415,0.922615601,0.943732058,0.820328149,0.823466355,0.83462419,0.908485964,0.625104623,0.713549408,0.722603766,0.742024454,0.767882723,0.779294859,0.812431058,0.892380516,0.88509637,0.815386939,0.881032787,0.997350749,0.964831098,1.013619774,1.068314726 -0.08,0.59946483,0.62466518,0.64115396,0.666850459,0.696117432,0.717627097,0.74087016,0.760716683,0.781089846,0.804275977,0.824570017,0.846120295,0.864545464,0.885557237,0.909352477,0.929262528,0.947116448,0.96286081,0.967209603,0.985834674,1.003689012,1.017730036,1.032072324,1.050534615,1.066174999,1.075637777,1.101602666,1.117614083,1.134563868,1.147788913,1.159258849,1.177976364,1.196524108,1.224050591,1.241773981,1.2656591,1.261187443,1.281158465,1.285816865,1.205875674,1.290542215,1.308435172,1.322762129,1.318352314,1.299106093,1.274909095,0.989418035,0.932090919,0.853466599,0.846094087,0.838995432,0.872481261,0.889740226,0.980815859,1.300537907,1.238393931,1.239621232,1.239771997,1.237183433,1.236921163,1.232863391,1.234718774,1.228788064,1.221935878,1.223619154,1.207667074,1.193440516,1.201778314,1.200433475,1.198735584,1.192203771,1.174757501,1.146414208,1.128386521,1.130287695,1.140840156 -0.35,0.586546748,0.607600414,0.607399902,0.669907955,0.684005414,0.64703291,0.649272715,0.630045833,0.601904461,0.729417362,0.618297752,0.515615925,0.580925389,0.61044274,0.616127515,0.620558943,0.572541324,0.632188649,0.559202322,0.600559192,0.586677533,0.569775981,0.568757384,0.576966256,0.520147011,0.594659399,0.599512181,0.605220512,0.57553778,0.605152804,0.615698444,0.619697916,0.612602067,0.600065335,0.603638,0.56298872,0.604585971,0.611899561,0.611178798,0.647747727,0.598559372,0.633526481,0.599600157,0.656361564,0.651926498,0.664686262,0.60981849,0.617762614,0.61341751,0.555815623,0.615874037,0.65835662,0.64653035,0.65905679,0.680581211,0.690945613,0.680076286,0.682605054,0.702400325,0.772802111,0.929631961,0.976024507,0.960294838,0.975519411,0.749963603,0.66803794,0.676488555,0.747025381,0.76863084,0.77448973,0.812510063,0.863798763,0.88958003,0.85217883,0.871008384,0.926671707 -0.36,0.582105319,0.620203525,0.595675597,0.615235919,0.676602818,0.672769088,0.596384146,0.576457871,0.580546927,0.582846099,0.552126541,0.559349196,0.548369111,0.5261487,0.599726462,0.589684705,0.527610786,0.569816597,0.575722989,0.570861575,0.574357161,0.570810207,0.549642555,0.59310751,0.575570652,0.59335692,0.584586369,0.598704264,0.615098178,0.60313227,0.618614596,0.569811241,0.618544278,0.600811,0.62189145,0.571429572,0.639655083,0.611037605,0.62484862,0.606930767,0.612233416,0.615039493,0.621304805,0.627376886,0.625727875,0.630269726,0.625080346,0.634116147,0.628572679,0.636574382,0.644269025,0.63270565,0.632616816,0.639173439,0.638830095,0.633455233,0.634583351,0.619583561,0.628239559,0.668302574,0.611548543,0.671348449,0.718132776,0.697446449,0.657728717,0.958350298,0.920179034,0.735842592,0.614291609,0.689014849,0.74422803,0.767892257,0.762852671,0.769424911,0.828432998,0.93618781 -0.37,0.595585147,0.636937671,0.657249378,0.679226954,0.667798139,0.655206629,0.668939678,0.655475066,0.671308595,0.614524282,0.535319893,0.55504848,0.683033358,0.539833072,0.55870436,0.562571851,0.565393616,0.536482482,0.564631318,0.564938191,0.59469886,0.577244259,0.570163352,0.569247941,0.543088035,0.583966998,0.602551167,0.554973551,0.550199982,0.604915511,0.629014402,0.613003129,0.605794144,0.62393946,0.618766164,0.616079625,0.60759177,0.626396291,0.65414182,0.629547263,0.64062036,0.643858075,0.652604389,0.64197826,0.638830882,0.631812979,0.659330719,0.656659297,0.645210329,0.669227771,0.655328236,0.647500022,0.656614308,0.659339843,0.664816609,0.65145111,0.662379913,0.659529067,0.666568386,0.649028098,0.646494806,0.656478324,0.644835012,0.642713687,0.619904512,0.62572982,0.641212543,0.655696138,0.653825495,0.748785114,0.665796842,0.660176664,0.631278907,0.70862235,0.763453757,0.754959809 -0.38,0.592833011,0.704818609,0.594451338,0.658198188,0.668121997,0.591102385,0.666120909,0.657161686,0.615719669,0.688786141,0.667952525,0.707683138,0.544112818,0.683055676,0.582407709,0.543954131,0.541405034,0.570448258,0.540448955,0.579295201,0.548562967,0.499830947,0.559108226,0.554845749,0.593442613,0.60473461,0.603224553,0.607367833,0.567599805,0.620938273,0.618081364,0.624898044,0.620198135,0.623372126,0.619234557,0.651889823,0.629775501,0.623686401,0.653599589,0.651741813,0.664812911,0.655072947,0.676042183,0.662819006,0.641532248,0.654926284,0.67356215,0.679385573,0.682306518,0.676609435,0.691135016,0.687256563,0.686095296,0.688552052,0.694754543,0.691794814,0.683760299,0.691281868,0.705116343,0.697870762,0.692574116,0.685269471,0.690198214,0.670911463,0.672783196,0.679814919,0.685106172,0.665107309,0.660139545,0.661559698,0.633551932,0.636501406,0.611955303,0.616952102,0.600244953,0.62973723 -0.39,0.624291332,0.63520331,0.578243162,0.588527991,0.600472857,0.601013841,0.601208169,0.601262058,0.609480317,0.69054831,0.656203602,0.701464526,0.718004324,0.55820416,0.718117702,0.695073883,0.554740013,0.561492885,0.555177719,0.582089784,0.60732467,0.549873952,0.604656355,0.561358873,0.585205693,0.570703292,0.620189898,0.626415045,0.617631104,0.606474154,0.626300549,0.641229123,0.646901938,0.654754546,0.653074986,0.658729884,0.65782185,0.654535819,0.687855468,0.66593057,0.672567539,0.667623129,0.678930234,0.679406631,0.69220033,0.684917985,0.737824713,0.701119696,0.760717056,0.760219946,0.744243189,0.728124662,0.725514724,0.759910968,0.624294121,0.737241282,0.708364815,0.620809946,0.748937777,0.713320022,0.717672944,0.627949035,0.712905968,0.626627608,0.620764261,0.710674989,0.64517188,0.71513794,0.61342383,0.710509047,0.708874684,0.697725623,0.689418015,0.684364332,0.678473755,0.669688182 -0.4,0.617765296,0.595676994,0.606912037,0.67214894,0.592497339,0.667369494,0.643868999,0.59998374,0.673551406,0.689739178,0.664077633,0.687559775,0.696867061,0.697273763,0.681616294,0.659918141,0.653705494,0.659734005,0.57599348,0.538519658,0.596516224,0.613670139,0.568928627,0.632861642,0.615991865,0.647841019,0.611644164,0.621488961,0.653212381,0.652318303,0.656461107,0.653763842,0.64365145,0.648935696,0.660257686,0.671203667,0.670128164,0.677656963,0.678827035,0.667452846,0.683359575,0.678396317,0.693144951,0.702615992,0.703784185,0.665034304,0.729831262,0.741024168,0.624720043,0.637620309,0.623404555,0.734424222,0.654081735,0.658170985,0.636684359,0.630465348,0.653744027,0.64278867,0.649967738,0.658764968,0.681495753,0.674167519,0.666158069,0.664750747,0.656104729,0.648324144,0.675399808,0.651204948,0.683961375,0.631396311,0.645780133,0.625066493,0.624758761,0.621272983,0.751337806,0.773827184 -0.48,0.564871885,0.618157026,0.56983434,0.620567824,0.593076248,0.62667109,0.616667607,0.578653642,0.626996906,0.569953012,0.598133422,0.541354529,0.525511475,0.59338106,0.531979281,0.572112955,0.569999358,0.563659317,0.578363514,0.711357457,0.571104433,0.570808825,0.571212983,0.564056038,0.547238396,0.54173214,0.565230028,0.53993908,0.585180219,0.57365615,0.545622746,0.58699044,0.547747906,0.535047603,0.57845033,0.633419506,0.616053038,0.646312429,0.644428056,0.65497233,0.635782687,0.662241118,0.675308138,0.66822929,0.687769251,0.592535892,0.699682213,0.590381302,0.59477312,0.593390421,0.580520358,0.598022044,0.592623865,0.586044036,0.584743662,0.590352781,0.585628542,0.586064491,0.616298276,0.607514771,0.769014329,0.771914569,0.64082694,0.775994775,0.75132219,0.652609621,0.68170686,0.674776472,0.6851653,0.686685581,0.705217064,0.712118938,0.75410904,0.766109716,0.758109419,0.78672955 -0.49,0.558841673,0.654356753,0.612012669,0.614411561,0.60257284,0.600968786,0.651718826,0.556500512,0.56282105,0.565140434,0.559060181,0.532172237,0.54612094,0.571170876,0.565051531,0.571714805,0.570050173,0.584659598,0.569861418,0.690101768,0.576516388,0.603658865,0.564024481,0.577077442,0.550960302,0.530642723,0.542788292,0.588029293,0.579490949,0.571823482,0.58723218,0.594129322,0.543524808,0.550644479,0.624449113,0.615045467,0.626085205,0.626916069,0.650367095,0.665218934,0.673521462,0.677132101,0.681014716,0.690095369,0.692805358,0.592479582,0.579041264,0.713596152,0.586624196,0.595784275,0.591513299,0.599595623,0.600664767,0.588217105,0.599090703,0.599844626,0.586037322,0.596935039,0.592559586,0.598022731,0.584413348,0.615564674,0.772309413,0.597564227,0.608722883,0.641022628,0.662570487,0.662232783,0.671345521,0.676524351,0.699929379,0.695369357,0.706922255,0.726102911,0.768779755,0.769635352 -0.5,0.562448457,0.565796802,0.631249643,0.652590714,0.575723906,0.648310924,0.56764643,0.589269263,0.570321931,0.566502361,0.591499302,0.547807542,0.567977957,0.570014744,0.566086688,0.536914794,0.579831688,0.56536537,0.579848915,0.575226731,0.579078688,0.574010385,0.592322334,0.597860223,0.522078987,0.524415889,0.502816514,0.542240105,0.545402687,0.576039545,0.580050983,0.549264545,0.586976788,0.61038385,0.620770262,0.596487721,0.634297241,0.599208397,0.653241749,0.667333959,0.67156429,0.687863394,0.689708141,0.6964109,0.700944058,0.59934155,0.595692533,0.603148577,0.608511337,0.612046395,0.610929704,0.596507246,0.698906841,0.60708681,0.600811445,0.611439312,0.60043717,0.602879905,0.602631421,0.615781052,0.599357877,0.597549144,0.609136407,0.605334934,0.619037922,0.604843015,0.785101786,0.617582175,0.78103712,0.641139155,0.6751528,0.706328072,0.703973487,0.703331817,0.705185906,0.736870346 -0.1,0.747092716,0.590847925,0.617432157,0.657462195,0.68658337,0.725229864,0.756821315,0.768952733,0.789060772,0.80521337,0.825468624,0.850788403,0.856828779,0.870514687,0.883968747,0.893920331,0.911877832,0.924943001,0.937657385,0.943427794,0.958872384,0.968817179,0.965429239,0.977260803,0.992368737,1.008846438,1.02128706,1.032905711,1.045226533,1.055484209,1.06515566,1.077873233,1.093423618,1.103091622,1.111348004,1.116626874,1.122247727,1.129664595,1.131873568,1.139901239,1.144000585,1.145961992,1.15794172,1.16021917,1.158915203,1.169100639,1.172816557,1.172687935,1.174158421,1.166891953,1.179779213,1.17676629,1.182542691,1.185568304,1.188758311,1.186229544,1.176815171,1.183793386,1.188206482,1.195207909,1.199190148,1.201286516,1.214652216,1.215348441,1.225417391,1.2184015,1.206439116,1.208353253,1.19380644,1.202197431,1.221026635,1.227981611,1.240972821,1.247993435,1.237654485,1.228281837 -0.11,0.718764613,0.599474914,0.607216525,0.606080287,0.631152995,0.676770738,0.715614175,0.756281421,0.795879915,0.8243039,0.840519675,0.854861125,0.861965524,0.877027369,0.890756804,0.900058734,0.91464235,0.924962402,0.935690213,0.94651692,0.954841167,0.950626392,0.954611757,0.956455688,0.971533839,0.976819977,0.985754828,0.997951157,1.005175121,1.01429147,1.027853457,1.041420673,1.05925269,1.066334532,1.076425272,1.08302171,1.085970885,1.095703574,1.096879828,1.099218389,1.106741546,1.107545456,1.111946468,1.115100427,1.115782733,1.117643172,1.119719213,1.12024187,1.118694324,1.112449979,1.113851184,1.108425691,1.104528295,1.103950625,1.114296804,1.118102214,1.134062661,1.14281573,1.152516804,1.163241831,1.168180537,1.176055894,1.188337869,1.181959214,1.196372523,1.202278461,1.209735882,1.213729939,1.216416917,1.202326073,1.232637318,1.218147558,1.214404399,1.223491509,1.232152291,1.234304834 -0.12,0.727328733,0.744119883,0.63537271,0.635815124,0.633347568,0.659543561,0.632300628,0.674820788,0.733220163,0.804302957,0.842945517,0.873393985,0.891406056,0.903370788,0.913936373,0.914229135,0.91604933,0.9319282,0.943329425,0.95196064,0.953495304,0.956409769,0.951290806,0.965808639,0.961864576,0.965280402,0.970442374,0.980372211,0.985688901,0.986862207,0.993814095,1.008081102,1.021677842,1.028463531,1.037675876,1.045662078,1.049197665,1.059389783,1.048106322,1.058308584,1.061568929,1.061050447,1.062528505,1.065663091,1.064015278,1.062968704,1.071434468,1.063838609,1.064998479,1.056926547,1.058183976,1.052410469,1.050222779,1.061876479,1.079888699,1.093549113,1.103455055,1.11279069,1.117263954,1.125671104,1.133213531,1.132136583,1.154296184,1.141415901,1.154939426,1.161661833,1.167010806,1.196724488,1.187802313,1.200160767,1.21104686,1.211451798,1.213185234,1.222367216,1.229947005,1.227428727 -0.13,0.601867127,0.586773483,0.600291418,0.635146605,0.645121482,0.707495856,0.684254478,0.668184034,0.689693157,0.664674857,0.700340081,0.748996,0.828114863,0.888523246,0.926079973,0.949329116,0.958958635,0.944314766,0.952998876,0.962033423,0.962938722,0.959762199,0.96987308,0.961342607,0.973026501,0.974167819,0.977164689,0.983567328,0.977104285,0.981981924,0.974034967,0.989786089,0.990960553,0.995518647,0.996114567,1.00520115,1.010702681,1.007901328,1.015320633,1.015779304,1.021731042,1.017163301,1.021308647,1.024127036,1.022789429,1.015187487,1.014099054,1.021990534,1.002970087,1.000630188,0.990243921,0.997505765,1.012796707,1.035735923,1.051331727,1.072018285,1.083695963,1.08233286,1.085689989,1.098967014,1.091008424,1.098238325,1.126863425,1.134443507,1.130398957,1.145033687,1.152506408,1.156389894,1.160808781,1.167730219,1.171753802,1.176697302,1.184025482,1.190697257,1.193916506,1.203540054 -0.14,0.748886478,0.730068006,0.616407581,0.648475949,0.646272363,0.677748387,0.762755116,0.758991138,0.718126682,0.710406983,0.686522903,0.710485332,0.685580497,0.727819672,0.770873433,0.867372954,0.937301444,0.961584709,0.976990251,0.987841408,0.983628603,0.984615649,0.992312554,0.994464226,0.997010879,0.995940726,1.000981949,1.001100674,0.982449543,0.985647686,0.987429418,0.997894844,1.011496173,0.994963623,0.978200394,0.973162588,0.981309013,0.969742114,0.974289248,0.98953026,0.994711795,0.989358524,0.994100931,0.964802639,0.99856263,0.995508674,0.991980889,0.976675994,0.958807549,0.953772728,0.942155197,0.950045416,0.968090641,0.976174771,1.022999845,1.043522635,1.036042729,1.03888494,1.041200928,1.057821976,1.084040967,1.091453453,1.098481501,1.091168945,1.097286241,1.101914215,1.105847319,1.10876122,1.113515319,1.119597526,1.124727437,1.12849184,1.132505127,1.137228314,1.140367502,1.141837336 -0.45,0.607336366,0.596646638,0.623324487,0.633359331,0.597850415,0.575882228,0.628021282,0.594751274,0.687516034,0.58636833,0.557394492,0.656069409,0.616621563,0.593168102,0.571953128,0.582513912,0.576053971,0.592576076,0.571620533,0.589199281,0.560479749,0.556940451,0.566455539,0.570328001,0.600213825,0.560885072,0.560768733,0.50882076,0.555416408,0.537861252,0.532894881,0.606344007,0.610878136,0.538564205,0.538723307,0.625178525,0.604666708,0.717882192,0.655003663,0.646592943,0.655158454,0.644452545,0.643259285,0.692133312,0.686971344,0.724577433,0.683139874,0.708940322,0.7690132,0.761211383,0.782134994,0.76612838,0.801533421,0.796045685,0.766638276,0.783916686,0.811115154,0.768788868,0.798619042,0.790371328,0.856350716,0.82351104,0.813627623,0.82424673,0.847097865,0.78766966,0.842094283,0.821012753,0.830837675,0.833104706,0.83826088,0.843812904,0.843232431,0.819840247,0.848627137,0.847493043 -0.46,0.612834094,0.615009195,0.630159514,0.583494408,0.579705563,0.587836924,0.584407859,0.593186692,0.653949366,0.647290085,0.569951248,0.571935303,0.568603413,0.593405221,0.527210018,0.567514475,0.574859912,0.582129032,0.564478528,0.56651943,0.578976364,0.586762486,0.549138771,0.614784214,0.564091051,0.555347638,0.512814897,0.566090909,0.540165987,0.537084089,0.544036632,0.543089471,0.53699811,0.600372241,0.608430944,0.633266692,0.608028314,0.65279974,0.645915645,0.633515183,0.65371355,0.654984623,0.662452097,0.680359237,0.682239812,0.588564111,0.718034969,0.594851301,0.585631418,0.695960461,0.696329503,0.780611983,0.599402453,0.734480927,0.797497767,0.609197701,0.851274106,0.828247878,0.79480671,0.846858599,0.851736442,0.884357518,0.745389717,0.685087721,0.667016056,0.822355792,0.864852498,0.901420734,0.830529746,0.950221392,0.898121308,0.869012859,0.935410484,0.879375009,0.881217336,0.885822834 -0.47,0.610298412,0.567974749,0.621728343,0.572176636,0.585935319,0.653759762,0.621083958,0.620812063,0.627082648,0.580066755,0.591531267,0.573102491,0.56874627,0.571112249,0.599337768,0.584192293,0.569085595,0.575663315,0.561855213,0.710263837,0.710851294,0.568877362,0.572090474,0.571443877,0.53223315,0.55437323,0.571911401,0.513109736,0.512072007,0.552348019,0.551398431,0.596140358,0.550251065,0.547603475,0.588527219,0.621597279,0.601051432,0.611600325,0.638869788,0.613537192,0.650396954,0.678336368,0.656103995,0.686207091,0.687841381,0.699109198,0.692686109,0.594178511,0.587822786,0.588240534,0.592290305,0.702290464,0.593046809,0.582072283,0.601803236,0.594065344,0.594705269,0.72603775,0.593915522,0.761696182,0.730290642,0.647770668,0.647858698,0.899885802,0.673907954,0.831964284,0.69483633,0.695154513,0.735000361,0.713838156,0.757331398,0.741037896,0.737003271,0.942975821,0.73229815,0.946013172 -0.42,0.60073815,0.626327768,0.61813395,0.574251234,0.580484144,0.685181134,0.582386464,0.644761016,0.590398177,0.594626572,0.709430651,0.681248513,0.709472343,0.706530202,0.578535759,0.573522119,0.563868564,0.572295752,0.582054736,0.620825486,0.642583142,0.648980006,0.656866793,0.651911177,0.58168907,0.564268089,0.660487807,0.673402173,0.66044355,0.669134937,0.660481677,0.734031654,0.726770451,0.692529089,0.749037481,0.745947944,0.663558491,0.738407542,0.622693142,0.628597232,0.737291338,0.64497676,0.65456268,0.652630791,0.661740611,0.649077517,0.671132223,0.659783562,0.662387181,0.694065635,0.718406339,0.696965382,0.712613526,0.669660214,0.728182562,0.72067191,0.685976444,0.698067333,0.701362823,0.763910845,0.741530624,0.740983602,0.751575781,0.813831228,0.76931737,0.718780727,0.792156343,0.777750759,0.791762693,0.802952022,0.777494449,0.716257194,0.768248485,0.751861294,0.770082398,0.7711934 -0.43,0.595145706,0.60302457,0.619972538,0.646573564,0.577274758,0.581718241,0.588003732,0.656963502,0.693678591,0.640511035,0.695307031,0.60556636,0.568278648,0.697686627,0.556110828,0.571112008,0.579015978,0.579572861,0.588304509,0.549694135,0.643985945,0.570168592,0.564929586,0.57461237,0.5783386,0.667851978,0.563424244,0.560546132,0.662583923,0.677812457,0.571818449,0.642311224,0.510846383,0.611918455,0.614382448,0.61237248,0.607253359,0.621940123,0.646120977,0.623185082,0.607718376,0.639085034,0.654178767,0.649767542,0.682509912,0.680252279,0.730491782,0.676925199,0.722503086,0.726713362,0.721660788,0.751365296,0.749646418,0.787935786,0.788590938,0.766080843,0.752596013,0.782413938,0.792935968,0.809031322,0.796061434,0.814749252,0.805056675,0.80295323,0.810457668,0.796093616,0.812755194,0.803348552,0.75736775,0.810526153,0.803154665,0.806174223,0.764378794,0.805914234,0.80504915,0.80866908 -0.44,0.591431527,0.607661658,0.624825793,0.63701503,0.578334532,0.583249042,0.580143814,0.588152054,0.596243466,0.603155642,0.600711827,0.692051063,0.652601714,0.566131675,0.583052016,0.579646836,0.565504867,0.53172174,0.548281149,0.588025623,0.558883359,0.575720146,0.570710875,0.583884708,0.573714315,0.567342573,0.557573953,0.582681252,0.554120876,0.497941403,0.530849822,0.531323163,0.616521952,0.589070867,0.587647715,0.596157587,0.638708344,0.637172155,0.674264342,0.663362381,0.63765902,0.662241823,0.63234751,0.661836422,0.662733293,0.680349843,0.684638602,0.698176532,0.719272081,0.750880503,0.71800663,0.754956366,0.780647839,0.787337362,0.774210961,0.759398115,0.788684801,0.761406448,0.799091498,0.820348172,0.783862862,0.792193349,0.794269699,0.794422618,0.799149107,0.822964159,0.810804922,0.812912909,0.81598853,0.821613906,0.811475757,0.80634565,0.805055153,0.782942577,0.810187756,0.793903032 -0.09,0.596538035,0.625069312,0.645460278,0.672991228,0.702029468,0.728526636,0.744991217,0.76241932,0.777531009,0.799178424,0.820307472,0.837222501,0.851724551,0.872162823,0.883935997,0.902890579,0.917373302,0.934540538,0.950370294,0.964459243,0.96412249,0.979381885,0.994877952,1.008583257,1.022977279,1.035159106,1.054731139,1.064920984,1.075309081,1.087892623,1.104720544,1.121528798,1.14606314,1.150958531,1.157456098,1.18504402,1.189461314,1.194722754,1.196936276,1.201613689,1.180256059,1.214436328,1.216189046,1.222237731,1.226484867,1.229942503,1.235186629,1.249791667,1.25063787,1.252734132,1.249424579,1.250225376,1.25165446,1.260442893,1.261156695,1.255134293,1.251315625,1.253844092,1.253015676,1.252175585,1.232453444,1.230006834,1.221369727,1.225072441,1.213266955,1.211952449,1.227619884,1.238857421,1.233353471,1.220974435,1.217326201,1.211256508,1.206030585,1.208002138,1.200204997,1.190296262 -0.41,0.619459584,0.627420422,0.61704851,0.680315574,0.676232938,0.6784373,0.603456204,0.699035925,0.671664135,0.671487655,0.681012424,0.675726082,0.672842609,0.707628195,0.717966721,0.655151405,0.564010832,0.595345308,0.594038618,0.627402002,0.593653818,0.631823948,0.646044618,0.599277034,0.628341952,0.655970211,0.62407952,0.648483097,0.658462558,0.647605758,0.661530793,0.671136451,0.672930617,0.683101898,0.689614277,0.678882844,0.681540214,0.672623252,0.752606,0.752673317,0.753770182,0.74938198,0.764383541,0.74295999,0.731723496,0.675362515,0.650845147,0.640671586,0.6573916,0.633689832,0.655195313,0.683538269,0.671070249,0.709917196,0.673618755,0.699074956,0.705009319,0.695062781,0.719316689,0.683813081,0.694908773,0.741490571,0.692571743,0.736891087,0.750672096,0.757822227,0.691738843,0.700604521,0.739444719,0.736910087,0.733084289,0.696290329,0.703985478,0.736943961,0.712480183,0.693505923 +# Patton & Sukhbold (2020, MNRAS) +# +# s_c, the central entropy per baryon in units of K_B (Boltzmann constant), evaluated at the presupernova stage (needed for example in the Maltsev+2025 criterion) +# for KEPLER models of a given CO-core mass (columns) and initial carbon mass fraction (rows) +# +# All masses are in units of Msun +# +X_c 2.5 2.6 2.7 2.8 2.9 3.0 3.1 3.2 3.3 3.4 3.5 3.6 3.7 3.8 3.9 4.0 4.1 4.2 4.3 4.4 4.5 4.6 4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1 6.2 6.3 6.4 6.5 6.6 6.7 6.8 6.9 7.0 7.1 7.2 7.3 7.4 7.5 7.6 7.7 7.8 7.9 8.0 8.1 8.2 8.3 8.4 8.5 8.6 8.7 8.8 8.9 9.0 9.1 9.2 9.3 9.4 9.5 9.6 9.7 9.8 9.9 10.0 +0.05 0.610768691 0.629214872 0.652130574 0.679378435 0.713697783 0.74581048 0.766641043 0.792775501 0.814823111 0.836142529 0.859851158 0.886006531 0.912686043 0.932691598 0.957916148 0.969091329 0.99016173 1.010252072 1.028069634 1.051504705 1.075993752 1.089255614 1.111628723 1.119726359 1.14275482 1.161087743 1.18040405 1.197066773 1.216365632 1.214596008 1.229566027 1.235289616 1.238242492 1.24917912 1.245350981 1.220772176 1.21836697 1.210971843 1.187712915 1.171558872 0.91886142 0.86374049 0.865662993 0.870884007 0.661530736 0.673704051 0.678886681 0.688039343 0.696985998 0.702601761 0.711639237 0.721744358 0.731312803 0.734804539 0.744305905 0.754773775 0.76451156 0.77518963 0.78722218 0.795089722 0.806110319 0.815227124 0.825915333 0.835420584 0.845608485 0.860265491 0.868023291 0.875491152 0.88321075 0.890889423 0.89890877 0.905702072 0.918266901 0.925577573 0.93295046 0.937262003 +0.06 0.605510653 0.623915014 0.645836118 0.669321322 0.711392924 0.733214322 0.757603034 0.779210939 0.809051813 0.827016041 0.853383266 0.876592594 0.900028228 0.917641138 0.940458175 0.955522327 0.953821922 0.970036773 0.980775063 0.993971811 1.018976141 1.059055157 1.059484498 1.091019601 1.128510811 1.148597138 1.169798336 1.182814096 1.193163283 1.204827891 1.218106081 1.216802697 1.223924857 1.232778163 1.233200008 1.241112042 1.242004225 1.234769423 1.215049219 1.215025812 1.201259291 1.183634618 1.171101742 1.155320234 1.108348597 1.096416255 0.977886043 0.921079589 0.677173147 0.682344755 0.692446217 0.700938994 0.704854752 0.714058995 0.721762359 0.73015152 0.734381046 0.743366991 0.753205934 0.76265074 0.772110114 0.782041086 0.792809845 0.805655556 0.816805382 0.825751237 0.837665069 0.841273076 0.833332233 0.841220896 0.848222083 0.860692799 0.868035718 0.875329517 0.882247869 0.890472758 +0.15 0.728703373 0.741488304 0.743411687 0.766181023 0.613251415 0.654098815 0.706728262 0.710525257 0.645557443 0.792594011 0.782761187 0.727139362 0.714101691 0.710218882 0.688158065 0.697339026 0.764769326 0.81681644 0.891546699 0.999853931 1.00023813 1.014926909 1.022942369 1.009845222 1.010410148 1.013922446 1.015498105 1.014668779 1.015341347 1.019183579 1.027168877 1.028267606 1.023165366 1.002707222 0.996271088 0.999200651 1.000902452 0.990751311 0.981018618 0.961410751 0.959386139 0.960218557 0.996352029 0.949127941 0.967258548 0.946368996 0.952897947 0.946629509 0.92697324 0.958720712 0.946238579 0.940932286 0.947880852 0.933168069 0.989886803 0.994774084 1.013139995 1.00647957 1.018824226 1.041982809 1.056247591 1.054407715 1.03772044 1.046278875 1.047502012 1.04529673 1.044989069 1.054270488 1.055515471 1.061478717 1.074239667 1.074599382 1.080888843 1.082550062 1.085902628 1.086620885 +0.16 0.599633585 0.611961543 0.625996328 0.633822125 0.615217121 0.68483262 0.741640804 0.619520461 0.689847198 0.682656235 0.637590107 0.80817751 0.83878263 0.760413159 0.739164805 0.700305141 0.712754622 0.677125565 0.730130902 0.780742243 0.843040634 0.977177974 0.993821747 1.023210575 1.045642263 1.049752601 1.045145577 1.036772519 1.038826626 1.040209459 1.039261589 1.042671897 1.0474753 1.042759345 1.044256182 1.038306369 1.029397954 1.029626247 1.003515831 0.983398453 0.968150634 0.962061126 0.943464758 0.938685426 0.980288044 0.93565932 0.932571021 0.925900812 0.924422837 0.91899856 0.919840663 0.909938799 0.908222729 0.884624715 0.947441916 0.935440271 0.959698716 0.978727859 0.985858279 0.994486455 0.916248277 1.025814764 0.987339092 0.93338029 0.99845715 1.003853643 0.997222447 0.999187517 1.010113832 1.017798073 1.021035711 1.020547659 1.012971681 1.023295175 1.018392363 1.02134024 +0.17 0.587725025 0.612759 0.627221458 0.646763752 0.681311163 0.710167506 0.721270885 0.699205477 0.696677518 0.715640212 0.624307784 0.749942997 0.65038581 0.732325339 0.875772174 0.789570186 0.747227081 0.688299955 0.70436639 0.659003087 0.701630785 0.757770746 0.813137437 0.851168643 0.993620809 1.025745324 1.049771566 1.071080624 1.078912683 1.068253829 1.06231945 1.065611582 1.064376071 1.061958916 1.057772624 1.054217852 1.048283199 1.050983592 1.045242996 1.032177621 1.020595686 1.001124084 0.969305095 0.965945212 0.954382256 0.927264762 0.922587195 0.967355137 0.92057521 0.931032706 0.897565613 0.903844817 0.894341806 0.886701797 0.922287303 0.925330893 0.920176669 0.927682868 0.93509453 0.930533478 0.912689298 0.906929262 0.927766559 0.934492348 0.935035565 0.940913949 0.93153897 0.929876437 0.925307186 0.915233431 0.928474516 0.952779735 0.958731999 0.924558995 0.923206804 0.934589435 +0.18 0.714812461 0.692773794 0.613792284 0.630027041 0.649855255 0.672508811 0.701349874 0.728603143 0.724875224 0.742257278 0.811857801 0.770264626 0.656872767 0.699842862 0.646901719 0.764874888 0.913510515 0.89138468 0.792259055 0.730158077 0.689693931 0.639964685 0.67411517 0.727404807 0.770459075 0.821487178 0.863029641 1.059560295 1.035655298 1.076871488 1.101405818 1.1066164 1.101483525 1.087786831 1.093537301 1.081583575 1.071869165 1.0671787 1.062486977 1.051066843 1.042141229 1.049765835 1.028267987 1.026518791 1.000759463 0.991332417 0.963493146 0.940345205 0.947860654 0.903517802 0.9009087 0.914452068 0.883628099 0.876459656 0.88037106 0.868060338 0.875999065 0.894374463 0.901717925 0.893990531 0.901202933 0.865691672 0.860992171 0.855043814 0.857375624 0.862012287 0.870245295 0.864464627 0.869944295 0.868347402 0.871126038 0.875259993 0.877083873 0.880593155 0.884207058 0.890785358 +0.19 0.727233715 0.743851809 0.76354611 0.760753509 0.617168234 0.61794141 0.650806325 0.660348827 0.706062145 0.707048881 0.74496703 0.764045885 0.784318085 0.785524333 0.670872529 0.708017104 0.632780578 0.807783283 0.924338934 0.906389152 0.7833206 0.750296728 0.677112811 0.705436654 0.683518706 0.706021226 0.740130761 0.790800401 0.846049857 0.882190769 0.994632623 1.055943214 1.094053795 1.108537171 1.123517082 1.114169814 1.101315029 1.103504987 1.098985184 1.076504483 1.075215846 1.065854465 1.057549715 1.039080143 1.040481551 1.043411307 1.011084281 0.9946586 0.982224421 0.975246055 0.922378203 0.921905954 0.890951127 0.851420352 0.879906609 0.853852975 0.84432161 0.847062915 0.864089848 0.864962826 0.881890994 0.847187889 0.826110122 0.815214058 0.807663401 0.810570517 0.8103254 0.827159101 0.815621849 0.825291956 0.826375372 0.833898273 0.838969986 0.844355918 0.851350684 0.856840041 +0.2 0.725408675 0.665036581 0.660357254 0.72321987 0.676935978 0.607083394 0.737230097 0.627402677 0.642831359 0.638348081 0.650153976 0.696334225 0.697186155 0.715268179 0.730252938 0.815231584 0.812987491 0.794369068 0.637120215 0.66280771 0.862751357 0.924217324 0.919134428 0.74458322 0.688406117 0.699657403 0.638443575 0.66110335 0.718083155 0.754260088 0.797524686 0.833732443 0.943479358 1.037992689 1.084115839 1.136359028 1.13136764 1.131865793 1.115464271 1.120548625 1.110858932 1.100940163 1.08511353 1.074885521 1.072853982 1.063516903 1.053632589 1.035061315 1.040954895 1.016377375 0.987752848 0.963146375 0.951000966 0.899426588 0.885562717 0.858724861 0.838486966 0.83842367 0.82286416 0.825247071 0.836047606 0.816389719 0.803362609 0.750579898 0.770668116 0.771567862 0.775730331 0.782189531 0.764858975 0.753347005 0.785706695 0.810970859 0.815701883 0.825304187 0.830636744 0.833193849 +0.21 0.735126773 0.744628837 0.645749284 0.654571107 0.659779622 0.676540063 0.69309537 0.686906054 0.692523999 0.713091576 0.697731622 0.714895199 0.72855382 0.672382652 0.68018181 0.670527191 0.700748121 0.721272835 0.828538225 0.819732078 0.77269786 0.670726498 0.830413287 0.862263732 0.914938654 0.751235882 0.77395706 0.691449011 0.673080647 0.641296124 0.680259896 0.702148518 0.743657283 0.81745519 0.847451739 0.927289367 0.968268163 1.10271581 1.160478325 1.156932162 1.106469019 1.112365303 1.124255286 1.12093272 1.122682189 1.105946567 1.107622071 1.07231254 1.059866214 1.057039918 1.029399634 1.037075677 1.015201954 0.969069512 0.970802023 0.949553777 0.915996532 0.828294009 0.829624809 0.811956314 0.796417264 0.795673675 0.820751574 0.823976182 0.814909962 0.742422034 0.745382346 0.74915411 0.734188658 0.71282445 0.715909514 0.729040972 0.74339648 0.752799785 0.715557119 0.703158514 +0.22 0.701398866 0.711386416 0.726749635 0.675935837 0.692545086 0.613977848 0.653415306 0.693918532 0.698899073 0.70752421 0.698111522 0.631634111 0.630324906 0.633126497 0.635687214 0.643507131 0.646162186 0.654918893 0.754520876 0.694397342 0.709439984 0.746461911 0.813749933 0.627419073 0.803238027 0.768233454 0.946523224 0.924993001 0.829934978 0.692961439 0.683272168 0.622423238 0.659676979 0.693452996 0.694382079 0.720235104 0.811223938 0.826530647 0.850492336 0.973606635 1.098183492 1.170232748 1.178672548 1.120467503 1.107065636 1.115182021 1.118926609 1.099597647 1.121216982 1.11167808 1.08538358 1.077721256 1.051007097 1.045073783 1.02819266 1.012672673 0.965328456 0.96519974 0.939342945 0.841751651 0.837567496 0.802709817 0.799928885 0.799525233 0.802391004 0.797193407 0.72400731 0.709400902 0.71011076 0.68167114 0.690300333 0.705918457 0.696770802 0.695384452 0.706007033 0.709845331 +0.23 0.658451411 0.658211544 0.72008665 0.663961997 0.608773249 0.767288307 0.750697968 0.721680885 0.723213208 0.708280227 0.647791405 0.677654161 0.651894377 0.669186928 0.653146245 0.616553276 0.603232839 0.599819042 0.690478821 0.698952129 0.715817204 0.664047424 0.660235423 0.756301266 0.810886066 0.89325317 0.815302286 0.803072628 0.947570826 0.925897138 0.747721421 0.696804569 0.682187708 0.740896246 0.638532656 0.672612467 0.706223969 0.681518374 0.732676513 0.808662416 0.85616011 0.889549038 1.024724837 1.068332024 1.18598479 0.992473428 1.034451038 1.09827728 1.112214288 1.12912739 1.109564791 1.105677334 1.111320494 1.097623584 1.085324496 1.054961066 1.046582892 1.037505401 1.015485476 1.000589101 0.954740459 0.920999465 0.90826714 0.802312534 0.775737812 0.761084778 0.770015126 0.778706811 0.698187162 0.696664823 0.669757003 0.672539602 0.670864418 0.677396089 0.683695123 0.696839995 +0.24 0.704386171 0.708339231 0.703784872 0.676793868 0.703329384 0.702250478 0.716516172 0.699388092 0.701383125 0.610823047 0.645956098 0.728628556 0.678827012 0.647876043 0.646526662 0.639506743 0.662445226 0.652024836 0.713104442 0.699785106 0.675601315 0.670440501 0.60670898 0.635678117 0.592668839 0.667837807 0.709553617 0.781214981 0.67871891 0.738804204 0.817301997 0.954952508 0.807959618 0.691695008 0.689354743 0.594279444 0.6478417 0.695044656 0.733582623 0.712450562 0.75624058 0.804116146 0.813306826 0.867075469 0.906719598 0.947998439 1.103944855 1.171471978 0.944103579 0.991219219 1.022312779 1.138247345 1.120713222 1.122846631 1.120523415 1.104092606 1.090414107 1.092920718 1.072445562 1.043424124 1.041582503 1.009936191 1.019911548 0.937973455 0.903119754 0.889136115 0.792004575 0.758036277 0.740187954 0.758494189 0.754387651 0.682106069 0.666932574 0.667560261 0.670734494 0.673272902 +0.07 0.602024189 0.622541816 0.641925427 0.661061987 0.682199475 0.71608768 0.736130711 0.756423012 0.78220097 0.805954179 0.833453975 0.850680206 0.873652473 0.895387393 0.919000237 0.936650553 0.956749168 0.958428265 0.976431461 1.00027234 1.014072395 1.037385533 1.061917497 1.074569321 1.100016978 1.119481309 1.138185408 1.15516439 1.177634754 1.191928795 1.212483174 1.229613407 1.245076232 1.250715207 1.268432907 1.259737306 1.245551569 1.249007368 1.249760592 1.24559669 1.221035129 1.064478441 1.132249041 0.958213568 0.877971319 0.85894617 0.858601039 0.861637054 0.85968838 0.854605375 0.866231732 0.666231413 0.678038778 0.681786241 1.241645492 1.248384477 1.251460329 1.241026878 1.230966744 1.222895047 1.203731852 1.210402905 1.204245193 1.199608974 1.196047686 1.159717642 1.144563403 1.150349404 1.135195411 1.14361162 1.145764216 1.146450762 1.144878776 1.141819996 0.848542549 0.848886815 +0.25 0.716741845 0.71652531 0.730556964 0.732498272 0.692143561 0.694080449 0.69078604 0.69228101 0.699390694 0.703209284 0.72939904 0.695670576 0.681784049 0.711635967 0.723680634 0.682729749 0.730438536 0.731000471 0.724743182 0.736726756 0.733173765 0.746577822 0.701202452 0.705390591 0.656166652 0.720975792 0.712413235 0.668007289 0.680940446 0.674063711 0.727474074 0.753429634 0.789417914 0.991797448 0.854183853 0.748466602 0.669532971 0.673957414 0.610258737 0.666440811 0.700366833 0.744776875 0.738482906 0.785075386 0.852227779 0.85522408 0.902952106 1.000174571 1.073474871 0.862423364 0.918155396 0.97555319 0.976700043 1.02506644 1.050052472 1.149103718 1.128975822 1.125965798 1.120895941 1.116517754 1.105770505 1.099405256 1.069334411 1.033345557 1.011322467 1.018202499 1.000461303 0.914618633 0.875836395 0.851416431 0.727269031 0.734557216 0.750873739 0.787126288 0.737978366 0.714128365 +0.26 0.704446971 0.721169831 0.712893113 0.70820766 0.679560191 0.704907958 0.715057514 0.6918948 0.701139001 0.691232777 0.709673416 0.709262094 0.68306829 0.684419024 0.68679468 0.697990159 0.707121228 0.683780982 0.711374617 0.71063618 0.695620696 0.606977989 0.622181006 0.619561259 0.621536638 0.622779289 0.771995804 0.78320893 0.707279074 0.662875209 0.720812834 0.685710167 0.589247753 0.713615703 0.818133775 0.792878401 0.981497744 0.772903203 0.730205992 0.694643687 0.677360268 0.677080113 0.684114393 0.664199935 0.73483551 0.768444583 0.787001033 0.857254563 0.849327118 0.951819288 0.932847798 1.084784336 1.148996543 0.890544193 0.923256639 0.900231496 0.999316417 1.055970225 1.132200398 1.112469449 1.124044788 1.105739561 1.109378055 1.108443987 1.10150171 1.038735213 1.006590658 1.002410311 1.017222984 1.006555199 0.982159368 0.854080981 0.847835274 0.818685493 0.741078607 0.778403357 +0.27 0.688226045 0.701539399 0.712657602 0.661800295 0.670031133 0.691022283 0.712173324 0.692649489 0.710674744 0.698398626 0.688772972 0.713615637 0.72435416 0.729662961 0.701634315 0.646965586 0.71565246 0.721869439 0.715653875 0.727152061 0.714700927 0.717324645 0.665248254 0.639488288 0.636178219 0.644493515 0.64601868 0.648726091 0.644032369 0.640182839 0.640841862 0.817062924 0.776765747 0.702299277 0.726177613 0.63312702 0.608764391 0.7215841 0.981807613 0.898267736 0.742523874 0.724872391 0.650384957 0.702511296 0.629969494 0.702341296 0.739845968 0.741604625 0.784942608 0.802600102 0.870100039 0.817238257 0.89899934 1.016697398 1.035264925 1.149570449 0.877201696 0.934245767 0.911914938 0.991560878 1.001912353 1.051156303 1.133744782 1.120559077 1.119935266 1.119528917 1.107158387 1.096679434 1.052955993 1.04359871 1.013702736 1.005226334 0.986061548 0.981708933 0.7869379 0.765596838 +0.28 0.672400487 0.699112825 0.685701712 0.669767785 0.666571176 0.677358191 0.625984675 0.63773839 0.640121294 0.626375525 0.618917875 0.623809699 0.662786939 0.62531922 0.636898952 0.623660535 0.63247957 0.635609554 0.655551349 0.646794358 0.655720321 0.686448527 0.671620193 0.674195655 0.681607371 0.675076191 0.695447545 0.692585797 0.686230035 0.692869765 0.69023029 0.665855773 0.662909085 0.671751978 0.677744297 0.657616546 0.800889951 0.807214346 0.713211034 0.629941479 0.788112764 0.969053516 0.79111148 0.75100382 0.717263475 0.671586018 0.615275618 0.643065338 0.729574481 0.663084923 0.766393673 0.807956292 0.822326966 0.901237829 0.830933972 0.890279973 0.931649158 1.091177171 1.091282775 1.115811277 0.900489272 0.978653314 0.977942181 1.009150729 1.031709844 1.026037788 1.049355651 1.138773643 1.124070638 1.110063079 1.092999279 1.090880674 1.058046955 1.015677503 0.985555346 0.980169381 +0.29 0.665453455 0.680790969 0.706939162 0.594713365 0.673527984 0.645034799 0.700104705 0.633307581 0.588352435 0.613282962 0.642647562 0.618123238 0.623913884 0.625743984 0.624161598 0.631020458 0.628384829 0.652071695 0.64106055 0.669700957 0.657876721 0.724868778 0.670861482 0.72798338 0.66871124 0.672119399 0.678860744 0.67551983 0.7724433 0.708646697 0.712679666 0.709883458 0.711452031 0.706935443 0.740712788 0.745365346 0.692741748 0.739111822 0.68351506 0.690338961 0.862242494 0.825828372 0.757635129 0.798618098 0.999407334 0.740818563 0.729327934 0.586937662 0.726740225 0.624854326 0.655861258 0.747535055 0.73605682 0.765121481 0.827010749 0.84183159 0.867000758 0.850370762 0.902490409 0.931232089 1.024361918 1.072452066 1.164462837 0.895891475 0.903569584 0.907620365 0.923169243 0.978376152 1.013577895 1.018344139 1.078516969 1.149707585 1.11546471 1.1064485 1.096717667 1.092731707 +0.3 0.601742495 0.603479351 0.625129097 0.684184559 0.636908287 0.696402014 0.69426112 0.629387991 0.710284152 0.654474783 0.723289138 0.597115699 0.624999849 0.730114118 0.65000875 0.661914733 0.706213782 0.698087305 0.667790691 0.752302519 0.657779234 0.656482567 0.758328733 0.765503764 0.677809254 0.778296252 0.782668806 0.799847207 0.799127183 0.808777483 0.696221926 0.849511672 0.745400241 0.787214935 0.792843381 0.822588308 0.716610653 0.727747945 0.767964028 0.77352834 0.769325662 0.775351453 0.712933338 0.716076188 0.863077702 0.907653407 0.899411478 0.707095793 0.720794209 0.578051347 0.64708457 0.715991872 0.644705111 0.663647839 0.693140744 0.759587089 0.792349194 0.830673659 0.852019003 0.870533958 0.848837912 0.880728817 0.925043699 0.982958649 1.053823489 1.150515811 0.897477284 0.890299938 0.916569743 0.924511122 0.958726464 1.00533473 1.004704377 1.047265598 1.066599926 1.167767699 +0.31 0.691325178 0.688663832 0.628669891 0.65491838 0.663987843 0.751553439 0.688352662 0.702859954 0.729196245 0.71441199 0.699700676 0.740500318 0.751189599 0.722165374 0.712277933 0.755404786 0.657165038 0.675756012 0.688696872 0.710015829 0.741099345 0.726088897 0.738567843 0.741869568 0.735708132 0.752197278 0.721989435 0.773039511 0.790930818 0.798099672 0.772176986 0.763454064 0.814542629 0.788119697 0.800648491 0.86548908 0.900786694 0.915652909 0.885149524 0.916602087 0.743414226 0.724258559 0.776407177 0.769619242 0.783242734 0.785181673 0.778085288 0.745941384 0.931431459 0.776349218 0.6841201 0.6477042 0.707736854 0.655150727 0.655398181 0.669597053 0.684718985 0.699750704 0.707376361 0.789209972 0.835426534 0.866383149 0.932554222 0.86486251 0.920933216 0.924261736 1.002879887 1.029418745 1.059004797 1.177111327 0.883100827 0.904485439 0.907080739 0.950152868 0.98376019 0.988611552 +0.32 0.614205464 0.707685564 0.695794145 0.62714604 0.66354386 0.66760916 0.669178508 0.712956905 0.67331129 0.71034524 0.741519961 0.725952266 0.747104891 0.750470076 0.758894629 0.771347977 0.778942132 0.780919574 0.790540829 0.668344354 0.736686777 0.692279822 0.755144229 0.749198723 0.728248001 0.733540697 0.721989109 0.72605721 0.724460508 0.731752048 0.773062974 0.764405706 0.709526184 0.697809301 0.775846911 0.775440096 0.763850399 0.731742253 0.850527843 0.846444996 0.904891414 0.822097352 0.807234695 0.927121489 0.956917325 0.941331298 0.871427455 0.942177727 0.786615297 0.762742709 0.803596724 0.785857527 0.781854357 0.719171507 0.629905105 0.708443564 0.65697022 0.708995178 0.718098798 0.78044221 0.781739715 0.8154921 0.868462144 0.870102287 0.870338506 0.878094373 0.886983713 0.878299735 0.89785296 1.005292509 1.002907939 1.021172004 1.16909946 0.8985822 0.912158462 0.946479683 +0.33 0.618420958 0.627870203 0.653063536 0.675510681 0.654044285 0.6865992 0.657468191 0.618668143 0.690746854 0.701296762 0.724371023 0.677683994 0.721116581 0.733218909 0.746587992 0.728400247 0.733639341 0.744518313 0.646803952 0.765147657 0.773164938 0.766223764 0.757983877 0.742250963 0.794378482 0.754158674 0.697215021 0.684813648 0.751123424 0.755727298 0.696574592 0.682785986 0.694155016 0.688118193 0.716716827 0.765746155 0.754270772 0.738291004 0.719440101 0.770212775 0.757561602 0.745670819 0.765796057 0.766801745 0.749333244 0.674019385 0.877433771 0.73322129 0.746184313 0.899737179 0.940869412 0.950801596 0.806305219 0.796186736 0.786324364 0.763002814 0.92241866 0.612922368 0.674136589 0.616622786 0.717908227 0.73568542 0.778011254 0.789131949 0.856289482 0.874952745 0.87987338 0.836837514 0.856067715 0.897723723 0.923809497 0.984182292 0.937990451 0.986306689 1.051171448 1.093657488 +0.34 0.623976778 0.62587934 0.61653257 0.688538716 0.644632417 0.642128912 0.683704788 0.682506137 0.610627814 0.694173297 0.666782693 0.622050799 0.604578851 0.716472335 0.746469824 0.638293309 0.645003997 0.644799494 0.648254115 0.567809208 0.685201096 0.525021296 0.642873748 0.650244212 0.657518189 0.622598744 0.671567179 0.529157179 0.62072265 0.678586252 0.72577096 0.674728141 0.631530444 0.617052654 0.620691192 0.687220199 0.630240305 0.630452424 0.641107476 0.676193963 0.638672301 0.612295257 0.636129398 0.62392038 0.692508496 0.627869713 0.642512681 0.652907644 0.593657452 0.71965915 0.745270716 0.736428925 0.750084732 0.716931971 0.738495415 0.922615601 0.943732058 0.820328149 0.823466355 0.83462419 0.908485964 0.625104623 0.713549408 0.722603766 0.742024454 0.767882723 0.779294859 0.812431058 0.892380516 0.88509637 0.815386939 0.881032787 0.997350749 0.964831098 1.013619774 1.068314726 +0.08 0.59946483 0.62466518 0.64115396 0.666850459 0.696117432 0.717627097 0.74087016 0.760716683 0.781089846 0.804275977 0.824570017 0.846120295 0.864545464 0.885557237 0.909352477 0.929262528 0.947116448 0.96286081 0.967209603 0.985834674 1.003689012 1.017730036 1.032072324 1.050534615 1.066174999 1.075637777 1.101602666 1.117614083 1.134563868 1.147788913 1.159258849 1.177976364 1.196524108 1.224050591 1.241773981 1.2656591 1.261187443 1.281158465 1.285816865 1.205875674 1.290542215 1.308435172 1.322762129 1.318352314 1.299106093 1.274909095 0.989418035 0.932090919 0.853466599 0.846094087 0.838995432 0.872481261 0.889740226 0.980815859 1.300537907 1.238393931 1.239621232 1.239771997 1.237183433 1.236921163 1.232863391 1.234718774 1.228788064 1.221935878 1.223619154 1.207667074 1.193440516 1.201778314 1.200433475 1.198735584 1.192203771 1.174757501 1.146414208 1.128386521 1.130287695 1.140840156 +0.35 0.586546748 0.607600414 0.607399902 0.669907955 0.684005414 0.64703291 0.649272715 0.630045833 0.601904461 0.729417362 0.618297752 0.515615925 0.580925389 0.61044274 0.616127515 0.620558943 0.572541324 0.632188649 0.559202322 0.600559192 0.586677533 0.569775981 0.568757384 0.576966256 0.520147011 0.594659399 0.599512181 0.605220512 0.57553778 0.605152804 0.615698444 0.619697916 0.612602067 0.600065335 0.603638 0.56298872 0.604585971 0.611899561 0.611178798 0.647747727 0.598559372 0.633526481 0.599600157 0.656361564 0.651926498 0.664686262 0.60981849 0.617762614 0.61341751 0.555815623 0.615874037 0.65835662 0.64653035 0.65905679 0.680581211 0.690945613 0.680076286 0.682605054 0.702400325 0.772802111 0.929631961 0.976024507 0.960294838 0.975519411 0.749963603 0.66803794 0.676488555 0.747025381 0.76863084 0.77448973 0.812510063 0.863798763 0.88958003 0.85217883 0.871008384 0.926671707 +0.36 0.582105319 0.620203525 0.595675597 0.615235919 0.676602818 0.672769088 0.596384146 0.576457871 0.580546927 0.582846099 0.552126541 0.559349196 0.548369111 0.5261487 0.599726462 0.589684705 0.527610786 0.569816597 0.575722989 0.570861575 0.574357161 0.570810207 0.549642555 0.59310751 0.575570652 0.59335692 0.584586369 0.598704264 0.615098178 0.60313227 0.618614596 0.569811241 0.618544278 0.600811 0.62189145 0.571429572 0.639655083 0.611037605 0.62484862 0.606930767 0.612233416 0.615039493 0.621304805 0.627376886 0.625727875 0.630269726 0.625080346 0.634116147 0.628572679 0.636574382 0.644269025 0.63270565 0.632616816 0.639173439 0.638830095 0.633455233 0.634583351 0.619583561 0.628239559 0.668302574 0.611548543 0.671348449 0.718132776 0.697446449 0.657728717 0.958350298 0.920179034 0.735842592 0.614291609 0.689014849 0.74422803 0.767892257 0.762852671 0.769424911 0.828432998 0.93618781 +0.37 0.595585147 0.636937671 0.657249378 0.679226954 0.667798139 0.655206629 0.668939678 0.655475066 0.671308595 0.614524282 0.535319893 0.55504848 0.683033358 0.539833072 0.55870436 0.562571851 0.565393616 0.536482482 0.564631318 0.564938191 0.59469886 0.577244259 0.570163352 0.569247941 0.543088035 0.583966998 0.602551167 0.554973551 0.550199982 0.604915511 0.629014402 0.613003129 0.605794144 0.62393946 0.618766164 0.616079625 0.60759177 0.626396291 0.65414182 0.629547263 0.64062036 0.643858075 0.652604389 0.64197826 0.638830882 0.631812979 0.659330719 0.656659297 0.645210329 0.669227771 0.655328236 0.647500022 0.656614308 0.659339843 0.664816609 0.65145111 0.662379913 0.659529067 0.666568386 0.649028098 0.646494806 0.656478324 0.644835012 0.642713687 0.619904512 0.62572982 0.641212543 0.655696138 0.653825495 0.748785114 0.665796842 0.660176664 0.631278907 0.70862235 0.763453757 0.754959809 +0.38 0.592833011 0.704818609 0.594451338 0.658198188 0.668121997 0.591102385 0.666120909 0.657161686 0.615719669 0.688786141 0.667952525 0.707683138 0.544112818 0.683055676 0.582407709 0.543954131 0.541405034 0.570448258 0.540448955 0.579295201 0.548562967 0.499830947 0.559108226 0.554845749 0.593442613 0.60473461 0.603224553 0.607367833 0.567599805 0.620938273 0.618081364 0.624898044 0.620198135 0.623372126 0.619234557 0.651889823 0.629775501 0.623686401 0.653599589 0.651741813 0.664812911 0.655072947 0.676042183 0.662819006 0.641532248 0.654926284 0.67356215 0.679385573 0.682306518 0.676609435 0.691135016 0.687256563 0.686095296 0.688552052 0.694754543 0.691794814 0.683760299 0.691281868 0.705116343 0.697870762 0.692574116 0.685269471 0.690198214 0.670911463 0.672783196 0.679814919 0.685106172 0.665107309 0.660139545 0.661559698 0.633551932 0.636501406 0.611955303 0.616952102 0.600244953 0.62973723 +0.39 0.624291332 0.63520331 0.578243162 0.588527991 0.600472857 0.601013841 0.601208169 0.601262058 0.609480317 0.69054831 0.656203602 0.701464526 0.718004324 0.55820416 0.718117702 0.695073883 0.554740013 0.561492885 0.555177719 0.582089784 0.60732467 0.549873952 0.604656355 0.561358873 0.585205693 0.570703292 0.620189898 0.626415045 0.617631104 0.606474154 0.626300549 0.641229123 0.646901938 0.654754546 0.653074986 0.658729884 0.65782185 0.654535819 0.687855468 0.66593057 0.672567539 0.667623129 0.678930234 0.679406631 0.69220033 0.684917985 0.737824713 0.701119696 0.760717056 0.760219946 0.744243189 0.728124662 0.725514724 0.759910968 0.624294121 0.737241282 0.708364815 0.620809946 0.748937777 0.713320022 0.717672944 0.627949035 0.712905968 0.626627608 0.620764261 0.710674989 0.64517188 0.71513794 0.61342383 0.710509047 0.708874684 0.697725623 0.689418015 0.684364332 0.678473755 0.669688182 +0.4 0.617765296 0.595676994 0.606912037 0.67214894 0.592497339 0.667369494 0.643868999 0.59998374 0.673551406 0.689739178 0.664077633 0.687559775 0.696867061 0.697273763 0.681616294 0.659918141 0.653705494 0.659734005 0.57599348 0.538519658 0.596516224 0.613670139 0.568928627 0.632861642 0.615991865 0.647841019 0.611644164 0.621488961 0.653212381 0.652318303 0.656461107 0.653763842 0.64365145 0.648935696 0.660257686 0.671203667 0.670128164 0.677656963 0.678827035 0.667452846 0.683359575 0.678396317 0.693144951 0.702615992 0.703784185 0.665034304 0.729831262 0.741024168 0.624720043 0.637620309 0.623404555 0.734424222 0.654081735 0.658170985 0.636684359 0.630465348 0.653744027 0.64278867 0.649967738 0.658764968 0.681495753 0.674167519 0.666158069 0.664750747 0.656104729 0.648324144 0.675399808 0.651204948 0.683961375 0.631396311 0.645780133 0.625066493 0.624758761 0.621272983 0.751337806 0.773827184 +0.48 0.564871885 0.618157026 0.56983434 0.620567824 0.593076248 0.62667109 0.616667607 0.578653642 0.626996906 0.569953012 0.598133422 0.541354529 0.525511475 0.59338106 0.531979281 0.572112955 0.569999358 0.563659317 0.578363514 0.711357457 0.571104433 0.570808825 0.571212983 0.564056038 0.547238396 0.54173214 0.565230028 0.53993908 0.585180219 0.57365615 0.545622746 0.58699044 0.547747906 0.535047603 0.57845033 0.633419506 0.616053038 0.646312429 0.644428056 0.65497233 0.635782687 0.662241118 0.675308138 0.66822929 0.687769251 0.592535892 0.699682213 0.590381302 0.59477312 0.593390421 0.580520358 0.598022044 0.592623865 0.586044036 0.584743662 0.590352781 0.585628542 0.586064491 0.616298276 0.607514771 0.769014329 0.771914569 0.64082694 0.775994775 0.75132219 0.652609621 0.68170686 0.674776472 0.6851653 0.686685581 0.705217064 0.712118938 0.75410904 0.766109716 0.758109419 0.78672955 +0.49 0.558841673 0.654356753 0.612012669 0.614411561 0.60257284 0.600968786 0.651718826 0.556500512 0.56282105 0.565140434 0.559060181 0.532172237 0.54612094 0.571170876 0.565051531 0.571714805 0.570050173 0.584659598 0.569861418 0.690101768 0.576516388 0.603658865 0.564024481 0.577077442 0.550960302 0.530642723 0.542788292 0.588029293 0.579490949 0.571823482 0.58723218 0.594129322 0.543524808 0.550644479 0.624449113 0.615045467 0.626085205 0.626916069 0.650367095 0.665218934 0.673521462 0.677132101 0.681014716 0.690095369 0.692805358 0.592479582 0.579041264 0.713596152 0.586624196 0.595784275 0.591513299 0.599595623 0.600664767 0.588217105 0.599090703 0.599844626 0.586037322 0.596935039 0.592559586 0.598022731 0.584413348 0.615564674 0.772309413 0.597564227 0.608722883 0.641022628 0.662570487 0.662232783 0.671345521 0.676524351 0.699929379 0.695369357 0.706922255 0.726102911 0.768779755 0.769635352 +0.5 0.562448457 0.565796802 0.631249643 0.652590714 0.575723906 0.648310924 0.56764643 0.589269263 0.570321931 0.566502361 0.591499302 0.547807542 0.567977957 0.570014744 0.566086688 0.536914794 0.579831688 0.56536537 0.579848915 0.575226731 0.579078688 0.574010385 0.592322334 0.597860223 0.522078987 0.524415889 0.502816514 0.542240105 0.545402687 0.576039545 0.580050983 0.549264545 0.586976788 0.61038385 0.620770262 0.596487721 0.634297241 0.599208397 0.653241749 0.667333959 0.67156429 0.687863394 0.689708141 0.6964109 0.700944058 0.59934155 0.595692533 0.603148577 0.608511337 0.612046395 0.610929704 0.596507246 0.698906841 0.60708681 0.600811445 0.611439312 0.60043717 0.602879905 0.602631421 0.615781052 0.599357877 0.597549144 0.609136407 0.605334934 0.619037922 0.604843015 0.785101786 0.617582175 0.78103712 0.641139155 0.6751528 0.706328072 0.703973487 0.703331817 0.705185906 0.736870346 +0.1 0.747092716 0.590847925 0.617432157 0.657462195 0.68658337 0.725229864 0.756821315 0.768952733 0.789060772 0.80521337 0.825468624 0.850788403 0.856828779 0.870514687 0.883968747 0.893920331 0.911877832 0.924943001 0.937657385 0.943427794 0.958872384 0.968817179 0.965429239 0.977260803 0.992368737 1.008846438 1.02128706 1.032905711 1.045226533 1.055484209 1.06515566 1.077873233 1.093423618 1.103091622 1.111348004 1.116626874 1.122247727 1.129664595 1.131873568 1.139901239 1.144000585 1.145961992 1.15794172 1.16021917 1.158915203 1.169100639 1.172816557 1.172687935 1.174158421 1.166891953 1.179779213 1.17676629 1.182542691 1.185568304 1.188758311 1.186229544 1.176815171 1.183793386 1.188206482 1.195207909 1.199190148 1.201286516 1.214652216 1.215348441 1.225417391 1.2184015 1.206439116 1.208353253 1.19380644 1.202197431 1.221026635 1.227981611 1.240972821 1.247993435 1.237654485 1.228281837 +0.11 0.718764613 0.599474914 0.607216525 0.606080287 0.631152995 0.676770738 0.715614175 0.756281421 0.795879915 0.8243039 0.840519675 0.854861125 0.861965524 0.877027369 0.890756804 0.900058734 0.91464235 0.924962402 0.935690213 0.94651692 0.954841167 0.950626392 0.954611757 0.956455688 0.971533839 0.976819977 0.985754828 0.997951157 1.005175121 1.01429147 1.027853457 1.041420673 1.05925269 1.066334532 1.076425272 1.08302171 1.085970885 1.095703574 1.096879828 1.099218389 1.106741546 1.107545456 1.111946468 1.115100427 1.115782733 1.117643172 1.119719213 1.12024187 1.118694324 1.112449979 1.113851184 1.108425691 1.104528295 1.103950625 1.114296804 1.118102214 1.134062661 1.14281573 1.152516804 1.163241831 1.168180537 1.176055894 1.188337869 1.181959214 1.196372523 1.202278461 1.209735882 1.213729939 1.216416917 1.202326073 1.232637318 1.218147558 1.214404399 1.223491509 1.232152291 1.234304834 +0.12 0.727328733 0.744119883 0.63537271 0.635815124 0.633347568 0.659543561 0.632300628 0.674820788 0.733220163 0.804302957 0.842945517 0.873393985 0.891406056 0.903370788 0.913936373 0.914229135 0.91604933 0.9319282 0.943329425 0.95196064 0.953495304 0.956409769 0.951290806 0.965808639 0.961864576 0.965280402 0.970442374 0.980372211 0.985688901 0.986862207 0.993814095 1.008081102 1.021677842 1.028463531 1.037675876 1.045662078 1.049197665 1.059389783 1.048106322 1.058308584 1.061568929 1.061050447 1.062528505 1.065663091 1.064015278 1.062968704 1.071434468 1.063838609 1.064998479 1.056926547 1.058183976 1.052410469 1.050222779 1.061876479 1.079888699 1.093549113 1.103455055 1.11279069 1.117263954 1.125671104 1.133213531 1.132136583 1.154296184 1.141415901 1.154939426 1.161661833 1.167010806 1.196724488 1.187802313 1.200160767 1.21104686 1.211451798 1.213185234 1.222367216 1.229947005 1.227428727 +0.13 0.601867127 0.586773483 0.600291418 0.635146605 0.645121482 0.707495856 0.684254478 0.668184034 0.689693157 0.664674857 0.700340081 0.748996 0.828114863 0.888523246 0.926079973 0.949329116 0.958958635 0.944314766 0.952998876 0.962033423 0.962938722 0.959762199 0.96987308 0.961342607 0.973026501 0.974167819 0.977164689 0.983567328 0.977104285 0.981981924 0.974034967 0.989786089 0.990960553 0.995518647 0.996114567 1.00520115 1.010702681 1.007901328 1.015320633 1.015779304 1.021731042 1.017163301 1.021308647 1.024127036 1.022789429 1.015187487 1.014099054 1.021990534 1.002970087 1.000630188 0.990243921 0.997505765 1.012796707 1.035735923 1.051331727 1.072018285 1.083695963 1.08233286 1.085689989 1.098967014 1.091008424 1.098238325 1.126863425 1.134443507 1.130398957 1.145033687 1.152506408 1.156389894 1.160808781 1.167730219 1.171753802 1.176697302 1.184025482 1.190697257 1.193916506 1.203540054 +0.14 0.748886478 0.730068006 0.616407581 0.648475949 0.646272363 0.677748387 0.762755116 0.758991138 0.718126682 0.710406983 0.686522903 0.710485332 0.685580497 0.727819672 0.770873433 0.867372954 0.937301444 0.961584709 0.976990251 0.987841408 0.983628603 0.984615649 0.992312554 0.994464226 0.997010879 0.995940726 1.000981949 1.001100674 0.982449543 0.985647686 0.987429418 0.997894844 1.011496173 0.994963623 0.978200394 0.973162588 0.981309013 0.969742114 0.974289248 0.98953026 0.994711795 0.989358524 0.994100931 0.964802639 0.99856263 0.995508674 0.991980889 0.976675994 0.958807549 0.953772728 0.942155197 0.950045416 0.968090641 0.976174771 1.022999845 1.043522635 1.036042729 1.03888494 1.041200928 1.057821976 1.084040967 1.091453453 1.098481501 1.091168945 1.097286241 1.101914215 1.105847319 1.10876122 1.113515319 1.119597526 1.124727437 1.12849184 1.132505127 1.137228314 1.140367502 1.141837336 +0.45 0.607336366 0.596646638 0.623324487 0.633359331 0.597850415 0.575882228 0.628021282 0.594751274 0.687516034 0.58636833 0.557394492 0.656069409 0.616621563 0.593168102 0.571953128 0.582513912 0.576053971 0.592576076 0.571620533 0.589199281 0.560479749 0.556940451 0.566455539 0.570328001 0.600213825 0.560885072 0.560768733 0.50882076 0.555416408 0.537861252 0.532894881 0.606344007 0.610878136 0.538564205 0.538723307 0.625178525 0.604666708 0.717882192 0.655003663 0.646592943 0.655158454 0.644452545 0.643259285 0.692133312 0.686971344 0.724577433 0.683139874 0.708940322 0.7690132 0.761211383 0.782134994 0.76612838 0.801533421 0.796045685 0.766638276 0.783916686 0.811115154 0.768788868 0.798619042 0.790371328 0.856350716 0.82351104 0.813627623 0.82424673 0.847097865 0.78766966 0.842094283 0.821012753 0.830837675 0.833104706 0.83826088 0.843812904 0.843232431 0.819840247 0.848627137 0.847493043 +0.46 0.612834094 0.615009195 0.630159514 0.583494408 0.579705563 0.587836924 0.584407859 0.593186692 0.653949366 0.647290085 0.569951248 0.571935303 0.568603413 0.593405221 0.527210018 0.567514475 0.574859912 0.582129032 0.564478528 0.56651943 0.578976364 0.586762486 0.549138771 0.614784214 0.564091051 0.555347638 0.512814897 0.566090909 0.540165987 0.537084089 0.544036632 0.543089471 0.53699811 0.600372241 0.608430944 0.633266692 0.608028314 0.65279974 0.645915645 0.633515183 0.65371355 0.654984623 0.662452097 0.680359237 0.682239812 0.588564111 0.718034969 0.594851301 0.585631418 0.695960461 0.696329503 0.780611983 0.599402453 0.734480927 0.797497767 0.609197701 0.851274106 0.828247878 0.79480671 0.846858599 0.851736442 0.884357518 0.745389717 0.685087721 0.667016056 0.822355792 0.864852498 0.901420734 0.830529746 0.950221392 0.898121308 0.869012859 0.935410484 0.879375009 0.881217336 0.885822834 +0.47 0.610298412 0.567974749 0.621728343 0.572176636 0.585935319 0.653759762 0.621083958 0.620812063 0.627082648 0.580066755 0.591531267 0.573102491 0.56874627 0.571112249 0.599337768 0.584192293 0.569085595 0.575663315 0.561855213 0.710263837 0.710851294 0.568877362 0.572090474 0.571443877 0.53223315 0.55437323 0.571911401 0.513109736 0.512072007 0.552348019 0.551398431 0.596140358 0.550251065 0.547603475 0.588527219 0.621597279 0.601051432 0.611600325 0.638869788 0.613537192 0.650396954 0.678336368 0.656103995 0.686207091 0.687841381 0.699109198 0.692686109 0.594178511 0.587822786 0.588240534 0.592290305 0.702290464 0.593046809 0.582072283 0.601803236 0.594065344 0.594705269 0.72603775 0.593915522 0.761696182 0.730290642 0.647770668 0.647858698 0.899885802 0.673907954 0.831964284 0.69483633 0.695154513 0.735000361 0.713838156 0.757331398 0.741037896 0.737003271 0.942975821 0.73229815 0.946013172 +0.42 0.60073815 0.626327768 0.61813395 0.574251234 0.580484144 0.685181134 0.582386464 0.644761016 0.590398177 0.594626572 0.709430651 0.681248513 0.709472343 0.706530202 0.578535759 0.573522119 0.563868564 0.572295752 0.582054736 0.620825486 0.642583142 0.648980006 0.656866793 0.651911177 0.58168907 0.564268089 0.660487807 0.673402173 0.66044355 0.669134937 0.660481677 0.734031654 0.726770451 0.692529089 0.749037481 0.745947944 0.663558491 0.738407542 0.622693142 0.628597232 0.737291338 0.64497676 0.65456268 0.652630791 0.661740611 0.649077517 0.671132223 0.659783562 0.662387181 0.694065635 0.718406339 0.696965382 0.712613526 0.669660214 0.728182562 0.72067191 0.685976444 0.698067333 0.701362823 0.763910845 0.741530624 0.740983602 0.751575781 0.813831228 0.76931737 0.718780727 0.792156343 0.777750759 0.791762693 0.802952022 0.777494449 0.716257194 0.768248485 0.751861294 0.770082398 0.7711934 +0.43 0.595145706 0.60302457 0.619972538 0.646573564 0.577274758 0.581718241 0.588003732 0.656963502 0.693678591 0.640511035 0.695307031 0.60556636 0.568278648 0.697686627 0.556110828 0.571112008 0.579015978 0.579572861 0.588304509 0.549694135 0.643985945 0.570168592 0.564929586 0.57461237 0.5783386 0.667851978 0.563424244 0.560546132 0.662583923 0.677812457 0.571818449 0.642311224 0.510846383 0.611918455 0.614382448 0.61237248 0.607253359 0.621940123 0.646120977 0.623185082 0.607718376 0.639085034 0.654178767 0.649767542 0.682509912 0.680252279 0.730491782 0.676925199 0.722503086 0.726713362 0.721660788 0.751365296 0.749646418 0.787935786 0.788590938 0.766080843 0.752596013 0.782413938 0.792935968 0.809031322 0.796061434 0.814749252 0.805056675 0.80295323 0.810457668 0.796093616 0.812755194 0.803348552 0.75736775 0.810526153 0.803154665 0.806174223 0.764378794 0.805914234 0.80504915 0.80866908 +0.44 0.591431527 0.607661658 0.624825793 0.63701503 0.578334532 0.583249042 0.580143814 0.588152054 0.596243466 0.603155642 0.600711827 0.692051063 0.652601714 0.566131675 0.583052016 0.579646836 0.565504867 0.53172174 0.548281149 0.588025623 0.558883359 0.575720146 0.570710875 0.583884708 0.573714315 0.567342573 0.557573953 0.582681252 0.554120876 0.497941403 0.530849822 0.531323163 0.616521952 0.589070867 0.587647715 0.596157587 0.638708344 0.637172155 0.674264342 0.663362381 0.63765902 0.662241823 0.63234751 0.661836422 0.662733293 0.680349843 0.684638602 0.698176532 0.719272081 0.750880503 0.71800663 0.754956366 0.780647839 0.787337362 0.774210961 0.759398115 0.788684801 0.761406448 0.799091498 0.820348172 0.783862862 0.792193349 0.794269699 0.794422618 0.799149107 0.822964159 0.810804922 0.812912909 0.81598853 0.821613906 0.811475757 0.80634565 0.805055153 0.782942577 0.810187756 0.793903032 +0.09 0.596538035 0.625069312 0.645460278 0.672991228 0.702029468 0.728526636 0.744991217 0.76241932 0.777531009 0.799178424 0.820307472 0.837222501 0.851724551 0.872162823 0.883935997 0.902890579 0.917373302 0.934540538 0.950370294 0.964459243 0.96412249 0.979381885 0.994877952 1.008583257 1.022977279 1.035159106 1.054731139 1.064920984 1.075309081 1.087892623 1.104720544 1.121528798 1.14606314 1.150958531 1.157456098 1.18504402 1.189461314 1.194722754 1.196936276 1.201613689 1.180256059 1.214436328 1.216189046 1.222237731 1.226484867 1.229942503 1.235186629 1.249791667 1.25063787 1.252734132 1.249424579 1.250225376 1.25165446 1.260442893 1.261156695 1.255134293 1.251315625 1.253844092 1.253015676 1.252175585 1.232453444 1.230006834 1.221369727 1.225072441 1.213266955 1.211952449 1.227619884 1.238857421 1.233353471 1.220974435 1.217326201 1.211256508 1.206030585 1.208002138 1.200204997 1.190296262 +0.41 0.619459584 0.627420422 0.61704851 0.680315574 0.676232938 0.6784373 0.603456204 0.699035925 0.671664135 0.671487655 0.681012424 0.675726082 0.672842609 0.707628195 0.717966721 0.655151405 0.564010832 0.595345308 0.594038618 0.627402002 0.593653818 0.631823948 0.646044618 0.599277034 0.628341952 0.655970211 0.62407952 0.648483097 0.658462558 0.647605758 0.661530793 0.671136451 0.672930617 0.683101898 0.689614277 0.678882844 0.681540214 0.672623252 0.752606 0.752673317 0.753770182 0.74938198 0.764383541 0.74295999 0.731723496 0.675362515 0.650845147 0.640671586 0.6573916 0.633689832 0.655195313 0.683538269 0.671070249 0.709917196 0.673618755 0.699074956 0.705009319 0.695062781 0.719316689 0.683813081 0.694908773 0.741490571 0.692571743 0.736891087 0.750672096 0.757822227 0.691738843 0.700604521 0.739444719 0.736910087 0.733084289 0.696290329 0.703985478 0.736943961 0.712480183 0.693505923 From ec6a5a59457aa922cf5d3bf54ae72d11720e2203 Mon Sep 17 00:00:00 2001 From: Max Briel Date: Wed, 29 Apr 2026 12:10:30 +0200 Subject: [PATCH 355/389] clean up whitespace --- .../_data/POSYDON_data/Patton+Sukhbold20/Kepler_sc_table.dat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/unit_tests/_data/POSYDON_data/Patton+Sukhbold20/Kepler_sc_table.dat b/posydon/unit_tests/_data/POSYDON_data/Patton+Sukhbold20/Kepler_sc_table.dat index e255e53056..50e832da4d 100644 --- a/posydon/unit_tests/_data/POSYDON_data/Patton+Sukhbold20/Kepler_sc_table.dat +++ b/posydon/unit_tests/_data/POSYDON_data/Patton+Sukhbold20/Kepler_sc_table.dat @@ -5,7 +5,7 @@ # # All masses are in units of Msun # -X_c 2.5 2.6 2.7 2.8 2.9 3.0 3.1 3.2 3.3 3.4 3.5 3.6 3.7 3.8 3.9 4.0 4.1 4.2 4.3 4.4 4.5 4.6 4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1 6.2 6.3 6.4 6.5 6.6 6.7 6.8 6.9 7.0 7.1 7.2 7.3 7.4 7.5 7.6 7.7 7.8 7.9 8.0 8.1 8.2 8.3 8.4 8.5 8.6 8.7 8.8 8.9 9.0 9.1 9.2 9.3 9.4 9.5 9.6 9.7 9.8 9.9 10.0 +X_c 2.5 2.6 2.7 2.8 2.9 3.0 3.1 3.2 3.3 3.4 3.5 3.6 3.7 3.8 3.9 4.0 4.1 4.2 4.3 4.4 4.5 4.6 4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1 6.2 6.3 6.4 6.5 6.6 6.7 6.8 6.9 7.0 7.1 7.2 7.3 7.4 7.5 7.6 7.7 7.8 7.9 8.0 8.1 8.2 8.3 8.4 8.5 8.6 8.7 8.8 8.9 9.0 9.1 9.2 9.3 9.4 9.5 9.6 9.7 9.8 9.9 10.0 0.05 0.610768691 0.629214872 0.652130574 0.679378435 0.713697783 0.74581048 0.766641043 0.792775501 0.814823111 0.836142529 0.859851158 0.886006531 0.912686043 0.932691598 0.957916148 0.969091329 0.99016173 1.010252072 1.028069634 1.051504705 1.075993752 1.089255614 1.111628723 1.119726359 1.14275482 1.161087743 1.18040405 1.197066773 1.216365632 1.214596008 1.229566027 1.235289616 1.238242492 1.24917912 1.245350981 1.220772176 1.21836697 1.210971843 1.187712915 1.171558872 0.91886142 0.86374049 0.865662993 0.870884007 0.661530736 0.673704051 0.678886681 0.688039343 0.696985998 0.702601761 0.711639237 0.721744358 0.731312803 0.734804539 0.744305905 0.754773775 0.76451156 0.77518963 0.78722218 0.795089722 0.806110319 0.815227124 0.825915333 0.835420584 0.845608485 0.860265491 0.868023291 0.875491152 0.88321075 0.890889423 0.89890877 0.905702072 0.918266901 0.925577573 0.93295046 0.937262003 0.06 0.605510653 0.623915014 0.645836118 0.669321322 0.711392924 0.733214322 0.757603034 0.779210939 0.809051813 0.827016041 0.853383266 0.876592594 0.900028228 0.917641138 0.940458175 0.955522327 0.953821922 0.970036773 0.980775063 0.993971811 1.018976141 1.059055157 1.059484498 1.091019601 1.128510811 1.148597138 1.169798336 1.182814096 1.193163283 1.204827891 1.218106081 1.216802697 1.223924857 1.232778163 1.233200008 1.241112042 1.242004225 1.234769423 1.215049219 1.215025812 1.201259291 1.183634618 1.171101742 1.155320234 1.108348597 1.096416255 0.977886043 0.921079589 0.677173147 0.682344755 0.692446217 0.700938994 0.704854752 0.714058995 0.721762359 0.73015152 0.734381046 0.743366991 0.753205934 0.76265074 0.772110114 0.782041086 0.792809845 0.805655556 0.816805382 0.825751237 0.837665069 0.841273076 0.833332233 0.841220896 0.848222083 0.860692799 0.868035718 0.875329517 0.882247869 0.890472758 0.15 0.728703373 0.741488304 0.743411687 0.766181023 0.613251415 0.654098815 0.706728262 0.710525257 0.645557443 0.792594011 0.782761187 0.727139362 0.714101691 0.710218882 0.688158065 0.697339026 0.764769326 0.81681644 0.891546699 0.999853931 1.00023813 1.014926909 1.022942369 1.009845222 1.010410148 1.013922446 1.015498105 1.014668779 1.015341347 1.019183579 1.027168877 1.028267606 1.023165366 1.002707222 0.996271088 0.999200651 1.000902452 0.990751311 0.981018618 0.961410751 0.959386139 0.960218557 0.996352029 0.949127941 0.967258548 0.946368996 0.952897947 0.946629509 0.92697324 0.958720712 0.946238579 0.940932286 0.947880852 0.933168069 0.989886803 0.994774084 1.013139995 1.00647957 1.018824226 1.041982809 1.056247591 1.054407715 1.03772044 1.046278875 1.047502012 1.04529673 1.044989069 1.054270488 1.055515471 1.061478717 1.074239667 1.074599382 1.080888843 1.082550062 1.085902628 1.086620885 From c5583f4074b012d87c5a4f9009a72b8925f2cc4a Mon Sep 17 00:00:00 2001 From: Max Briel Date: Mon, 4 May 2026 09:30:00 +0200 Subject: [PATCH 356/389] clean posydon repo; redo PR784 into v2.3 instead --- .github/workflows/continuous_integration.yml | 18 +- .gitignore | 1 + .gitmodules | 6 - conda/meta.yaml | 6 +- data/POSYDON_data | 1 - posydon/__init__.py | 11 +- posydon/_version.py | 532 -------------- .../psy_cris/test_Classifier.py | 159 ----- .../psy_cris/test_Regressor.py | 174 ----- .../active_learning/psy_cris/test_Sampler.py | 166 ----- .../psy_cris/test_TableData.py | 247 ------- .../active_learning/psy_cris/test_utils.py | 76 -- posydon/tests/binary_evol/CE/test_CEE.py | 655 ------------------ .../binary_evol/DT/test_step_detached.py | 404 ----------- .../binary_evol/SN/test_profile_collapse.py | 98 --- posydon/tests/binary_evol/SN/test_step_SN.py | 567 --------------- posydon/tests/binary_evol/test_BinaryStar.py | 127 ---- posydon/tests/binary_evol/test_SingleStar.py | 73 -- posydon/tests/data/POSYDON-UNIT-TESTS | 1 - .../tests/interpolation/test_data_scaling.py | 251 ------- .../tests/interpolation/test_interpolation.py | 37 - posydon/tests/popsyn/test_binarypopulation.py | 180 ----- .../tests/popsyn/test_synthetic_population.py | 645 ----------------- 23 files changed, 14 insertions(+), 4421 deletions(-) delete mode 160000 data/POSYDON_data delete mode 100644 posydon/_version.py delete mode 100644 posydon/tests/active_learning/psy_cris/test_Classifier.py delete mode 100644 posydon/tests/active_learning/psy_cris/test_Regressor.py delete mode 100644 posydon/tests/active_learning/psy_cris/test_Sampler.py delete mode 100644 posydon/tests/active_learning/psy_cris/test_TableData.py delete mode 100644 posydon/tests/active_learning/psy_cris/test_utils.py delete mode 100644 posydon/tests/binary_evol/CE/test_CEE.py delete mode 100644 posydon/tests/binary_evol/DT/test_step_detached.py delete mode 100644 posydon/tests/binary_evol/SN/test_profile_collapse.py delete mode 100644 posydon/tests/binary_evol/SN/test_step_SN.py delete mode 100644 posydon/tests/binary_evol/test_BinaryStar.py delete mode 100644 posydon/tests/binary_evol/test_SingleStar.py delete mode 160000 posydon/tests/data/POSYDON-UNIT-TESTS delete mode 100644 posydon/tests/interpolation/test_data_scaling.py delete mode 100644 posydon/tests/interpolation/test_interpolation.py delete mode 100644 posydon/tests/popsyn/test_binarypopulation.py delete mode 100644 posydon/tests/popsyn/test_synthetic_population.py diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index f9edfc236d..a688d5b959 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -25,26 +25,14 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Install POSYDON without extras + - name: Install POSYDON with test dependencies run: | python -m pip install --upgrade pip - pip install . + pip install .[test] - name: Run all tests in posydon/unit_tests run: | - # python -m pip install --upgrade pip - # pip install . - pip install pytest - pip install pytest-cov export PATH_TO_POSYDON=./ export PATH_TO_POSYDON_DATA=./posydon/unit_tests/_data/ export MESA_DIR=./ - python -m pytest posydon/unit_tests/ \ - --cov=posydon.config \ - --cov=posydon.utils \ - --cov=posydon.grids \ - --cov=posydon.popsyn \ - --cov=posydon.CLI \ - --cov-branch \ - --cov-report term-missing \ - --cov-fail-under=100 + pytest # run and coverage parameters are defined in pyproject.toml diff --git a/.gitignore b/.gitignore index 45e334668d..63e5cf387d 100644 --- a/.gitignore +++ b/.gitignore @@ -70,6 +70,7 @@ instance/ # Sphinx documentation docs/_build/ docs/_tmp/ +docs/_source/_build/ docs/_source/api_reference docs/checkautodoc *.h5 diff --git a/.gitmodules b/.gitmodules index 6cda6aff11..1cfccfceda 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,3 @@ [submodule "grid_params/POSYDON-MESA-INLISTS"] path = grid_params/POSYDON-MESA-INLISTS url = https://github.com/POSYDON-code/POSYDON-MESA-INLISTS.git -[submodule "data/POSYDON_data"] - path = data/POSYDON_data - url = https://github.com/POSYDON-code/POSYDON_data.git -[submodule "posydon/tests/data/POSYDON-UNIT-TESTS"] - path = posydon/tests/data/POSYDON-UNIT-TESTS - url = https://github.com/POSYDON-code/POSYDON-UNIT-TESTS.git diff --git a/conda/meta.yaml b/conda/meta.yaml index 7586866e6d..751d76aec0 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -1,9 +1,8 @@ {% set name = "posydon" %} -{% set version = "2.2.8" %} package: name: "{{ name|lower }}" - version: "{{ version }}" + version: {{ GIT_DESCRIBE_TAG }} source: path: .. @@ -17,7 +16,8 @@ requirements: host: - pip - python==3.11 - - setuptools>=38.2.5 + - setuptools>=76.0.0 + - setuptools-scm>=8.0 run: - python==3.11 diff --git a/data/POSYDON_data b/data/POSYDON_data deleted file mode 160000 index e5d8d77985..0000000000 --- a/data/POSYDON_data +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e5d8d77985fc1502b6b6cc0400577623d50743ab diff --git a/posydon/__init__.py b/posydon/__init__.py index bf13af499c..d3c2c0325a 100644 --- a/posydon/__init__.py +++ b/posydon/__init__.py @@ -1,6 +1,11 @@ -from ._version import get_versions +from importlib.metadata import PackageNotFoundError, version + +try: + __version__ = version("posydon") +except PackageNotFoundError: + # Package is not installed + __version__ = "unknown" -__version__ = get_versions()['version'] __author__ = "Tassos Fragos " __credits__ = [ "Emmanouil Zapartas ", @@ -19,5 +24,3 @@ "Ying Qin <", "Aaron Dotter ", ] - -del get_versions diff --git a/posydon/_version.py b/posydon/_version.py deleted file mode 100644 index 030e6a8b1b..0000000000 --- a/posydon/_version.py +++ /dev/null @@ -1,532 +0,0 @@ - -# This file helps to compute a version number in source trees obtained from -# git-archive tarball (such as those provided by githubs download-from-tag -# feature). Distribution tarballs (built by setup.py sdist) and build -# directories (produced by setup.py build) will contain a much shorter file -# that just contains the computed version number. - -# This file is released into the public domain. Generated by -# versioneer-0.18 (https://github.com/warner/python-versioneer) - -"""Git implementation of _version.py.""" - -__authors__ = [ - "Scott Coughlin ", - "Matthias Kruckow ", -] - -import errno -import os -import re -import subprocess -import sys - - -def get_keywords(): - """Get the keywords needed to look up the version information.""" - # these strings will be replaced by git during git-archive. - # setup.py/versioneer.py will grep for the variable names, so they must - # each be defined on a line of their own. _version.py will just call - # get_keywords(). - git_refnames = "$Format:%d$" - git_full = "$Format:%H$" - git_date = "$Format:%ci$" - keywords = {"refnames": git_refnames, "full": git_full, "date": git_date} - return keywords - - -class VersioneerConfig: - """Container for Versioneer configuration parameters.""" - - -def get_config(): - """Create, populate and return the VersioneerConfig() object.""" - # these strings are filled in when 'setup.py versioneer' creates - # _version.py - cfg = VersioneerConfig() - cfg.VCS = "git" - cfg.style = "pep440" - cfg.tag_prefix = "v" - cfg.parentdir_prefix = "" - cfg.versionfile_source = "posydon/_version.py" - cfg.verbose = False - return cfg - - -class NotThisMethod(Exception): - """Exception raised if a method is not valid for the current scenario.""" - - -LONG_VERSION_PY = {} -HANDLERS = {} - - -def register_vcs_handler(vcs, method): # decorator - """Get decorator to mark a method as the handler for a particular VCS.""" - def decorate(f): - """Store f in HANDLERS[vcs][method].""" - if vcs not in HANDLERS: - HANDLERS[vcs] = {} - HANDLERS[vcs][method] = f - return f - return decorate - - -def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, - env=None): - """Call the given command(s).""" - assert isinstance(commands, list) - p = None - for c in commands: - try: - dispcmd = str([c] + args) - # remember shell=False, so use git.cmd on windows, not just git - p = subprocess.Popen([c] + args, cwd=cwd, env=env, - stdout=subprocess.PIPE, - stderr=(subprocess.PIPE if hide_stderr - else None)) - break - except EnvironmentError: - e = sys.exc_info()[1] - if e.errno == errno.ENOENT: - continue - if verbose: - print("unable to run %s" % dispcmd) - print(e) - return None, None - else: - if verbose: - print("unable to find command, tried %s" % (commands,)) - return None, None - stdout = p.communicate()[0].strip() - if sys.version_info[0] >= 3: - stdout = stdout.decode() - if p.returncode != 0: - if verbose: - print("unable to run %s (error)" % dispcmd) - print("stdout was %s" % stdout) - return None, p.returncode - return stdout, p.returncode - - -def versions_from_parentdir(parentdir_prefix, root, verbose): - """Try to determine the version from the parent directory name. - - Source tarballs conventionally unpack into a directory that includes both - the project name and a version string. We will also support searching up - two directory levels for an appropriately named parent directory - """ - rootdirs = [] - - for i in range(3): - dirname = os.path.basename(root) - if dirname.startswith(parentdir_prefix): - return {"version": dirname[len(parentdir_prefix):], - "full-revisionid": None, - "dirty": False, "error": None, "date": None} - else: - rootdirs.append(root) - root = os.path.dirname(root) # up a level - - if verbose: - print("Tried directories %s but none started with prefix %s" % - (str(rootdirs), parentdir_prefix)) - raise NotThisMethod("rootdir doesn't start with parentdir_prefix") - - -@register_vcs_handler("git", "get_keywords") -def git_get_keywords(versionfile_abs): - """Extract version information from the given file.""" - # the code embedded in _version.py can just fetch the value of these - # keywords. When used from setup.py, we don't want to import _version.py, - # so we do it with a regexp instead. This function is not used from - # _version.py. - keywords = {} - try: - f = open(versionfile_abs, "r") - for line in f.readlines(): - if line.strip().startswith("git_refnames ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["refnames"] = mo.group(1) - if line.strip().startswith("git_full ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["full"] = mo.group(1) - if line.strip().startswith("git_date ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["date"] = mo.group(1) - f.close() - except EnvironmentError: - pass - return keywords - - -@register_vcs_handler("git", "keywords") -def git_versions_from_keywords(keywords, tag_prefix, verbose): - """Get version information from git keywords.""" - if not keywords: - raise NotThisMethod("no keywords at all, weird") - date = keywords.get("date") - if date is not None: - # git-2.2.0 added "%cI", which expands to an ISO-8601 -compliant - # datestamp. However we prefer "%ci" (which expands to an "ISO-8601 - # -like" string, which we must then edit to make compliant), because - # it's been around since git-1.5.3, and it's too difficult to - # discover which version we're using, or to work around using an - # older one. - date = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - refnames = keywords["refnames"].strip() - if refnames.startswith("$Format"): - if verbose: - print("keywords are unexpanded, not using") - raise NotThisMethod("unexpanded keywords, not a git-archive tarball") - refs = set([r.strip() for r in refnames.strip("()").split(",")]) - # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of - # just "foo-1.0". If we see a "tag: " prefix, prefer those. - TAG = "tag: " - tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)]) - if not tags: - # Either we're using git < 1.8.3, or there really are no tags. We use - # a heuristic: assume all version tags have a digit. The old git %d - # expansion behaves like git log --decorate=short and strips out the - # refs/heads/ and refs/tags/ prefixes that would let us distinguish - # between branches and tags. By ignoring refnames without digits, we - # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". - tags = set([r for r in refs if re.search(r'\d', r)]) - if verbose: - print("discarding '%s', no digits" % ",".join(refs - tags)) - if verbose: - print("likely tags: %s" % ",".join(sorted(tags))) - for ref in sorted(tags): - # sorting will prefer e.g. "2.0" over "2.0rc1" - if ref.startswith(tag_prefix): - r = ref[len(tag_prefix):] - if verbose: - print("picking %s" % r) - return {"version": r, - "full-revisionid": keywords["full"].strip(), - "dirty": False, "error": None, - "date": date} - # no suitable tags, so version is "0+unknown", but full hex is still there - if verbose: - print("no suitable tags, using unknown + full revision id") - return {"version": "0+unknown", - "full-revisionid": keywords["full"].strip(), - "dirty": False, "error": "no suitable tags", "date": None} - - -@register_vcs_handler("git", "pieces_from_vcs") -def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - """Get version from 'git describe' in the root of the source tree. - - This only gets called if the git-archive 'subst' keywords were *not* - expanded, and _version.py hasn't already been rewritten with a short - version string, meaning we're inside a checked out source tree. - """ - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - - out, rc = run_command(GITS, ["rev-parse", "--git-dir"], cwd=root, - hide_stderr=True) - if rc != 0: - if verbose: - print("Directory %s not under git control" % root) - raise NotThisMethod("'git rev-parse --git-dir' returned error") - - # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty] - # if there isn't one, this yields HEX[-dirty] (no NUM) - describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty", - "--always", "--long", - "--match", "%s*" % tag_prefix], - cwd=root) - # --long was added in git-1.5.5 - if describe_out is None: - raise NotThisMethod("'git describe' failed") - describe_out = describe_out.strip() - full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) - if full_out is None: - raise NotThisMethod("'git rev-parse' failed") - full_out = full_out.strip() - - pieces = {} - pieces["long"] = full_out - pieces["short"] = full_out[:7] # maybe improved later - pieces["error"] = None - - # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty] - # TAG might have hyphens. - git_describe = describe_out - - # look for -dirty suffix - dirty = git_describe.endswith("-dirty") - pieces["dirty"] = dirty - if dirty: - git_describe = git_describe[:git_describe.rindex("-dirty")] - - # now we have TAG-NUM-gHEX or HEX - - if "-" in git_describe: - # TAG-NUM-gHEX - mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe) - if not mo: - # unparseable. Maybe git-describe is misbehaving? - pieces["error"] = ("unable to parse git-describe output: '%s'" - % describe_out) - return pieces - - # tag - full_tag = mo.group(1) - if not full_tag.startswith(tag_prefix): - if verbose: - fmt = "tag '%s' doesn't start with prefix '%s'" - print(fmt % (full_tag, tag_prefix)) - pieces["error"] = ("tag '%s' doesn't start with prefix '%s'" - % (full_tag, tag_prefix)) - return pieces - pieces["closest-tag"] = full_tag[len(tag_prefix):] - - # distance: number of commits since tag - pieces["distance"] = int(mo.group(2)) - - # commit: short hex revision ID - pieces["short"] = mo.group(3) - - else: - # HEX: no tags - pieces["closest-tag"] = None - count_out, rc = run_command(GITS, ["rev-list", "HEAD", "--count"], - cwd=root) - pieces["distance"] = int(count_out) # total number of commits - - # commit date: see ISO-8601 comment in git_versions_from_keywords() - date, rc = run_command(GITS, ["show", "-s", "--format=%ci", "HEAD"], - cwd=root) - if rc != 0: - if verbose: - print("Retry 'git show'") - date, rc = run_command(GITS, ["show", "-s", "--format=%ci", "HEAD"], - cwd=root) - if date is None: - raise NotThisMethod("'git show' failed") - pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - - return pieces - - -def plus_or_dot(pieces): - """Return a + if we don't already have one, else return a .""" - if "+" in pieces.get("closest-tag", ""): - return "." - return "+" - - -def render_pep440(pieces): - """Build up version string, with post-release "local version identifier". - - Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you - get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty - - Exceptions: - 1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += plus_or_dot(pieces) - rendered += "%d.g%s" % (pieces["distance"], pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - else: - # exception #1 - rendered = "0+untagged.%d.g%s" % (pieces["distance"], - pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - return rendered - - -def render_pep440_pre(pieces): - """TAG[.post.devDISTANCE] -- No -dirty. - - Exceptions: - 1: no tags. 0.post.devDISTANCE - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += ".post.dev%d" % pieces["distance"] - else: - # exception #1 - rendered = "0.post.dev%d" % pieces["distance"] - return rendered - - -def render_pep440_post(pieces): - """TAG[.postDISTANCE[.dev0]+gHEX] . - - The ".dev0" means dirty. Note that .dev0 sorts backwards - (a dirty tree will appear "older" than the corresponding clean one), - but you shouldn't be releasing software with -dirty anyways. - - Exceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += plus_or_dot(pieces) - rendered += "g%s" % pieces["short"] - else: - # exception #1 - rendered = "0.post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += "+g%s" % pieces["short"] - return rendered - - -def render_pep440_old(pieces): - """TAG[.postDISTANCE[.dev0]] . - - The ".dev0" means dirty. - - Eexceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - else: - # exception #1 - rendered = "0.post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - return rendered - - -def render_git_describe(pieces): - """TAG[-DISTANCE-gHEX][-dirty]. - - Like 'git describe --tags --dirty --always'. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += "-%d-g%s" % (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render_git_describe_long(pieces): - """TAG-DISTANCE-gHEX[-dirty]. - - Like 'git describe --tags --dirty --always -long'. - The distance/hash is unconditional. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - rendered += "-%d-g%s" % (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render(pieces, style): - """Render the given version pieces into the requested style.""" - if pieces["error"]: - return {"version": "unknown", - "full-revisionid": pieces.get("long"), - "dirty": None, - "error": pieces["error"], - "date": None} - - if not style or style == "default": - style = "pep440" # the default - - if style == "pep440": - rendered = render_pep440(pieces) - elif style == "pep440-pre": - rendered = render_pep440_pre(pieces) - elif style == "pep440-post": - rendered = render_pep440_post(pieces) - elif style == "pep440-old": - rendered = render_pep440_old(pieces) - elif style == "git-describe": - rendered = render_git_describe(pieces) - elif style == "git-describe-long": - rendered = render_git_describe_long(pieces) - else: - raise ValueError("unknown style '%s'" % style) - - return {"version": rendered, "full-revisionid": pieces["long"], - "dirty": pieces["dirty"], "error": None, - "date": pieces.get("date")} - - -def get_versions(): - """Get version information or return default if unable to do so.""" - # I am in _version.py, which lives at ROOT/VERSIONFILE_SOURCE. If we have - # __file__, we can work backwards from there to the root. Some - # py2exe/bbfreeze/non-CPython implementations don't do __file__, in which - # case we can only use expanded keywords. - - cfg = get_config() - verbose = cfg.verbose - - try: - return git_versions_from_keywords(get_keywords(), cfg.tag_prefix, - verbose) - except NotThisMethod: - pass - - try: - root = os.path.realpath(__file__) - # versionfile_source is the relative path from the top of the source - # tree (where the .git directory might live) to this file. Invert - # this to find the root from __file__. - for i in cfg.versionfile_source.split('/'): - root = os.path.dirname(root) - except NameError: - return {"version": "0+unknown", "full-revisionid": None, - "dirty": None, - "error": "unable to find root of source tree", - "date": None} - - try: - pieces = git_pieces_from_vcs(cfg.tag_prefix, root, verbose) - return render(pieces, cfg.style) - except NotThisMethod: - pass - - try: - if cfg.parentdir_prefix: - return versions_from_parentdir(cfg.parentdir_prefix, root, verbose) - except NotThisMethod: - pass - - return {"version": "0+unknown", "full-revisionid": None, - "dirty": None, - "error": "unable to compute version", "date": None} diff --git a/posydon/tests/active_learning/psy_cris/test_Classifier.py b/posydon/tests/active_learning/psy_cris/test_Classifier.py deleted file mode 100644 index 7c7d7f2953..0000000000 --- a/posydon/tests/active_learning/psy_cris/test_Classifier.py +++ /dev/null @@ -1,159 +0,0 @@ -"""Unit test for posydon.active_learning.psy_cris classes -""" -import unittest - -import matplotlib.pyplot as plt -import numpy as np -import pandas as pd - -from posydon.active_learning.psy_cris.classify import Classifier -from posydon.active_learning.psy_cris.data import TableData -from posydon.active_learning.psy_cris.synthetic_data.synth_data_3D import get_output_3D -from posydon.active_learning.psy_cris.utils import ( - get_random_grid_df, - get_regular_grid_df, -) - -# True for faster runtime ~ 3s vs 15s -SKIP_GP_TESTS = True - -SKIP_TEST_PLOTS = False -SHOW_PLOTS = False - - -class TestClassifier(unittest.TestCase): - """Test Classifier class on the 3d synthetic data set.""" - - @classmethod - def setUpClass(cls): - np.random.seed(12345) - cls.TEST_DATA_GRID = get_regular_grid_df(N=10 ** 3, dim=3) - cls.TEST_DATA_RAND = get_random_grid_df(N=10 ** 3, dim=3) - cls.UNIQUE_CLASSES = [1, 2, 3, 4, 6, 8] - - cls.TEST_INPUT_POINTS = np.array([[0, 0, 0], [-0.5, 0.5, 0.5]]) - cls.TEST_OUTPUT_TRUTH = get_output_3D(*cls.TEST_INPUT_POINTS.T) - - def setUp(self): - my_kwargs = {"n_neighbors": [2, 3]} - self.table_grid = self.create_TableData(self.TEST_DATA_GRID, **my_kwargs) - self.table_rand = self.create_TableData(self.TEST_DATA_RAND, **my_kwargs) - self.cls_obj_grid = Classifier(self.table_grid) - self.cls_obj_rand = Classifier(self.table_rand) - - def create_TableData(self, data_frame, **kwargs): - files = None - input_cols = ["input_1", "input_2", "input_3"] - output_cols = ["class", "output_1"] - class_col_name = "class" - table_obj = TableData( - files, - input_cols, - output_cols, - class_col_name, - my_DataFrame=data_frame, - verbose=False, - **kwargs - ) - return table_obj - - def test_train_classifiers_1(self): - # di can be [16,19,24,32,41,48,64] to avoid multi class error for gp - data_range = np.arange(0, 1000)[::64] - for cls in ["rbf", "linear", "gp"]: - with self.subTest("Train grid:", classifier=cls): - self.cls_obj_grid.train(cls, di=data_range, verbose=False) - - def test_train_classifiers_2(self): - # skipping gp here - data_range = np.arange(0, 1000)[::10] - for cls in ["rbf", "linear"]: - with self.subTest("Train random:", classifier=cls): - self.cls_obj_rand.train(cls, di=data_range, verbose=False) - - def train_grid_classifiers(self, cls_names, **kwargs): - for name in cls_names: - self.cls_obj_grid.train(name, **kwargs) - - def test_predictions(self): - self.train_grid_classifiers(["linear", "rbf"]) - correct_probabilities = [0.98519722, 1.00000, 0.5883452] - for i, cls_name in enumerate(["rbf", "linear"]): - with self.subTest("Get class predictions:", classifier=cls_name): - tup_out = self.cls_obj_grid.get_class_predictions( - cls_name, self.TEST_INPUT_POINTS, return_ids=False - ) - class_pred, probs, where_not_nan = tup_out - - self.assertTrue( - (3 in class_pred) and (8 in class_pred), - msg="All predictions should contain class 3 and 8", - ) - self.assertAlmostEqual(probs[0], correct_probabilities[i], places=3) - self.assertTrue(len(where_not_nan) == 2, msg="Should not get any nans.") - - @unittest.skipIf(SKIP_GP_TESTS, "GP train / predict - long runtime.") - def test_predictions_gp(self): - self.train_grid_classifiers(["gp"], di=np.arange(0, 1000)[::6]) - tup_out = self.cls_obj_grid.get_class_predictions( - "gp", self.TEST_INPUT_POINTS, return_ids=False - ) - class_pred, probs, where_not_nan = tup_out - - self.assertTrue( - (3 in class_pred) and (8 in class_pred), - msg="All predictions should contain class 3 and 8", - ) - self.assertAlmostEqual(probs[0], 0.5883452, places=3) - self.assertTrue(len(where_not_nan) == 2, msg="Should not get any nans.") - - def test_pred_train_err(self): - # Trying to predict without training - names = ["grid", "random"] - for i, classifier in enumerate([self.cls_obj_grid, self.cls_obj_rand]): - with self.subTest(classifier_name=names[i]): - with self.assertRaisesRegex( - Exception, "No trained interpolators exist" - ): - classifier.get_class_predictions("linear", [[0, 0, 0]]) - - def test_pred_linear_err(self): - self.cls_obj_rand.train("linear", di=np.arange(0, 1000, 50)) - tup_out = self.cls_obj_rand.get_class_predictions( - "lin", [[-1, -1, -1], [1, 1, 1]], return_ids=False - ) - self.assertTrue(len(tup_out[2]) == 0, msg="Should return no valid values.") - - # def test_cross_val(self): - # correct_ans = [67.36842105263158, 66.66666666666666] - # acc, times = self.cls_obj_grid.cross_validate( - # ["rbf", "linear"], 0.05, verbose=False - # ) - # for i, percent_acc in enumerate(acc): - # with self.subTest("Cross Val", i=i, percent_acc=percent_acc): - # self.assertAlmostEqual(acc[i], correct_ans[i], places=3) - - @unittest.skipIf(SKIP_GP_TESTS, "GP cross_val - long runtime.") - def test_cross_val_gp(self): - correct_ans = [73.76470588235294] - acc, times = self.cls_obj_grid.cross_validate(["gp"], 0.15, verbose=False) - for i, percent_acc in enumerate(acc): - with self.subTest("Cross Val", i=i, percent_acc=percent_acc): - self.assertAlmostEqual(acc[i], correct_ans[i], places=3) - - @unittest.skipIf(SKIP_TEST_PLOTS, "Skipping maximum class P plot.") - def test_max_cls_plot(self): - N = int(2e4) if SHOW_PLOTS else 100 - self.train_grid_classifiers(["rbf"]) - fig, axes = self.cls_obj_grid.make_max_cls_plot( - "rbf", ("input_1", "input_2"), N=N, s=3, alpha=0.6, cmap="bone" - ) - if SHOW_PLOTS: - fig.show() - else: - print("To show plots set SHOW_PLOTS to True.") - plt.close(fig) - - -if __name__ == "__main__": - unittest.main() diff --git a/posydon/tests/active_learning/psy_cris/test_Regressor.py b/posydon/tests/active_learning/psy_cris/test_Regressor.py deleted file mode 100644 index 94695db620..0000000000 --- a/posydon/tests/active_learning/psy_cris/test_Regressor.py +++ /dev/null @@ -1,174 +0,0 @@ -"""Unit test for posydon.active_learning.psy_cris classes -""" -import math -import unittest - -import matplotlib.pyplot as plt -import numpy as np -import pandas as pd - -from posydon.active_learning.psy_cris.data import TableData -from posydon.active_learning.psy_cris.regress import Regressor -from posydon.active_learning.psy_cris.synthetic_data.synth_data_3D import get_output_3D -from posydon.active_learning.psy_cris.utils import ( - get_random_grid_df, - get_regular_grid_df, -) - -# True for faster runtime ~ 1s vs 3s -SKIP_GP_TESTS = False - -SKIP_TEST_PLOTS = False -SHOW_PLOTS = False - - -class TestRegressor(unittest.TestCase): - """Test Regressor class on the 3d synthetic data set.""" - - @classmethod - def setUpClass(cls): - np.random.seed(12345) - cls.TEST_DATA_GRID = get_regular_grid_df(N=10 ** 3, dim=3) - cls.TEST_DATA_RAND = get_random_grid_df(N=10 ** 3, dim=3) - cls.UNIQUE_CLASSES = [1, 2, 3, 4, 6, 8] - - cls.TEST_INPUT_POINTS = np.array([[0, 0, 0], [-0.5, 0.5, 0.5]]) - cls.TEST_OUTPUT_TRUTH = get_output_3D(*cls.TEST_INPUT_POINTS.T) - - def setUp(self): - my_kwargs = {"n_neighbors": [2, 3, 5]} - self.table_grid = self.create_TableData(self.TEST_DATA_GRID, **my_kwargs) - self.table_rand = self.create_TableData(self.TEST_DATA_RAND, **my_kwargs) - self.regr_grid = Regressor(self.table_grid) - self.regr_rand = Regressor(self.table_rand) - - def create_TableData(self, data_frame, **kwargs): - files = None - input_cols = ["input_1", "input_2", "input_3"] - output_cols = ["class", "output_1"] - class_col_name = "class" - table_obj = TableData( - files, - input_cols, - output_cols, - class_col_name, - my_DataFrame=data_frame, - verbose=False, - **kwargs - ) - return table_obj - - def train_grid_regressors(self, names, *args, **kwargs): - for i, regr_name in enumerate(names): - self.regr_grid.train(regr_name, *args, **kwargs) - - def test_train_regressors_1(self): - # di can be [16,19,24,32,41,48,64] to avoid multi class error for gp - classes_to_train = [ [1,2,3,4,6,8], [1,6,8], [1,6,8] ] - col_keys = ["output_1"] - for i, regr in enumerate(["rbf", "linear", "gp"]): - with self.subTest("Train grid:", regressor=regr): - self.regr_grid.train(regr, classes_to_train[i], col_keys, - verbose=False) - - def test_train_regressors_2(self): - # skipping gp here - classes_to_train = [ [1,2,3,4,6,8], [1,6,8], [1,6,8] ] - col_keys = ["output_1"] - for i, regr in enumerate(["rbf", "linear"]): - with self.subTest("Train random:", regressor=regr): - self.regr_rand.train(regr, classes_to_train[i], - col_keys, verbose=False) - - def test_predictions(self): - """Checking for consistency only, not true values.""" - self.train_grid_regressors(["rbf", "linear"], [6], ["output_1"]) - - regr_out = self.regr_grid.get_predictions( - ["rbf", "linear"], [6], ["output_1"], self.TEST_INPUT_POINTS - ) - # RBF check - for i, corr_ans in enumerate([-0.78295781, -0.7401497]): - with self.subTest("RBF regr", correct_ans=corr_ans): - pred = regr_out["RBF"][6]["output_1"][i] - self.assertAlmostEqual(pred, corr_ans, places=5) - - # LinearNDInterpolator check - for i, corr_ans in enumerate([0.13898644, float("Nan")]): - with self.subTest("LinearNDInterpolator regr", correct_ans=corr_ans): - pred = regr_out["LinearNDInterpolator"][6]["output_1"][i] - if i == 1: - self.assertTrue(math.isnan(pred), msg="Prediction should be Nan. {}".format(pred)) - else: - self.assertAlmostEqual(pred, corr_ans, places=5) - - @unittest.skipIf(SKIP_GP_TESTS, "GP train / predict - longer runtime.") - def test_predictions_gp(self): - self.train_grid_regressors(["gp"], [6], ["output_1"], di=None) - - regr_out = self.regr_grid.get_predictions( - ["gp"], [6], ["output_1"], self.TEST_INPUT_POINTS - ) - for i, corr_ans in enumerate([0,0]): - with self.subTest("GaussianProcessRegressor", correct_ans=corr_ans): - pred = regr_out["GaussianProcessRegressor"][6]["output_1"][i] - self.assertAlmostEqual(pred, corr_ans, places=5) - - - def test_pred_train_err(self): - # Trying to predict without training - names = ["grid", "random"] - for i, regressor in enumerate([self.regr_grid, self.regr_rand]): - with self.subTest(classifier_name=names[i]): - with self.assertRaisesRegex( - Exception, "No trained interpolators exist" - ): - regressor.get_predictions( ["linear"], [6], ["output_1"], [[0, 0, 0]]) - - def test_cross_val(self): - corr_ans = [-16.528141760898365, -61.41327730988214, -10.621903342287425] - for index, cls in enumerate([1,6,8]): - with self.subTest("Cross Validation Regression", class_key=cls): - perc_diffs, actual_diffs = self.regr_grid.cross_validate("rbf", cls, "output_1", 0.5 ) - self.assertAlmostEqual( np.mean(perc_diffs), corr_ans[index], places=5) - - plt.hist(perc_diffs, bins=40, density=True, range=(-300,300), - histtype="step", label="class "+str(cls)) - plt.xlabel("Regression Percent Difference") - plt.title("Test Regression CV") - plt.legend() - if SHOW_PLOTS: - plt.show() - plt.close() - - - @unittest.skipIf(SKIP_GP_TESTS, "GP cross_val - longer runtime.") - def test_cross_val_gp(self): - corr_ans = [-36.08266156603506, -100.0, -70.79557229587994] - for index, cls in enumerate([1,6,8]): - with self.subTest("Cross Validation Regression GP", class_key=cls, ans=corr_ans[index]): - perc_diffs, actual_diffs = self.regr_grid.cross_validate("gp", cls, "output_1", 0.5 ) - self.assertAlmostEqual( np.mean(perc_diffs), corr_ans[index], places=5) - - plt.hist(perc_diffs, bins=40, density=True, range=(-300,300), - histtype="step", label="class "+str(cls)) - plt.xlabel("Regression Percent Difference") - plt.title("Test GP Regression CV") - plt.legend() - if SHOW_PLOTS: - plt.show() - plt.close() - - @unittest.skipIf(SKIP_TEST_PLOTS, "All regression data plot.") - def test_max_cls_plot(self): - class_key = 1 - fig = self.regr_grid.plot_regr_data(class_key) - if SHOW_PLOTS: - plt.show() - else: - print("To show plots set SHOW_PLOTS to True.") - plt.close() - - -if __name__ == "__main__": - unittest.main() diff --git a/posydon/tests/active_learning/psy_cris/test_Sampler.py b/posydon/tests/active_learning/psy_cris/test_Sampler.py deleted file mode 100644 index 8ac35611dc..0000000000 --- a/posydon/tests/active_learning/psy_cris/test_Sampler.py +++ /dev/null @@ -1,166 +0,0 @@ -"""Unit test for posydon.active_learning.psy_cris classes -""" -import math -import unittest - -import matplotlib.pyplot as plt -import numpy as np -import pandas as pd - -from posydon.active_learning.psy_cris.classify import Classifier -from posydon.active_learning.psy_cris.data import TableData -from posydon.active_learning.psy_cris.regress import Regressor -from posydon.active_learning.psy_cris.sample import Sampler -from posydon.active_learning.psy_cris.synthetic_data.synth_data_3D import get_output_3D -from posydon.active_learning.psy_cris.utils import ( - get_random_grid_df, - get_regular_grid_df, -) - -SKIP_TEST_PLOTS = False -SHOW_PLOTS = False - - -class TestSampler(unittest.TestCase): - """Test Sampler class on the 3d synthetic data set.""" - - @classmethod - def setUpClass(cls): - np.random.seed(12345) - cls.TEST_DATA_GRID = get_regular_grid_df(N=10 ** 3, dim=3) - cls.TEST_DATA_RAND = get_random_grid_df(N=10 ** 3, dim=3) - cls.UNIQUE_CLASSES = [1, 2, 3, 4, 6, 8] - - cls.TEST_INPUT_POINTS = np.array([[0, 0, 0], [-0.5, 0.5, 0.5]]) - cls.TEST_OUTPUT_TRUTH = get_output_3D(*cls.TEST_INPUT_POINTS.T) - - def setUp(self): - my_kwargs = {"n_neighbors": [2, 3, 5]} - self.table_grid = self.create_TableData(self.TEST_DATA_GRID, **my_kwargs) - self.regr_grid = Regressor(self.table_grid) - self.cls_grid = Classifier(self.table_grid) - - def create_TableData(self, data_frame, **kwargs): - files = None - input_cols = ["input_1", "input_2", "input_3"] - output_cols = ["class", "output_1"] - class_col_name = "class" - table_obj = TableData( - files, - input_cols, - output_cols, - class_col_name, - my_DataFrame=data_frame, - verbose=False, - **kwargs - ) - return table_obj - - def train_everything_grid(self, cls_names, regr_names): - if cls_names is not None: - self.cls_grid.train_everything(cls_names) - if regr_names is not None: - self.regr_grid.train_everything(regr_names) - - def test_init_0(self): - test_cases = [ - (None, None), - (self.cls_grid, self.regr_grid), - (None, self.regr_grid), - ] - for i, tup_input in enumerate([(None, None), ()]): - with self.subTest("Sampler init", iter=i): - samp = Sampler(*tup_input) - - def test_mcmc(self): - self.train_everything_grid(["rbf"], None) - samp = Sampler(classifier=self.cls_grid, regressor=None) - - steps, acc, rej = samp.run_MCMC( - 15, 0.25, [0, 0, 0], samp.TD_classification, "rbf", T=1, **{"TD_BETA": 2} - ) - self.assertTrue(len(steps) == (acc + 1), msg="steps taken should match acc.") - - def test_ptmcmc(self): - self.train_everything_grid(["rbf"], ["rbf"]) - samp = Sampler(classifier=self.cls_grid, regressor=self.regr_grid) - - chain_step_hist, T_list = samp.run_PTMCMC( - 5, - 15, - samp.TD_classification_regression, - ("rbf", "rbf"), - init_pos=[0, 0, 0], - alpha=0.25, - verbose=False, - trace_plots=False, - TD_BETA=1, - ) - # try with default values - chain_step_hist, T_list = samp.run_PTMCMC( - 10, 15, samp.TD_classification_regression, ("rbf", "rbf"), - verbose=False, trace_plots=False) - - - def test_simple_density_logic(self): - self.cls_grid.train("rbf") - samp = Sampler(classifier=self.cls_grid, regressor=None) - steps, acc, rej = samp.run_MCMC( - 200, 0.25, [0, 0, 0], samp.TD_classification, "rbf", T=1 - ) - acc_pts, rej_pts = samp.do_simple_density_logic(steps, 10, 0.05) - return samp, steps - - def test_get_proposed_points(self): - N = 10 - samp, step_hist = self.test_simple_density_logic() - prop_points, kappa = samp.get_proposed_points(step_hist, N, 0.046) - self.assertTrue(len(prop_points) == N) - - @unittest.skipIf(SKIP_TEST_PLOTS, "Plotting C, C+R target distributions") - def test_TD_plots(self): - self.train_everything_grid(["rbf"], ["rbf"]) - samp = Sampler(classifier=self.cls_grid, regressor=self.regr_grid) - - N = 70 if SHOW_PLOTS else 5 - zed = 0 - x, y = np.meshgrid(np.linspace(-1, 1, N), np.linspace(-1, 1, N)) - z = np.ones(x.shape) * zed - data_points = np.concatenate( - (x.flatten()[:, None], y.flatten()[:, None], z.flatten()[:, None]), axis=1 - ) - - max_probs, pos, cls_keys = samp.get_TD_classification_data("rbf", data_points) - - kwargs = {"TD_BETA": 2, "TD_TAU": 0.5} - cls_regr_td_vals = [ - float(samp.TD_classification_regression(["rbf", "rbf"], dat, **kwargs)) - for dat in data_points - ] - - fig, subs = plt.subplots(1, 2, figsize=(13, 5)) - subs[0].set_title("TD_classification at z = {}".format(zed)) - cls_plot = subs[0].pcolormesh( - x, y, (1 - max_probs).reshape(N, N), shading="auto" - ) - - subs[1].set_title("TD_classification_regression at z = {}".format(zed)) - cls_regr_plot = subs[1].pcolormesh( - x, y, np.array(cls_regr_td_vals).reshape(N, N), shading="auto" - ) - - fig.colorbar(cls_plot, ax=subs[0]) - fig.colorbar(cls_regr_plot, ax=subs[1]) - - for i in range(2): - subs[i].set_xlabel("input_1") - subs[1].set_ylabel("input_2") - subs[i].axis("equal") - - if SHOW_PLOTS: - plt.show() - plt.close() - - -if __name__ == "__main__": - unittest.main() diff --git a/posydon/tests/active_learning/psy_cris/test_TableData.py b/posydon/tests/active_learning/psy_cris/test_TableData.py deleted file mode 100644 index ae1795e4e8..0000000000 --- a/posydon/tests/active_learning/psy_cris/test_TableData.py +++ /dev/null @@ -1,247 +0,0 @@ -"""Unit test for posydon.active_learning.psy_cris classes -""" -import unittest - -import matplotlib.pyplot as plt -import numpy as np -import pandas as pd - -from posydon.active_learning.psy_cris.data import TableData -from posydon.active_learning.psy_cris.synthetic_data.synth_data_3D import get_output_3D -from posydon.active_learning.psy_cris.utils import ( - get_random_grid_df, - get_regular_grid_df, -) - -SKIP_TEST_PLOTS = False -SHOW_PLOTS = False - - -class TestTableData(unittest.TestCase): - """Test TableData class on the 3d synthetic data set.""" - - @classmethod - def setUpClass(cls): - np.random.seed(12345) - cls.TEST_DATA_GRID = get_regular_grid_df(N=10 ** 3, dim=3) - cls.TEST_DATA_RAND = get_random_grid_df(N=10 ** 3, dim=3) - cls.UNIQUE_CLASSES = [1, 2, 3, 4, 6, 8] - - def create_TableData(self, data_frame, **kwargs): - files = None - input_cols = ["input_1", "input_2", "input_3"] - output_cols = ["class", "output_1"] - class_col_name = "class" - table_obj = TableData( - files, - input_cols, - output_cols, - class_col_name, - my_DataFrame=data_frame, - verbose=False, - **kwargs - ) - return table_obj - - def test_init_0(self): - td = self.create_TableData(self.TEST_DATA_GRID) - self.assertTrue(isinstance(td, TableData)) - - def test_init_1_grid(self): - my_kwargs = {"n_neighbors": [2, 3]} - table_grid = self.create_TableData(self.TEST_DATA_GRID, **my_kwargs) - # N classes - self.assertTrue( - table_grid.num_classes == len(self.UNIQUE_CLASSES), - msg="Should find 6 classes. Found {}".format(table_grid.num_classes), - ) - # Unique classes + APC cols - regr_data = table_grid.get_regr_data(what_data="output") - for cls_key in regr_data.keys(): - with self.subTest("Checking data by class.", cls_key=cls_key): - self.assertIn(cls_key, self.UNIQUE_CLASSES) - self.assertIn("APC2_output_1", regr_data[cls_key].columns) - if cls_key != 2: - self.assertIn("APC3_output_1", regr_data[cls_key].columns) - - def test_init_2_rand(self): - my_kwargs = {"n_neighbors": [2, 3]} - table_rand = self.create_TableData(self.TEST_DATA_RAND, **my_kwargs) - - # N classes - self.assertTrue( - table_rand.num_classes == len(self.UNIQUE_CLASSES), - msg="Should find 6 classes. Found {}".format(table_rand.num_classes), - ) - # Unique classes + APC cols - regr_data = table_rand.get_regr_data(what_data="output") - for cls_key in regr_data.keys(): - with self.subTest("Checking data by class.", cls_key=cls_key): - self.assertIn(cls_key, self.UNIQUE_CLASSES) - self.assertIn("APC2_output_1", regr_data[cls_key].columns) - self.assertIn("APC3_output_1", regr_data[cls_key].columns) - - def test_init_3_clean_data(self): - my_kwargs = {"n_neighbors": [2, 3], "omit_vals": [-1]} - table_grid = self.create_TableData(self.TEST_DATA_GRID, **my_kwargs) - - self.assertTrue( - len(table_grid.get_data()) == 729, - msg="Should remove 271 rows from grid data set with value -1.", - ) - - def test_init_4_clean_data(self): - my_kwargs = {"n_neighbors": [2, 3], "omit_vals": [-1]} - table_rand = self.create_TableData(self.TEST_DATA_RAND, **my_kwargs) - - self.assertTrue( - len(table_rand.get_data()) == 1000, - msg="Should remove 0 rows from random data set with value -1.", - ) - - def test_classification_data(self): - my_kwargs = {"n_neighbors": [2, 3], "omit_vals": [-1]} - table_grid = self.create_TableData(self.TEST_DATA_GRID, **my_kwargs) - - binary_classification_data = table_grid.get_binary_mapping_per_class() - self.assertTrue( - binary_classification_data.shape == (len(self.UNIQUE_CLASSES), 729) - ) - self.assertTrue( - all( - [ - sum((row == 1) + (row == 0)) == 729 - for row in binary_classification_data - ] - ) - ) - - def test_regression_data_1(self): - my_kwargs = { - "n_neighbors": [2, 3], - } - table_grid = self.create_TableData(self.TEST_DATA_GRID, **my_kwargs) - output_dat = table_grid.get_regr_data(what_data="output") - for cls in [5, 7]: - with self.subTest(cls=cls): - # Raise KeyError for classes that shouldn't exist - with self.assertRaisesRegex(KeyError, str(cls)): - output_dat[cls] - - def test_regression_data_2(self): - my_kwargs = {"n_neighbors": [2, 3, 5, 10, 50]} - table_grid = self.create_TableData(self.TEST_DATA_GRID, **my_kwargs) - table_rand = self.create_TableData(self.TEST_DATA_RAND, **my_kwargs) - - for key, val in table_grid._regr_dfs_per_class_.items(): - col_names = list(val.columns) - with self.subTest(key=key, data="grid"): - self.assertTrue(any(["APC2" in item for item in col_names])) - if key in [1, 3, 4, 8]: - self.assertTrue(any(["APC50" in item for item in col_names])) - - for key, val in table_rand._regr_dfs_per_class_.items(): - col_names = list(val.columns) - with self.subTest(key=key, data="random"): - self.assertTrue(any(["APC2" in item for item in col_names])) - self.assertTrue(any(["APC3" in item for item in col_names])) - if key in [1, 3, 6, 8]: - self.assertTrue(any(["APC50" in item for item in col_names])) - - @unittest.skipIf( SKIP_TEST_PLOTS, "Test by plotting nearest neighbors skipped") - def test_nearest_neighbhors(self): - my_kwargs = { - "n_neighbors": [2, 3], - } - table_grid = self.create_TableData(self.TEST_DATA_GRID, **my_kwargs) - n_neigh = 3 - - dat = np.random.uniform(low=(-1, -1), high=(1, 1), size=(15, 2)) - output = table_grid.find_n_neighbors(dat, [n_neigh]) - - plt.figure(figsize=(4, 4), dpi=100) - plt.title("NearestNeighbors test") - plt.plot( - dat.T[0][0], dat.T[1][0], "+", color="r", markersize=10, label="reference" - ) - plt.scatter(dat.T[0], dat.T[1], label="data") - for i in range(n_neigh): - plt.scatter( - dat.T[0][output[n_neigh][0][i]], - dat.T[1][output[n_neigh][0][i]], - marker="+", - color="lime", - s=29, - label="nearest", - ) - plt.axis("equal") - if SHOW_PLOTS: - plt.show() - else: - print("To show plots set SHOW_PLOTS to True.") - plt.close() - - @unittest.skipIf( SKIP_TEST_PLOTS, "Test for general plotting skipped") - def test_plotting_1(self): - my_kwargs = { - "n_neighbors": [2, 3], - } - table_grid = self.create_TableData(self.TEST_DATA_GRID, **my_kwargs) - table_rand = self.create_TableData(self.TEST_DATA_RAND, **my_kwargs) - - zed_val = 1 - N = 40 - X, Y = np.meshgrid(np.linspace(-1, 1, N), np.linspace(-1, 1, N)) - Z = np.ones(X.shape) * zed_val - f_out = get_output_3D(X, Y, Z) - print("ZED VAL: {}".format(zed_val)) - - fig, subs = plt.subplots(1, 3, figsize=(14, 4), dpi=100) - subs[0].set_title("TableData - even grid") - fig, subs[0], handles = table_grid.make_class_data_plot( - fig, - subs[0], - ["input_1", "input_2"], - my_slice_vals={0: (0.9, 1.1)}, - return_legend_handles=True, - ) - subs[0].legend( - handles, table_grid._unique_class_keys_, bbox_to_anchor=(-0.25, 0.5) - ) - - subs[1].set_title("TableData - random points") - fig, subs[1], handles = table_rand.make_class_data_plot( - fig, - subs[1], - ["input_1", "input_2"], - my_slice_vals={0: (0.9, 1.1)}, - return_legend_handles=True, - ) - - subs[2].set_title("Analytic Classification") - subs[2].pcolormesh(X, Y, f_out["class"].values.reshape(N, N), shading="auto") - for i in range(3): - subs[i].axis("equal") - if SHOW_PLOTS: - plt.show() - else: - print("To show plots set SHOW_PLOTS to True.") - plt.close() - - @unittest.skipIf( SKIP_TEST_PLOTS, "Test for plotting 3d skipped") - def test_plotting_2(self): - my_kwargs = { - "n_neighbors": [2, 3], - } - table_grid = self.create_TableData(self.TEST_DATA_GRID, **my_kwargs) - table_grid.plot_3D_class_data() - plt.title("plot_3D_class_data") - if SHOW_PLOTS: - plt.show() - else: - print("To show plots set SHOW_PLOTS to True.") - plt.close() - - -if __name__ == "__main__": - unittest.main() diff --git a/posydon/tests/active_learning/psy_cris/test_utils.py b/posydon/tests/active_learning/psy_cris/test_utils.py deleted file mode 100644 index bd666c1ae2..0000000000 --- a/posydon/tests/active_learning/psy_cris/test_utils.py +++ /dev/null @@ -1,76 +0,0 @@ -"""Unit test for posydon.active_learning.psy_cris classes -""" -import os -import unittest - -import numpy as np -import pandas as pd - -from posydon.active_learning.psy_cris.utils import ( - check_dist, - get_new_query_points, - get_random_grid_df, - get_regular_grid_df, - parse_inifile, -) -from posydon.config import PATH_TO_POSYDON - - -class TestUtils(unittest.TestCase): - """Test methods in utils.""" - - @classmethod - def setUpClass(cls): - np.random.seed(12345) - psy_cris_dir = os.path.join( - PATH_TO_POSYDON, "posydon/active_learning/psy_cris") - cls.INI_FILE_PATH = os.path.join(psy_cris_dir, - "run_params/psycris_default.ini") - - def test_parse_inifile(self): - self.assertTrue(os.path.isfile(self.INI_FILE_PATH), msg="Can't find file.") - my_kwargs = parse_inifile(self.INI_FILE_PATH) - self.assertTrue(isinstance(my_kwargs, dict)) - return my_kwargs - - def test_get_new_query_points(self): - my_kwargs = self.test_parse_inifile() - holder = my_kwargs["TableData_kwargs"] - holder["my_DataFrame"] = get_regular_grid_df(N=10 ** 3, dim=3) - my_kwargs["TableData_kwargs"] = holder - - holder_1 = my_kwargs["Sampler_kwargs"] - holder_1["N_tot"] = 50 - holder_1["T_max"] = 5 - holder_1["verbose"] = False - my_kwargs["Sampler_kwargs"] = holder_1 - - query_pts, preds = get_new_query_points(3, **my_kwargs) - self.assertTrue(len(query_pts) == 3) - - def test_check_dist(self): - original_pts = np.random.uniform( - low=(-1, -1, -1), high=(1, 1, 1), size=(500, 3) - ) - proposed_pts = get_regular_grid_df(N=10 ** 3, dim=3).values[:, 0:3] - result = check_dist(original_pts, proposed_pts, threshold=1e-2) - self.assertTrue( - sum(result) == len(proposed_pts), - msg="All points should not be within 1e-2 of eachother.", - ) - - def test_get_regular_grid_df(self): - for config in [dict(N=1000, dim=3), dict(N=50, dim=2), dict(jitter=True)]: - with self.subTest("regular_grid_df", config=config): - df = get_regular_grid_df(**config) - self.assertTrue(isinstance(df, pd.DataFrame)) - - def test_get_random_grid_df(self): - for config in [dict(N=1000, dim=3), dict(N=50, dim=2)]: - with self.subTest("random_grid_df", config=config): - df = get_random_grid_df(**config) - self.assertTrue(isinstance(df, pd.DataFrame)) - - -if __name__ == "__main__": - unittest.main() diff --git a/posydon/tests/binary_evol/CE/test_CEE.py b/posydon/tests/binary_evol/CE/test_CEE.py deleted file mode 100644 index ddeea07647..0000000000 --- a/posydon/tests/binary_evol/CE/test_CEE.py +++ /dev/null @@ -1,655 +0,0 @@ -import os -import unittest - -import numpy as np - -from posydon.binary_evol.binarystar import BinaryStar -from posydon.binary_evol.CE.step_CEE import StepCEE -from posydon.binary_evol.singlestar import SingleStar -from posydon.config import PATH_TO_POSYDON -from posydon.utils import common_functions as cf - -# spaces are read '\\ ' instead of ' ' -PATH_TO_DATA = os.path.join( - PATH_TO_POSYDON, "posydon/tests/data/POSYDON-UNIT-TESTS/binary_evol/CE/") - - -class TestCommonEnvelope(unittest.TestCase): - def test_common_envelope_1(self): - kwargs = {'prescription': 'alpha-lambda', - "common_envelope_option_for_lambda" : 'default_lambda'} - - CEE = StepCEE(verbose=False, **kwargs) - - # simple binary system which will experience CEE with default_lambda - # option on. - # no profiles needed for this - PROPERTIES_STAR1 = { - 'mass': 10.0, - 'log_R': np.log10(1000.0), - 'he_core_mass': 3.0, - 'he_core_radius': 0.5, - 'state': 'H-rich_Shell_H_burning', - 'metallicity' : 0.0142, - "log_Lnuc": -1e6, # arbitrary - "log_LHe": -1e7, # arbitrary - "center_he4" : 0.0, - "center_h1" : 1.0, - "center_c12" : 0.01, - } - PROPERTIES_STAR2 = { - 'mass': 2.0, - 'log_R': np.log10(2.0), - 'he_core_mass': 0.0, - 'he_core_radius': 0.0, - 'state': 'H-rich_Core_H_burning', - 'metallicity' : 0.0142, - "log_Lnuc": -1e6, # arbitrary - "log_LHe": -1e7, # arbitrary - "center_he4" : 0.49, - "center_h1" : 0.49, - "center_c12" : 0.01, - } - giantstar = SingleStar(**PROPERTIES_STAR1) - compstar = SingleStar(**PROPERTIES_STAR2) - - orbital_separation_for_RLOF = 10**giantstar.log_R / cf.roche_lobe_radius( - giantstar.mass, compstar.mass, a_orb=1) - orbital_period_for_RLOF = cf.orbital_period_from_separation( - orbital_separation_for_RLOF, giantstar.mass, compstar.mass) - PROPERTIES_BINARY = { - "binary_state": "RLO1", - "event": "oCE1", - "orbital_period": orbital_period_for_RLOF - } - binary = BinaryStar(star_1=giantstar, - star_2=compstar, - **PROPERTIES_BINARY) - - CEE(binary) - #self.assertTrue(binary.event == 'redirect', "CEE test 1 failed") - self.assertTrue( - abs(binary.orbital_period - 5.056621408721529) < - 1.0, "CEE test 1 failed") - self.assertTrue("stripped_He" in binary.star_1.state, "CEE test 1 failed") - - def test_common_envelope_2(self): - kwargs = {'prescription': 'alpha-lambda', - "common_envelope_option_for_lambda" : 'lambda_from_profile_gravitational'} - - CEE = StepCEE(verbose=False, **kwargs) - - # testing with loading a profile of the donor at the moment of CEE to - # calculate the lamda CEE - profile_donor_name = os.path.join(PATH_TO_DATA, - 'simple_giant_profile_for_CEE.npy') - profile_donor = np.load(profile_donor_name) - PROPERTIES_STAR1_withprofile = { - 'mass': 22.77, - 'log_R': np.log10(1319.0), - 'he_core_mass': 11.0, - 'he_core_radius': 0.6, - 'state': 'H-rich_Shell_H_burning', - 'metallicity' : 0.0142, - 'profile': profile_donor, - "log_Lnuc": -1e6, # arbitrary - "log_LHe": -1e7, # arbitrary - "center_he4" : 0.0, - "center_h1" : 1.0, - "center_c12" : 0.01, - } - giantstar_withprofile = SingleStar(**PROPERTIES_STAR1_withprofile) - PROPERTIES_STAR2 = { - 'mass': 2.0, - 'log_R': np.log10(2.0), - 'he_core_mass': 0.0, - 'he_core_radius': 0.0, - 'state': 'H-rich_Core_H_burning', - 'metallicity' : 0.0142, - "log_Lnuc": -1e6, # arbitrary - "log_LHe": -1e7, # arbitrary - "center_he4" : 0.5, - "center_h1" : 0.5, - "center_c12" : 0.01, - } - compstar = SingleStar(**PROPERTIES_STAR2) - - orbital_separation_for_RLOF = 10**giantstar_withprofile.log_R / cf.roche_lobe_radius( - giantstar_withprofile.mass, compstar.mass, a_orb=1) - orbital_period_for_RLOF = cf.orbital_period_from_separation( - orbital_separation_for_RLOF, giantstar_withprofile.mass, - compstar.mass) - - PROPERTIES_BINARY_withprofile = { - "binary_state": "RLO1", - "event": "oCE1", - "orbital_period": orbital_period_for_RLOF - } - binary_withprofile = BinaryStar(giantstar_withprofile, compstar, - **PROPERTIES_BINARY_withprofile) - # options: 'default_lambda', 'lambda_from_profile_gravitational', - # 'lambda_from_profile_gravitational_plus_internal', - # 'lambda_from_profile_gravitational_plus_internal_minus_recombination' - #binary_withprofile.properties.common_envelope_option_for_lambda = "lambda_from_profile_gravitational" - CEE(binary_withprofile) - #print(binary_withprofile.event) - self.assertTrue(binary_withprofile.state == "merged", - "CEE test 2 failed") - - def test_common_envelope_3(self): - kwargs = {'prescription': 'alpha-lambda', - "common_envelope_option_for_lambda" : 'lambda_from_profile_gravitational_plus_internal_minus_recombination'} - - CEE = StepCEE(verbose=False, **kwargs) - - # testing with loading a profile of the donor at the moment of CEE to - # calculate the lamda CEE, taking into account also the internal energy - # - recombination energy - profile_donor_name = os.path.join( - PATH_TO_DATA, - 'giant_profile_for_CEE_with_recombinationenergy_calculation.npy') - #profile_donor = np.load(profile_donor_name, mmap_mode = "r") - profile_donor = np.load(profile_donor_name) - PROPERTIES_STAR1_withprofile = { - 'mass': 22.77, - 'log_R': np.log10(1319.0), - 'he_core_mass': 11.0, - 'he_core_radius': 0.6, - 'state': 'H-rich_Shell_H_burning', - 'metallicity' : 0.0142, - 'profile': profile_donor, - "log_Lnuc": -1e6, # arbitrary - "log_LHe": -1e7, # arbitrary - "center_he4" : 0.0, - "center_h1" : 1.0, - "center_c12" : 0.01, - } - giantstar_withprofile = SingleStar(**PROPERTIES_STAR1_withprofile) - PROPERTIES_STAR2 = { - 'mass': 2.0, - 'log_R': np.log10(2.0), - 'he_core_mass': 0.0, - 'he_core_radius': 0.0, - 'state': 'H-rich_Core_H_burning', - 'metallicity' : 0.0142, - "log_Lnuc": -1e6, # arbitrary - "log_LHe": -1e7, # arbitrary - "center_he4" : 0.49, - "center_h1" : 0.49, - "center_c12" : 0.01, - } - compstar = SingleStar(**PROPERTIES_STAR2) - - orbital_separation_for_RLOF = 10**giantstar_withprofile.log_R / cf.roche_lobe_radius( - giantstar_withprofile.mass, compstar.mass, a_orb=1) - orbital_period_for_RLOF = cf.orbital_period_from_separation( - orbital_separation_for_RLOF, giantstar_withprofile.mass, - compstar.mass) - - PROPERTIES_BINARY_withprofile = { - "binary_state": "RLO1", - "event": "oCE1", - "orbital_period": orbital_period_for_RLOF - } - binary_withprofile = BinaryStar(giantstar_withprofile, compstar, - **PROPERTIES_BINARY_withprofile) - # options: 'default_lambda', 'lambda_from_profile_gravitational', - # 'lambda_from_profile_gravitational_plus_internal', - # 'lambda_from_profile_gravitational_plus_internal_minus_recombination' - #binary_withprofile.properties.common_envelope_option_for_lambda = "lambda_from_profile_gravitational_plus_internal_minus_recombination" - #print(binary_withprofile.properties.common_envelope_option_for_lambda) - CEE(binary_withprofile) - #print(binary_withprofile.event) - self.assertTrue(binary_withprofile.state == "merged", - "CEE test 3 failed") - - def test_common_envelope_4(self): - kwargs = {'prescription': 'alpha-lambda', - "common_envelope_option_for_lambda" : 'lambda_from_profile_gravitational'} - - CEE = StepCEE(verbose=False, **kwargs) - - profile_donor_name = os.path.join(PATH_TO_DATA, - 'simple_giant_profile_for_CEE.npy') - profile_donor = np.load(profile_donor_name) - PROPERTIES_STAR1_withprofile = { - 'mass': 22.77, - 'log_R': np.log10(1319.0), - 'he_core_mass': 11.0, - 'he_core_radius': 0.6, - 'state': 'H-rich_Shell_H_burning', - 'metallicity' : 0.0142, - 'profile': profile_donor, - "log_Lnuc": -1e6, # arbitrary - "log_LHe": -1e7, # arbitrary - "center_he4" : 0.0, - "center_h1" : 1.0, - "center_c12" : 0.01, - } - giantstar_withprofile = SingleStar(**PROPERTIES_STAR1_withprofile) - PROPERTIES_STAR2 = { - 'mass': 10.0, - 'log_R': np.log10(7.0), - 'he_core_mass': 0.0, - 'he_core_radius': 0.0, - 'state': 'H-rich_Core_H_burning', - 'metallicity' : 0.0142, - "log_Lnuc": -1e6, # arbitrary - "log_LHe": -1e7, # arbitrary - "center_he4" : 0.49, - "center_h1" : 0.49, - "center_c12" : 0.01, - } - compstar = SingleStar(**PROPERTIES_STAR2) - - orbital_separation_for_RLOF = 10**giantstar_withprofile.log_R / cf.roche_lobe_radius( - giantstar_withprofile.mass, compstar.mass, a_orb=1) - orbital_period_for_RLOF = cf.orbital_period_from_separation( - orbital_separation_for_RLOF, giantstar_withprofile.mass, - compstar.mass) - - PROPERTIES_BINARY_withprofile = { - "binary_state": "RLO1", - "event": "oCE1", - "orbital_period": orbital_period_for_RLOF - } - binary_withprofile = BinaryStar(giantstar_withprofile, compstar, - **PROPERTIES_BINARY_withprofile) - # options: 'default_lambda', 'lambda_from_profile_gravitational', - # 'lambda_from_profile_gravitational_plus_internal', - # 'lambda_from_profile_gravitational_plus_internal_minus_recombination' - #binary_withprofile.properties.common_envelope_option_for_lambda = "lambda_from_profile_gravitational" - #print(binary_withprofile.properties.common_envelope_option_for_lambda) - CEE(binary_withprofile) - #print(binary_withprofile.event) - self.assertTrue(binary_withprofile.state == "merged", - "CEE test 4 failed") - - def test_common_envelope_5(self): - kwargs = {'prescription': 'alpha-lambda', - "common_envelope_option_for_lambda" : 'lambda_from_profile_gravitational_plus_internal_minus_recombination'} - - CEE = StepCEE(verbose=False, **kwargs) - # testing with loading a profile of the donor at the moment of CEE to - # calculate the lamda CEE, taking into account also the internal - # energy - recombination energy - profile_donor_name = os.path.join( - PATH_TO_DATA, - 'giant_profile_for_CEE_with_recombinationenergy_calculation.npy') - profile_donor = np.load(profile_donor_name) - PROPERTIES_STAR1_withprofile = { - 'mass': 22.77, - 'log_R': np.log10(1319.0), - 'he_core_mass': 11.0, - 'he_core_radius': 0.6, - 'state': 'H-rich_Shell_H_burning', - 'metallicity' : 0.0142, - 'profile': profile_donor, - "log_Lnuc": -1e6, # arbitrary - "log_LHe": -1e7, # arbitrary - "center_he4" : 0.0, - "center_h1" : 1.0, - "center_c12" : 0.01, - } - giantstar_withprofile = SingleStar(**PROPERTIES_STAR1_withprofile) - PROPERTIES_STAR2 = { - 'mass': 10.0, - 'log_R': np.log10(7.0), - 'he_core_mass': 0.0, - 'he_core_radius': 0.0, - 'state': 'H-rich_Core_H_burning', - 'metallicity' : 0.0142, - "log_Lnuc": -1e6, # arbitrary - "log_LHe": -1e7, # arbitrary - "center_he4" : 0.49, - "center_h1" : 0.49, - "center_c12" : 0.01, - } - compstar = SingleStar(**PROPERTIES_STAR2) - - orbital_separation_for_RLOF = 10**giantstar_withprofile.log_R / cf.roche_lobe_radius( - giantstar_withprofile.mass, compstar.mass, a_orb=1) - orbital_period_for_RLOF = cf.orbital_period_from_separation( - orbital_separation_for_RLOF, giantstar_withprofile.mass, - compstar.mass) - - PROPERTIES_BINARY_withprofile = { - "binary_state": "RLO1", - "event": "oCE1", - "orbital_period": orbital_period_for_RLOF - } - binary_withprofile = BinaryStar(giantstar_withprofile, compstar, - **PROPERTIES_BINARY_withprofile) - # options: 'default_lambda', 'lambda_from_profile_gravitational', - # 'lambda_from_profile_gravitational_plus_internal', - # 'lambda_from_profile_gravitational_plus_internal_minus_recombination' - #binary_withprofile.properties.common_envelope_option_for_lambda = "lambda_from_profile_gravitational_plus_internal_minus_recombination" - #print(binary_withprofile.properties.common_envelope_option_for_lambda) - CEE(binary_withprofile) - #print(binary_withprofile.event) - self.assertTrue(binary_withprofile.state == "merged", - "CEE test 5 failed") - - def test_common_envelope_6(self): - kwargs = {'prescription': 'alpha-lambda', - "common_envelope_option_for_lambda" : 'lambda_from_profile_gravitational'} - - CEE = StepCEE(verbose=False, **kwargs) - - profile_donor_name = os.path.join(PATH_TO_DATA, - 'simple_giant_profile_for_CEE.npy') - #profile_donor = np.genfromtxt(profile_donor_name, skip_header=5, names=True, dtype=None) - profile_donor = np.load(profile_donor_name) - PROPERTIES_STAR1_withprofile = { - 'mass': 22.77, - 'log_R': np.log10(1319.0), - 'he_core_mass': 11.0, - 'he_core_radius': 0.6, - 'state': 'H-rich_Shell_H_burning', - 'metallicity' : 0.0142, - 'profile': profile_donor, - "log_Lnuc": -1e6, # arbitrary - "log_LHe": -1e7, # arbitrary - "center_he4" : 0.0, - "center_h1" : 1.0, - "center_c12" : 0.01, - } - giantstar_withprofile = SingleStar(**PROPERTIES_STAR1_withprofile) - PROPERTIES_STAR2 = { - 'mass': 10., - 'log_R': np.log10(0.0001), - 'he_core_mass': 0.0, - 'he_core_radius': 0.0, - 'state': 'BH' - } - compstar = SingleStar(**PROPERTIES_STAR2) - - orbital_separation_for_RLOF = 10**giantstar_withprofile.log_R / cf.roche_lobe_radius( - giantstar_withprofile.mass, compstar.mass, a_orb=1) - orbital_period_for_RLOF = cf.orbital_period_from_separation( - orbital_separation_for_RLOF, giantstar_withprofile.mass, - compstar.mass) - - PROPERTIES_BINARY_withprofile = { - "binary_state": "RLO1", - "event": "oCE1", - "orbital_period": orbital_period_for_RLOF - } - binary_withprofile = BinaryStar(giantstar_withprofile, compstar, - **PROPERTIES_BINARY_withprofile) - #binary_withprofile.properties.common_envelope_option_for_lambda = "lambda_from_profile_gravitational" # options: 'default_lambda', 'lambda_from_profile_gravitational', 'lambda_from_profile_gravitational_plus_internal', 'lambda_from_profile_gravitational_plus_internal_minus_recombination' - #print(binary_withprofile.properties.common_envelope_option_for_lambda) - CEE(binary_withprofile) - #print("new state of the star that triggered CEE = ",giantstar_withprofile.state) - #print("new mass of the star that triggered CEE = ",giantstar_withprofile.mass) - print(binary_withprofile.event) - #self.assertTrue(binary_withprofile.event == 'redirect', - # "CEE test 6 failed") - self.assertTrue((10**giantstar_withprofile.log_R - cf.roche_lobe_radius( - giantstar_withprofile.mass, compstar.mass, - a_orb=cf.orbital_separation_from_period( - binary_withprofile.orbital_period, giantstar_withprofile.mass, - compstar.mass))), "CEE test 6 failed") - - self.assertTrue( - (abs(binary_withprofile.orbital_period - 0.12123905531545925) < - 1.0), - "CEE test 6 failed") - - def test_common_envelope_7(self): - kwargs = {'prescription': 'alpha-lambda', - "common_envelope_option_for_lambda" : 'lambda_from_profile_gravitational_plus_internal_minus_recombination'} - - CEE = StepCEE(verbose=False, **kwargs) - - # testing with loading a profile of the donor at the moment of CEE to - # calculate the lamda CEE, taking into account also the internal - # energy - recombination energy - profile_donor_name = os.path.join( - PATH_TO_DATA, - 'giant_profile_for_CEE_with_recombinationenergy_calculation.npy') - profile_donor = np.load(profile_donor_name) - PROPERTIES_STAR1_withprofile = { - 'mass': 22.77, - 'log_R': np.log10(1319.0), - 'he_core_mass': 11.0, - 'he_core_radius': 0.6, - 'state': 'H-rich_Shell_H_burning', - 'metallicity' : 0.0142, - 'profile': profile_donor, - "log_Lnuc": -1e6, # arbitrary - "log_LHe": -1e7, # arbitrary - "center_he4" : 0.0, - "center_h1" : 1.0, - "center_c12" : 0.01, - } - giantstar_withprofile = SingleStar(**PROPERTIES_STAR1_withprofile) - PROPERTIES_STAR2 = { - 'mass': 10., - 'log_R': np.log10(0.0001), - 'he_core_mass': 0.0, - 'he_core_radius': 0.0, - 'state': 'BH' - } - compstar = SingleStar(**PROPERTIES_STAR2) - - orbital_separation_for_RLOF = 10**giantstar_withprofile.log_R / cf.roche_lobe_radius( - giantstar_withprofile.mass, compstar.mass, a_orb=1) - orbital_period_for_RLOF = cf.orbital_period_from_separation( - orbital_separation_for_RLOF, giantstar_withprofile.mass, - compstar.mass) - - PROPERTIES_BINARY_withprofile = { - "binary_state": "RLO1", - "event": "oCE1", - "orbital_period": orbital_period_for_RLOF - } - binary_withprofile = BinaryStar(giantstar_withprofile, compstar, - **PROPERTIES_BINARY_withprofile) - # options: 'default_lambda', 'lambda_from_profile_gravitational', - # 'lambda_from_profile_gravitational_plus_internal', - # 'lambda_from_profile_gravitational_plus_internal_minus_recombination' - #binary_withprofile.properties.common_envelope_option_for_lambda = "lambda_from_profile_gravitational_plus_internal_minus_recombination" - #print(binary_withprofile.properties.common_envelope_option_for_lambda) - CEE(binary_withprofile) - #print(binary_withprofile.event) - #self.assertTrue(binary_withprofile.event == 'redirect', - # "CEE test 7 failed") - self.assertTrue((10**giantstar_withprofile.log_R - cf.roche_lobe_radius( - giantstar_withprofile.mass, compstar.mass, - a_orb=cf.orbital_separation_from_period( - binary_withprofile.orbital_period, giantstar_withprofile.mass, - compstar.mass))), "CEE test 7 failed") - self.assertTrue( - (abs(binary_withprofile.orbital_period - 0.3287114957064215) < - 1.0), - "CEE test 7 failed") - - def test_common_envelope_8(self): - kwargs = {'prescription': 'alpha-lambda', - "common_envelope_option_for_lambda" : 'lambda_from_profile_gravitational_plus_internal_minus_recombination'} - - CEE = StepCEE(verbose=False, **kwargs) - - profile_donor_name = os.path.join( - PATH_TO_DATA, - 'giant_profile_for_CEE_with_recombinationenergy_calculation.npy') - profile_donor = np.load(profile_donor_name) - PROPERTIES_STAR1_withprofile = { - 'mass': 22.77, - 'log_R': np.log10(1319.0), - 'he_core_mass': 11.0, - 'he_core_radius': 0.6, - 'state': 'H-rich_Shell_H_burning', - 'metallicity' : 0.0142, - 'profile': profile_donor, - "log_Lnuc": -1e6, # arbitrary - "log_LHe": -1e7, # arbitrary - "center_he4" : 0.0, - "center_h1" : 1.0, - "center_c12" : 0.01, - } - giantstar_withprofile = SingleStar(**PROPERTIES_STAR1_withprofile) - PROPERTIES_STAR2 = { - 'mass': 20., - 'log_R': np.log10(0.0001), - 'he_core_mass': 0.0, - 'he_core_radius': 0.0, - 'state': 'BH' - } #radius = 10km - compstar = SingleStar(**PROPERTIES_STAR2) - - orbital_separation_for_RLOF = 10**giantstar_withprofile.log_R / cf.roche_lobe_radius( - giantstar_withprofile.mass, compstar.mass, a_orb=1) - orbital_period_for_RLOF = cf.orbital_period_from_separation( - orbital_separation_for_RLOF, giantstar_withprofile.mass, - compstar.mass) - - PROPERTIES_BINARY_withprofile = { - "binary_state": "RLO1", - "event": "oCE1", - "orbital_period": orbital_period_for_RLOF - } - binary_withprofile = BinaryStar(giantstar_withprofile, compstar, - **PROPERTIES_BINARY_withprofile) - # options: 'default_lambda', 'lambda_from_profile_gravitational', - # 'lambda_from_profile_gravitational_plus_internal', - # 'lambda_from_profile_gravitational_plus_internal_minus_recombination' - #binary_withprofile.properties.common_envelope_option_for_lambda = "lambda_from_profile_gravitational_plus_internal_minus_recombination" - #print(binary_withprofile.properties.common_envelope_option_for_lambda) - CEE(binary_withprofile) - #print(binary_withprofile.event) - #self.assertTrue(binary_withprofile.event == 'redirect', - # "CEE test 8 failed") - #self.assertTrue(binary_withprofile.star_1.state == "stripped_He_Core_He_burning", - # "CEE test 8 failed") - self.assertTrue("stripped_He" in binary_withprofile.star_1.state, - "CEE test 8 failed") - self.assertTrue( - (abs(binary_withprofile.orbital_period - 0.7636524660283687) < - 1.0), - "CEE test 8 failed") - - def test_common_envelope_9(self): - kwargs = {'prescription': 'alpha-lambda', - "common_envelope_option_for_lambda" : 'lambda_from_profile_gravitational_plus_internal_minus_recombination'} - - CEE = StepCEE(verbose=False, **kwargs) - - profile_donor_name = os.path.join(PATH_TO_DATA, - 'caseB_CEE_profile.npy') - profile_donor = np.load(profile_donor_name) - PROPERTIES_STAR1_withprofile = { - 'mass': 28.04, - 'log_R': np.log10(927.0), - 'he_core_mass': 11.0, - 'he_core_radius': 0.6, - 'state': 'H-rich_Shell_H_burning', - 'metallicity' : 0.0142, - 'profile': profile_donor, - "log_Lnuc": -1e6, # arbitrary - "log_LHe": -1e7, # arbitrary - "center_he4" : 0.0, - "center_h1" : 1.0, - "center_c12" : 0.01, - } - giantstar_withprofile = SingleStar(**PROPERTIES_STAR1_withprofile) - PROPERTIES_STAR2 = { - 'mass': 20., - 'log_R': np.log10(0.0001), - 'he_core_mass': 0.0, - 'he_core_radius': 0.0, - 'state': 'BH' - } #radius = 10km - compstar = SingleStar(**PROPERTIES_STAR2) - - orbital_separation_for_RLOF = 10**giantstar_withprofile.log_R / cf.roche_lobe_radius( - giantstar_withprofile.mass, compstar.mass, a_orb=1) - orbital_period_for_RLOF = cf.orbital_period_from_separation( - orbital_separation_for_RLOF, giantstar_withprofile.mass, - compstar.mass) - - PROPERTIES_BINARY_withprofile = { - "binary_state": "RLO1", - "event": "oCE1", - "orbital_period": orbital_period_for_RLOF - } - binary_withprofile = BinaryStar(giantstar_withprofile, compstar, - **PROPERTIES_BINARY_withprofile) - # options: 'default_lambda', 'lambda_from_profile_gravitational', - # 'lambda_from_profile_gravitational_plus_internal', - # 'lambda_from_profile_gravitational_plus_internal_minus_recombination' - #binary_withprofile.properties.common_envelope_option_for_lambda = "lambda_from_profile_gravitational_plus_internal_minus_recombination" - #print(binary_withprofile.properties.common_envelope_option_for_lambda) - CEE(binary_withprofile) - #print(binary_withprofile.event) - #self.assertTrue(binary_withprofile.event == 'redirect', - # "CEE test 9 failed event") - self.assertTrue("stripped_He" in binary_withprofile.star_1.state, - "CEE test 9 failed state") - self.assertTrue( - (abs(binary_withprofile.orbital_period - 0.166535882054919) < - 1.0), - "CEE test 9 failed tolerance") - - def test_common_envelope_10(self): - kwargs = {'prescription': 'alpha-lambda', - "common_envelope_option_for_lambda" : 'lambda_from_profile_gravitational_plus_internal_minus_recombination'} - - CEE = StepCEE(verbose=False, **kwargs) - - profile_donor_name = os.path.join(PATH_TO_DATA, - 'caseB_CEE_profile.npy') - profile_donor = np.load(profile_donor_name) - PROPERTIES_STAR1_withprofile = { - 'mass': 28.04, - 'log_R': np.log10(927.0), - 'he_core_mass': 11.0, - 'he_core_radius': 0.6, - 'state': 'H-rich_Shell_H_burning', - 'metallicity' : 0.0142, - 'profile': profile_donor, - "log_Lnuc": -1e6, # arbitrary - "log_LHe": -1e7, # arbitrary - "center_he4" : 0.0, - "center_h1" : 1.0, - "center_c12" : 0.01, - } - giantstar_withprofile = SingleStar(**PROPERTIES_STAR1_withprofile) - PROPERTIES_STAR2 = { - 'mass': 2., - 'log_R': np.log10(1.5), - 'he_core_mass': 0.0, - 'he_core_radius': 0.0, - 'state': 'H-rich_Core_H_burning', - 'metallicity' : 0.0142, - "log_Lnuc": -1e6, # arbitrary - "log_LHe": -1e7, # arbitrary - "center_he4" : 0.49, - "center_h1" : 0.49, - "center_c12" : 0.01, - } #radius = 10km - compstar = SingleStar(**PROPERTIES_STAR2) - - orbital_separation_for_RLOF = 10**giantstar_withprofile.log_R / cf.roche_lobe_radius( - giantstar_withprofile.mass, compstar.mass, a_orb=1) - orbital_period_for_RLOF = cf.orbital_period_from_separation( - orbital_separation_for_RLOF, giantstar_withprofile.mass, - compstar.mass) - - PROPERTIES_BINARY_withprofile = { - "binary_state": "RLO1", - "event": "oCE1", - "orbital_period": orbital_period_for_RLOF - } - binary_withprofile = BinaryStar(giantstar_withprofile, compstar, - **PROPERTIES_BINARY_withprofile) - # options: 'default_lambda', 'lambda_from_profile_gravitational', - # 'lambda_from_profile_gravitational_plus_internal', - # 'lambda_from_profile_gravitational_plus_internal_minus_recombination' - #binary_withprofile.properties.common_envelope_option_for_lambda = "lambda_from_profile_gravitational_plus_internal_minus_recombination" - #print(binary_withprofile.properties.common_envelope_option_for_lambda) - CEE(binary_withprofile) - #print(binary_withprofile.event) - self.assertTrue(binary_withprofile.state == "merged", - "CEE test 10 failed") diff --git a/posydon/tests/binary_evol/DT/test_step_detached.py b/posydon/tests/binary_evol/DT/test_step_detached.py deleted file mode 100644 index 00fbb9db43..0000000000 --- a/posydon/tests/binary_evol/DT/test_step_detached.py +++ /dev/null @@ -1,404 +0,0 @@ -import os -import unittest - -from posydon.binary_evol.binarystar import BinaryStar -from posydon.binary_evol.DT.step_detached import detached_step, diffeq -from posydon.binary_evol.simulationproperties import SimulationProperties -from posydon.binary_evol.singlestar import SingleStar -from posydon.config import PATH_TO_POSYDON -from posydon.utils import common_functions as cf -from posydon.utils import constants as const - -PATH_TO_DATA = os.path.join( - PATH_TO_POSYDON, "posydon/tests/data/POSYDON-UNIT-TESTS/binary_evol/detached/") -#eep_version = "POSYDON" - - -class TestDetached_step(unittest.TestCase): - def test_matching1_root(self): - method = "root" - matching = detached_step(#grid='POSYDON', - path=PATH_TO_DATA, - matching_method=method, - #eep_version=eep_version, - verbose=False) - get_mist0 = detached_step.get_mist0 - get_track_val = detached_step.get_track_val - htrack = True - PROPERTIES_STAR = { - "mass": 60.0, - "log_R": 1.0, - "mdot": -(10.0**(-5)), - "state": "H-rich_Core_H_burning", - "center_he4": 0.48, - "center_h1": 0.5, - "total_moment_of_inertia": 10.0**57, - "log_total_angular_momentum": 52, - "he_core_mass": 0.0, - "surface_he4": 0.28, - "surface_h1": 0.7, - } - m0, t = get_mist0(matching, SingleStar(**PROPERTIES_STAR),htrack) - - self.assertAlmostEqual( - m0, - 64.2410914922183, - places=1, - msg= - "Initial mass in MIST matching not exactly what expected. Should be 64.68538051198551", - ) - self.assertAlmostEqual( - get_track_val(matching, "mass",htrack, m0, t), - 60.0000000000419, - places=3, - msg= - "Current mass in matching not exactly what expected. Should be 60.0000000000419", - ) - self.assertAlmostEqual( - get_track_val(matching, "log_R",htrack, m0, t), - 1.1282247490900794, - places=1, - msg= - "Current log_R in matching not exactly what expected. Should be 1.1282247490900794", - ) - self.assertAlmostEqual( - get_track_val(matching, "center_he4",htrack, m0, t), - 0.4861139708172655, - places=2, - msg= - "Current center_he4 in matching not exactly what expected. Should be 0.4861139708172655", - ) - self.assertAlmostEqual( - get_track_val(matching, "he_core_mass",htrack, m0, t), - 0.0, - places=1, - msg= - "Current he_core_mass matching not exactly what expected. Should be 0.0", - ) - - def test_matching1_minimize(self): - method = "minimize" - matching = detached_step(#grid='POSYDON', - path=PATH_TO_DATA, - matching_method=method, - #eep_version=eep_version, - verbose=False) - get_mist0 = detached_step.get_mist0 - get_track_val = detached_step.get_track_val - htrack = True - PROPERTIES_STAR = { - "mass": 60.0, - "log_R": 1.0, - "mdot": -(10.0**(-5)), - "state": "H-rich_Core_H_burning", - "center_he4": 0.48, - "center_h1": 0.5, - "total_moment_of_inertia": 10.0**57, - "log_total_angular_momentum": 52, - "he_core_mass": 0.0, - "surface_he4": 0.28, - "surface_h1": 0.7, - } - m0, t = get_mist0(matching, SingleStar(**PROPERTIES_STAR),htrack) - - #self.assertAlmostEqual( - # m0, - # 62.88453923015954, - # places= - # 1, # less accuracy because we try to fit more alternative parameters than "root" method at the same time - # msg= - # "Initial mass in MIST matching not exactly what expected. Should be 62.78903050084804", - #) - #self.assertAlmostEqual( - # get_track_val(matching, "mass",htrack, m0, t), - # 59.96234634155157, - # places=1, - # msg= - # "Current mass in matching not exactly what expected. Should be 59.96234634155157", - #) - #self.assertAlmostEqual( - # get_track_val(matching, "log_R",htrack, m0, t), - # 1.0973066851601672, - # places=1, - # msg= - # "Current log_R in matching not exactly what expected. Should be 1.0973066851601672", - #) - #self.assertAlmostEqual( - # get_track_val(matching, "center_he4",htrack, m0, t), - # 0.4252496982220549, - # places=1, - # msg= - # "Current center_he4 in matching not exactly what expected. Should be 0.4252496982220549", - #) - self.assertAlmostEqual( - get_track_val(matching, "he_core_mass",htrack, m0, t), - 0.0, - places=1, - msg= - "Current mass he_core_mass matching not exactly what expected. Should be 0.0", - ) - - def test_only_tides(self): - method = "minimize" - matching = detached_step(#grid='POSYDON', - path=PATH_TO_DATA, - matching_method=method, - #eep_version=eep_version, - verbose=False) - step_ODE_minimize_hist = detached_step( - #grid='POSYDON', - path=PATH_TO_DATA, - n_o_steps_history=30, - #eep_version=eep_version, - matching_method=method, - verbose=False, - ) - step_ODE_minimize_hist_onlytides = detached_step( - #grid='POSYDON', - path=PATH_TO_DATA, - n_o_steps_history=30, - matching_method=method, - #eep_version=eep_version, - verbose=False, - do_wind_loss=False, - do_tides=True, - do_gravitational_radiation=False, - do_magnetic_braking=False, - do_stellar_evolution_and_spin_from_winds=False, - ) - PROPERTIES_STAR1 = {"mass": 10.0, "state": "BH"} - LOW_MS_PROPERTIES_STAR2_non_rot = { - "mass": 8.0, - "log_R": 0.6, - "mdot": -(10.0**(-7)), - "state": "H-rich_Core_H_burning", - "center_he4": 0.28, - "center_h1": 0.7, - "total_moment_of_inertia": 10.0**57, - "log_total_angular_momentum": -10.99, # non-rotating - "he_core_mass": 0.0, - "surface_he4": 0.28, - "surface_h1": 0.7, - } - init_orbital_period = 10 - init_separation = cf.orbital_separation_from_period( - init_orbital_period, - PROPERTIES_STAR1["mass"], - LOW_MS_PROPERTIES_STAR2_non_rot["mass"], - ) - CLOSE_BINARY = { - "time": 5 * 10.0**6, - "orbital_period": init_orbital_period, - "separation": init_separation, - "state": "detached", - "eccentricity": 0.0, - "event": "None", - } - - binary = BinaryStar( - star_1=SingleStar(**PROPERTIES_STAR1), - star_2=SingleStar(**LOW_MS_PROPERTIES_STAR2_non_rot), - **CLOSE_BINARY) - binary.properties.max_simulation_time = 10.0**10 - step_ODE_minimize_hist_onlytides(binary) - - self.assertLessEqual( - getattr(binary, "separation_history")[-1], - getattr(binary, "separation_history")[0], - msg= - "final sepertation with tides only and a non-rotating donor should decrease.", - ) - - def test_tides_vs_tides_and_winds(self): - method = "minimize" - matching = detached_step(#grid='POSYDON', - path=PATH_TO_DATA, - matching_method=method, - #eep_version=eep_version, - verbose=False) - step_ODE_minimize_hist_tides_and_winds = detached_step( - #grid='POSYDON', - path=PATH_TO_DATA, - n_o_steps_history=30, - matching_method=method, - #eep_version=eep_version, - verbose=False, - do_wind_loss=True, - do_tides=True, - do_gravitational_radiation=False, - do_magnetic_braking=False, - do_stellar_evolution_and_spin_from_winds=False, - ) - step_ODE_minimize_hist_onlytides = detached_step( - #grid='POSYDON', - path=PATH_TO_DATA, - n_o_steps_history=30, - matching_method=method, - #eep_version=eep_version, - verbose=False, - do_wind_loss=False, - do_tides=True, - do_gravitational_radiation=False, - do_magnetic_braking=False, - do_stellar_evolution_and_spin_from_winds=False, - ) - - PROPERTIES_STAR1 = {"mass": 10.0, "state": "BH"} - LOW_MS_PROPERTIES_STAR2_non_rot = { - "mass": 8.0, - "log_R": 0.6, - "mdot": -(10.0**(-7)), - "state": "H-rich_Core_H_burning", - "center_he4": 0.28, - "center_h1": 0.7, - "total_moment_of_inertia": 10.0**57, - "log_total_angular_momentum": -10.99, # non-rotating - "he_core_mass": 0.0, - "surface_he4": 0.28, - "surface_h1": 0.7, - } - init_orbital_period = 10 - init_separation = cf.orbital_separation_from_period( - init_orbital_period, - PROPERTIES_STAR1["mass"], - LOW_MS_PROPERTIES_STAR2_non_rot["mass"], - ) - CLOSE_BINARY = { - "time": 5 * 10.0**6, - "orbital_period": init_orbital_period, - "separation": init_separation, - "state": "detached", - "eccentricity": 0.0, - "event": "None", - } - - binary = BinaryStar( - star_1=SingleStar(**PROPERTIES_STAR1), - star_2=SingleStar(**LOW_MS_PROPERTIES_STAR2_non_rot), - **CLOSE_BINARY) - binary_test = BinaryStar( - star_1=SingleStar(**PROPERTIES_STAR1), - star_2=SingleStar(**LOW_MS_PROPERTIES_STAR2_non_rot), - **CLOSE_BINARY) - - binary.properties.max_simulation_time = 10.0**10 - binary_test.properties.max_simulation_time = 10.0**10 - - step_ODE_minimize_hist_tides_and_winds(binary) - step_ODE_minimize_hist_onlytides(binary_test) - - self.assertLessEqual( - getattr(binary_test, "separation_history")[-1], - getattr(binary, "separation_history")[-1], - msg= - "final sepertation with tides only and a non-rotating donor should be lower than including winds too that widen the orbit too.", - ) - - # the following tests are out because they need more EEPS MIST models around their mass. If included they should work. - """ - def test_matching2_root(self): - method = "root" - matching = HMS_detached_step(PATH_TO_EEPS, matching_method=method, verbose=True) - get_mist0 = HMS_detached_step.get_mist0 - get_track_val = HMS_detached_step.get_track_val - PROPERTIES_STAR = { - "mass": 20.0, - "log_R": 2.5, - "mdot": -(10.0 ** (-5)), - "state": "PostMS", - "center_he4": 0.8, - "center_h1": 0.0, - "total_moment_of_inertia": 10.0 ** 57, - "log_total_angular_momentum": 52, - "he_core_mass": 7.0, - "surface_he4": 0.2, - "surface_h1": 0.7, - } - m0, t = get_mist0(matching, SingleStar(**PROPERTIES_STAR)) - - self.assertAlmostEqual( - m0, - 23.092430444226363, - places=5, - msg="Initial mass in MIST matching not exactly what expected. Should be 23.092430444226363", - ) - self.assertAlmostEqual( - get_track_val(matching, "mass", m0, t), - 20.000000000003112, - places=5, - msg="Current mass in matching not exactly what expected. Should be 20.000000000003112", - ) - self.assertAlmostEqual( - get_track_val(matching, "log_R", m0, t), - 3.006026700371161, - places=5, - msg="Current log_R in matching not exactly what expected. Should be 3.006026700371161", - ) - self.assertAlmostEqual( - get_track_val(matching, "center_he4", m0, t), - 0.6426242107646186, - places=5, - msg="Current center_he4 in matching not exactly what expected. Should be 0.6426242107646186", - ) - self.assertAlmostEqual( - get_track_val(matching, "he_core_mass", m0, t), - 6.99999999999913, - places=5, - msg="Current mass he_core_mass matching not exactly what expected. Should be 6.99999999999913", - ) - - def test_matching2_minimize(self): - method = "minimize" - matching = HMS_detached_step(PATH_TO_EEPS, matching_method=method, verbose=True) - get_mist0 = HMS_detached_step.get_mist0 - get_track_val = HMS_detached_step.get_track_val - PROPERTIES_STAR = { - "mass": 20.0, - "log_R": 2.5, - "mdot": -(10.0 ** (-5)), - "state": "PostMS", - "center_he4": 0.8, - "center_h1": 0.0, - "total_moment_of_inertia": 10.0 ** 57, - "log_total_angular_momentum": 52, - "he_core_mass": 7.0, - "surface_he4": 0.2, - "surface_h1": 0.7, - } - m0, t = get_mist0(matching, SingleStar(**PROPERTIES_STAR)) - - self.assertAlmostEqual( - m0, - 23.441360274390483, - places=5, - msg="Initial mass in MIST matching not exactly what expected. Should be 23.441360274390483", - ) - self.assertAlmostEqual( - get_track_val(matching, "mass", m0, t), - 21.931950016322705, - places=5, - msg="Current mass in matching not exactly what expected. Should be 21.931950016322705", - ) - self.assertAlmostEqual( - get_track_val(matching, "log_R", m0, t), - 2.5019520817980974, - places=5, - msg="Current log_R in matching not exactly what expected. Should be 2.5019520817980974", - ) - self.assertAlmostEqual( - get_track_val(matching, "center_he4", m0, t), - 0.9095107795447867, - places=5, - msg="Current center_he4 in matching not exactly what expected. Should be 0.9095107795447867", - ) - self.assertAlmostEqual( - get_track_val(matching, "he_core_mass", m0, t), - 6.86182071726521, - places=5, - msg="Current mass he_core_mass matching not exactly what expected. Should be 6.86182071726521", - ) - """ - - -if __name__ == "__main__": - unittest.main() diff --git a/posydon/tests/binary_evol/SN/test_profile_collapse.py b/posydon/tests/binary_evol/SN/test_profile_collapse.py deleted file mode 100644 index eb137cd6fa..0000000000 --- a/posydon/tests/binary_evol/SN/test_profile_collapse.py +++ /dev/null @@ -1,98 +0,0 @@ -import os -import unittest - -import posydon.utils.constants as const -from posydon.binary_evol.singlestar import SingleStar -from posydon.binary_evol.SN.profile_collapse import ( - compute_isco_properties, - do_core_collapse_BH, - get_initial_BH_properties, -) -from posydon.config import PATH_TO_POSYDON -from posydon.grids.psygrid import PSyGrid - -PATH_TO_GRID = os.path.join( - PATH_TO_POSYDON, "posydon/tests/data/POSYDON-UNIT-TESTS/" - "visualization/grid_unit_test_plot.h5") - -if not os.path.isfile(PATH_TO_GRID): - print(PATH_TO_GRID) - raise ValueError("Test grid for unit testing was not found!") - -# constants in CGS -G = const.standard_cgrav -c = const.clight -Mo = const.Msun - - -class TestProfileCollapse(unittest.TestCase): - def test_r_isco(self): - m_BH = 1. * Mo - self.assertAlmostEqual(compute_isco_properties(0., m_BH)[0] / - (G * m_BH / c**2), - 6.0, - places=5) - self.assertAlmostEqual(compute_isco_properties(0.999, m_BH)[0] / - (G * m_BH / c**2), - 1.1817646130335708, - places=5) - - def test_j_isco(self): - m_BH = 1. * Mo - self.assertAlmostEqual(compute_isco_properties(0, m_BH)[1] / - (G * m_BH / c), - 3.464101615137754, - places=5) - self.assertAlmostEqual(compute_isco_properties(0.999, m_BH)[1] / - (G * m_BH / c), - 1.3418378380509774, - places=5) - - def test_radiation_efficiency(self): - m_BH = 1. * Mo - self.assertAlmostEqual((1 - compute_isco_properties(0., m_BH)[2]), - 0.057190958417936644, - places=5) - self.assertAlmostEqual((1 - compute_isco_properties(0.999, m_BH)[2]), - 0.3397940734762088, - places=5) - - def test_low_spinning_He_star(self): - grid = PSyGrid(PATH_TO_GRID) - i = 42 - star = SingleStar(**{'profile': grid[i].final_profile1}) - m_rembar = grid[i].final_values['star_1_mass'] - mass_direct_collapse = 3. # Msun - delta_M = 0.5 # Msun - results = do_core_collapse_BH(star, m_rembar, mass_direct_collapse, - delta_M) - self.assertAlmostEqual(results[0], 13.365071929231409, places=5) - self.assertAlmostEqual(results[1], 8.98074719361575e-09, places=5) - - def test_midly_spinning_He_star(self): - grid = PSyGrid(PATH_TO_GRID) - i = 13 - star = SingleStar(**{'profile': grid[i].final_profile1}) - m_rembar = grid[i].final_values['star_1_mass'] - mass_direct_collapse = 3. # Msun - delta_M = 0.5 # Msun - results = do_core_collapse_BH(star, m_rembar, mass_direct_collapse, - delta_M) - self.assertAlmostEqual(results[0], 5.60832288900688, places=5) - self.assertAlmostEqual(results[1], 0.42583967572001924, places=5) - - def test_rapidly_spinning_He_star(self): - grid = PSyGrid(PATH_TO_GRID) - i = 6 - star = SingleStar(**{'profile': grid[i].final_profile1}) - m_rembar = grid[i].final_values['star_1_mass'] - mass_direct_collapse = 3. # Msun - delta_M = 0.5 # Msun - results = do_core_collapse_BH(star, m_rembar, mass_direct_collapse, - delta_M) - self.assertAlmostEqual(results[0], 38.50844589130613, places=5) - self.assertAlmostEqual(results[1], 0.9835226614001595, places=5) - - -if __name__ == "__main__": - unittest.main() diff --git a/posydon/tests/binary_evol/SN/test_step_SN.py b/posydon/tests/binary_evol/SN/test_step_SN.py deleted file mode 100644 index 065a8d0399..0000000000 --- a/posydon/tests/binary_evol/SN/test_step_SN.py +++ /dev/null @@ -1,567 +0,0 @@ -import os -import unittest - -import matplotlib.cm as cm -import numpy as np -import pandas as pd -from scipy.stats import maxwell - -from posydon.binary_evol.binarystar import BinaryStar -from posydon.binary_evol.singlestar import SingleStar -from posydon.binary_evol.SN.step_SN import StepSN -from posydon.config import PATH_TO_POSYDON - -# github action are not cloning the data submoule, data for unit testing -# are therefore stored to the unit test submodule - -path_to_Sukhbold_datasets = os.path.join( - PATH_TO_POSYDON, "posydon/tests/data/POSYDON-UNIT-TESTS/binary_evol/SN/") - -class TestStepSN(unittest.TestCase): - # TODO - ''' - """ - Test WD formation - """ - def test_WD_formation_RAPID(self): - M_CO = 1.3 - SN = StepSN( **{'mechanism' : 'Fryer+12-rapid', - 'engine' : None, - 'PISN' : 'Marchant+19', - 'ECSN' : 'cosmic', - 'max_neutrino_mass_loss' : 0., - 'kick' : True, - 'sigma_kick_CCSN' : 265.0, - 'sigma_kick_ECSN' : 20.0, - 'max_NS_mass' : 2.5, - 'verbose' : False} ) - - star_prop = {'mass': M_CO / 0.7638113015667961, - 'co_core_mass': M_CO , - 'he_core_mass': M_CO / 0.7638113015667961, - 'state':'stripped_He_Core_C_depleted', - 'profile':None , - 'spin': 0.0} - star = SingleStar(**star_prop) - - star_he_core = star.he_core_mass - - M_rembar = SN.compute_m_rembar(star , None)[0] - - self.assertEqual( SN.SN_type , 'WD') - self.assertEqual( M_rembar , star_he_core) - - def test_WD_formation_DELAYED(self): - M_CO = 1.3 - SN = StepSN( **{'mechanism' : 'Fryer+12-delayed', - 'engine' : None, - 'PISN' : 'Marchant+19', - 'ECSN' : 'cosmic', - 'max_neutrino_mass_loss' : 0., - 'kick' : True, - 'sigma_kick_CCSN' : 265.0, - 'sigma_kick_ECSN' : 20.0, - 'max_NS_mass' : 2.5, - 'verbose' : False} ) - - star_prop = {'mass': M_CO / 0.7638113015667961, - 'co_core_mass': M_CO , - 'he_core_mass': M_CO / 0.7638113015667961, - 'state':'stripped_He_Core_C_depleted', - 'profile':None , - 'spin': 0.0} - star = SingleStar(**star_prop) - - star_he_core = star.he_core_mass - - M_rembar = SN.compute_m_rembar(star , None)[0] - - self.assertEqual( SN.SN_type , 'WD') - self.assertEqual( M_rembar , star_he_core) - - def test_WD_formation_SUKHBOLDN20(self): - M_CO = 1.3 - SN = StepSN( **{'mechanism' : 'Sukhbold+16-engine', - 'engine' : 'N20', - 'PISN' : 'Marchant+19', - 'ECSN' : 'cosmic', - 'max_neutrino_mass_loss' : 0., - 'kick' : True, - 'sigma_kick_CCSN' : 265.0, - 'sigma_kick_ECSN' : 20.0, - 'max_NS_mass' : 2.5, - 'verbose' : False, - 'path_to_datasets': path_to_Sukhbold_datasets} ) - - star_prop = {'mass': M_CO / 0.7638113015667961, - 'co_core_mass': M_CO , - 'he_core_mass': M_CO / 0.7638113015667961, - 'state':'stripped_He_Core_C_depleted', - 'profile':None , - 'spin': 0.0} - star = SingleStar(**star_prop) - - star_he_core = star.he_core_mass - - M_rembar = SN.compute_m_rembar(star , None)[0] - - self.assertEqual( SN.SN_type , 'WD') - self.assertEqual( M_rembar , star_he_core) - - - """ - Test ECSN formation - """ - def test_WD_formation_RAPID(self): - M_CO = 1.38 - SN = StepSN( **{'mechanism' : 'Fryer+12-rapid', - 'engine' : None, - 'PISN' : 'Marchant+19', - 'ECSN' : 'cosmic', - 'max_neutrino_mass_loss' : 0., - 'kick' : True, - 'sigma_kick_CCSN' : 265.0, - 'sigma_kick_ECSN' : 20.0, - 'max_NS_mass' : 2.5, - 'verbose' : False} ) - - star_prop = {'mass': M_CO / 0.7638113015667961, - 'co_core_mass': M_CO , - 'he_core_mass': M_CO / 0.7638113015667961, - 'state':'stripped_He_Core_C_depleted', - 'profile':None , - 'spin': 0.0} - star = SingleStar(**star_prop) - - star_c_core = star.co_core_mass - - M_rembar = SN.compute_m_rembar(star , None)[0] - - self.assertEqual( SN.SN_type , 'ECSN') - self.assertEqual( M_rembar , star_c_core) - - def test_WD_formation_DELAYED(self): - M_CO = 1.38 - SN = StepSN( **{'mechanism' : 'Fryer+12-delayed', - 'engine' : None, - 'PISN' : 'Marchant+19', - 'ECSN' : 'cosmic', - 'max_neutrino_mass_loss' : 0., - 'kick' : True, - 'sigma_kick_CCSN' : 265.0, - 'sigma_kick_ECSN' : 20.0, - 'max_NS_mass' : 2.5, - 'verbose' : False} ) - - star_prop = {'mass': M_CO / 0.7638113015667961, - 'co_core_mass': M_CO , - 'he_core_mass': M_CO / 0.7638113015667961, - 'state':'stripped_He_Core_C_depleted', - 'profile':None , - 'spin': 0.0} - star = SingleStar(**star_prop) - - star_c_core = star.co_core_mass - - M_rembar = SN.compute_m_rembar(star , None)[0] - - self.assertEqual( SN.SN_type , 'ECSN') - self.assertEqual( M_rembar , star_c_core) - - def test_WD_formation_SUKHBOLDN20(self): - M_CO = 1.38 - SN = StepSN( **{'mechanism' : 'Sukhbold+16-engine', - 'engine' : 'N20', - 'PISN' : 'Marchant+19', - 'ECSN' : 'cosmic', - 'max_neutrino_mass_loss' : 0., - 'kick' : True, - 'sigma_kick_CCSN' : 265.0, - 'sigma_kick_ECSN' : 20.0, - 'max_NS_mass' : 2.5, - 'verbose' : False, - 'path_to_datasets': path_to_Sukhbold_datasets} ) - - star_prop = {'mass': M_CO / 0.7638113015667961, - 'co_core_mass': M_CO , - 'he_core_mass': M_CO / 0.7638113015667961, - 'state':'stripped_He_Core_C_depleted', - 'profile':None , - 'spin': 0.0} - star = SingleStar(**star_prop) - - star_c_core = star.co_core_mass - - M_rembar = SN.compute_m_rembar(star , None)[0] - - self.assertEqual( SN.SN_type , 'ECSN') - self.assertEqual( M_rembar , star_c_core) - - - """ - Test CCSN formation - """ - def test_CCSN_formation_RAPID(self): - M_CO = 2.0 - SN = StepSN( **{'mechanism' : 'Fryer+12-rapid', - 'engine' : None, - 'PISN' : 'Marchant+19', - 'ECSN' : 'cosmic', - 'max_neutrino_mass_loss' : 0., - 'kick' : True, - 'sigma_kick_CCSN' : 265.0, - 'sigma_kick_ECSN' : 20.0, - 'max_NS_mass' : 2.5, - 'verbose' : False} ) - - star_prop = {'mass': M_CO / 0.7638113015667961, - 'co_core_mass': M_CO , - 'he_core_mass': M_CO / 0.7638113015667961, - 'state':'stripped_He_Core_C_depleted', - 'profile':None , - 'spin': 0.0} - star = SingleStar(**star_prop) - - star_he_core = star.he_core_mass - - M_rembar = SN.compute_m_rembar(star , None)[0] - - self.assertEqual( SN.SN_type , 'CCSN') - - def test_CCSN_formation_DELAYED(self): - M_CO = 2.0 - SN = StepSN( **{'mechanism' : 'Fryer+12-delayed', - 'engine' : None, - 'PISN' : 'Marchant+19', - 'ECSN' : 'cosmic', - 'max_neutrino_mass_loss' : 0., - 'kick' : True, - 'sigma_kick_CCSN' : 265.0, - 'sigma_kick_ECSN' : 20.0, - 'max_NS_mass' : 2.5, - 'verbose' : False} ) - - star_prop = {'mass': M_CO / 0.7638113015667961, - 'co_core_mass': M_CO , - 'he_core_mass': M_CO / 0.7638113015667961, - 'state':'stripped_He_Core_C_depleted', - 'profile':None , - 'spin': 0.0} - star = SingleStar(**star_prop) - - star_he_core = star.he_core_mass - - M_rembar = SN.compute_m_rembar(star , None)[0] - - self.assertEqual( SN.SN_type , 'CCSN') - - def test_CCSN_formation_SUKHBOLDN20(self): - M_CO = 2.0 - SN = StepSN( **{'mechanism' : 'Sukhbold+16-engine', - 'engine' : 'N20', - 'PISN' : 'Marchant+19', - 'ECSN' : 'cosmic', - 'max_neutrino_mass_loss' : 0., - 'kick' : True, - 'sigma_kick_CCSN' : 265.0, - 'sigma_kick_ECSN' : 20.0, - 'max_NS_mass' : 2.5, - 'verbose' : False, - 'path_to_datasets': path_to_Sukhbold_datasets} ) - - star_prop = {'mass': M_CO / 0.7638113015667961, - 'co_core_mass': M_CO , - 'he_core_mass': M_CO / 0.7638113015667961, - 'state':'stripped_He_Core_C_depleted', - 'profile':None , - 'spin': 0.0} - star = SingleStar(**star_prop) - - star_he_core = star.he_core_mass - - M_rembar = SN.compute_m_rembar(star , None)[0] - - self.assertEqual( SN.SN_type , 'CCSN') - - """ - Test PPISN - """ - def test_remnant_mass_PPISN(self): - M_He = 35.0 - - SN = StepSN( **{'mechanism' : 'Fryer+12-rapid', - 'engine' : None, - 'PISN' : 'Marchant+19', - 'ECSN' : 'cosmic', - 'max_neutrino_mass_loss' : 0., - 'kick' : True, - 'sigma_kick_CCSN' : 265.0, - 'sigma_kick_ECSN' : 20.0, - 'max_NS_mass' : 2.5, - 'verbose' : False} ) - - star_prop = {'mass': M_He, - 'co_core_mass': M_He * 0.7638113015667961 , - 'he_core_mass': M_He , - 'state':'stripped_He_Core_C_depleted', - 'profile':None , - 'spin': 0.0} - - star = SingleStar(**star_prop) - - m_PISN = SN.PISN_prescription(star) - - SN.compute_m_rembar(star , m_PISN)[0] - - self.assertTrue( m_PISN > 0.0 ) - self.assertTrue( m_PISN <= 50.0 ) - self.assertEqual(SN.SN_type , 'PPISN') - - """ - Test PISN - """ - def test_remnant_mass_PPISN(self): - M_He = 70.0 - - SN = StepSN( **{'mechanism' : 'Fryer+12-rapid', - 'engine' : None, - 'PISN' : 'Marchant+19', - 'ECSN' : 'cosmic', - 'max_neutrino_mass_loss' : 0., - 'kick' : True, - 'sigma_kick_CCSN' : 265.0, - 'sigma_kick_ECSN' : 20.0, - 'max_NS_mass' : 2.5, - 'verbose' : False} ) - - star_prop = {'mass': M_He, - 'co_core_mass': M_He * 0.7638113015667961 , - 'he_core_mass': M_He , - 'state':'stripped_He_Core_C_depleted', - 'profile':None , - 'spin': 0.0} - - star = SingleStar(**star_prop) - - m_PISN = SN.PISN_prescription(star) - - SN.compute_m_rembar(star , m_PISN)[0] - - self.assertTrue( np.isnan(m_PISN) ) - self.assertEqual(SN.SN_type , 'PISN') - - """ - Test kick distribution for ECSN - """ - def test_kick_ECSN(self): - SN = StepSN( **{'mechanism' : 'Fryer+12-rapid', - 'engine' : None, - 'PISN' : 'Marchant+19', - 'ECSN' : 'cosmic', - 'max_neutrino_mass_loss' : 0., - 'kick' : True, - 'sigma_kick_CCSN' : 265.0, - 'sigma_kick_ECSN' : 20.0, - 'max_NS_mass' : 2.5, - 'verbose' : False} ) - - SN_type = np.array([]) - Vkick = np.array([]) - M_co = np.full_like(np.arange(50000)*1.0 , 1.38) - - # The He stars are created - for m_co in M_co: - star_prop = {'mass':m_co / 0.7638113015667961, - 'co_core_mass':m_co, - 'he_core_mass':m_co / 0.7638113015667961, - 'state':'stripped_He_Core_C_depleted', - 'profile':None , - 'spin': 0.0} - - - star = SingleStar(**star_prop) - - # The fallback fraction is stracted, this is not a random - # variable then is a fixed value for all explotions - f_fb = SN.compute_m_rembar(star, None)[1] - - # We perform the collapse to extract the SN type of the - # from the code - SN.collapse_star(star) - - if (SN.SN_type == 'CCSN') + (SN.SN_type == 'PPISN') : - kick = SN.generate_kick(star , SN.sigma_kick_CCSN) - sigma = SN.sigma_kick_CCSN - elif SN.SN_type == 'ECSN': - kick = SN.generate_kick(star , SN.sigma_kick_ECSN) - sigma = SN.sigma_kick_ECSN - - - SN_type = np.append(SN_type , SN.SN_type) - Vkick = np.append(Vkick , kick) - - star = None - - dist = (Vkick[SN_type == 'ECSN'] / (1.0 - f_fb)) - - sigma_ECSN = np.round(np.std(dist) / np.sqrt((3*np.pi - 8)/np.pi) , 2) - - print(sigma_ECSN) - - lower = sigma_ECSN <= (SN.sigma_kick_ECSN + 2) - upper = sigma_ECSN >= (SN.sigma_kick_ECSN - 2) - - self.assertTrue( lower ) - self.assertTrue( upper ) - - """ - Test kick distribution for CCSN - """ - def test_kick_CCSN(self): - SN = StepSN( **{'mechanism' : 'Fryer+12-rapid', - 'engine' : None, - 'PISN' : 'Marchant+19', - 'ECSN' : 'cosmic', - 'max_neutrino_mass_loss' : 0., - 'kick' : True, - 'sigma_kick_CCSN' : 265.0, - 'sigma_kick_ECSN' : 20.0, - 'max_NS_mass' : 2.5, - 'verbose' : False} ) - - SN_type = np.array([]) - Vkick = np.array([]) - M_co = np.full_like(np.arange(50000)*1.0 , 8.0) - - # The He stars are created - for m_co in M_co: - star_prop = {'mass':m_co / 0.7638113015667961, - 'co_core_mass':m_co, - 'he_core_mass':m_co / 0.7638113015667961, - 'state':'stripped_He_Core_C_depleted', - 'profile':None , - 'spin': 0.0} - - - star = SingleStar(**star_prop) - - # The fallback fraction is stracted, this is not a random - # variable then is a fixed value for all explotions - f_fb = SN.compute_m_rembar(star, None)[1] - - # We perform the collapse to extract the SN type of the - # from the code - SN.collapse_star(star) - - if (SN.SN_type == 'CCSN') + (SN.SN_type == 'PPISN') : - kick = SN.generate_kick(star , SN.sigma_kick_CCSN) - sigma = SN.sigma_kick_CCSN - elif SN.SN_type == 'ECSN': - kick = SN.generate_kick(star , SN.sigma_kick_ECSN) - sigma = SN.sigma_kick_ECSN - - - SN_type = np.append(SN_type , SN.SN_type) - Vkick = np.append(Vkick , kick) - - star = None - - dist = (Vkick[SN_type == 'CCSN'] / (1.0 - f_fb)) - - sigma_CCSN = np.round(np.std(dist) / np.sqrt((3*np.pi - 8)/np.pi) , 2) - - print(sigma_CCSN) - - lower = sigma_CCSN <= (SN.sigma_kick_CCSN + 2) - upper = sigma_CCSN >= (SN.sigma_kick_CCSN - 2) - - self.assertTrue( lower ) - self.assertTrue( upper ) - - """ - Test generate kick for expanding orbit - """ - def test_generate_kick(self): - SN = StepSN( **{'mechanism' : 'Fryer+12-rapid', - 'engine' : None, - 'PISN' : 'Marchant+19', - 'ECSN' : 'cosmic', - 'max_neutrino_mass_loss' : 0., - 'kick' : True, - 'sigma_kick_CCSN' : 265.0, - 'sigma_kick_ECSN' : 20.0, - 'max_NS_mass' : 2.5, - 'verbose' : False} ) - - fallback = [] - - sep_i = [] - ecc_i = [] - - - sep_f = [] - ecc_f = [] - Vsys_f = [] - - # Loading the test data - def end(binary): - binary.event = 'END' - - properties_star1 = {"mass": 16.200984100257546, "state": "BH", "profile": None} - properties_star2 = {"mass": 5.497560636139926, - "state": "stripped_He_Core_C_depleted", - "profile": None, - 'he_core_mass': 5.497560636139926, - 'co_core_mass': 4.1990989449324205} - - BH = SingleStar(**properties_star1) - He_star = SingleStar(**properties_star2) - properties_binary = { - 'orbital_period' : 6.182118856988261, - 'eccentricity' : 0.0, - 'separation': 39.5265173131476, - 'state' : 'ZAMS', - 'event' : 'CC2', - 'V_sys' : [0, 0, 0], - 'mass_transfer_case' : None, - } - binary = BinaryStar(BH, He_star, **properties_binary) - - pop = [binary] - - - for i in range(len(pop)): - binary = pop[i] - - # We consider that the kicks will have the same direction - # as the velocity of the He star at the periapsis - binary.star_2.natal_kick_array = [None , 0., 0., 0.] - - # We save the orbital separation end eccentricity pre-supernova - sep_i.append( binary.separation ) - ecc_i.append( binary.eccentricity ) - - # We save the fallback fraction f_fb of the remnant - fallback.append(SN.compute_m_rembar(binary.star_2, None)[1]) - - # The orbital kick is applied to the three dimensional orbit - SN.orbital_kick(binary) - - # We save the orbital separation, eccentricity and kick velocity post-supernova - sep_f.append( binary.separation ) - ecc_f.append( binary.eccentricity ) - Vsys_f.append( binary.V_sys ) - - index = [sep_f[i] < sep_i[i] for i in range(len(sep_i))] - - # See if there is any orbit post supernova that shrinked more than one meter - smaller_orbits = np.array(np.array(sep_i)[index] - np.array(sep_f)[index] > 10**-8) - - orbit_comparision = np.sum(smaller_orbits) - - self.assertEqual( orbit_comparision , 0.0) - ''' - - -if __name__ == '__main__': - unittest.main() diff --git a/posydon/tests/binary_evol/test_BinaryStar.py b/posydon/tests/binary_evol/test_BinaryStar.py deleted file mode 100644 index b0f12fe7a7..0000000000 --- a/posydon/tests/binary_evol/test_BinaryStar.py +++ /dev/null @@ -1,127 +0,0 @@ -import os -import unittest - -import numpy as np - -from posydon.binary_evol.binarystar import BinaryStar -from posydon.binary_evol.singlestar import SingleStar -from posydon.config import PATH_TO_POSYDON -from posydon.grids.psygrid import PSyGrid - -PATH_TO_GRID = os.path.join( - PATH_TO_POSYDON, - "posydon/tests/data/POSYDON-UNIT-TESTS/" - "visualization/grid_unit_test_plot.h5" -) - -if not os.path.exists(PATH_TO_GRID): - raise ValueError("Test grid for unit testing was not found!") - - -class TestSingleStar(unittest.TestCase): - def test_BinaryStar_initialisation(self): - # load an example grid: compact object + He-star - grid = PSyGrid(PATH_TO_GRID) - - # initialise a star with the properties of run i=42 - i = 42 - - kwargs1 = { - 'state': 'stripped_He_Core_C_depleted', - 'metallicity': grid[i].initial_values['Z'], - 'mass': grid[i].history1['star_mass'][-1], - 'log_R': np.nan, - 'log_L': grid[i].history1['log_L'][-1], - 'lg_mdot': np.nan, - 'lg_system_mdot' : np.nan, - 'lg_wind_mdot': np.nan, - 'he_core_mass': grid[i].history1['he_core_mass'][-1], - 'he_core_radius': np.nan, - 'c_core_radius': grid[i].history1['he_core_mass'][-1], - 'o_core_mass': np.nan, - 'o_core_radius': np.nan, - 'center_h1': grid[i].history1['center_h1'][-1], - 'center_he4': grid[i].history1['center_he4'][-1], - 'center_c12': grid[i].history1['center_c12'][-1], - 'center_n14': np.nan, - 'center_o16': np.nan, - 'surface_h1': grid[i].history1['surface_h1'][-1], - 'surface_he4': np.nan, - 'surface_c12': np.nan, - 'surface_n14': np.nan, - 'surface_o16': np.nan, - 'log_LH': grid[i].history1['log_LH'][-1], - 'log_LHe': grid[i].history1['log_LHe'][-1], - 'log_LZ': grid[i].history1['log_LZ'][-1], - 'log_Lnuc': grid[i].history1['log_Lnuc'][-1], - 'c12_c12': grid[i].history1['c12_c12'][-1], - 'surf_avg_omega_div_omega_crit': np.nan, - 'total_moment_of_inertia': np.nan, - 'log_total_angular_momentum': np.nan, - 'spin': np.nan, - 'profile': grid[i].final_profile1 - } - - star_1 = SingleStar(**kwargs1) - - kwargs2 = { - 'state': 'stripped_He_Core_C_depleted', - 'metallicity': grid[i].initial_values['Z'], - 'mass': grid[i].initial_values['star_2_mass'], - 'log_R': np.nan, - 'log_L': np.nan, - 'lg_mdot': np.nan, - 'lg_system_mdot' : np.nan, - 'lg_wind_mdot': np.nan, - 'he_core_mass': np.nan, - 'he_core_radius': np.nan, - 'c_core_radius': np.nan, - 'o_core_mass': np.nan, - 'o_core_radius': np.nan, - 'center_h1': np.nan, - 'center_he4': np.nan, - 'center_c12': np.nan, - 'center_n14': np.nan, - 'center_o16': np.nan, - 'surface_h1': np.nan, - 'surface_he4': np.nan, - 'surface_c12': np.nan, - 'surface_n14': np.nan, - 'surface_o16': np.nan, - 'log_LH': np.nan, - 'log_LHe': np.nan, - 'log_LZ': np.nan, - 'log_Lnuc': np.nan, - 'c12_c12': np.nan, - 'surf_avg_omega_div_omega_crit': np.nan, - 'total_moment_of_inertia': np.nan, - 'log_total_angular_momentum': np.nan, - 'spin': np.nan, - 'profile': None - } - - star_2 = SingleStar(**kwargs2) - - kwargs3 = { - 'state': 'detached', - 'event': 'CC1', - 'time': grid.final_values['age'][i], - 'orbital_period': grid.final_values['period_days'][i], - 'eccentricity': 0., - 'separation': grid.final_values['binary_separation'][i], - 'V_sys': [0, 0, 0], - 'rl_relative_overflow_1' : np.nan, - 'rl_relative_overflow_2' : np.nan, - 'lg_mtransfer_rate': np.nan, - #'mass_transfer_case': None - } - - binary = BinaryStar(star_1, star_2, **kwargs3) - - # check that the above kwars have a history - for item in kwargs3.keys(): - self.assertIsInstance(getattr(binary, item + '_history'), list) - - -if __name__ == '__main__': - unittest.main() diff --git a/posydon/tests/binary_evol/test_SingleStar.py b/posydon/tests/binary_evol/test_SingleStar.py deleted file mode 100644 index 4fabf41981..0000000000 --- a/posydon/tests/binary_evol/test_SingleStar.py +++ /dev/null @@ -1,73 +0,0 @@ -import os -import unittest - -import numpy as np - -from posydon.binary_evol.singlestar import SingleStar -from posydon.config import PATH_TO_POSYDON -from posydon.grids.psygrid import PSyGrid - -PATH_TO_GRID = os.path.join( - PATH_TO_POSYDON, - "posydon/tests/data/POSYDON-UNIT-TESTS/" - "visualization/grid_unit_test_plot.h5" -) - -if not os.path.exists(PATH_TO_GRID): - raise ValueError("Test grid for unit testing was not found!") - - -class TestSingleStar(unittest.TestCase): - def test_SingleStar_initialisation(self): - # load an example grid: compact object + He-star - grid = PSyGrid(PATH_TO_GRID) - - # initialise a star with the properties of run i=42 - i = 42 - - # all STARPROPERTIES - kwargs = { - 'state': 'stripped_He_Central_C_depletion', - 'metallicity': grid[i].initial_values['Z'], - 'mass': grid[i].history1['star_mass'][-1], - 'log_R': np.nan, - 'log_L': grid[i].history1['log_L'][-1], - 'lg_mdot': np.nan, - 'lg_system_mdot': np.nan, - 'lg_wind_mdot': np.nan, - 'he_core_mass': grid[i].history1['he_core_mass'][-1], - 'he_core_radius': np.nan, - 'c_core_radius': grid[i].history1['he_core_mass'][-1], - 'o_core_mass': np.nan, - 'o_core_radius': np.nan, - 'center_h1': grid[i].history1['center_h1'][-1], - 'center_he4': grid[i].history1['center_he4'][-1], - 'center_c12': grid[i].history1['center_c12'][-1], - 'center_n14': np.nan, - 'center_o16': np.nan, - 'surface_h1': grid[i].history1['surface_h1'][-1], - 'surface_he4': np.nan, - 'surface_c12': np.nan, - 'surface_n14': np.nan, - 'surface_o16': np.nan, - 'log_LH': grid[i].history1['log_LH'][-1], - 'log_LHe': grid[i].history1['log_LHe'][-1], - 'log_LZ': grid[i].history1['log_LZ'][-1], - 'log_Lnuc': grid[i].history1['log_Lnuc'][-1], - 'c12_c12': grid[i].history1['c12_c12'][-1], - 'surf_avg_omega_div_omega_crit': np.nan, - 'total_moment_of_inertia': np.nan, - 'log_total_angular_momentum': np.nan, - 'spin': np.nan, - 'profile': grid[i].final_profile1 - } - - star = SingleStar(**kwargs) - - # check that the above kwars have a history - for item in kwargs.keys(): - self.assertIsInstance(getattr(star, item + '_history'), list) - - -if __name__ == '__main__': - unittest.main() diff --git a/posydon/tests/data/POSYDON-UNIT-TESTS b/posydon/tests/data/POSYDON-UNIT-TESTS deleted file mode 160000 index eaf9d59229..0000000000 --- a/posydon/tests/data/POSYDON-UNIT-TESTS +++ /dev/null @@ -1 +0,0 @@ -Subproject commit eaf9d592291f093cc0095e13c93d431c5b6051da diff --git a/posydon/tests/interpolation/test_data_scaling.py b/posydon/tests/interpolation/test_data_scaling.py deleted file mode 100644 index ba9e29fd73..0000000000 --- a/posydon/tests/interpolation/test_data_scaling.py +++ /dev/null @@ -1,251 +0,0 @@ -from unittest import TestCase - -import numpy as np - -from posydon.interpolation.data_scaling import DataScaler - - -class DataScaler_test(TestCase): - def setUp(self): - self.sc = DataScaler() - self.x = np.array([1,2,3,4]) - self.y = -self.x.copy() - - def test_fit(self): - # not a 1D array - with self.assertRaises(AssertionError): - self.sc.fit([12,2,3]) #list - with self.assertRaises(AssertionError): - self.sc.fit(np.ones((5,1))) # list - # default value 'none' - with self.subTest(i=0): - self.sc.fit(self.x) - self.assertIsInstance(self.sc.params, list) - self.assertEqual(self.sc.method,'none') - self.assertEqual(len(self.sc.params),0) - # min_max - with self.subTest(i=1): - self.sc.fit(self.x, method='min_max') - self.assertEqual(self.sc.method, 'min_max') - self.assertEqual(len(self.sc.params),2) - self.assertEqual(self.sc.params[0], 1) - self.assertEqual(self.sc.params[1], 4) - self.assertEqual(self.sc.lower, -1) - self.assertEqual(self.sc.upper, 1) - # min_max modifying lower/upper - with self.subTest(i=2): - with self.assertRaises(AssertionError): - self.sc.fit(self.x, method='min_max', lower=2) - self.sc.fit(self.x, method='min_max', lower=-2, upper=0.5) - self.assertEqual(self.sc.params[0], 1) - self.assertEqual(self.sc.params[1], 4) - self.assertEqual(self.sc.lower, -2) - self.assertEqual(self.sc.upper, 0.5) - # max_abs - with self.subTest(i=3): - self.sc.fit(self.x, method='max_abs') - self.assertEqual(self.sc.method, 'max_abs') - self.assertEqual(len(self.sc.params), 1) - self.assertEqual(self.sc.params[0], 4) - self.sc.fit(self.y, method='max_abs') # check with negative numbers - self.assertEqual(self.sc.params[0], 4) - # standarize - with self.subTest(i=4): - self.sc.fit(self.x, method='standarize') - self.assertEqual(self.sc.method, 'standarize') - self.assertEqual(len(self.sc.params), 2) - self.assertEqual(self.sc.params[0], np.mean(self.x)) - self.assertEqual(self.sc.params[1], np.std(self.x)) - # log_min_max - with self.subTest(i=5): - self.sc.fit(self.x, method='log_min_max') - self.assertEqual(self.sc.method, 'log_min_max') - self.assertEqual(len(self.sc.params), 2) - self.assertEqual(self.sc.params[0], 0) - self.assertEqual(self.sc.params[1], np.log10(4)) - self.assertEqual(self.sc.lower, -1) - self.assertEqual(self.sc.upper, 1) - # log_min_max modifying lower/upper - with self.subTest(i=6): - with self.assertRaises(AssertionError): - self.sc.fit(self.x, method='log_min_max', lower=2) - self.sc.fit(self.x, method='log_min_max', lower=-2, upper=0.5) - self.assertEqual(self.sc.params[0], 0) - self.assertEqual(self.sc.params[1], np.log10(4)) - self.assertEqual(self.sc.lower, -2) - self.assertEqual(self.sc.upper, 0.5) - # log_max_abs - with self.subTest(i=7): - self.sc.fit(self.x, method='log_max_abs') - self.assertEqual(self.sc.method, 'log_max_abs') - self.assertEqual(len(self.sc.params), 1) - self.assertEqual(self.sc.params[0], np.log10(4)) - self.sc.fit(self.y, method='log_max_abs') # check with negative numbers - self.assertTrue(np.isnan(self.sc.params[0])) - # log_standarize - with self.subTest(i=8): - self.sc.fit(self.x, method='log_standarize') - self.assertEqual(self.sc.method, 'log_standarize') - self.assertEqual(len(self.sc.params), 2) - self.assertEqual(self.sc.params[0], np.mean(np.log10(self.x))) - self.assertEqual(self.sc.params[1], np.std(np.log10(self.x))) - # wrong method string - with self.assertRaises(ValueError): - self.sc.fit(self.x, method='wrong') - - def test_transform(self): - # check .fit has been run first - with self.assertRaises(AssertionError): - sc = DataScaler() - sc.transform(self.x) - # default value 'none' - with self.subTest(i=0): - self.sc.fit(self.x) - xt = self.sc.transform(self.x) - self.assertIsInstance(xt, np.ndarray) - self.assertEqual(len(xt.shape),1) - self.assertEqual(np.sum(np.abs(xt-self.x)),0) - # min_max - with self.subTest(i=1): - self.sc.fit(self.x, method='min_max') - xt = self.sc.transform(self.x) - self.assertAlmostEqual(xt.min(),self.sc.lower) - self.assertAlmostEqual(xt.max(), self.sc.upper) - # min_max modifying lower/upper - with self.subTest(i=2): - self.sc.fit(self.x, method='min_max', lower=-2, upper=0.5) - xt = self.sc.transform(self.x) - self.assertAlmostEqual(xt.min(), self.sc.lower) - self.assertAlmostEqual(xt.max(), self.sc.upper) - # max_abs - with self.subTest(i=3): - self.sc.fit(self.x, method='max_abs') - xt = self.sc.transform(self.x) - self.assertEqual(np.abs(xt).max(), 1) - self.assertGreaterEqual(np.abs(xt).min(),-1) - self.sc.fit(self.y, method='max_abs') # check with negative numbers - xt = self.sc.transform(self.x) - self.assertEqual(np.abs(xt).max(), 1) - self.assertGreaterEqual(np.abs(xt).min(), -1) - # standarize - with self.subTest(i=4): - self.sc.fit(self.x, method='standarize') - xt = self.sc.transform(self.x) - self.assertAlmostEqual(xt.mean(),0) - self.assertAlmostEqual(xt.std(), 1) - # log_min_max - with self.subTest(i=5): - self.sc.fit(self.x, method='log_min_max') - xt = self.sc.transform(self.x) - self.assertAlmostEqual(xt.min(), self.sc.lower) - self.assertAlmostEqual(xt.max(), self.sc.upper) - # log_min_max modifying lower/upper - with self.subTest(i=6): - self.sc.fit(self.x, method='log_min_max', lower=-2, upper=0.5) - xt = self.sc.transform(self.x) - self.assertAlmostEqual(xt.min(), self.sc.lower) - self.assertAlmostEqual(xt.max(), self.sc.upper) - # log_max_abs - with self.subTest(i=7): - self.sc.fit(self.x, method='log_max_abs') - xt = self.sc.transform(self.x) - self.assertEqual(np.abs(xt).max(), 1) - self.assertGreaterEqual(np.abs(xt).min(), -1) - # log_standarize - with self.subTest(i=8): - self.sc.fit(self.x, method='log_standarize') - xt = self.sc.transform(self.x) - self.assertAlmostEqual(xt.mean(), 0) - self.assertAlmostEqual(xt.std(), 1) - - def test_fit_and_transform(self): - - # default value 'none' - with self.subTest(i=0): - xt = self.sc.fit_and_transform(self.x) - self.assertIsInstance(xt, np.ndarray) - self.assertEqual(len(xt.shape),1) - self.assertEqual(np.sum(np.abs(xt-self.x)),0) - # min_max - with self.subTest(i=1): - xt = self.sc.fit_and_transform(self.x, method='min_max') - self.assertAlmostEqual(xt.min(),self.sc.lower) - self.assertAlmostEqual(xt.max(), self.sc.upper) - # min_max modifying lower/upper - with self.subTest(i=2): - xt = self.sc.fit_and_transform(self.x, method='min_max', lower=-2, upper=0.5) - self.assertAlmostEqual(xt.min(), self.sc.lower) - self.assertAlmostEqual(xt.max(), self.sc.upper) - # max_abs - with self.subTest(i=3): - xt = self.sc.fit_and_transform(self.x, method='max_abs') - self.assertEqual(np.abs(xt).max(), 1) - self.assertGreaterEqual(np.abs(xt).min(),-1) - xt = self.sc.fit_and_transform(self.y, method='max_abs') # check with negative numbers - self.assertEqual(np.abs(xt).max(), 1) - self.assertGreaterEqual(np.abs(xt).min(), -1) - # standarize - with self.subTest(i=4): - xt = self.sc.fit_and_transform(self.x, method='standarize') - self.assertAlmostEqual(xt.mean(),0) - self.assertAlmostEqual(xt.std(), 1) - # log_min_max - with self.subTest(i=5): - xt = self.sc.fit_and_transform(self.x, method='log_min_max') - self.assertAlmostEqual(xt.min(), self.sc.lower) - self.assertAlmostEqual(xt.max(), self.sc.upper) - # log_min_max modifying lower/upper - with self.subTest(i=6): - xt = self.sc.fit_and_transform(self.x, method='log_min_max', lower=-2, upper=0.5) - self.assertAlmostEqual(xt.min(), self.sc.lower) - self.assertAlmostEqual(xt.max(), self.sc.upper) - # log_max_abs - with self.subTest(i=7): - xt = self.sc.fit_and_transform(self.x, method='log_max_abs') - self.assertEqual(np.abs(xt).max(), 1) - self.assertGreaterEqual(np.abs(xt).min(), -1) - # log_standarize - with self.subTest(i=8): - xt = self.sc.fit_and_transform(self.x, method='log_standarize') - self.assertAlmostEqual(xt.mean(), 0) - self.assertAlmostEqual(xt.std(), 1) - - def test_inv_transform(self): - # default value 'none' - with self.subTest(i=0): - xt = self.sc.fit_and_transform(self.x) - self.assertAlmostEqual(np.sum(np.abs(self.sc.inv_transform(xt) - self.x)), 0) - # min_max - with self.subTest(i=1): - xt = self.sc.fit_and_transform(self.x, method='min_max') - self.assertAlmostEqual(np.sum(np.abs(self.sc.inv_transform(xt) - self.x)), 0) - # min_max modifying lower/upper - with self.subTest(i=2): - xt = self.sc.fit_and_transform(self.x, method='min_max', lower=-2, upper=0.5) - self.assertAlmostEqual(np.sum(np.abs(self.sc.inv_transform(xt) - self.x)), 0) - # max_abs - with self.subTest(i=3): - xt = self.sc.fit_and_transform(self.x, method='max_abs') - self.assertAlmostEqual(np.sum(np.abs(self.sc.inv_transform(xt) - self.x)), 0) - xt = self.sc.fit_and_transform(self.y, method='max_abs') # check with negative numbers - self.assertAlmostEqual(np.sum(np.abs(self.sc.inv_transform(xt) - self.y)), 0) - # standarize - with self.subTest(i=4): - xt = self.sc.fit_and_transform(self.x, method='standarize') - self.assertAlmostEqual(np.sum(np.abs(self.sc.inv_transform(xt) - self.x)), 0) - # log_min_max - with self.subTest(i=5): - xt = self.sc.fit_and_transform(self.x, method='log_min_max') - self.assertAlmostEqual(np.sum(np.abs(self.sc.inv_transform(xt) - self.x)), 0) - # log_min_max modifying lower/upper - with self.subTest(i=6): - xt = self.sc.fit_and_transform(self.x, method='log_min_max', lower=-2, upper=0.5) - self.assertAlmostEqual(np.sum(np.abs(self.sc.inv_transform(xt) - self.x)), 0) - # log_max_abs - with self.subTest(i=7): - xt = self.sc.fit_and_transform(self.x, method='log_max_abs') - self.assertAlmostEqual(np.sum(np.abs(self.sc.inv_transform(xt) - self.x)), 0) - # log_standarize - with self.subTest(i=8): - xt = self.sc.fit_and_transform(self.x, method='log_standarize') - self.assertAlmostEqual(np.sum(np.abs(self.sc.inv_transform(xt) - self.x)), 0) diff --git a/posydon/tests/interpolation/test_interpolation.py b/posydon/tests/interpolation/test_interpolation.py deleted file mode 100644 index 3e791481bb..0000000000 --- a/posydon/tests/interpolation/test_interpolation.py +++ /dev/null @@ -1,37 +0,0 @@ -# from unittest import TestCase -# -# import numpy as np -# import posydon.grids.psygrid as psg -# import posydon.interpolation.interpolation as psi -# -# try: -# import gpflow -# except ImportError: -# print("Import Error for TensorFlow and/or GPFlow, most, if not all " -# "features of the psyInterp class will not work, please check your installation " -# "of gpflow or tensorflow or install the correct gpflow by running pip install .[ml]") -# -# -# class Interpolation_test(TestCase): -# def setUp(self): -# # FIX PATH YOU CANNOT GIVE A LOCAL PATH -# self.grid = psg.PSyGrid() -# self.grid.load("/home/juanga/Desktop/data/grid_BH_He_star.h5") -# self.input_keys = self.grid.initial_values.dtype.names -# self.output_keys = self.grid.final_values.dtype.names[2:4] -# self.input_norms = ['log_min_max', 'log_min_max', 'log_min_max'] -# self.output_norms = ['log_standarize', 'log_standarize'] -# -# def test_init(self): -# m = psi.psyInterp(grid=self.grid, -# in_keys=self.input_keys, -# out_keys=self.output_keys, -# in_scaling=self.input_norms, -# out_scaling=self.output_norms) -# self.assertEqual(len(m.in_keys), len(self.input_keys)) -# self.assertEqual(len(m.out_keys), len(self.output_keys)) -# self.assertEqual(m.XYT.shape[0], m.N) -# self.assertEqual(m.XYT.shape[1], m.n_in+m.n_out) -# -# class SGPInterp_test(TestCase): -# pass diff --git a/posydon/tests/popsyn/test_binarypopulation.py b/posydon/tests/popsyn/test_binarypopulation.py deleted file mode 100644 index 8388acb69a..0000000000 --- a/posydon/tests/popsyn/test_binarypopulation.py +++ /dev/null @@ -1,180 +0,0 @@ -import os -import unittest - -import matplotlib.pyplot as plt -import numpy as np - -from posydon.binary_evol.flow_chart import flow_chart -from posydon.binary_evol.simulationproperties import SimulationProperties -from posydon.binary_evol.step_end import step_end -from posydon.popsyn.binarypopulation import BinaryPopulation - - -class TestBinaryPopulation(unittest.TestCase): - @classmethod - def setUpClass(cls): - np.random.seed(12345) - cls.POP_KWARGS = { - "number_of_binaries": int(500), - "primary_mass_min": 15 - } - - class MyEndStep(step_end): - def __call__(self, binary): - step_end.__call__(binary) - binary.star_1.mass = np.sqrt(binary.star_1.mass) - # change star_1 mass - - cls.SIM_PROP = SimulationProperties( - flow = (flow_chart, {}), - step_HMS_HMS = (MyEndStep, {}), - step_CO_HeMS = (MyEndStep, {}), - step_CO_HMS_RLO = (MyEndStep, {}), - step_detached = (MyEndStep, {}), - step_CE = (MyEndStep, {}), - step_SN = (MyEndStep, {}), - step_end = (MyEndStep, {}), - ) - - def test_init_0(self): - bin_pop = BinaryPopulation() - self.assertTrue(isinstance(bin_pop, BinaryPopulation)) - self.assertTrue(hasattr(bin_pop, 'population_properties')) - self.assertTrue(hasattr(bin_pop, 'entropy')) - - - def test_generate(self): - bin_pop = BinaryPopulation(**self.POP_KWARGS) - for i in range(bin_pop.number_of_binaries): - bin_pop.manager.generate(**self.POP_KWARGS) - self.assertTrue(len(bin_pop) == self.POP_KWARGS["number_of_binaries"]) - - self.assertTrue( [b.star_1.mass > self.POP_KWARGS["primary_mass_min"] - for b in bin_pop] ) - - # def test_generate_initial_binaries(self): - # bin_pop = BinaryPopulation(generate_initial_population=False, **self.POP_KWARGS) - # bin_pop.generate_initial_binaries() - # first_bin = bin_pop[1] - # bin_pop.generate_initial_binaries(overwrite=True) - # second_bin = bin_pop[1] - # self.assertFalse( - # first_bin is second_bin, msg="Binaries should not be the same object." - # ) - # - # def test_gen_init_bin_err(self): - # bin_pop = BinaryPopulation() - # with self.assertRaisesRegex( - # ValueError, "set overwrite=True to overwrite existing population" - # ): - # bin_pop.generate_initial_binaries() - # - def test_sim_properties(self): - bin_pop = BinaryPopulation(population_properties=self.SIM_PROP) - self.assertTrue(isinstance(bin_pop, BinaryPopulation)) - self.assertTrue(bin_pop.population_properties is self.SIM_PROP) - bin_pop.population_properties.load_steps() - return bin_pop - - # def test_evolve(self): - # bin_pop = self.test_sim_properties() - # test_ids = np.arange(0, 15, 1) - # original_bins = bin_pop.copy(ids=test_ids) - # bin_pop.evolve() - # for b in bin_pop: - # with self.subTest("Check event END", binary_ind=b.index): - # self.assertTrue(b.event == "END") - # - # for j, b in enumerate(bin_pop[test_ids]): - # with self.subTest( - # "Check mass changed", - # binary_ind=b.index, - # test_ind=original_bins[j].index, - # ): - # self.assertAlmostEqual( - # b.star_1.mass, np.sqrt(original_bins[j].star_1.mass), places=8 - # ) - - # def test_evolve_binary_population(self): - # # It is unclear how to test multiprocessing at the moment - # POP_KWARGS = {"number_of_binaries": int(500), "primary_mass_min": 15} - # - # def end(binary): - # binary.star_1.mass = np.sqrt(binary.star_1.mass) - # binary.event = "END" - # - # def get_sim_prop(): - # SIM_PROP = SimulationProperties( - # flow={("H-rich_Core_H_burning", "H-rich_Core_H_burning", - # "detached", "ZAMS"): "step_end"}, step_end=end, max_simulation_time=13.7e9) - # return SIM_PROP - # - # bin_pop = BinaryPopulation(population_properties=get_sim_prop, **POP_KWARGS) - # bin_pop.evolve_binary_population(num_batches=4, verbose=True, use_df=True) - - # def test_evolve_each_binary(self): - # bin_pop = self.test_sim_properties() - # for num, evolved_bin in enumerate(bin_pop.evolve_each_binary()): - # with self.subTest("Evolve generator", num=num): - # self.assertTrue(num == evolved_bin.index) - # self.assertTrue(evolved_bin.event == "END") - - # def test_copy(self): - # bin_pop = self.test_sim_properties() - # binary_copy = bin_pop.copy(ids=0) - # self.assertFalse(binary_copy is bin_pop[0]) - # all_binaries_copy = bin_pop.copy() - # self.assertFalse( - # any([copy_b is b for copy_b, b in zip(all_binaries_copy, bin_pop)]) - # ) - - # TODO: step_times is breaking to_df with only initialized binary / pop - # def test_to_df(self): - # bin_pop = self.test_sim_properties() - # self.assertTrue( isinstance(bin_pop.to_df(), pd.DataFrame) ) - - # def test_get_bin_by_index(self): - # bin_pop = self.test_sim_properties() - # test_indicies = [1, 6, 9, 8, 2] - # out_bins = bin_pop.get_binaries_by_index(test_indicies) - # self.assertTrue([b.index for b in out_bins] == test_indicies) - - # def test_bool_and_len(self): - # bin_pop = BinaryPopulation(population_properties=self.SIM_PROP) - # self.assertTrue(bool(bin_pop), msg="True if len self > 0") - # self.assertTrue( - # len(bin_pop) == bin_pop.number_of_binaries, msg="Should be len __binaries" - # ) - - # def test_get_subpopulation(self): - # bin_pop = BinaryPopulation(population_properties=self.SIM_PROP, **self.POP_KWARGS) - # for i in range(200, 300): - # bin_pop[i].star_2.state = "BH" - # subpop = bin_pop.get_subpopulation(star_1_states=None, star_2_states="BH") - # self.assertTrue(all([bin.index == 200 + j for j, bin in enumerate(subpop)])) - # self.assertTrue(all([bin.star_2.state == "BH" for bin in subpop])) - - # def test_pickle_and_load(self): - # bin_pop = BinaryPopulation() - # bin_pop.pickle("saved_population.pkl") - # self.assertTrue(os.path.isfile("saved_population.pkl")) - # - # loaded_pop = BinaryPopulation.load("saved_population.pkl") - # self.assertTrue(isinstance(loaded_pop, BinaryPopulation)) - # - # def test_unique_sim_prop(self): - # bin_pop = BinaryPopulation() - # prop = bin_pop.population_properties - # self.assertTrue( - # all([prop is b.properties for b in bin_pop]), - # msg="All binary properties should map to the same object.", - # ) - - def tearDown(self): - # remove pickled files - if os.path.isfile("saved_population.pkl"): - os.remove("saved_population.pkl") - - -if __name__ == "__main__": - unittest.main() diff --git a/posydon/tests/popsyn/test_synthetic_population.py b/posydon/tests/popsyn/test_synthetic_population.py deleted file mode 100644 index 58fc01a033..0000000000 --- a/posydon/tests/popsyn/test_synthetic_population.py +++ /dev/null @@ -1,645 +0,0 @@ -import os -import tempfile - -import numpy as np -import pandas as pd -import pytest - -from posydon.config import PATH_TO_POSYDON -from posydon.popsyn.synthetic_population import ( - History, - Oneline, - Population, - PopulationIO, - PopulationRunner, - parameter_array, -) -from posydon.utils.constants import Zsun - - -# Test the PopulationRunner class -class TestPopulationRunner: - # Test the initialisation of the PopulationRunner class - def test_init(self): - # Test the initialisation of the PopulationRunner class - poprun = PopulationRunner(PATH_TO_POSYDON+'posydon/popsyn/population_params_default.ini', verbose=True) - - # Check if the verbose attribute is set correctly - assert poprun.verbose == True, 'Verbose attribute is not set correctly' - - # Check if the solar_metallicities attribute is a list - assert isinstance(poprun.solar_metallicities, list), 'solar_metallicities attribute is not a list' - - # Check if the binary_populations attribute is a list - assert isinstance(poprun.binary_populations, list), 'binary_populations attribute is not a list' - - def test_init_invalid_ini_file(self): - with pytest.raises(ValueError): - PopulationRunner('invalid_file') - - def test_single_metallicity(self): - # copy the default ini file to a new file - new_ini_file = 'test_population_params.ini' - with open(PATH_TO_POSYDON+'posydon/popsyn/population_params_default.ini', 'r') as file: - data = file.read() - start = data.find('metallicity') - replace_str = 'metallicity = 0.0001' - data_new = data[:start] + replace_str + data[start+22:] - with open(new_ini_file, 'w') as file: - file.write(data_new) - - poprun = PopulationRunner(new_ini_file) - assert poprun.binary_populations[0].metallicity == 0.0001 - - def test_evolve(self, mocker): - mocker.patch('posydon.popsyn.binarypopulation.BinaryPopulation.evolve', return_value=None) - mocker.patch('posydon.popsyn.binarypopulation.BinaryPopulation.combine_saved_files', return_value=None) - - poprun = PopulationRunner(PATH_TO_POSYDON+'/posydon/popsyn/population_params_default.ini') - # set population to 1 binary - for pop in poprun.binary_populations: - pop.number_of_systems = 1 - - # create a temporary directory with 1e-04_Zsun_batches - os.makedirs('1e-04_Zsun_batches', exist_ok=True) - - poprun.evolve() - assert poprun.binary_populations, 'binary_populations attribute is empty after calling the evolve method' - - - def test_evolve_file_exists(self, mocker): - mocker.patch('posydon.popsyn.binarypopulation.BinaryPopulation.evolve', return_value=None) - mocker.patch('posydon.popsyn.binarypopulation.BinaryPopulation.combine_saved_files', return_value=None) - - # Create a temporary file with the 1e-04_ZSun_population.h5 name - open('1e-04_Zsun_population.h5', 'w').close() - - poprun = PopulationRunner(PATH_TO_POSYDON+'/posydon/popsyn/population_params_default.ini') - # set population to 1 binary - for pop in poprun.binary_populations: - pop.number_of_systems = 1 - - with pytest.raises(FileExistsError): - poprun.evolve() - - - # Test the evolve method - def test_changed_binarypop(self): - poprun = PopulationRunner(PATH_TO_POSYDON+'/posydon/popsyn/population_params_default.ini') - # test - assert poprun.binary_populations[0].metallicity == 0.0001 - # Check if the temp_directory attribute is set correctly - assert poprun.binary_populations[0].kwargs['temp_directory'] == '1e-04_Zsun_batches', 'temp_directory attribute is not set correctly' - - # Check if the binary_populations attribute is not empty after calling the evolve method - assert poprun.binary_populations, 'binary_populations attribute is empty after calling the evolve method' - - @classmethod - def teardown_class(cls): - if os.path.exists('1e-04_Zsun_batches'): - os.rmdir('1e-04_Zsun_batches') - if os.path.exists('test_population_params.ini'): - os.remove('test_population_params.ini') - if os.path.exists('1e-04_Zsun_population.h5'): - os.remove('1e-04_Zsun_population.h5') - - - -# Test the History class -class TestHistory: - - @classmethod - def setup_class(cls): - # Set up a test HDF5 file using pandas HDFStore - cls.filename = 'test_population.h5' - with pd.HDFStore(cls.filename, 'w') as store: - # Create a history dataframe - history_data = pd.DataFrame({'time': [1, 2, 3], 'event': ['ZAMS','oRLO1', 'CEE']}) - store.append('history',history_data, data_columns=True) - - cls.filename2 = 'test_population2.h5' - with pd.HDFStore(cls.filename2, 'w') as store: - # Create a history dataframe - history_data = pd.DataFrame({'time': [1, 2, 3], 'event': ['ZAMS','oRLO1', 'CEE']}) - store.append('history',history_data, data_columns=True) - - @classmethod - def teardown_class(cls): - os.remove(cls.filename) - - def setup_method(self): - self.history = History(self.filename, verbose=False, chunksize=10000) - - def test_init(self): - history = History(self.filename2, verbose=True, chunksize=10000) - assert history.filename == self.filename2, 'Filename is not set correctly' - assert history.verbose == True, 'Verbose attribute is not set correctly' - assert history.chunksize == 10000, 'Chunksize attribute is not set correctly' - - expected_lengths = pd.DataFrame(index=[0, 1, 2],data={'index': [1, 1, 1]}) - expected_lengths.index.name = 'index' - pd.testing.assert_frame_equal(history.lengths, expected_lengths, 'Lengths attribute is not equal to the expected dataframe') - - assert history.number_of_systems == 3, 'Number of systems attribute is not None' - assert history.columns.to_list() == ['time', 'event'], 'Columns attribute is not None' - - assert isinstance(history.indices, np.ndarray), 'Indices attribute is not an ndarray' - np.testing.assert_array_equal(history.indices, np.array([0, 1, 2]), 'Indices attribute is not equal to the expected list') - - with pytest.raises(FileNotFoundError): - History('invalid_filename.h5', verbose=False, chunksize=10000) - - def test_init_verbose_true(self): - history = History(self.filename, chunksize=10000) - assert history.verbose == False, 'Verbose attribute is not set correctly' - - - def test_getitem_single_index(self): - df = self.history[0] - assert isinstance(df, pd.DataFrame), 'Returned object is not a DataFrame' - assert len(df) == 1, 'Returned DataFrame does not have the correct length' - - - def test_getitem_multiple_indices(self): - df = self.history[[0, 1, 2]] - assert isinstance(df, pd.DataFrame), 'Returned object is not a DataFrame' - assert len(df) == 3, 'Returned DataFrame does not have the correct length' - - def test_getitem_index_array(self): - indices = np.array([0, 1, 2]) - df = self.history[indices] - assert isinstance(df, pd.DataFrame), 'Returned object is not a DataFrame' - assert len(df) == 3, 'Returned DataFrame does not have the correct length' - - def test_getitem_single_column(self): - column = 'time' - df = self.history[column] - assert isinstance(df, pd.DataFrame), 'Returned object is not a DataFrame' - assert len(df.columns) == 1, 'Returned DataFrame does not have the correct number of columns' - - def test_getitem_invalid_column(self): - column = 'invalid_column' - with pytest.raises(ValueError): - self.history[column] - - def test_getitem_invalid_keys(self): - columns = ['time', 'invalid_column'] - with pytest.raises(ValueError): - self.history[columns] - - def test_getitem_boolean_mask_numpy(self): - mask = (self.history['time'] > 1).to_numpy() - df = self.history[mask] - assert isinstance(df, pd.DataFrame), 'Returned object is not a DataFrame' - - def test_getitem_boolean_mask_pandas(self): - mask = self.history['time'] > 1 - df = self.history[mask] - assert isinstance(df, pd.DataFrame), 'Returned object is not a DataFrame' - - def test_getitem_multiple_columns(self): - columns = ['time', 'event'] - df = self.history[columns] - assert isinstance(df, pd.DataFrame), 'Returned object is not a DataFrame' - assert len(df.columns) == 2, 'Returned DataFrame does not have the correct number of columns' - - def test_getitem_invalid_key(self): - with pytest.raises(ValueError): - self.history[{1: 2}] - - def test_len(self): - length = len(self.history) - assert isinstance(length, int), 'Returned object is not an integer' - assert length == 3, 'Returned length is not correct' - - def test_head(self): - n = 2 - df = self.history.head(n) - assert isinstance(df, pd.DataFrame), 'Returned object is not a DataFrame' - assert len(df) == n, 'Returned DataFrame does not have the correct length' - - def test_tail(self): - n = 2 - df = self.history.tail(n) - assert isinstance(df, pd.DataFrame), 'Returned object is not a DataFrame' - assert len(df) == n, 'Returned DataFrame does not have the correct length' - - def test_repr(self): - representation = self.history.__repr__() - assert isinstance(representation, str), 'Returned object is not a string' - - def test_repr_html(self): - html_representation = self.history._repr_html_() - assert isinstance(html_representation, str), 'Returned object is not a string' - - - def test_select(self): - df = self.history.select(where="time > 1", start=0, stop=10, columns=['event', 'time']) - assert isinstance(df, pd.DataFrame), 'Returned object is not a DataFrame' - assert len(df.columns) == 2, 'Returned DataFrame does not have the correct number of columns' - assert len(df) == 2, 'Returned DataFrame does not have the correct length' - - - -# Test the Oneline class -class TestOneline: - - @classmethod - def setup_class(cls): - # Set up a test HDF5 file using pandas HDFStore - cls.filename = 'test_oneline.h5' - with pd.HDFStore(cls.filename, 'w') as store: - # Create a oneline dataframe - oneline_data = pd.DataFrame({'time': [1, 2, 3], 'S1_mass_i': ['30','30', '70']}) - store.append('oneline', oneline_data, data_columns=True) - - def setup_method(self): - self.oneline = Oneline(self.filename, verbose=False, chunksize=10000) - - def test_init(self): - oneline = Oneline(self.filename, verbose=True, chunksize=5000) - - assert oneline.filename == self.filename, 'Filename is not set correctly' - assert oneline.verbose == True, 'Verbose attribute is not set correctly' - assert oneline.chunksize == 5000, 'Chunksize attribute is not set correctly' - assert oneline.number_of_systems == 3, 'Number of systems attribute is not set correctly' - assert oneline.columns.to_list() == ['time', 'S1_mass_i'], 'Columns attribute is not set correctly' - assert oneline.number_of_systems == 3, 'Number of systems attribute is not set correctly' - - assert isinstance(oneline.indices, np.ndarray), 'Indices attribute is not an ndarray' - np.testing.assert_array_equal(oneline.indices, np.array([0, 1, 2]), 'Indices attribute is not equal to the expected list') - - with pytest.raises(FileNotFoundError): - Oneline('invalid_filename.h5', verbose=False, chunksize=10000) - - def test_getitem_single_index(self): - df = self.oneline[0] - assert isinstance(df, pd.DataFrame), 'Returned object is not a DataFrame' - assert len(df) == 1, 'Returned DataFrame does not have the correct length' - - def test_getitem_multiple_indices(self): - df = self.oneline[[0, 1, 2]] - assert isinstance(df, pd.DataFrame), 'Returned object is not a DataFrame' - assert len(df) == 3, 'Returned DataFrame does not have the correct length' - - def test_getitem_index_array(self): - indices = np.array([0, 1, 2]) - df = self.oneline[indices] - assert isinstance(df, pd.DataFrame), 'Returned object is not a DataFrame' - assert len(df) == 3, 'Returned DataFrame does not have the correct length' - pd.testing.assert_frame_equal(df, - pd.DataFrame({'time': [1, 2, 3], - 'S1_mass_i': ['30','30', '70']}), - 'Returned DataFrame is not equal to the expected DataFrame') - - def test_getitem_slice(self): - df = self.oneline[0:2] - assert isinstance(df, pd.DataFrame), 'Returned object is not a DataFrame' - assert len(df) == 2, 'Returned DataFrame does not have the correct length' - pd.testing.assert_frame_equal(df, - pd.DataFrame({'time': [1, 2], - 'S1_mass_i': ['30','30']}),) - def test_getitem_endslice(self): - df = self.oneline[:2] - assert isinstance(df, pd.DataFrame), 'Returned object is not a DataFrame' - assert len(df) == 2, 'Returned DataFrame does not have the correct length' - pd.testing.assert_frame_equal(df, - pd.DataFrame({'time': [1, 2], - 'S1_mass_i': ['30','30']}),) - def test_getitem_beginslice(self): - df = self.oneline[1:] - assert isinstance(df, pd.DataFrame), 'Returned object is not a DataFrame' - assert len(df) == 2, 'Returned DataFrame does not have the correct length' - pd.testing.assert_frame_equal(df, - pd.DataFrame(index=[1, 2], - data={'time': [2, 3], - 'S1_mass_i': ['30', '70']}),) - def test_getitem_float_indices(self): - with pytest.raises(ValueError): - self.oneline[[0.5, 1.2]] - - - - def test_getitem_single_column(self): - column = 'time' - df = self.oneline[column] - assert isinstance(df, pd.DataFrame), 'Returned object is not a DataFrame' - assert len(df.columns) == 1, 'Returned DataFrame does not have the correct number of columns' - - def test_getitem_boolean_mask_numpy(self): - mask = (self.oneline['time'] > 1).to_numpy().flatten() - df = self.oneline[mask] - assert isinstance(df, pd.DataFrame), 'Returned object is not a DataFrame' - - def test_getitem_boolean_mask_pandas(self): - mask = self.oneline['time'] > 1 - print(mask) - df = self.oneline[mask] - assert isinstance(df, pd.DataFrame), 'Returned object is not a DataFrame' - - def test_getitem_multiple_columns(self): - columns = ['time', 'S1_mass_i'] - df = self.oneline[columns] - assert isinstance(df, pd.DataFrame), 'Returned object is not a DataFrame' - assert len(df.columns) == 2, 'Returned DataFrame does not have the correct number of columns' - - def test_getitems_multiple_columns_invalid(self): - columns = ['time', 'invalid_column'] - with pytest.raises(ValueError): - self.oneline[columns] - - def test_getitem_invalid_key_type(self): - with pytest.raises(ValueError): - self.oneline[{1: 2}] - - def test_getitem_invalid_key(self): - with pytest.raises(ValueError): - self.oneline['invalid_key'] - - def test_len(self): - length = len(self.oneline) - assert isinstance(length, int), 'Returned object is not an integer' - assert length == 3, 'Returned length is not correct' - - def test_head(self): - n = 2 - df = self.oneline.head(n) - assert isinstance(df, pd.DataFrame), 'Returned object is not a DataFrame' - assert len(df) == n, 'Returned DataFrame does not have the correct length' - - def test_tail(self): - n = 2 - df = self.oneline.tail(n) - assert isinstance(df, pd.DataFrame), 'Returned object is not a DataFrame' - assert len(df) == n, 'Returned DataFrame does not have the correct length' - - def test_repr(self): - representation = self.oneline.__repr__() - assert isinstance(representation, str), 'Returned object is not a string' - - def test_repr_html(self): - html_representation = self.oneline._repr_html_() - assert isinstance(html_representation, str), 'Returned object is not a string' - - def test_select(self): - df = self.oneline.select(where="time > 1", start=0, stop=10, columns=['S1_mass_i', 'time']) - assert isinstance(df, pd.DataFrame), 'Returned object is not a DataFrame' - assert len(df.columns) == 2, 'Returned DataFrame does not have the correct number of columns' - assert len(df) == 2, 'Returned DataFrame does not have the correct length' - - - @classmethod - def teardown_class(cls): - os.remove(cls.filename) - -# Test the PopulationIO class -class TestPopulationIO: - - def setup_method(self): - self.filename = "test_population.h5" - - def teardown_method(self): - if os.path.exists(self.filename): - os.remove(self.filename) - - def test_init(self): - pop_io = PopulationIO() - assert pop_io.verbose == False, "Verbose attribute is not set correctly" - - - def test_invalid_filename(self): - pop_io = PopulationIO() - with pytest.raises(ValueError): - pop_io._load_metadata("invalid_filename") - - def test_save_and_load_mass_per_met(self): - population_io = PopulationIO() - population_io.verbose = True - population_io.mass_per_metallicity = pd.DataFrame({"metallicity": [0.02, 0.04], "mass": [1.0, 2.0]}) - population_io._save_mass_per_metallicity(self.filename) - - loaded_io = PopulationIO() - loaded_io.verbose = True - loaded_io._load_mass_per_metallicity(self.filename) - pd.testing.assert_frame_equal(population_io.mass_per_metallicity, loaded_io.mass_per_metallicity) - - def test_save_and_load_ini_params(self): - population_io = PopulationIO() - population_io.ini_params = {i:10 for i in parameter_array} - population_io._save_ini_params(self.filename) - - loaded_io = PopulationIO() - loaded_io._load_ini_params(self.filename) - - assert population_io.ini_params == loaded_io.ini_params, "Loaded ini_params are not equal to the saved ini_params" - - def test_save_and_load_metadata(self): - pop_io = PopulationIO() - pop_io.verbose = True - pop_io.ini_params = {i:10 for i in parameter_array} - pop_io._save_ini_params(self.filename) - pop_io.mass_per_metallicity = pd.DataFrame({"metallicity": [0.02, 0.04], "mass": [1.0, 2.0]}) - pop_io._save_mass_per_metallicity(self.filename) - - load_io = PopulationIO() - load_io._load_metadata(self.filename) - - assert pop_io.ini_params == load_io.ini_params, "Loaded ini_params are not equal to the saved ini_params" - assert pop_io.mass_per_metallicity.equals(load_io.mass_per_metallicity), "Loaded mass_per_metallicity is not equal to the saved mass_per_metallicity" - - - -class TestPopulation: - def setup_method(self): - pass - - def teardown_method(self): - # Clean up any resources used by the test - pass - - def setup_class(self): - self.filename1 = "no_mass_per_met_population.h5" - self.filename2 = "history_population.h5" - self.filename3 = "oneline_population.h5" - self.history_data = pd.DataFrame({'time': [1, 2, 3], 'event': ['ZAMS','oRLO1', 'CEE']}) - self.oneline_data = pd.DataFrame({'time': [1, 2, 3], 'S1_mass_i': [30, 30, 70], 'S2_mass_i': [30, 30, 70.]}) - self.formation_channels = pd.DataFrame({'channel': ['channel1', 'channel2', 'channel3'], 'channel_debug':['debug1', 'debug2', 'debug3']}) - - # create a file with only history and oneline data - with pd.HDFStore(self.filename1, 'w') as store: - store.append('history',self.history_data, data_columns=True) - store.append('oneline', self.oneline_data, data_columns=True) - - with pd.HDFStore(self.filename2, 'w') as store: - store.append('history', self.history_data, data_columns=True) - - with pd.HDFStore(self.filename3, 'w') as store: - store.append('oneline', self.oneline_data, data_columns=True) - - def teardown_class(self): - if os.path.exists(self.filename1): - os.remove(self.filename1) - if os.path.exists(self.filename2): - os.remove(self.filename2) - if os.path.exists(self.filename3): - os.remove(self.filename3) - - @pytest.fixture - def mass_per_met_pop(self): - self.filename = "mass_per_met_population.h5" - with pd.HDFStore(self.filename, 'w') as store: - store.append('history', self.history_data, data_columns=True) - store.append('oneline', self.oneline_data, data_columns=True) - - pop = Population(self.filename, verbose=True, metallicity=0.02, ini_file=PATH_TO_POSYDON+'/posydon/popsyn/population_params_default.ini') - yield - if os.path.exists(self.filename): - os.remove(self.filename) - - @pytest.fixture - def no_mass_per_met_pop(self): - self.filename = "no_mass_per_met_population.h5" - with pd.HDFStore(self.filename, 'w') as store: - store.append('history', self.history_data, data_columns=True) - store.append('oneline', self.oneline_data, data_columns=True) - yield - if os.path.exists(self.filename): - os.remove(self.filename) - - @pytest.fixture - def mass_per_met_pop_channels(self): - self.filename = "mass_per_met_population.h5" - with pd.HDFStore(self.filename, 'w') as store: - store.append('history', self.history_data, data_columns=True) - store.append('oneline', self.oneline_data, data_columns=True) - store.append('formation_channels', self.formation_channels, data_columns=True) - pop = Population(self.filename, verbose=True, metallicity=0.02, ini_file=PATH_TO_POSYDON+'/posydon/popsyn/population_params_default.ini') - yield - if os.path.exists(self.filename): - os.remove(self.filename) - - @pytest.fixture - def clean_up_selection_file(self): - self.outfile = "test_selection.h5" - yield - if os.path.exists(self.outfile): - os.remove(self.outfile) - - def test_init_invalid_file(self): - with pytest.raises(ValueError): - pop = Population('invalid_filename') - - def test_init_no_history(self): - with pytest.raises(ValueError): - pop = Population(self.filename3) - - def test_init_no_oneline(self): - with pytest.raises(ValueError): - pop = Population(self.filename2) - - def test_init_no_mass_per_met(self): - with pytest.raises(ValueError): - pop = Population(self.filename1, verbose=True) - - - def test_init_mass_per_met_calc(self, no_mass_per_met_pop: None): - pop = Population(self.filename, verbose=True, metallicity=1., ini_file=PATH_TO_POSYDON+'/posydon/popsyn/population_params_default.ini') - # check that the history and oneline data are read correctly - pd.testing.assert_frame_equal(pop.history[:], self.history_data) - pd.testing.assert_frame_equal(pop.oneline[:], self.oneline_data) - assert pop.solar_metallicities == [1.] - assert pop.metallicities == [1*Zsun] - pd.testing.assert_frame_equal(pop.mass_per_metallicity, pd.DataFrame(index=[1.], data={'simulated_mass': [260.], 'underlying_mass': [1462.194834], 'number_of_systems': [3]})) - - pop = Population(self.filename, verbose=True, metallicity=1., ini_file=PATH_TO_POSYDON+'/posydon/popsyn/population_params_default.ini') - # check that the history and oneline data are the same - pd.testing.assert_frame_equal(pop.history[:], self.history_data) - pd.testing.assert_frame_equal(pop.oneline[:], self.oneline_data) - assert pop.solar_metallicities == [1.] - assert pop.metallicities == [1*Zsun] - pd.testing.assert_frame_equal(pop.mass_per_metallicity, pd.DataFrame(index=[1.], data={'simulated_mass': [260.], 'underlying_mass': [1462.194834], 'number_of_systems': [3]})) - - - def test_init(self,mass_per_met_pop: None): - pop = Population(self.filename) - # check that the history and oneline data are read correctly - pd.testing.assert_frame_equal(pop.history[:], self.history_data) - pd.testing.assert_frame_equal(pop.oneline[:], self.oneline_data) - assert pop.metallicities == [0.02*Zsun] - assert pop.solar_metallicities == [0.02] - tmp_df = pd.DataFrame(index=[0, 1, 2], data={'index': [1, 1, 1]}) - tmp_df.index.name = 'index' - pd.testing.assert_frame_equal(pop.history_lengths, tmp_df) - pd.testing.assert_frame_equal(pop.mass_per_metallicity, pd.DataFrame(index=[0.02], data={'simulated_mass': [260.], 'underlying_mass': [1462.194834], 'number_of_systems': [3]})) - - - def test_read_formation_channels(self, mass_per_met_pop_channels: None): - pop = Population(self.filename) - # check that the formation channels are read correctly - assert pop.formation_channels.equals(self.formation_channels) - - def test_export_selection(self, mass_per_met_pop: None, clean_up_selection_file: None): - selection = [1, 2] - chunksize = 1000 - pop = Population(self.filename) - pop.export_selection(selection, self.outfile, chunksize) - assert os.path.exists(self.outfile) - assert pd.read_hdf(self.outfile, 'history').shape[0] == 2 - assert pd.read_hdf(self.outfile, 'oneline').shape[0] == 2 - - def test_bad_name_export_selection(self, mass_per_met_pop: None): - selection = [1, 2] - chunksize = 1000 - pop = Population(self.filename) - with pytest.raises(ValueError): - pop.export_selection(selection, 'test_selection.csv', history_chunksize=chunksize) - - def test_append_selection(self, mass_per_met_pop: None, clean_up_selection_file: None): - selection = [1, 2] - chunksize = 1000 - pop = Population(self.filename) - pop.export_selection(selection, self.outfile, overwrite=True, history_chunksize=chunksize) - pop.export_selection(selection, self.outfile, overwrite=False, history_chunksize=chunksize) - - assert pd.read_hdf(self.outfile, 'history').shape[0] == 4 - assert pd.read_hdf(self.outfile, 'oneline').shape[0] == 4 - - def test_no_formation_channels(self, mass_per_met_pop: None): - pop = Population(self.filename, verbose=True) - assert pop.formation_channels is None - - def test_len(self, mass_per_met_pop: None): - pop = Population(self.filename) - assert len(pop) == 3 - - def test_columns(self, mass_per_met_pop: None): - pop = Population(self.filename) - columns = pop.columns - - assert columns['history'].tolist() == self.history_data.columns.tolist() - assert columns['oneline'].tolist() == self.oneline_data.columns.tolist() - - - - - # Test formation channel calculation, I need a specific test file for this, - # since it requires specific columns to be present in the oneline and history dataframes - - # Test create_transient_population method requires a specific test file for this, - # since it requires specific columns to be present in the oneline and history dataframes - - -class TestTransientPopulation: - pass - # to implement - - - -class TestRates: - pass - # to implement - -# Run the tests - -if __name__ == '__main__': - pytest.main() From aefa45b7de964e0b057f2768353cb7cbf2efd48f Mon Sep 17 00:00:00 2001 From: Max Briel Date: Mon, 4 May 2026 09:31:43 +0200 Subject: [PATCH 357/389] remove more tests --- posydon/tests/visualization/test_VHdiagram.py | 93 ----------- posydon/tests/visualization/test_plot1D.py | 110 ------------ posydon/tests/visualization/test_plot2D.py | 157 ------------------ 3 files changed, 360 deletions(-) delete mode 100644 posydon/tests/visualization/test_VHdiagram.py delete mode 100644 posydon/tests/visualization/test_plot1D.py delete mode 100644 posydon/tests/visualization/test_plot2D.py diff --git a/posydon/tests/visualization/test_VHdiagram.py b/posydon/tests/visualization/test_VHdiagram.py deleted file mode 100644 index 4e0fa81276..0000000000 --- a/posydon/tests/visualization/test_VHdiagram.py +++ /dev/null @@ -1,93 +0,0 @@ -import os -import unittest -from unittest.mock import patch - -from PyQt5.QtCore import QTimer -from PyQt5.QtWidgets import QApplication - -from posydon.config import PATH_TO_POSYDON -from posydon.visualization.VH_diagram.Presenter import Presenter, PresenterMode - -PATH_TO_DATASET = os.path.join( - PATH_TO_POSYDON, - "posydon", - "tests", - "data", - "POSYDON-UNIT-TESTS", - "visualization", - "20000_binaries.csv.gz" -) - -# https://stackoverflow.com/questions/60692711/cant-create-python-qapplication-in-github-action - -# if not os.path.exists(PATH_TO_DATASET): -# raise ValueError("Dataset for unit testing (VH diagram) was not found!") -# -# -# class TestVHdiagram(unittest.TestCase): -# def test_termination_detailled_view(self): -# app = QApplication.instance() -# if not app: -# app = QApplication([]) -# -# presenter = Presenter(PATH_TO_DATASET) -# -# with patch('PyQt5.QtWidgets.QMainWindow.show') as show_patch: -# presenter.present(19628, PresenterMode.DETAILED) -# -# QTimer.singleShot(0, lambda : presenter.close() ) -# -# app.exec_() -# -# assert show_patch.called -# -# def test_termination_reduced_view(self): -# app = QApplication.instance() -# if not app: -# app = QApplication([]) -# -# presenter = Presenter(PATH_TO_DATASET) -# -# with patch('PyQt5.QtWidgets.QMainWindow.show') as show_patch: -# presenter.present(19628, PresenterMode.REDUCED) -# -# QTimer.singleShot(0, lambda : presenter.close() ) -# -# app.exec_() -# -# assert show_patch.called -# -# def test_termination_simplified_view(self): -# app = QApplication.instance() -# if not app: -# app = QApplication([]) -# -# presenter = Presenter(PATH_TO_DATASET) -# -# with patch('PyQt5.QtWidgets.QMainWindow.show') as show_patch: -# presenter.present(19628, PresenterMode.SIMPLIFIED) -# -# QTimer.singleShot(0, lambda : presenter.close() ) -# -# app.exec_() -# -# assert show_patch.called -# -# def test_termination_diagram_view(self): -# app = QApplication.instance() -# if not app: -# app = QApplication([]) -# -# presenter = Presenter(PATH_TO_DATASET) -# -# with patch('PyQt5.QtWidgets.QMainWindow.show') as show_patch: -# presenter.present(19628, PresenterMode.DIAGRAM) -# -# QTimer.singleShot(0, lambda : presenter.close() ) -# -# app.exec_() -# -# assert show_patch.called -# -# if __name__ == "__main__": -# unittest.main() diff --git a/posydon/tests/visualization/test_plot1D.py b/posydon/tests/visualization/test_plot1D.py deleted file mode 100644 index 5621832351..0000000000 --- a/posydon/tests/visualization/test_plot1D.py +++ /dev/null @@ -1,110 +0,0 @@ -import os -import unittest -from unittest.mock import patch - -from posydon.config import PATH_TO_POSYDON -from posydon.grids.psygrid import PSyGrid - -PATH_TO_GRID = os.path.join( - PATH_TO_POSYDON, - "posydon/tests/data/POSYDON-UNIT-TESTS/" - "visualization/grid_unit_test_plot.h5" -) - -if not os.path.exists(PATH_TO_GRID): - raise ValueError("Test grid for unit testing was not found!") - - -class TestPlot1D(unittest.TestCase): - def test_one_track_one_var_plotting(self): - grid = PSyGrid(PATH_TO_GRID) - with patch('matplotlib.pyplot.show') as show_patch: - grid.plot(42, - "star_age", - "center_he4", - history="history1", - **{'show_fig': True}) - assert show_patch.called - with patch('matplotlib.pyplot.show') as show_patch: - grid.plot(42, - "age", - "star_1_mass", - history="binary_history", - **{'show_fig': True}) - assert show_patch.called - - def test_one_track_many_vars_plotting(self): - grid = PSyGrid(PATH_TO_GRID) - with patch('matplotlib.pyplot.show') as show_patch: - grid.plot(42, - "star_age", ["center_he4", "log_LHe"], - history="history1", - **{'show_fig': True}) - assert show_patch.called - with patch('matplotlib.pyplot.show') as show_patch: - grid.plot( - 42, - "age", - ["star_1_mass", "binary_separation", "rl_relative_overflow_1"], - history="binary_history", - **{'show_fig': True}) - assert show_patch.called - - def test_many_tracks_one_var_plotting(self): - grid = PSyGrid(PATH_TO_GRID) - with patch('matplotlib.pyplot.show') as show_patch: - grid.plot([42, 43, 44], - "star_age", - "center_he4", - history="history1", - **{'show_fig': True}) - assert show_patch.called - - def test_many_tracks_many_vars_plotting(self): - grid = PSyGrid(PATH_TO_GRID) - with patch('matplotlib.pyplot.show') as show_patch: - grid.plot( - [42, 43, 44], - "age", - ["star_1_mass", "binary_separation", "rl_relative_overflow_1"], - history="binary_history", - **{'show_fig': True}) - assert show_patch.called - - def test_one_track_one_var_extra_var_color_plotting(self): - grid = PSyGrid(PATH_TO_GRID) - with patch('matplotlib.pyplot.show') as show_patch: - grid.plot(42, - "age", - "star_1_mass", - "period_days", - history="binary_history", - **{'show_fig': True}) - assert show_patch.called - - def test_many_tracks_one_var_extra_var_color_plotting(self): - grid = PSyGrid(PATH_TO_GRID) - with patch('matplotlib.pyplot.show') as show_patch: - grid.plot([42, 43], - "age", - "star_1_mass", - "period_days", - history="binary_history", - **{'show_fig': True}) - assert show_patch.called - - def test_one_track_HR_plotting(self): - grid = PSyGrid(PATH_TO_GRID) - with patch('matplotlib.pyplot.show') as show_patch: - grid.HR(42, history="history1", **{'show_fig': True}) - assert show_patch.called - - def test_many_tracks_HR_plotting(self): - grid = PSyGrid(PATH_TO_GRID) - with patch('matplotlib.pyplot.show') as show_patch: - grid.HR([42, 43, 44], history="history1", **{'show_fig': True}) - assert show_patch.called - - -if __name__ == "__main__": - unittest.main() diff --git a/posydon/tests/visualization/test_plot2D.py b/posydon/tests/visualization/test_plot2D.py deleted file mode 100644 index 637ebb72e8..0000000000 --- a/posydon/tests/visualization/test_plot2D.py +++ /dev/null @@ -1,157 +0,0 @@ -import os -import unittest -from unittest.mock import patch - -from posydon.config import PATH_TO_POSYDON -from posydon.grids.psygrid import PSyGrid - -PATH_TO_GRID = os.path.join( - PATH_TO_POSYDON, - "posydon/tests/data/POSYDON-UNIT-TESTS/" - "visualization/grid_unit_test_plot.h5" -) -if not os.path.exists(PATH_TO_GRID): - raise ValueError("Test grid for unit testing was not found!") - -# class TestPlot2D(unittest.TestCase): -# def test_termination_flag_1_plotting(self): -# grid = PSyGrid(PATH_TO_GRID) -# with patch('matplotlib.pyplot.show') as show_patch: -# grid.plot2D("star_1_mass", -# "period_days", -# "star_1_mass", -# termination_flag="termination_flag_1", -# grid_3D=True, -# slice_3D_var_str="star_2_mass", -# slice_3D_var_range=(2.5, 3.0), -# **{'show_fig': True}) -# assert show_patch.called -# with patch('matplotlib.pyplot.show') as show_patch: -# grid.plot2D("star_1_mass", -# "period_days", -# "c_core_mass", -# termination_flag="termination_flag_1", -# grid_3D=True, -# slice_3D_var_str="star_2_mass", -# slice_3D_var_range=(2.5, 3.0), -# **{'show_fig': True}) -# assert show_patch.called -# with patch('matplotlib.pyplot.show') as show_patch: -# grid.plot2D("star_1_mass", -# "period_days", -# "binary_separation", -# termination_flag="termination_flag_1", -# grid_3D=True, -# slice_3D_var_str="star_2_mass", -# slice_3D_var_range=(2.5, 3.0), -# **{'show_fig': True}) -# assert show_patch.called -# -# def test_termination_flag_2_plotting(self): -# grid = PSyGrid(PATH_TO_GRID) -# with patch('matplotlib.pyplot.show') as show_patch: -# grid.plot2D("star_1_mass", -# "period_days", -# None, -# termination_flag="termination_flag_2", -# grid_3D=True, -# slice_3D_var_str="star_2_mass", -# slice_3D_var_range=(2.5, 3.0), -# **{'show_fig': True}) -# assert show_patch.called -# -# def test_termination_flag_3_plotting(self): -# grid = PSyGrid(PATH_TO_GRID) -# with patch('matplotlib.pyplot.show') as show_patch: -# grid.plot2D("star_1_mass", -# "period_days", -# None, -# termination_flag="termination_flag_3", -# grid_3D=True, -# slice_3D_var_str="star_2_mass", -# slice_3D_var_range=(2.5, 3.0), -# **{'show_fig': True}) -# assert show_patch.called -# -# def test_termination_flag_4_plotting(self): -# grid = PSyGrid(PATH_TO_GRID) -# with patch('matplotlib.pyplot.show') as show_patch: -# grid.plot2D("star_1_mass", -# "period_days", -# None, -# termination_flag="termination_flag_4", -# grid_3D=True, -# slice_3D_var_str="star_2_mass", -# slice_3D_var_range=(2.5, 3.0), -# **{'show_fig': True}) -# assert show_patch.called -# -# def test_all_termination_flags_plotting(self): -# grid = PSyGrid(PATH_TO_GRID) -# with patch('matplotlib.pyplot.show') as show_patch: -# grid.plot2D("star_1_mass", -# "period_days", -# "binary_separation", -# termination_flag="all", -# grid_3D=True, -# slice_3D_var_str="star_2_mass", -# slice_3D_var_range=(2.5, 3.0), -# **{'show_fig': True}) -# assert show_patch.called -# -# def test_RLO_plotting(self): -# grid = PSyGrid(PATH_TO_GRID) -# # with patch('matplotlib.pyplot.show') as show_patch: -# # grid.plot2D("star_1_mass", -# # "period_days", -# # "c_core_mass", -# # termination_flag="termination_flag_1", -# # grid_3D=True, -# # slice_3D_var_str="star_2_mass", -# # slice_3D_var_range=(2.5, 3.0), -# # slice_at_RLO=True, -# # **{ -# # 'show_fig': True -# # }) -# # assert show_patch.called -# # with patch('matplotlib.pyplot.show') as show_patch: -# # grid.plot2D("star_1_mass", -# # "period_days", -# # "star_1_mass", -# # termination_flag="termination_flag_1", -# # grid_3D=True, -# # slice_3D_var_str="star_2_mass", -# # slice_3D_var_range=(2.5, 3.0), -# # slice_at_RLO=True, -# # **{ -# # 'show_fig': True -# # }) -# # assert show_patch.called -# -# def test_extra_grid_plotting(self): -# grid = PSyGrid(PATH_TO_GRID) -# with patch('matplotlib.pyplot.show') as show_patch: -# grid.plot2D("star_1_mass", -# "period_days", -# "star_1_mass", -# termination_flag="termination_flag_1", -# grid_3D=True, -# slice_3D_var_str="star_2_mass", -# slice_3D_var_range=(2.5, 3.0), -# extra_grid=grid, -# **{'show_fig': True}) -# with patch('matplotlib.pyplot.show') as show_patch: -# grid.plot2D("star_1_mass", -# "period_days", -# "star_1_mass", -# termination_flag="termination_flag_1", -# grid_3D=True, -# slice_3D_var_str="star_2_mass", -# slice_3D_var_range=(2.5, 3.0), -# extra_grid=grid, -# **{'show_fig': True}) -# assert show_patch.called -# -# -# if __name__ == "__main__": -# unittest.main() From 1ae0b900eafae63ce37edcde6f3dd46acd83b639 Mon Sep 17 00:00:00 2001 From: Max Briel Date: Mon, 4 May 2026 09:41:06 +0200 Subject: [PATCH 358/389] add setup.py and pytproject.toml changes --- pyproject.toml | 171 +++-- setup.cfg | 31 - setup.py | 175 +---- versioneer.py | 1825 ------------------------------------------------ 4 files changed, 114 insertions(+), 2088 deletions(-) delete mode 100644 setup.cfg delete mode 100644 versioneer.py diff --git a/pyproject.toml b/pyproject.toml index ed69b72524..746f28c5c8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,30 +2,21 @@ # details: https://packaging.python.org/en/latest/guides/writing-pyproject-toml [build-system] -requires = ["setuptools >= 76.0.0", "versioneer"] +requires = ["setuptools >= 76.0.0", "setuptools-scm >= 8.0"] build-backend = "setuptools.build_meta" [project] -dynamic = [ - "description", - "license", - "version", - "requires-python", - "classifiers", - "dependencies", - "optional-dependencies", -] name = "posydon" -#description = "POSYDON the Next Generation of Population Synthesis" +description = "POSYDON the Next Generation of Population Synthesis" authors = [ {name = "POSYDON Collaboration", email = "posydon.team@gmail.com"}, ] maintainers = [ {name = "POSYDON Collaboration", email = "posydon.team@gmail.com"}, ] -#license = 'GPLv3+' -#version = "2.0.0.dev" -#requires-python = ">=3.11, <3.12" +license = "GPL-3.0-or-later" +dynamic = ["version"] +requires-python = ">=3.11, <3.12" readme = "README.md" keywords = [ "POSYDON", @@ -34,60 +25,67 @@ keywords = [ "Population Synthesis", "MESA", ] -#classifiers = [ -# 'Development Status :: 4 - Beta', -# 'Intended Audience :: Science/Research', -# 'Intended Audience :: End Users/Desktop', -# 'Topic :: Scientific/Engineering', -# 'Topic :: Scientific/Engineering :: Astronomy', -# 'Topic :: Scientific/Engineering :: Physics', -# 'Programming Language :: Python', -# 'Programming Language :: Python :: 3.11', -# 'Operating System :: POSIX', -# 'Operating System :: Unix', -# 'Operating System :: MacOS', -# 'Natural Language :: English', -# 'License :: OSI Approved :: GNU General Public License v3 (GPLv3+)', -#] -#dependencies = [ -# 'numpy < 2.0.0, >= 1.24.2', -# 'scipy <= 1.14.1, >= 1.10.1', -# 'iminuit <= 2.30.1, >= 2.21.3', -# 'configparser <= 7.1.0, >= 5.3.0', -# 'astropy <= 6.1.6, >= 5.2.2', -# 'pandas <= 2.2.3, >= 2.0.0', -# 'scikit-learn == 1.2.2', -# 'matplotlib <= 3.9.2, >= 3.9.0', -# 'matplotlib-label-lines <= 0.7.0, >= 0.5.2', -# 'h5py <= 3.12.1, >= 3.8.0', -# 'psutil <= 6.1.0, >= 5.9.4', -# 'tqdm <= 4.67.0, >= 4.65.0', -# 'tables <= 3.10.1, >= 3.8.0', -# 'progressbar2 <= 4.5.0, >= 4.2.0', -# 'hurry.filesize <= 0.9, >= 0.9', -# 'python-dotenv <= 1.0.1, >= 1.0.0', -#] +classifiers = [ + "Development Status :: 4 - Beta", + "Intended Audience :: Science/Research", + "Intended Audience :: End Users/Desktop", + "Topic :: Scientific/Engineering", + "Topic :: Scientific/Engineering :: Astronomy", + "Topic :: Scientific/Engineering :: Physics", + "Programming Language :: Python", + "Programming Language :: Python :: 3.11", + "Operating System :: POSIX", + "Operating System :: Unix", + "Operating System :: MacOS", + "Natural Language :: English", +] +dependencies = [ + "numpy >= 1.24.2, < 2.0.0", + "scipy >= 1.10.1, <= 1.14.1", + "iminuit >= 2.21.3, <= 2.30.1", + "configparser >= 5.3.0, <= 7.1.0", + "astropy >= 5.2.2, <= 6.1.6", + "pandas >= 2.0.0, <= 2.2.3", + "scikit-learn == 1.2.2", + "matplotlib >= 3.9.0, <= 3.9.2", + "matplotlib-label-lines >= 0.5.2, <= 0.7.0", + "h5py >= 3.8.0, <= 3.12.1", + "psutil >= 5.9.4, <= 6.1.0", + "tqdm >= 4.65.0, <= 4.67.0", + "tables >= 3.8.0, <= 3.10.1", + "progressbar2 >= 4.2.0, <= 4.5.0", + "hurry.filesize >= 0.9, <= 0.9", + "python-dotenv >= 1.0.0, <= 1.0.1", +] -#[project.optional-dependencies] -#doc = [ -# 'ipython', -# 'sphinx >= 8.2.2', -# 'numpydoc', -# 'sphinx_rtd_theme', -# 'sphinxcontrib_programoutput', -# 'PSphinxTheme', -# 'nbsphinx', -# 'pandoc' -#] -#vis = [ -# 'PyQt5 <= 5.15.11, >= 5.15.9' -#] -#ml = [ -# 'tensorflow >= 2.13.0' -#] -#hpc = [ -# 'mpi4py >= 3.0.3' -#] +[project.optional-dependencies] +doc = [ + "ipython", + "sphinx >= 8.2.2", + "numpydoc", + "sphinx_rtd_theme", + "sphinxcontrib_programoutput", + "PSphinxTheme", + "nbsphinx", + "pandoc", +] +vis = [ + "PyQt5 >= 5.15.9, <= 5.15.11", +] +ml = [ + "tensorflow >= 2.13.0", +] +hpc = [ + "mpi4py >= 3.0.3", +] +dev = [ + "pre-commit >= 3.7.0", + "isort >= 5.13.2", +] +test = [ + "pytest >= 7.3.1", + "pytest-cov >= 4.0.0", +] [project.urls] Homepage = "https://posydon.org" @@ -95,3 +93,42 @@ Documentation = "https://posydon.org/POSYDON" Repository = "https://github.com/POSYDON-code/POSYDON.git" Issues = "https://github.com/POSYDON-code/POSYDON/issues" Changelog = "https://github.com/POSYDON-code/POSYDON/releases" + +[tool.setuptools.packages.find] +include = ["posydon*"] + +[tool.setuptools] +include-package-data = true +script-files = [ + "bin/compress-mesa", + "bin/get-posydon-data", + "bin/posydon-popsyn", + "bin/posydon-run-grid", + "bin/posydon-run-pipeline", + "bin/posydon-setup-grid", + "bin/posydon-setup-pipeline", +] + +[tool.setuptools_scm] +# setuptools-scm will automatically determine version from git tags + +[tool.pytest.ini_options] +addopts = "--verbose -r s --cov --cov-branch --cov-report=term-missing --cov-fail-under=100" +testpaths = ["posydon/unit_tests"] + +[tool.coverage.run] +branch = true +source = [ + "posydon.config", + "posydon.utils", + "posydon.grids", + "posydon.popsyn.IMFs", + "posydon.popsyn.norm_pop", + "posydon.popsyn.distributions", + "posydon.popsyn.star_formation_history", + "posydon.CLI", +] + +[tool.coverage.report] +fail_under = 100 +show_missing = true diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 871fe8718f..0000000000 --- a/setup.cfg +++ /dev/null @@ -1,31 +0,0 @@ -[aliases] -test = pytest - -[bdist_wheel] -universal = 1 - -[tool:pytest] -addopts = --verbose -r s - -[versioneer] -VCS = git -style = pep440 -versionfile_source = posydon/_version.py -versionfile_build = posydon/_version.py -tag_prefix = v -parentdir_prefix = - -[coverage:run] -source = posydon -omit = - posydon/tests/* - posydon/_version.py - posydon/popsyn/analysis.py - posydon/popsyn/GRB.py - -[coverage:report] -omit = - posydon/tests/* - posydon/_version.py - posydon/popsyn/analysis.py - posydon/popsyn/GRB.py diff --git a/setup.py b/setup.py index d8e1e7e709..adc1fb2678 100644 --- a/setup.py +++ b/setup.py @@ -1,174 +1,19 @@ -"""Setup the posydon package.""" +"""Minimal setup.py for POSYDON package. -from __future__ import print_function +All configuration is in pyproject.toml. +This file only handles optional sphinx documentation builds. +""" -import glob -import os.path -import sys - -sys.path.insert(0, os.path.dirname(__file__)) - -import versioneer +from setuptools import setup +# Optional: Add sphinx documentation build command cmdclass = {} - - -# VERSIONING - -__version__ = versioneer.get_version() -cmdclass.update(versioneer.get_cmdclass()) - - -# TOGGLE WRAPPING C/C++ OR FORTRAN - -WRAP_C_CPP_OR_FORTRAN = False - -if WRAP_C_CPP_OR_FORTRAN: - from distutils.command.sdist import sdist - - try: - from numpy.distutils.core import Extension, setup - except ImportError: - raise ImportError("Building fortran extensions requires numpy.") - - cmdclass["sdist"] = sdist -else: - from setuptools import find_packages, setup - - -# DOCUMENTATION - -# import sphinx commands try: from sphinx.setup_command import BuildDoc + cmdclass["build_sphinx"] = BuildDoc except ImportError: pass -else: - cmdclass["build_sphinx"] = BuildDoc - -# read description -with open("README.md", "rb") as f: - longdesc = "f.read().decode().strip()" - - -# DEPENDENCIES -setup_requires = [ - 'setuptools >= 76.0.0', -] -if 'test' in sys.argv: - setup_requires += [ - 'pytest-runner', - ] - - -# These pretty common requirement are commented out. Various syntax types -# are all used in the example below for specifying specific version of the -# packages that are compatbile with your software. -# TODO NOTE: before the v2.0.0 code release, we should froze the versions -# the correct way to do this is to make sure that they are available on -# conda and pip for all platforms we support (see prerequisites doc page). -install_requires = [ - 'numpy >= 1.24.2, < 2.0.0', - 'scipy >= 1.10.1, <= 1.14.1', - 'iminuit >= 2.21.3, <= 2.30.1', - 'configparser >= 5.3.0, <= 7.1.0', - 'astropy >= 5.2.2, <= 6.1.6', - 'pandas >= 2.0.0, <= 2.2.3', - 'scikit-learn == 1.2.2', - 'matplotlib >= 3.9.0, <= 3.9.2', - 'matplotlib-label-lines >= 0.5.2, <= 0.7.0', - 'h5py >= 3.8.0, <= 3.12.1', - 'psutil >= 5.9.4, <= 6.1.0', - 'tqdm >= 4.65.0, <= 4.67.0', - 'tables >= 3.8.0, <= 3.10.1', - 'progressbar2 >= 4.2.0, <= 4.5.0', # for downloading data - 'hurry.filesize >= 0.9, <= 0.9', - 'python-dotenv >= 1.0.0, <= 1.0.1', -] - -tests_require = [ - "pytest >= 7.3.1", - "pytest-cov >= 4.0.0", -] - -# For documentation -extras_require = { - # to build documentation - "doc": [ - "ipython", - "sphinx >= 8.2.2", - "numpydoc", - "sphinx_rtd_theme", - "sphinxcontrib_programoutput", - "PSphinxTheme", - "nbsphinx", - "pandoc", - ], - # for experimental visualization features, e.g. VDH diagrams - "vis": ["PyQt5 >= 5.15.9, <= 5.15.11"], - # for profile machine learning features, e.g. profile interpolation - "ml": ["tensorflow >= 2.13.0"], - # for running population synthesis on HPC facilities - "hpc": ["mpi4py >= 3.0.3"], - # development tooling - 'dev': [ - 'pre-commit >= 3.7.0', - 'isort >= 5.13.2', - ], -} - -# RUN SETUP - -packagenames = find_packages() - -# Executables go in a folder called bin -scripts = glob.glob(os.path.join("bin", "*")) - -PACKAGENAME = "posydon" -DISTNAME = "posydon" -AUTHOR = "POSYDON Collaboration" -AUTHOR_EMAIL = "posydon.team@gmail.com" -LICENSE = "GPLv3+" -DESCRIPTION = "POSYDON the Next Generation of Population Synthesis" -GITHUBURL = "https://github.com/POSYDON-code/POSYDON" - -# Additional included files via include_package_data are defined in MANIFEST.in -setup( - name=DISTNAME, - provides=[PACKAGENAME], - version=__version__, - description=DESCRIPTION, - long_description=longdesc, - long_description_content_type="text/markdown", - ext_modules=[wrapper] if WRAP_C_CPP_OR_FORTRAN else [], - author=AUTHOR, - author_email=AUTHOR_EMAIL, - license=LICENSE, - packages=packagenames, - include_package_data=True, - cmdclass=cmdclass, - url=GITHUBURL, - scripts=scripts, - setup_requires=setup_requires, - install_requires=install_requires, - tests_require=tests_require, - extras_require=extras_require, - python_requires=">=3.11, <3.12", - use_2to3=False, - classifiers=[ - "Development Status :: 4 - Beta", - "Intended Audience :: Science/Research", - "Intended Audience :: End Users/Desktop", - "Topic :: Scientific/Engineering", - "Topic :: Scientific/Engineering :: Astronomy", - "Topic :: Scientific/Engineering :: Physics", - "Programming Language :: Python", - "Programming Language :: Python :: 3.11", - "Operating System :: POSIX", - "Operating System :: Unix", - "Operating System :: MacOS", - "Natural Language :: English", - "License :: OSI Approved :: GNU General Public License v3 (GPLv3+)", - ], -) +# Minimal setup call - all metadata including version is in pyproject.toml +# Version is automatically determined by setuptools-scm from git tags +setup(cmdclass=cmdclass) diff --git a/versioneer.py b/versioneer.py deleted file mode 100644 index ef293d9b3e..0000000000 --- a/versioneer.py +++ /dev/null @@ -1,1825 +0,0 @@ - -# Version: 0.18 - -"""The Versioneer - like a rocketeer, but for versions. - -The Versioneer -============== - -* like a rocketeer, but for versions! -* https://github.com/warner/python-versioneer -* Brian Warner -* License: Public Domain -* Compatible With: python2.6, 2.7, 3.2, 3.3, 3.4, 3.5, 3.6, and pypy -* [![Latest Version] -(https://pypip.in/version/versioneer/badge.svg?style=flat) -](https://pypi.python.org/pypi/versioneer/) -* [![Build Status] -(https://travis-ci.org/warner/python-versioneer.png?branch=master) -](https://travis-ci.org/warner/python-versioneer) - -This is a tool for managing a recorded version number in distutils-based -python projects. The goal is to remove the tedious and error-prone "update -the embedded version string" step from your release process. Making a new -release should be as easy as recording a new tag in your version-control -system, and maybe making new tarballs. - - -## Quick Install - -* `pip install versioneer` to somewhere to your $PATH -* add a `[versioneer]` section to your setup.cfg (see below) -* run `versioneer install` in your source tree, commit the results - -## Version Identifiers - -Source trees come from a variety of places: - -* a version-control system checkout (mostly used by developers) -* a nightly tarball, produced by build automation -* a snapshot tarball, produced by a web-based VCS browser, like github's - "tarball from tag" feature -* a release tarball, produced by "setup.py sdist", distributed through PyPI - -Within each source tree, the version identifier (either a string or a number, -this tool is format-agnostic) can come from a variety of places: - -* ask the VCS tool itself, e.g. "git describe" (for checkouts), which knows - about recent "tags" and an absolute revision-id -* the name of the directory into which the tarball was unpacked -* an expanded VCS keyword ($Id$, etc) -* a `_version.py` created by some earlier build step - -For released software, the version identifier is closely related to a VCS -tag. Some projects use tag names that include more than just the version -string (e.g. "myproject-1.2" instead of just "1.2"), in which case the tool -needs to strip the tag prefix to extract the version identifier. For -unreleased software (between tags), the version identifier should provide -enough information to help developers recreate the same tree, while also -giving them an idea of roughly how old the tree is (after version 1.2, before -version 1.3). Many VCS systems can report a description that captures this, -for example `git describe --tags --dirty --always` reports things like -"0.7-1-g574ab98-dirty" to indicate that the checkout is one revision past the -0.7 tag, has a unique revision id of "574ab98", and is "dirty" (it has -uncommitted changes. - -The version identifier is used for multiple purposes: - -* to allow the module to self-identify its version: `myproject.__version__` -* to choose a name and prefix for a 'setup.py sdist' tarball - -## Theory of Operation - -Versioneer works by adding a special `_version.py` file into your source -tree, where your `__init__.py` can import it. This `_version.py` knows how to -dynamically ask the VCS tool for version information at import time. - -`_version.py` also contains `$Revision$` markers, and the installation -process marks `_version.py` to have this marker rewritten with a tag name -during the `git archive` command. As a result, generated tarballs will -contain enough information to get the proper version. - -To allow `setup.py` to compute a version too, a `versioneer.py` is added to -the top level of your source tree, next to `setup.py` and the `setup.cfg` -that configures it. This overrides several distutils/setuptools commands to -compute the version when invoked, and changes `setup.py build` and `setup.py -sdist` to replace `_version.py` with a small static file that contains just -the generated version data. - -## Installation - -See [INSTALL.md](./INSTALL.md) for detailed installation instructions. - -## Version-String Flavors - -Code which uses Versioneer can learn about its version string at runtime by -importing `_version` from your main `__init__.py` file and running the -`get_versions()` function. From the "outside" (e.g. in `setup.py`), you can -import the top-level `versioneer.py` and run `get_versions()`. - -Both functions return a dictionary with different flavors of version -information: - -* `['version']`: A condensed version string, rendered using the selected - style. This is the most commonly used value for the project's version - string. The default "pep440" style yields strings like `0.11`, - `0.11+2.g1076c97`, or `0.11+2.g1076c97.dirty`. See the "Styles" section - below for alternative styles. - -* `['full-revisionid']`: detailed revision identifier. For Git, this is the - full SHA1 commit id, e.g. "1076c978a8d3cfc70f408fe5974aa6c092c949ac". - -* `['date']`: Date and time of the latest `HEAD` commit. For Git, it is the - commit date in ISO 8601 format. This will be None if the date is not - available. - -* `['dirty']`: a boolean, True if the tree has uncommitted changes. Note that - this is only accurate if run in a VCS checkout, otherwise it is likely to - be False or None - -* `['error']`: if the version string could not be computed, this will be set - to a string describing the problem, otherwise it will be None. It may be - useful to throw an exception in setup.py if this is set, to avoid e.g. - creating tarballs with a version string of "unknown". - -Some variants are more useful than others. Including `full-revisionid` in a -bug report should allow developers to reconstruct the exact code being tested -(or indicate the presence of local changes that should be shared with the -developers). `version` is suitable for display in an "about" box or a CLI -`--version` output: it can be easily compared against release notes and lists -of bugs fixed in various releases. - -The installer adds the following text to your `__init__.py` to place a basic -version in `YOURPROJECT.__version__`: - - from ._version import get_versions - __version__ = get_versions()['version'] - del get_versions - -## Styles - -The setup.cfg `style=` configuration controls how the VCS information is -rendered into a version string. - -The default style, "pep440", produces a PEP440-compliant string, equal to the -un-prefixed tag name for actual releases, and containing an additional "local -version" section with more detail for in-between builds. For Git, this is -TAG[+DISTANCE.gHEX[.dirty]] , using information from `git describe --tags ---dirty --always`. For example "0.11+2.g1076c97.dirty" indicates that the -tree is like the "1076c97" commit but has uncommitted changes (".dirty"), and -that this commit is two revisions ("+2") beyond the "0.11" tag. For released -software (exactly equal to a known tag), the identifier will only contain the -stripped tag, e.g. "0.11". - -Other styles are available. See [details.md](details.md) in the Versioneer -source tree for descriptions. - -## Debugging - -Versioneer tries to avoid fatal errors: if something goes wrong, it will tend -to return a version of "0+unknown". To investigate the problem, run `setup.py -version`, which will run the version-lookup code in a verbose mode, and will -display the full contents of `get_versions()` (including the `error` string, -which may help identify what went wrong). - -## Known Limitations - -Some situations are known to cause problems for Versioneer. This details the -most significant ones. More can be found on Github -[issues page](https://github.com/warner/python-versioneer/issues). - -### Subprojects - -Versioneer has limited support for source trees in which `setup.py` is not in -the root directory (e.g. `setup.py` and `.git/` are *not* siblings). The are -two common reasons why `setup.py` might not be in the root: - -* Source trees which contain multiple subprojects, such as - [Buildbot](https://github.com/buildbot/buildbot), which contains both - "master" and "slave" subprojects, each with their own `setup.py`, - `setup.cfg`, and `tox.ini`. Projects like these produce multiple PyPI - distributions (and upload multiple independently-installable tarballs). -* Source trees whose main purpose is to contain a C library, but which also - provide bindings to Python (and perhaps other langauges) in subdirectories. - -Versioneer will look for `.git` in parent directories, and most operations -should get the right version string. However `pip` and `setuptools` have bugs -and implementation details which frequently cause `pip install .` from a -subproject directory to fail to find a correct version string (so it usually -defaults to `0+unknown`). - -`pip install --editable .` should work correctly. `setup.py install` might -work too. - -Pip-8.1.1 is known to have this problem, but hopefully it will get fixed in -some later version. - -[Bug #38](https://github.com/warner/python-versioneer/issues/38) is tracking -this issue. The discussion in -[PR #61](https://github.com/warner/python-versioneer/pull/61) describes the -issue from the Versioneer side in more detail. -[pip PR#3176](https://github.com/pypa/pip/pull/3176) and -[pip PR#3615](https://github.com/pypa/pip/pull/3615) contain work to improve -pip to let Versioneer work correctly. - -Versioneer-0.16 and earlier only looked for a `.git` directory next to the -`setup.cfg`, so subprojects were completely unsupported with those releases. - -### Editable installs with setuptools <= 18.5 - -`setup.py develop` and `pip install --editable .` allow you to install a -project into a virtualenv once, then continue editing the source code (and -test) without re-installing after every change. - -"Entry-point scripts" (`setup(entry_points={"console_scripts": ..})`) are a -convenient way to specify executable scripts that should be installed along -with the python package. - -These both work as expected when using modern setuptools. When using -setuptools-18.5 or earlier, however, certain operations will cause -`pkg_resources.DistributionNotFound` errors when running the entrypoint -script, which must be resolved by re-installing the package. This happens -when the install happens with one version, then the egg_info data is -regenerated while a different version is checked out. Many setup.py commands -cause egg_info to be rebuilt (including `sdist`, `wheel`, and installing into -a different virtualenv), so this can be surprising. - -[Bug #83](https://github.com/warner/python-versioneer/issues/83) describes -this one, but upgrading to a newer version of setuptools should probably -resolve it. - -### Unicode version strings - -While Versioneer works (and is continually tested) with both Python 2 and -Python 3, it is not entirely consistent with bytes-vs-unicode distinctions. -Newer releases probably generate unicode version strings on py2. It's not -clear that this is wrong, but it may be surprising for applications when then -write these strings to a network connection or include them in bytes-oriented -APIs like cryptographic checksums. - -[Bug #71](https://github.com/warner/python-versioneer/issues/71) investigates -this question. - - -## Updating Versioneer - -To upgrade your project to a new release of Versioneer, do the following: - -* install the new Versioneer (`pip install -U versioneer` or equivalent) -* edit `setup.cfg`, if necessary, to include any new configuration settings - indicated by the release notes. See [UPGRADING](./UPGRADING.md) for details. -* re-run `versioneer install` in your source tree, to replace - `SRC/_version.py` -* commit any changed files - -## Future Directions - -This tool is designed to make it easily extended to other version-control -systems: all VCS-specific components are in separate directories like -src/git/ . The top-level `versioneer.py` script is assembled from these -components by running make-versioneer.py . In the future, make-versioneer.py -will take a VCS name as an argument, and will construct a version of -`versioneer.py` that is specific to the given VCS. It might also take the -configuration arguments that are currently provided manually during -installation by editing setup.py . Alternatively, it might go the other -direction and include code from all supported VCS systems, reducing the -number of intermediate scripts. - - -## License - -To make Versioneer easier to embed, all its code is dedicated to the public -domain. The `_version.py` that it creates is also in the public domain. -Specifically, both are released under the Creative Commons "Public Domain -Dedication" license (CC0-1.0), as described in -https://creativecommons.org/publicdomain/zero/1.0/ . - -""" - -from __future__ import print_function - -try: - import configparser -except ImportError: - import ConfigParser as configparser - -import errno -import json -import os -import re -import subprocess -import sys - - -class VersioneerConfig: - """Container for Versioneer configuration parameters.""" - - -def get_root(): - """Get the project root directory. - - We require that all commands are run from the project root, i.e. the - directory that contains setup.py, setup.cfg, and versioneer.py . - """ - root = os.path.realpath(os.path.abspath(os.getcwd())) - setup_py = os.path.join(root, "setup.py") - versioneer_py = os.path.join(root, "versioneer.py") - if not (os.path.exists(setup_py) or os.path.exists(versioneer_py)): - # allow 'python path/to/setup.py COMMAND' - root = os.path.dirname(os.path.realpath(os.path.abspath(sys.argv[0]))) - setup_py = os.path.join(root, "setup.py") - versioneer_py = os.path.join(root, "versioneer.py") - if not (os.path.exists(setup_py) or os.path.exists(versioneer_py)): - err = ("Versioneer was unable to run the project root directory. " - "Versioneer requires setup.py to be executed from " - "its immediate directory (like 'python setup.py COMMAND'), " - "or in a way that lets it use sys.argv[0] to find the root " - "(like 'python path/to/setup.py COMMAND').") - raise VersioneerBadRootError(err) - try: - # Certain runtime workflows (setup.py install/develop in a setuptools - # tree) execute all dependencies in a single python process, so - # "versioneer" may be imported multiple times, and python's shared - # module-import table will cache the first one. So we can't use - # os.path.dirname(__file__), as that will find whichever - # versioneer.py was first imported, even in later projects. - me = os.path.realpath(os.path.abspath(__file__)) - me_dir = os.path.normcase(os.path.splitext(me)[0]) - vsr_dir = os.path.normcase(os.path.splitext(versioneer_py)[0]) - if me_dir != vsr_dir: - print("Warning: build in %s is using versioneer.py from %s" - % (os.path.dirname(me), versioneer_py)) - except NameError: - pass - return root - - -def get_config_from_root(root): - """Read the project setup.cfg file to determine Versioneer config.""" - # This might raise EnvironmentError (if setup.cfg is missing), or - # configparser.NoSectionError (if it lacks a [versioneer] section), or - # configparser.NoOptionError (if it lacks "VCS="). See the docstring at - # the top of versioneer.py for instructions on writing your setup.cfg . - setup_cfg = os.path.join(root, "setup.cfg") - parser = configparser.SafeConfigParser() - with open(setup_cfg, "r") as f: - parser.readfp(f) - VCS = parser.get("versioneer", "VCS") # mandatory - - def get(parser, name): - if parser.has_option("versioneer", name): - return parser.get("versioneer", name) - return None - cfg = VersioneerConfig() - cfg.VCS = VCS - cfg.style = get(parser, "style") or "" - cfg.versionfile_source = get(parser, "versionfile_source") - cfg.versionfile_build = get(parser, "versionfile_build") - cfg.tag_prefix = get(parser, "tag_prefix") - if cfg.tag_prefix in ("''", '""'): - cfg.tag_prefix = "" - cfg.parentdir_prefix = get(parser, "parentdir_prefix") - cfg.verbose = get(parser, "verbose") - return cfg - - -class NotThisMethod(Exception): - """Exception raised if a method is not valid for the current scenario.""" - - -# these dictionaries contain VCS-specific tools -LONG_VERSION_PY = {} -HANDLERS = {} - - -def register_vcs_handler(vcs, method): # decorator - """Get decorator to mark a method as the handler for a particular VCS.""" - def decorate(f): - """Store f in HANDLERS[vcs][method].""" - if vcs not in HANDLERS: - HANDLERS[vcs] = {} - HANDLERS[vcs][method] = f - return f - return decorate - - -def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, - env=None): - """Call the given command(s).""" - assert isinstance(commands, list) - p = None - for c in commands: - try: - dispcmd = str([c] + args) - # remember shell=False, so use git.cmd on windows, not just git - p = subprocess.Popen([c] + args, cwd=cwd, env=env, - stdout=subprocess.PIPE, - stderr=(subprocess.PIPE if hide_stderr - else None)) - break - except EnvironmentError: - e = sys.exc_info()[1] - if e.errno == errno.ENOENT: - continue - if verbose: - print("unable to run %s" % dispcmd) - print(e) - return None, None - else: - if verbose: - print("unable to find command, tried %s" % (commands,)) - return None, None - stdout = p.communicate()[0].strip() - if sys.version_info[0] >= 3: - stdout = stdout.decode() - if p.returncode != 0: - if verbose: - print("unable to run %s (error)" % dispcmd) - print("stdout was %s" % stdout) - return None, p.returncode - return stdout, p.returncode - - -LONG_VERSION_PY['git'] = ''' -# This file helps to compute a version number in source trees obtained from -# git-archive tarball (such as those provided by githubs download-from-tag -# feature). Distribution tarballs (built by setup.py sdist) and build -# directories (produced by setup.py build) will contain a much shorter file -# that just contains the computed version number. - -# This file is released into the public domain. Generated by -# versioneer-0.18 (https://github.com/warner/python-versioneer) - -"""Git implementation of _version.py.""" - -import errno -import os -import re -import subprocess -import sys - - -def get_keywords(): - """Get the keywords needed to look up the version information.""" - # these strings will be replaced by git during git-archive. - # setup.py/versioneer.py will grep for the variable names, so they must - # each be defined on a line of their own. _version.py will just call - # get_keywords(). - git_refnames = "%(DOLLAR)sFormat:%%d%(DOLLAR)s" - git_full = "%(DOLLAR)sFormat:%%H%(DOLLAR)s" - git_date = "%(DOLLAR)sFormat:%%ci%(DOLLAR)s" - keywords = {"refnames": git_refnames, "full": git_full, "date": git_date} - return keywords - - -class VersioneerConfig: - """Container for Versioneer configuration parameters.""" - - -def get_config(): - """Create, populate and return the VersioneerConfig() object.""" - # these strings are filled in when 'setup.py versioneer' creates - # _version.py - cfg = VersioneerConfig() - cfg.VCS = "git" - cfg.style = "%(STYLE)s" - cfg.tag_prefix = "%(TAG_PREFIX)s" - cfg.parentdir_prefix = "%(PARENTDIR_PREFIX)s" - cfg.versionfile_source = "%(VERSIONFILE_SOURCE)s" - cfg.verbose = False - return cfg - - -class NotThisMethod(Exception): - """Exception raised if a method is not valid for the current scenario.""" - - -LONG_VERSION_PY = {} -HANDLERS = {} - - -def register_vcs_handler(vcs, method): # decorator - """Decorator to mark a method as the handler for a particular VCS.""" - def decorate(f): - """Store f in HANDLERS[vcs][method].""" - if vcs not in HANDLERS: - HANDLERS[vcs] = {} - HANDLERS[vcs][method] = f - return f - return decorate - - -def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, - env=None): - """Call the given command(s).""" - assert isinstance(commands, list) - p = None - for c in commands: - try: - dispcmd = str([c] + args) - # remember shell=False, so use git.cmd on windows, not just git - p = subprocess.Popen([c] + args, cwd=cwd, env=env, - stdout=subprocess.PIPE, - stderr=(subprocess.PIPE if hide_stderr - else None)) - break - except EnvironmentError: - e = sys.exc_info()[1] - if e.errno == errno.ENOENT: - continue - if verbose: - print("unable to run %%s" %% dispcmd) - print(e) - return None, None - else: - if verbose: - print("unable to find command, tried %%s" %% (commands,)) - return None, None - stdout = p.communicate()[0].strip() - if sys.version_info[0] >= 3: - stdout = stdout.decode() - if p.returncode != 0: - if verbose: - print("unable to run %%s (error)" %% dispcmd) - print("stdout was %%s" %% stdout) - return None, p.returncode - return stdout, p.returncode - - -def versions_from_parentdir(parentdir_prefix, root, verbose): - """Try to determine the version from the parent directory name. - - Source tarballs conventionally unpack into a directory that includes both - the project name and a version string. We will also support searching up - two directory levels for an appropriately named parent directory - """ - rootdirs = [] - - for i in range(3): - dirname = os.path.basename(root) - if dirname.startswith(parentdir_prefix): - return {"version": dirname[len(parentdir_prefix):], - "full-revisionid": None, - "dirty": False, "error": None, "date": None} - else: - rootdirs.append(root) - root = os.path.dirname(root) # up a level - - if verbose: - print("Tried directories %%s but none started with prefix %%s" %% - (str(rootdirs), parentdir_prefix)) - raise NotThisMethod("rootdir doesn't start with parentdir_prefix") - - -@register_vcs_handler("git", "get_keywords") -def git_get_keywords(versionfile_abs): - """Extract version information from the given file.""" - # the code embedded in _version.py can just fetch the value of these - # keywords. When used from setup.py, we don't want to import _version.py, - # so we do it with a regexp instead. This function is not used from - # _version.py. - keywords = {} - try: - f = open(versionfile_abs, "r") - for line in f.readlines(): - if line.strip().startswith("git_refnames ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["refnames"] = mo.group(1) - if line.strip().startswith("git_full ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["full"] = mo.group(1) - if line.strip().startswith("git_date ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["date"] = mo.group(1) - f.close() - except EnvironmentError: - pass - return keywords - - -@register_vcs_handler("git", "keywords") -def git_versions_from_keywords(keywords, tag_prefix, verbose): - """Get version information from git keywords.""" - if not keywords: - raise NotThisMethod("no keywords at all, weird") - date = keywords.get("date") - if date is not None: - # git-2.2.0 added "%%cI", which expands to an ISO-8601 -compliant - # datestamp. However we prefer "%%ci" (which expands to an "ISO-8601 - # -like" string, which we must then edit to make compliant), because - # it's been around since git-1.5.3, and it's too difficult to - # discover which version we're using, or to work around using an - # older one. - date = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - refnames = keywords["refnames"].strip() - if refnames.startswith("$Format"): - if verbose: - print("keywords are unexpanded, not using") - raise NotThisMethod("unexpanded keywords, not a git-archive tarball") - refs = set([r.strip() for r in refnames.strip("()").split(",")]) - # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of - # just "foo-1.0". If we see a "tag: " prefix, prefer those. - TAG = "tag: " - tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)]) - if not tags: - # Either we're using git < 1.8.3, or there really are no tags. We use - # a heuristic: assume all version tags have a digit. The old git %%d - # expansion behaves like git log --decorate=short and strips out the - # refs/heads/ and refs/tags/ prefixes that would let us distinguish - # between branches and tags. By ignoring refnames without digits, we - # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". - tags = set([r for r in refs if re.search(r'\d', r)]) - if verbose: - print("discarding '%%s', no digits" %% ",".join(refs - tags)) - if verbose: - print("likely tags: %%s" %% ",".join(sorted(tags))) - for ref in sorted(tags): - # sorting will prefer e.g. "2.0" over "2.0rc1" - if ref.startswith(tag_prefix): - r = ref[len(tag_prefix):] - if verbose: - print("picking %%s" %% r) - return {"version": r, - "full-revisionid": keywords["full"].strip(), - "dirty": False, "error": None, - "date": date} - # no suitable tags, so version is "0+unknown", but full hex is still there - if verbose: - print("no suitable tags, using unknown + full revision id") - return {"version": "0+unknown", - "full-revisionid": keywords["full"].strip(), - "dirty": False, "error": "no suitable tags", "date": None} - - -@register_vcs_handler("git", "pieces_from_vcs") -def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - """Get version from 'git describe' in the root of the source tree. - - This only gets called if the git-archive 'subst' keywords were *not* - expanded, and _version.py hasn't already been rewritten with a short - version string, meaning we're inside a checked out source tree. - """ - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - - out, rc = run_command(GITS, ["rev-parse", "--git-dir"], cwd=root, - hide_stderr=True) - if rc != 0: - if verbose: - print("Directory %%s not under git control" %% root) - raise NotThisMethod("'git rev-parse --git-dir' returned error") - - # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty] - # if there isn't one, this yields HEX[-dirty] (no NUM) - describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty", - "--always", "--long", - "--match", "%%s*" %% tag_prefix], - cwd=root) - # --long was added in git-1.5.5 - if describe_out is None: - raise NotThisMethod("'git describe' failed") - describe_out = describe_out.strip() - full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) - if full_out is None: - raise NotThisMethod("'git rev-parse' failed") - full_out = full_out.strip() - - pieces = {} - pieces["long"] = full_out - pieces["short"] = full_out[:7] # maybe improved later - pieces["error"] = None - - # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty] - # TAG might have hyphens. - git_describe = describe_out - - # look for -dirty suffix - dirty = git_describe.endswith("-dirty") - pieces["dirty"] = dirty - if dirty: - git_describe = git_describe[:git_describe.rindex("-dirty")] - - # now we have TAG-NUM-gHEX or HEX - - if "-" in git_describe: - # TAG-NUM-gHEX - mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe) - if not mo: - # unparseable. Maybe git-describe is misbehaving? - pieces["error"] = ("unable to parse git-describe output: '%%s'" - %% describe_out) - return pieces - - # tag - full_tag = mo.group(1) - if not full_tag.startswith(tag_prefix): - if verbose: - fmt = "tag '%%s' doesn't start with prefix '%%s'" - print(fmt %% (full_tag, tag_prefix)) - pieces["error"] = ("tag '%%s' doesn't start with prefix '%%s'" - %% (full_tag, tag_prefix)) - return pieces - pieces["closest-tag"] = full_tag[len(tag_prefix):] - - # distance: number of commits since tag - pieces["distance"] = int(mo.group(2)) - - # commit: short hex revision ID - pieces["short"] = mo.group(3) - - else: - # HEX: no tags - pieces["closest-tag"] = None - count_out, rc = run_command(GITS, ["rev-list", "HEAD", "--count"], - cwd=root) - pieces["distance"] = int(count_out) # total number of commits - - # commit date: see ISO-8601 comment in git_versions_from_keywords() - date = run_command(GITS, ["show", "-s", "--format=%%ci", "HEAD"], - cwd=root)[0].strip() - pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - - return pieces - - -def plus_or_dot(pieces): - """Return a + if we don't already have one, else return a .""" - if "+" in pieces.get("closest-tag", ""): - return "." - return "+" - - -def render_pep440(pieces): - """Build up version string, with post-release "local version identifier". - - Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you - get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty - - Exceptions: - 1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += plus_or_dot(pieces) - rendered += "%%d.g%%s" %% (pieces["distance"], pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - else: - # exception #1 - rendered = "0+untagged.%%d.g%%s" %% (pieces["distance"], - pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - return rendered - - -def render_pep440_pre(pieces): - """TAG[.post.devDISTANCE] -- No -dirty. - - Exceptions: - 1: no tags. 0.post.devDISTANCE - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += ".post.dev%%d" %% pieces["distance"] - else: - # exception #1 - rendered = "0.post.dev%%d" %% pieces["distance"] - return rendered - - -def render_pep440_post(pieces): - """TAG[.postDISTANCE[.dev0]+gHEX] . - - The ".dev0" means dirty. Note that .dev0 sorts backwards - (a dirty tree will appear "older" than the corresponding clean one), - but you shouldn't be releasing software with -dirty anyways. - - Exceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%%d" %% pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += plus_or_dot(pieces) - rendered += "g%%s" %% pieces["short"] - else: - # exception #1 - rendered = "0.post%%d" %% pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += "+g%%s" %% pieces["short"] - return rendered - - -def render_pep440_old(pieces): - """TAG[.postDISTANCE[.dev0]] . - - The ".dev0" means dirty. - - Eexceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%%d" %% pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - else: - # exception #1 - rendered = "0.post%%d" %% pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - return rendered - - -def render_git_describe(pieces): - """TAG[-DISTANCE-gHEX][-dirty]. - - Like 'git describe --tags --dirty --always'. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += "-%%d-g%%s" %% (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render_git_describe_long(pieces): - """TAG-DISTANCE-gHEX[-dirty]. - - Like 'git describe --tags --dirty --always -long'. - The distance/hash is unconditional. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - rendered += "-%%d-g%%s" %% (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render(pieces, style): - """Render the given version pieces into the requested style.""" - if pieces["error"]: - return {"version": "unknown", - "full-revisionid": pieces.get("long"), - "dirty": None, - "error": pieces["error"], - "date": None} - - if not style or style == "default": - style = "pep440" # the default - - if style == "pep440": - rendered = render_pep440(pieces) - elif style == "pep440-pre": - rendered = render_pep440_pre(pieces) - elif style == "pep440-post": - rendered = render_pep440_post(pieces) - elif style == "pep440-old": - rendered = render_pep440_old(pieces) - elif style == "git-describe": - rendered = render_git_describe(pieces) - elif style == "git-describe-long": - rendered = render_git_describe_long(pieces) - else: - raise ValueError("unknown style '%%s'" %% style) - - return {"version": rendered, "full-revisionid": pieces["long"], - "dirty": pieces["dirty"], "error": None, - "date": pieces.get("date")} - - -def get_versions(): - """Get version information or return default if unable to do so.""" - # I am in _version.py, which lives at ROOT/VERSIONFILE_SOURCE. If we have - # __file__, we can work backwards from there to the root. Some - # py2exe/bbfreeze/non-CPython implementations don't do __file__, in which - # case we can only use expanded keywords. - - cfg = get_config() - verbose = cfg.verbose - - try: - return git_versions_from_keywords(get_keywords(), cfg.tag_prefix, - verbose) - except NotThisMethod: - pass - - try: - root = os.path.realpath(__file__) - # versionfile_source is the relative path from the top of the source - # tree (where the .git directory might live) to this file. Invert - # this to find the root from __file__. - for i in cfg.versionfile_source.split('/'): - root = os.path.dirname(root) - except NameError: - return {"version": "0+unknown", "full-revisionid": None, - "dirty": None, - "error": "unable to find root of source tree", - "date": None} - - try: - pieces = git_pieces_from_vcs(cfg.tag_prefix, root, verbose) - return render(pieces, cfg.style) - except NotThisMethod: - pass - - try: - if cfg.parentdir_prefix: - return versions_from_parentdir(cfg.parentdir_prefix, root, verbose) - except NotThisMethod: - pass - - return {"version": "0+unknown", "full-revisionid": None, - "dirty": None, - "error": "unable to compute version", "date": None} -''' - - -@register_vcs_handler("git", "get_keywords") -def git_get_keywords(versionfile_abs): - """Extract version information from the given file.""" - # the code embedded in _version.py can just fetch the value of these - # keywords. When used from setup.py, we don't want to import _version.py, - # so we do it with a regexp instead. This function is not used from - # _version.py. - keywords = {} - try: - f = open(versionfile_abs, "r") - for line in f.readlines(): - if line.strip().startswith("git_refnames ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["refnames"] = mo.group(1) - if line.strip().startswith("git_full ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["full"] = mo.group(1) - if line.strip().startswith("git_date ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["date"] = mo.group(1) - f.close() - except EnvironmentError: - pass - return keywords - - -@register_vcs_handler("git", "keywords") -def git_versions_from_keywords(keywords, tag_prefix, verbose): - """Get version information from git keywords.""" - if not keywords: - raise NotThisMethod("no keywords at all, weird") - date = keywords.get("date") - if date is not None: - # git-2.2.0 added "%cI", which expands to an ISO-8601 -compliant - # datestamp. However we prefer "%ci" (which expands to an "ISO-8601 - # -like" string, which we must then edit to make compliant), because - # it's been around since git-1.5.3, and it's too difficult to - # discover which version we're using, or to work around using an - # older one. - date = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - refnames = keywords["refnames"].strip() - if refnames.startswith("$Format"): - if verbose: - print("keywords are unexpanded, not using") - raise NotThisMethod("unexpanded keywords, not a git-archive tarball") - refs = set([r.strip() for r in refnames.strip("()").split(",")]) - # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of - # just "foo-1.0". If we see a "tag: " prefix, prefer those. - TAG = "tag: " - tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)]) - if not tags: - # Either we're using git < 1.8.3, or there really are no tags. We use - # a heuristic: assume all version tags have a digit. The old git %d - # expansion behaves like git log --decorate=short and strips out the - # refs/heads/ and refs/tags/ prefixes that would let us distinguish - # between branches and tags. By ignoring refnames without digits, we - # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". - tags = set([r for r in refs if re.search(r'\d', r)]) - if verbose: - print("discarding '%s', no digits" % ",".join(refs - tags)) - if verbose: - print("likely tags: %s" % ",".join(sorted(tags))) - for ref in sorted(tags): - # sorting will prefer e.g. "2.0" over "2.0rc1" - if ref.startswith(tag_prefix): - r = ref[len(tag_prefix):] - if verbose: - print("picking %s" % r) - return {"version": r, - "full-revisionid": keywords["full"].strip(), - "dirty": False, "error": None, - "date": date} - # no suitable tags, so version is "0+unknown", but full hex is still there - if verbose: - print("no suitable tags, using unknown + full revision id") - return {"version": "0+unknown", - "full-revisionid": keywords["full"].strip(), - "dirty": False, "error": "no suitable tags", "date": None} - - -@register_vcs_handler("git", "pieces_from_vcs") -def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - """Get version from 'git describe' in the root of the source tree. - - This only gets called if the git-archive 'subst' keywords were *not* - expanded, and _version.py hasn't already been rewritten with a short - version string, meaning we're inside a checked out source tree. - """ - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - - out, rc = run_command(GITS, ["rev-parse", "--git-dir"], cwd=root, - hide_stderr=True) - if rc != 0: - if verbose: - print("Directory %s not under git control" % root) - raise NotThisMethod("'git rev-parse --git-dir' returned error") - - # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty] - # if there isn't one, this yields HEX[-dirty] (no NUM) - describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty", - "--always", "--long", - "--match", "%s*" % tag_prefix], - cwd=root) - # --long was added in git-1.5.5 - if describe_out is None: - raise NotThisMethod("'git describe' failed") - describe_out = describe_out.strip() - full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) - if full_out is None: - raise NotThisMethod("'git rev-parse' failed") - full_out = full_out.strip() - - pieces = {} - pieces["long"] = full_out - pieces["short"] = full_out[:7] # maybe improved later - pieces["error"] = None - - # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty] - # TAG might have hyphens. - git_describe = describe_out - - # look for -dirty suffix - dirty = git_describe.endswith("-dirty") - pieces["dirty"] = dirty - if dirty: - git_describe = git_describe[:git_describe.rindex("-dirty")] - - # now we have TAG-NUM-gHEX or HEX - - if "-" in git_describe: - # TAG-NUM-gHEX - mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe) - if not mo: - # unparseable. Maybe git-describe is misbehaving? - pieces["error"] = ("unable to parse git-describe output: '%s'" - % describe_out) - return pieces - - # tag - full_tag = mo.group(1) - if not full_tag.startswith(tag_prefix): - if verbose: - fmt = "tag '%s' doesn't start with prefix '%s'" - print(fmt % (full_tag, tag_prefix)) - pieces["error"] = ("tag '%s' doesn't start with prefix '%s'" - % (full_tag, tag_prefix)) - return pieces - pieces["closest-tag"] = full_tag[len(tag_prefix):] - - # distance: number of commits since tag - pieces["distance"] = int(mo.group(2)) - - # commit: short hex revision ID - pieces["short"] = mo.group(3) - - else: - # HEX: no tags - pieces["closest-tag"] = None - count_out, rc = run_command(GITS, ["rev-list", "HEAD", "--count"], - cwd=root) - pieces["distance"] = int(count_out) # total number of commits - - # commit date: see ISO-8601 comment in git_versions_from_keywords() - date = run_command(GITS, ["show", "-s", "--format=%ci", "HEAD"], - cwd=root)[0].strip() - pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - - return pieces - - -def do_vcs_install(manifest_in, versionfile_source, ipy): - """Git-specific installation logic for Versioneer. - - For Git, this means creating/changing .gitattributes to mark _version.py - for export-subst keyword substitution. - """ - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - files = [manifest_in, versionfile_source] - if ipy: - files.append(ipy) - try: - me = __file__ - if me.endswith(".pyc") or me.endswith(".pyo"): - me = os.path.splitext(me)[0] + ".py" - versioneer_file = os.path.relpath(me) - except NameError: - versioneer_file = "versioneer.py" - files.append(versioneer_file) - present = False - try: - f = open(".gitattributes", "r") - for line in f.readlines(): - if line.strip().startswith(versionfile_source): - if "export-subst" in line.strip().split()[1:]: - present = True - f.close() - except EnvironmentError: - pass - if not present: - f = open(".gitattributes", "a+") - f.write("%s export-subst\n" % versionfile_source) - f.close() - files.append(".gitattributes") - run_command(GITS, ["add", "--"] + files) - - -def versions_from_parentdir(parentdir_prefix, root, verbose): - """Try to determine the version from the parent directory name. - - Source tarballs conventionally unpack into a directory that includes both - the project name and a version string. We will also support searching up - two directory levels for an appropriately named parent directory - """ - rootdirs = [] - - for i in range(3): - dirname = os.path.basename(root) - if dirname.startswith(parentdir_prefix): - return {"version": dirname[len(parentdir_prefix):], - "full-revisionid": None, - "dirty": False, "error": None, "date": None} - else: - rootdirs.append(root) - root = os.path.dirname(root) # up a level - - if verbose: - print("Tried directories %s but none started with prefix %s" % - (str(rootdirs), parentdir_prefix)) - raise NotThisMethod("rootdir doesn't start with parentdir_prefix") - - -SHORT_VERSION_PY = """ -# This file was generated by 'versioneer.py' (0.18) from -# revision-control system data, or from the parent directory name of an -# unpacked source archive. Distribution tarballs contain a pre-generated copy -# of this file. - -import json - -version_json = ''' -%s -''' # END VERSION_JSON - - -def get_versions(): - return json.loads(version_json) -""" - - -def versions_from_file(filename): - """Try to determine the version from _version.py if present.""" - try: - with open(filename) as f: - contents = f.read() - except EnvironmentError: - raise NotThisMethod("unable to read _version.py") - mo = re.search(r"version_json = '''\n(.*)''' # END VERSION_JSON", - contents, re.M | re.S) - if not mo: - mo = re.search(r"version_json = '''\r\n(.*)''' # END VERSION_JSON", - contents, re.M | re.S) - if not mo: - raise NotThisMethod("no version_json in _version.py") - return json.loads(mo.group(1)) - - -def write_to_version_file(filename, versions): - """Write the given version number to the given _version.py file.""" - os.unlink(filename) - contents = json.dumps(versions, sort_keys=True, - indent=1, separators=(",", ": ")) - with open(filename, "w") as f: - f.write(SHORT_VERSION_PY % contents) - - print("set %s to '%s'" % (filename, versions["version"])) - - -def plus_or_dot(pieces): - """Return a + if we don't already have one, else return a .""" - if "+" in pieces.get("closest-tag", ""): - return "." - return "+" - - -def render_pep440(pieces): - """Build up version string, with post-release "local version identifier". - - Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you - get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty - - Exceptions: - 1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += plus_or_dot(pieces) - rendered += "%d.g%s" % (pieces["distance"], pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - else: - # exception #1 - rendered = "0+untagged.%d.g%s" % (pieces["distance"], - pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - return rendered - - -def render_pep440_pre(pieces): - """TAG[.post.devDISTANCE] -- No -dirty. - - Exceptions: - 1: no tags. 0.post.devDISTANCE - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += ".post.dev%d" % pieces["distance"] - else: - # exception #1 - rendered = "0.post.dev%d" % pieces["distance"] - return rendered - - -def render_pep440_post(pieces): - """TAG[.postDISTANCE[.dev0]+gHEX] . - - The ".dev0" means dirty. Note that .dev0 sorts backwards - (a dirty tree will appear "older" than the corresponding clean one), - but you shouldn't be releasing software with -dirty anyways. - - Exceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += plus_or_dot(pieces) - rendered += "g%s" % pieces["short"] - else: - # exception #1 - rendered = "0.post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += "+g%s" % pieces["short"] - return rendered - - -def render_pep440_old(pieces): - """TAG[.postDISTANCE[.dev0]] . - - The ".dev0" means dirty. - - Eexceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - else: - # exception #1 - rendered = "0.post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - return rendered - - -def render_git_describe(pieces): - """TAG[-DISTANCE-gHEX][-dirty]. - - Like 'git describe --tags --dirty --always'. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += "-%d-g%s" % (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render_git_describe_long(pieces): - """TAG-DISTANCE-gHEX[-dirty]. - - Like 'git describe --tags --dirty --always -long'. - The distance/hash is unconditional. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - rendered += "-%d-g%s" % (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render(pieces, style): - """Render the given version pieces into the requested style.""" - if pieces["error"]: - return {"version": "unknown", - "full-revisionid": pieces.get("long"), - "dirty": None, - "error": pieces["error"], - "date": None} - - if not style or style == "default": - style = "pep440" # the default - - if style == "pep440": - rendered = render_pep440(pieces) - elif style == "pep440-pre": - rendered = render_pep440_pre(pieces) - elif style == "pep440-post": - rendered = render_pep440_post(pieces) - elif style == "pep440-old": - rendered = render_pep440_old(pieces) - elif style == "git-describe": - rendered = render_git_describe(pieces) - elif style == "git-describe-long": - rendered = render_git_describe_long(pieces) - else: - raise ValueError("unknown style '%s'" % style) - - return {"version": rendered, "full-revisionid": pieces["long"], - "dirty": pieces["dirty"], "error": None, - "date": pieces.get("date")} - - -class VersioneerBadRootError(Exception): - """The project root directory is unknown or missing key files.""" - - -def get_versions(verbose=False): - """Get the project version from whatever source is available. - - Returns dict with two keys: 'version' and 'full'. - """ - if "versioneer" in sys.modules: - # see the discussion in cmdclass.py:get_cmdclass() - del sys.modules["versioneer"] - - root = get_root() - cfg = get_config_from_root(root) - - assert cfg.VCS is not None, "please set [versioneer]VCS= in setup.cfg" - handlers = HANDLERS.get(cfg.VCS) - assert handlers, "unrecognized VCS '%s'" % cfg.VCS - verbose = verbose or cfg.verbose - assert cfg.versionfile_source is not None, \ - "please set versioneer.versionfile_source" - assert cfg.tag_prefix is not None, "please set versioneer.tag_prefix" - - versionfile_abs = os.path.join(root, cfg.versionfile_source) - - # extract version from first of: _version.py, VCS command (e.g. 'git - # describe'), parentdir. This is meant to work for developers using a - # source checkout, for users of a tarball created by 'setup.py sdist', - # and for users of a tarball/zipball created by 'git archive' or github's - # download-from-tag feature or the equivalent in other VCSes. - - get_keywords_f = handlers.get("get_keywords") - from_keywords_f = handlers.get("keywords") - if get_keywords_f and from_keywords_f: - try: - keywords = get_keywords_f(versionfile_abs) - ver = from_keywords_f(keywords, cfg.tag_prefix, verbose) - if verbose: - print("got version from expanded keyword %s" % ver) - return ver - except NotThisMethod: - pass - - try: - ver = versions_from_file(versionfile_abs) - if verbose: - print("got version from file %s %s" % (versionfile_abs, ver)) - return ver - except NotThisMethod: - pass - - from_vcs_f = handlers.get("pieces_from_vcs") - if from_vcs_f: - try: - pieces = from_vcs_f(cfg.tag_prefix, root, verbose) - ver = render(pieces, cfg.style) - if verbose: - print("got version from VCS %s" % ver) - return ver - except NotThisMethod: - pass - - try: - if cfg.parentdir_prefix: - ver = versions_from_parentdir(cfg.parentdir_prefix, root, verbose) - if verbose: - print("got version from parentdir %s" % ver) - return ver - except NotThisMethod: - pass - - if verbose: - print("unable to compute version") - - return {"version": "0+unknown", "full-revisionid": None, - "dirty": None, "error": "unable to compute version", - "date": None} - - -def get_version(): - """Get the short version string for this project.""" - return get_versions()["version"] - - -def get_cmdclass(): - """Get the custom setuptools/distutils subclasses used by Versioneer.""" - if "versioneer" in sys.modules: - del sys.modules["versioneer"] - # this fixes the "python setup.py develop" case (also 'install' and - # 'easy_install .'), in which subdependencies of the main project are - # built (using setup.py bdist_egg) in the same python process. Assume - # a main project A and a dependency B, which use different versions - # of Versioneer. A's setup.py imports A's Versioneer, leaving it in - # sys.modules by the time B's setup.py is executed, causing B to run - # with the wrong versioneer. Setuptools wraps the sub-dep builds in a - # sandbox that restores sys.modules to it's pre-build state, so the - # parent is protected against the child's "import versioneer". By - # removing ourselves from sys.modules here, before the child build - # happens, we protect the child from the parent's versioneer too. - # Also see https://github.com/warner/python-versioneer/issues/52 - - cmds = {} - - # we add "version" to both distutils and setuptools - from distutils.core import Command - - class cmd_version(Command): - description = "report generated version string" - user_options = [] - boolean_options = [] - - def initialize_options(self): - pass - - def finalize_options(self): - pass - - def run(self): - vers = get_versions(verbose=True) - print("Version: %s" % vers["version"]) - print(" full-revisionid: %s" % vers.get("full-revisionid")) - print(" dirty: %s" % vers.get("dirty")) - print(" date: %s" % vers.get("date")) - if vers["error"]: - print(" error: %s" % vers["error"]) - cmds["version"] = cmd_version - - # we override "build_py" in both distutils and setuptools - # - # most invocation pathways end up running build_py: - # distutils/build -> build_py - # distutils/install -> distutils/build ->.. - # setuptools/bdist_wheel -> distutils/install ->.. - # setuptools/bdist_egg -> distutils/install_lib -> build_py - # setuptools/install -> bdist_egg ->.. - # setuptools/develop -> ? - # pip install: - # copies source tree to a tempdir before running egg_info/etc - # if .git isn't copied too, 'git describe' will fail - # then does setup.py bdist_wheel, or sometimes setup.py install - # setup.py egg_info -> ? - - # we override different "build_py" commands for both environments - if "setuptools" in sys.modules: - from setuptools.command.build_py import build_py as _build_py - else: - from distutils.command.build_py import build_py as _build_py - - class cmd_build_py(_build_py): - def run(self): - root = get_root() - cfg = get_config_from_root(root) - versions = get_versions() - _build_py.run(self) - # now locate _version.py in the new build/ directory and replace - # it with an updated value - if cfg.versionfile_build: - target_versionfile = os.path.join(self.build_lib, - cfg.versionfile_build) - print("UPDATING %s" % target_versionfile) - write_to_version_file(target_versionfile, versions) - cmds["build_py"] = cmd_build_py - - if "cx_Freeze" in sys.modules: # cx_freeze enabled? - from cx_Freeze.dist import build_exe as _build_exe - - # nczeczulin reports that py2exe won't like the pep440-style string - # as FILEVERSION, but it can be used for PRODUCTVERSION, e.g. - # setup(console=[{ - # "version": versioneer.get_version().split("+", 1)[0], # FILEVERSION - # "product_version": versioneer.get_version(), - # ... - - class cmd_build_exe(_build_exe): - def run(self): - root = get_root() - cfg = get_config_from_root(root) - versions = get_versions() - target_versionfile = cfg.versionfile_source - print("UPDATING %s" % target_versionfile) - write_to_version_file(target_versionfile, versions) - - _build_exe.run(self) - os.unlink(target_versionfile) - with open(cfg.versionfile_source, "w") as f: - LONG = LONG_VERSION_PY[cfg.VCS] - f.write(LONG % - {"DOLLAR": "$", - "STYLE": cfg.style, - "TAG_PREFIX": cfg.tag_prefix, - "PARENTDIR_PREFIX": cfg.parentdir_prefix, - "VERSIONFILE_SOURCE": cfg.versionfile_source, - }) - cmds["build_exe"] = cmd_build_exe - del cmds["build_py"] - - if 'py2exe' in sys.modules: # py2exe enabled? - try: - from py2exe.distutils_buildexe import py2exe as _py2exe # py3 - except ImportError: - from py2exe.build_exe import py2exe as _py2exe # py2 - - class cmd_py2exe(_py2exe): - def run(self): - root = get_root() - cfg = get_config_from_root(root) - versions = get_versions() - target_versionfile = cfg.versionfile_source - print("UPDATING %s" % target_versionfile) - write_to_version_file(target_versionfile, versions) - - _py2exe.run(self) - os.unlink(target_versionfile) - with open(cfg.versionfile_source, "w") as f: - LONG = LONG_VERSION_PY[cfg.VCS] - f.write(LONG % - {"DOLLAR": "$", - "STYLE": cfg.style, - "TAG_PREFIX": cfg.tag_prefix, - "PARENTDIR_PREFIX": cfg.parentdir_prefix, - "VERSIONFILE_SOURCE": cfg.versionfile_source, - }) - cmds["py2exe"] = cmd_py2exe - - # we override different "sdist" commands for both environments - if "setuptools" in sys.modules: - from setuptools.command.sdist import sdist as _sdist - else: - from distutils.command.sdist import sdist as _sdist - - class cmd_sdist(_sdist): - def run(self): - versions = get_versions() - self._versioneer_generated_versions = versions - # unless we update this, the command will keep using the old - # version - self.distribution.metadata.version = versions["version"] - return _sdist.run(self) - - def make_release_tree(self, base_dir, files): - root = get_root() - cfg = get_config_from_root(root) - _sdist.make_release_tree(self, base_dir, files) - # now locate _version.py in the new base_dir directory - # (remembering that it may be a hardlink) and replace it with an - # updated value - target_versionfile = os.path.join(base_dir, cfg.versionfile_source) - print("UPDATING %s" % target_versionfile) - write_to_version_file(target_versionfile, - self._versioneer_generated_versions) - cmds["sdist"] = cmd_sdist - - return cmds - - -CONFIG_ERROR = """ -setup.cfg is missing the necessary Versioneer configuration. You need -a section like: - - [versioneer] - VCS = git - style = pep440 - versionfile_source = src/myproject/_version.py - versionfile_build = myproject/_version.py - tag_prefix = - parentdir_prefix = myproject- - -You will also need to edit your setup.py to use the results: - - import versioneer - setup(version=versioneer.get_version(), - cmdclass=versioneer.get_cmdclass(), ...) - -Please read the docstring in ./versioneer.py for configuration instructions, -edit setup.cfg, and re-run the installer or 'python versioneer.py setup'. -""" - -SAMPLE_CONFIG = """ -# See the docstring in versioneer.py for instructions. Note that you must -# re-run 'versioneer.py setup' after changing this section, and commit the -# resulting files. - -[versioneer] -#VCS = git -#style = pep440 -#versionfile_source = -#versionfile_build = -#tag_prefix = -#parentdir_prefix = - -""" - -INIT_PY_SNIPPET = """ -from ._version import get_versions -__version__ = get_versions()['version'] -del get_versions -""" - - -def do_setup(): - """Perform VCS-independent setup function for installing Versioneer.""" - root = get_root() - try: - cfg = get_config_from_root(root) - except (EnvironmentError, configparser.NoSectionError, - configparser.NoOptionError) as e: - if isinstance(e, (EnvironmentError, configparser.NoSectionError)): - print("Adding sample versioneer config to setup.cfg", - file=sys.stderr) - with open(os.path.join(root, "setup.cfg"), "a") as f: - f.write(SAMPLE_CONFIG) - print(CONFIG_ERROR, file=sys.stderr) - return 1 - - print(" creating %s" % cfg.versionfile_source) - with open(cfg.versionfile_source, "w") as f: - LONG = LONG_VERSION_PY[cfg.VCS] - f.write(LONG % {"DOLLAR": "$", - "STYLE": cfg.style, - "TAG_PREFIX": cfg.tag_prefix, - "PARENTDIR_PREFIX": cfg.parentdir_prefix, - "VERSIONFILE_SOURCE": cfg.versionfile_source, - }) - - ipy = os.path.join(os.path.dirname(cfg.versionfile_source), - "__init__.py") - if os.path.exists(ipy): - try: - with open(ipy, "r") as f: - old = f.read() - except EnvironmentError: - old = "" - if INIT_PY_SNIPPET not in old: - print(" appending to %s" % ipy) - with open(ipy, "a") as f: - f.write(INIT_PY_SNIPPET) - else: - print(" %s unmodified" % ipy) - else: - print(" %s doesn't exist, ok" % ipy) - ipy = None - - # Make sure both the top-level "versioneer.py" and versionfile_source - # (PKG/_version.py, used by runtime code) are in MANIFEST.in, so - # they'll be copied into source distributions. Pip won't be able to - # install the package without this. - manifest_in = os.path.join(root, "MANIFEST.in") - simple_includes = set() - try: - with open(manifest_in, "r") as f: - for line in f: - if line.startswith("include "): - for include in line.split()[1:]: - simple_includes.add(include) - except EnvironmentError: - pass - # That doesn't cover everything MANIFEST.in can do - # (http://docs.python.org/2/distutils/sourcedist.html#commands), so - # it might give some false negatives. Appending redundant 'include' - # lines is safe, though. - if "versioneer.py" not in simple_includes: - print(" appending 'versioneer.py' to MANIFEST.in") - with open(manifest_in, "a") as f: - f.write("include versioneer.py\n") - else: - print(" 'versioneer.py' already in MANIFEST.in") - if cfg.versionfile_source not in simple_includes: - print(" appending versionfile_source ('%s') to MANIFEST.in" % - cfg.versionfile_source) - with open(manifest_in, "a") as f: - f.write("include %s\n" % cfg.versionfile_source) - else: - print(" versionfile_source already in MANIFEST.in") - - # Make VCS-specific changes. For git, this means creating/changing - # .gitattributes to mark _version.py for export-subst keyword - # substitution. - do_vcs_install(manifest_in, cfg.versionfile_source, ipy) - return 0 - - -def scan_setup_py(): - """Validate the contents of setup.py against Versioneer's expectations.""" - found = set() - setters = False - errors = 0 - with open("setup.py", "r") as f: - for line in f.readlines(): - if "import versioneer" in line: - found.add("import") - if "versioneer.get_cmdclass()" in line: - found.add("cmdclass") - if "versioneer.get_version()" in line: - found.add("get_version") - if "versioneer.VCS" in line: - setters = True - if "versioneer.versionfile_source" in line: - setters = True - if len(found) != 3: - print("") - print("Your setup.py appears to be missing some important items") - print("(but I might be wrong). Please make sure it has something") - print("roughly like the following:") - print("") - print(" import versioneer") - print(" setup( version=versioneer.get_version(),") - print(" cmdclass=versioneer.get_cmdclass(), ...)") - print("") - errors += 1 - if setters: - print("You should remove lines like 'versioneer.VCS = ' and") - print("'versioneer.versionfile_source = ' . This configuration") - print("now lives in setup.cfg, and should be removed from setup.py") - print("") - errors += 1 - return errors - - -if __name__ == "__main__": - cmd = sys.argv[1] - if cmd == "setup": - errors = do_setup() - errors += scan_setup_py() - if errors: - sys.exit(1) From 00d7c5d3e9c4b862a9b3a79c56a9ecd82b2aabbf Mon Sep 17 00:00:00 2001 From: Max <14039563+maxbriel@users.noreply.github.com> Date: Mon, 4 May 2026 15:36:05 +0200 Subject: [PATCH 359/389] Correct spelling of 'remnant' in step_SN.py Fix typo in docstring for engine parameter. --- posydon/binary_evol/SN/step_SN.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index 6cc4d64a5b..06d32ad78b 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -115,7 +115,7 @@ class StepSN(object): to describe the collapse of the star. engine : str - Engine used for supernova remnanrt outcome propierties for the + Engine used for supernova remnant outcome propierties for the Sukhbold+16-engineand and Patton&Sukhbold20-engine mechanisms. Available options: From 2781490c74a3b94b1d76389632b38baff5b29255 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Tue, 5 May 2026 11:28:36 -0500 Subject: [PATCH 360/389] uncomment binary test run code (#840) --- dev-tools/run_test_suite.sh | 42 ++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/dev-tools/run_test_suite.sh b/dev-tools/run_test_suite.sh index b3957d1a2c..fea8bcd621 100755 --- a/dev-tools/run_test_suite.sh +++ b/dev-tools/run_test_suite.sh @@ -138,27 +138,27 @@ for Z in $METALLICITIES; do echo " Log: $LOG_FILE" echo "============================================================" - #python "$SUITE_SCRIPT" \ - # --metallicity "$Z" \ - # --output "$OUTPUT_FILE" \ - # --branch "$BRANCH" \ - # --sha "$ACTUAL_SHA" \ - # 2>&1 | tee "$LOG_FILE" - #EXIT_CODE=${PIPESTATUS[0]} - - #if [ $EXIT_CODE -eq 137 ]; then - # echo "ERROR: Process killed (likely OOM) for Z=${Z}. Exit code 137 (SIGKILL)." >&2 - # echo " Consider increasing job memory." >&2 - # FAILED=$((FAILED + 1)) - #elif [ $EXIT_CODE -ne 0 ]; then - # echo "WARNING: Suite failed for Z=${Z} (exit code $EXIT_CODE). Check $LOG_FILE" >&2 - # FAILED=$((FAILED + 1)) - #elif [ ! -f "$OUTPUT_FILE" ]; then - # echo "WARNING: Output file not created for Z=${Z}" >&2 - # FAILED=$((FAILED + 1)) - #else - # echo " Z=${Z} Zsun complete." - #fi + python "$SUITE_SCRIPT" \ + --metallicity "$Z" \ + --output "$OUTPUT_FILE" \ + --branch "$BRANCH" \ + --sha "$ACTUAL_SHA" \ + 2>&1 | tee "$LOG_FILE" + EXIT_CODE=${PIPESTATUS[0]} + + if [ $EXIT_CODE -eq 137 ]; then + echo "ERROR: Process killed (likely OOM) for Z=${Z}. Exit code 137 (SIGKILL)." >&2 + echo " Consider increasing job memory." >&2 + FAILED=$((FAILED + 1)) + elif [ $EXIT_CODE -ne 0 ]; then + echo "WARNING: Suite failed for Z=${Z} (exit code $EXIT_CODE). Check $LOG_FILE" >&2 + FAILED=$((FAILED + 1)) + elif [ ! -f "$OUTPUT_FILE" ]; then + echo "WARNING: Output file not created for Z=${Z}" >&2 + FAILED=$((FAILED + 1)) + else + echo " Z=${Z} Zsun complete." + fi done From 6f25cfcc7c98ab013588e0aabc2f930c05ebf927 Mon Sep 17 00:00:00 2001 From: Max <14039563+maxbriel@users.noreply.github.com> Date: Wed, 6 May 2026 19:06:09 +0200 Subject: [PATCH 361/389] [fix/enhancement] Remove forced lower mass ratio limit (#819) * remove lower limit + add warning during setup * add unit tests for new warning + fix failing ones due to missing 'secondary_mass_scheme' * revert limit on q_min to test unit test * revert the test * update test_independent_sample.py with new lower q min limit * update the other instance of hard coded m2[0] value * remove lower q bound in get_mass_ratio_pdf * Update norm_pop.py * Update independent_sample.py --------- Co-authored-by: Seth Gossage Co-authored-by: Jeff Andrews --- posydon/CLI/popsyn/setup.py | 17 ++++ posydon/popsyn/independent_sample.py | 2 +- posydon/popsyn/norm_pop.py | 2 +- posydon/unit_tests/CLI/popsyn/test_setup.py | 96 ++++++++++++++++++- .../popsyn/test_independent_sample.py | 4 +- 5 files changed, 113 insertions(+), 8 deletions(-) diff --git a/posydon/CLI/popsyn/setup.py b/posydon/CLI/popsyn/setup.py index 0c088f8a6e..f60887a5f0 100644 --- a/posydon/CLI/popsyn/setup.py +++ b/posydon/CLI/popsyn/setup.py @@ -14,6 +14,7 @@ from posydon.grids.SN_MODELS import get_SN_MODEL_NAME from posydon.popsyn.io import binarypop_kwargs_from_ini, simprop_kwargs_from_ini from posydon.utils.common_functions import convert_metallicity_to_string +from posydon.utils.posydonwarning import Pwarn def check_SN_MODEL_validity(ini_file, verbose_on_fail=True): @@ -86,6 +87,22 @@ def setup_popsyn_function(args): validate_ini_file(args.ini_file) synpop_params = binarypop_kwargs_from_ini(args.ini_file) + # warn if mass ratio q = M2/M1 could fall below 0.05 + if synpop_params['secondary_mass_scheme'] == 'flat_mass_ratio': + q_min_possible = (synpop_params['secondary_mass_min'] + / synpop_params['primary_mass_max']) + if q_min_possible < 0.05: + Pwarn( + f"With secondary_mass_min=" + f"{synpop_params['secondary_mass_min']} and " + f"primary_mass_max=" + f"{synpop_params['primary_mass_max']}, the mass " + f"ratio q=M2/M1 can be as low as {q_min_possible:.4f}. " + f"Some binaries with q<0.05 might fall outside the POSYDON " + f"default grids.", + "InappropriateValueWarning" + ) + metallicities = synpop_params['metallicities'] if synpop_params['number_of_binaries'] / args.job_array < 1: raise ValueError("The number of binaries is less than the job array" diff --git a/posydon/popsyn/independent_sample.py b/posydon/popsyn/independent_sample.py index a87ea3be85..16dd4f1cfa 100644 --- a/posydon/popsyn/independent_sample.py +++ b/posydon/popsyn/independent_sample.py @@ -358,7 +358,7 @@ def generate_secondary_masses(primary_masses, # Generate secondary masses if secondary_mass_scheme == 'flat_mass_ratio': # Calculate mass ratio bounds for each primary mass - q_min = np.maximum(secondary_mass_min / primary_masses, 0.05) + q_min = np.maximum(secondary_mass_min / primary_masses, 0.0) q_max = np.minimum(secondary_mass_max / primary_masses, 1.0) # Sample mass ratios using the distribution class diff --git a/posydon/popsyn/norm_pop.py b/posydon/popsyn/norm_pop.py index 550b06a4ba..915a95ae67 100644 --- a/posydon/popsyn/norm_pop.py +++ b/posydon/popsyn/norm_pop.py @@ -99,7 +99,7 @@ def get_mass_ratio_pdf(kwargs): def get_pdf_for_m1(m1): m1 = np.atleast_1d(m1) minimum = np.max( - [kwargs['secondary_mass_min'] / m1, np.ones(len(m1))*0.05], + [kwargs['secondary_mass_min'] / m1, np.zeros(len(m1))], axis=0) maximum = np.min( diff --git a/posydon/unit_tests/CLI/popsyn/test_setup.py b/posydon/unit_tests/CLI/popsyn/test_setup.py index 07f0ac9c4b..ea5d0c65e3 100644 --- a/posydon/unit_tests/CLI/popsyn/test_setup.py +++ b/posydon/unit_tests/CLI/popsyn/test_setup.py @@ -125,7 +125,8 @@ def test_setup_popsyn_function_too_few_binaries(self, mock_binarypop, mock_valid """Test that ValueError is raised when number of binaries is too small.""" mock_binarypop.return_value = { 'metallicities': [1.0], - 'number_of_binaries': 5 # Less than job_array (10) + 'number_of_binaries': 5, # Less than job_array (10) + 'secondary_mass_scheme': 'q=1' } with pytest.raises(ValueError, match="number of binaries is less than the job array"): @@ -147,7 +148,8 @@ def test_setup_popsyn_function_success( metallicities = [0.01, 1.0] mock_binarypop.return_value = { 'metallicities': metallicities, - 'number_of_binaries': 1000 + 'number_of_binaries': 1000, + 'secondary_mass_scheme': 'q=1' } # Call function @@ -174,7 +176,8 @@ def test_setup_popsyn_function_creates_log_directories( metallicities = [0.1, 1.0] mock_binarypop.return_value = { 'metallicities': metallicities, - 'number_of_binaries': 1000 + 'number_of_binaries': 1000, + 'secondary_mass_scheme': 'q=1' } totest.setup_popsyn_function(mock_args) @@ -187,6 +190,90 @@ def test_setup_popsyn_function_creates_log_directories( assert any(['1e-01_logs' in call for call in calls]) +class TestFlatMassRatioWarning: + """Test class for flat_mass_ratio mass ratio warning logic.""" + + @pytest.fixture + def mock_args(self): + """Create mock command-line arguments.""" + args = MagicMock() + args.ini_file = "test.ini" + args.job_array = 10 + return args + + @patch('posydon.CLI.popsyn.setup.validate_ini_file') + @patch('posydon.CLI.popsyn.setup.binarypop_kwargs_from_ini') + @patch('posydon.CLI.popsyn.setup.create_python_scripts') + @patch('posydon.CLI.popsyn.setup.create_slurm_scripts') + @patch('posydon.CLI.popsyn.setup.create_bash_submit_script') + @patch('posydon.CLI.popsyn.setup.Pwarn') + @patch('os.makedirs') + def test_flat_mass_ratio_low_q_issues_warning( + self, mock_makedirs, mock_pwarn, mock_bash, mock_slurm, + mock_python, mock_binarypop, mock_validate, mock_args + ): + """Test warning is issued when q_min < 0.05 with flat_mass_ratio.""" + mock_binarypop.return_value = { + 'metallicities': [1.0], + 'number_of_binaries': 1000, + 'secondary_mass_scheme': 'flat_mass_ratio', + 'secondary_mass_min': 0.1, + 'primary_mass_max': 150.0, + } + + totest.setup_popsyn_function(mock_args) + + mock_pwarn.assert_called_once() + call_args = mock_pwarn.call_args[0] + assert 'InappropriateValueWarning' in call_args + + @patch('posydon.CLI.popsyn.setup.validate_ini_file') + @patch('posydon.CLI.popsyn.setup.binarypop_kwargs_from_ini') + @patch('posydon.CLI.popsyn.setup.create_python_scripts') + @patch('posydon.CLI.popsyn.setup.create_slurm_scripts') + @patch('posydon.CLI.popsyn.setup.create_bash_submit_script') + @patch('posydon.CLI.popsyn.setup.Pwarn') + @patch('os.makedirs') + def test_flat_mass_ratio_acceptable_q_no_warning( + self, mock_makedirs, mock_pwarn, mock_bash, mock_slurm, + mock_python, mock_binarypop, mock_validate, mock_args + ): + """Test no warning is issued when q_min >= 0.05 with flat_mass_ratio.""" + mock_binarypop.return_value = { + 'metallicities': [1.0], + 'number_of_binaries': 1000, + 'secondary_mass_scheme': 'flat_mass_ratio', + 'secondary_mass_min': 5.0, + 'primary_mass_max': 80.0, + } + + totest.setup_popsyn_function(mock_args) + + mock_pwarn.assert_not_called() + + @patch('posydon.CLI.popsyn.setup.validate_ini_file') + @patch('posydon.CLI.popsyn.setup.binarypop_kwargs_from_ini') + @patch('posydon.CLI.popsyn.setup.create_python_scripts') + @patch('posydon.CLI.popsyn.setup.create_slurm_scripts') + @patch('posydon.CLI.popsyn.setup.create_bash_submit_script') + @patch('posydon.CLI.popsyn.setup.Pwarn') + @patch('os.makedirs') + def test_non_flat_mass_ratio_scheme_no_warning( + self, mock_makedirs, mock_pwarn, mock_bash, mock_slurm, + mock_python, mock_binarypop, mock_validate, mock_args + ): + """Test no warning is issued when secondary_mass_scheme is not flat_mass_ratio.""" + mock_binarypop.return_value = { + 'metallicities': [1.0], + 'number_of_binaries': 1000, + 'secondary_mass_scheme': 'q=1', + } + + totest.setup_popsyn_function(mock_args) + + mock_pwarn.assert_not_called() + + class TestIntegration: """Integration tests for the setup module.""" @@ -211,7 +298,8 @@ def test_full_setup_workflow( } mock_binarypop.return_value = { 'metallicities': [1.0], - 'number_of_binaries': 100 + 'number_of_binaries': 100, + 'secondary_mass_scheme': 'q=1' } # Create mock args diff --git a/posydon/unit_tests/popsyn/test_independent_sample.py b/posydon/unit_tests/popsyn/test_independent_sample.py index 3e5cd6ab5a..cac8c2852f 100644 --- a/posydon/unit_tests/popsyn/test_independent_sample.py +++ b/posydon/unit_tests/popsyn/test_independent_sample.py @@ -62,7 +62,7 @@ def test_generate_independent_samples(self): assert orb[0] == approx(24650.481799781122,abs=6e-12) assert ecc[0] == approx(0.8350856417514098,abs=6e-12) assert m1[0] == approx(19.97764511120556,abs=6e-12) - assert m2[0] == approx(9.328252086070083,abs=6e-12) + assert m2[0] == approx(8.964150262412895,abs=6e-12) assert isinstance(orb, np.ndarray) assert len(orb) == 1 assert all(np.isfinite(m1)) @@ -74,7 +74,7 @@ def test_generate_independent_samples(self): assert orb_p[0] == approx(872.213878458193,abs=6e-12) assert ecc_p[0] == approx(0.7259611833901314,abs=6e-12) assert m1_p[0] == approx(19.97764511120556,abs=6e-12) - assert m2_p[0] == approx(9.328252086070083,abs=6e-12) + assert m2_p[0] == approx(8.964150262412895,abs=6e-12) assert isinstance(orb_p, np.ndarray) assert len(orb_p) == 1 assert all(np.isfinite(m1_p)) From 99b918d6564923e7da0a71b684ad1c78243c2760 Mon Sep 17 00:00:00 2001 From: Max Briel Date: Thu, 7 May 2026 14:45:40 +0200 Subject: [PATCH 362/389] fix comments to explain that metallicity is in Z/Zsun ratio --- docs/_source/components-overview/pop_syn/single_star.rst | 2 +- posydon/binary_evol/singlestar.py | 2 +- posydon/popsyn/io.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/_source/components-overview/pop_syn/single_star.rst b/docs/_source/components-overview/pop_syn/single_star.rst index 8873ee3427..60cef6e1e8 100644 --- a/docs/_source/components-overview/pop_syn/single_star.rst +++ b/docs/_source/components-overview/pop_syn/single_star.rst @@ -32,7 +32,7 @@ The star properties are defined as follows * - ``state`` - The state of the star, see state options. * - ``metallicity`` - - Fractional metal content (Z) of the star. + - Ratio to solar metallicity (Z/Z_sun, e.g., 1.0 for solar metallicity). * - ``mass`` - Stellar mass in M_sun. * - ``log_R`` diff --git a/posydon/binary_evol/singlestar.py b/posydon/binary_evol/singlestar.py index 8b194c8574..17705bf85c 100644 --- a/posydon/binary_evol/singlestar.py +++ b/posydon/binary_evol/singlestar.py @@ -40,7 +40,7 @@ STARPROPERTIES = [ 'state', # the evolutionary state of the star. For more info see # `posydon.utils.common_functions.check_state_of_star` - 'metallicity', # initial mass fraction of metals + 'metallicity', # Z/Z_sun, ratio to solar metallicity (1.0 for solar) 'mass', # mass (solar units) 'log_R', # log10 of radius (solar units) 'log_L', # log10 luminosity (solar units) diff --git a/posydon/popsyn/io.py b/posydon/popsyn/io.py index b6700f1eec..810b6ccb3e 100644 --- a/posydon/popsyn/io.py +++ b/posydon/popsyn/io.py @@ -60,7 +60,7 @@ STARPROPERTIES_DTYPES = { 'state': 'string', # the evolutionary state of the star. For more info see # `posydon.utils.common_functions.check_state_of_star` - 'metallicity': 'float64', # initial mass fraction of metals + 'metallicity': 'float64', # Z/Z_sun, ratio to solar metallicity (1.0 for solar) 'mass': 'float64', # mass (solar units) 'log_R': 'float64', # log10 of radius (solar units) 'log_L': 'float64', # log10 luminosity (solar units) From 46a072a6e931f75a081de7b6ce04afa0823f9947 Mon Sep 17 00:00:00 2001 From: Max Briel Date: Thu, 7 May 2026 14:54:05 +0200 Subject: [PATCH 363/389] [fix] suppress warnings for overflow & divide by zero from unbound binaries --- posydon/binary_evol/SN/step_SN.py | 59 +++++++++++++++++-------------- 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index 06d32ad78b..60e05afb90 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -1758,32 +1758,34 @@ def orbital_kick(self, binary): # extended to Eq 13, in Wong, T.-W., Valsecchi, F., Fragos, T., & Kalogera, V. 2012, ApJ, 747, 111 # get the orbital separation post SN # Eq from conservation of energy - Apost = ((2.0 / rpre) - - (((Vkick ** 2) + (Vr ** 2) + (2 * (Vkick * cos_theta) * Vr)) / (G * Mtot_post)) - ) ** -1 + # Note: Suppress overflow warnings for extreme kick scenarios that lead to + # disrupted binaries. + with np.errstate(over='ignore', divide='ignore', invalid='ignore'): + Apost = ((2.0 / rpre) + - (((Vkick ** 2) + (Vr ** 2) + (2 * (Vkick * cos_theta) * Vr)) / (G * Mtot_post)) + ) ** -1 - # get kicks componets in the coordinate system - Vkx = Vkick * (sin_theta * np.sin(phi) * sin_psi + cos_theta * cos_psi) - Vky = Vkick * (-sin_theta * np.sin(phi) * cos_psi + cos_theta * sin_psi) - Vkz = Vkick * sin_theta * np.cos(phi) + # get kicks componets in the coordinate system + Vkx = Vkick * (sin_theta * np.sin(phi) * sin_psi + cos_theta * cos_psi) + Vky = Vkick * (-sin_theta * np.sin(phi) * cos_psi + cos_theta * sin_psi) + Vkz = Vkick * sin_theta * np.cos(phi) - # Eq 4, in Kalogera, V. 1996, ApJ, 471, 352 - # extended to Eq 14 in Wong, T.-W., Valsecchi, F., Fragos, T., & Kalogera, V. 2012, ApJ, 747, 111 - # get the eccentricity post SN - # Eq from setting specific angular momentum r X Vr = sqrt(G*M*A*(1-e**2)) - + # Eq 4, in Kalogera, V. 1996, ApJ, 471, 352 + # extended to Eq 14 in Wong, T.-W., Valsecchi, F., Fragos, T., & Kalogera, V. 2012, ApJ, 747, 111 + # get the eccentricity post SN + # Eq from setting specific angular momentum r X Vr = sqrt(G*M*A*(1-e**2)) - x = ((Vkz ** 2 + (Vky + Vr * sin_psi)** 2) - * rpre ** 2 - / (G * Mtot_post * Apost)) + x = ((Vkz ** 2 + (Vky + Vr * sin_psi)** 2) + * rpre ** 2 + / (G * Mtot_post * Apost)) - # catch negative values, i.e. disrupted binaries - if 1.-x < 0.: - epost = np.nan - else: - epost = np.sqrt(1 - x) + # catch negative values, i.e. disrupted binaries + if 1.-x < 0.: + epost = np.nan + else: + epost = np.sqrt(1 - x) # Compute COM velocity, VS, post SN # VS_pre in COM frame is 0. So VS_post in COM frame is @@ -1811,7 +1813,9 @@ def orbital_kick(self, binary): # cos(tilt) = Lpre dot Lpost / ||Lpre||||Lpost|| # For epre=0 (sin_psi=1), reduces to Eq 4, in Kalogera, V. 1996, ApJ, 471, 352 - tilt = np.arccos((Vky + Vr * sin_psi) / np.sqrt( Vkz ** 2 + (Vky + Vr * sin_psi) ** 2 )) + # Suppress overflow warnings for extreme values + with np.errstate(over='ignore', invalid='ignore'): + tilt = np.arccos((Vky + Vr * sin_psi) / np.sqrt( Vkz ** 2 + (Vky + Vr * sin_psi) ** 2 )) # Track direction of tilt if Vkz < 0: tilt *= -1 @@ -1885,11 +1889,14 @@ def SNCheck( # (see, e.g., Kalogera, V. & Lorimer, D.R. 2000, ApJ, 530, 890) # The derivation in the papers above assume a circular pre SN # orbit. Hence, need a correction for eccentric pre SN orbits: - eccentric_orbit_correction = Vr**2 * rpre / (G * Mtot_pre) - tmp1 = 2 - Mtot_pre / Mtot_post * (Vkick / Vr - 1) ** 2\ - * eccentric_orbit_correction - tmp2 = 2 - Mtot_pre / Mtot_post * (Vkick / Vr + 1) ** 2\ - * eccentric_orbit_correction + # Suppress divide by zero warnings for edge cases + with np.errstate(divide='ignore', over='ignore', invalid='ignore'): + eccentric_orbit_correction = Vr**2 * rpre / (G * Mtot_pre) + tmp1 = 2 - Mtot_pre / Mtot_post * (Vkick / Vr - 1) ** 2\ + * eccentric_orbit_correction + tmp2 = 2 - Mtot_pre / Mtot_post * (Vkick / Vr + 1) ** 2\ + * eccentric_orbit_correction + SNflag2 = ((rpre / Apost - tmp1 < err) and (err > tmp2 - rpre / Apost)) From 78f5f3c93049ad8fb3b4ef9e0ad468c0e50f69f7 Mon Sep 17 00:00:00 2001 From: Jeff Andrews Date: Thu, 7 May 2026 09:57:07 -0400 Subject: [PATCH 364/389] Update step_SN.py --- posydon/binary_evol/SN/step_SN.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index ffc0e01d4d..64035b7da5 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -2522,13 +2522,13 @@ def explod_crit(self, comp_val, sc_val, mu4M4_val, mu4_val, k1, k2): # check whether criterion for failed SN is fulfilled if comp_val > comp_crit2 or sc_val > sc_crit2: ff2.append(0) - ff = 0 + ff = False unclassified = False # check whether criterion for successful SN is fulfilled if comp_val < comp_crit1 or sc_val < sc_crit1: ff1.append(1) - ff = 1 + ff = True unclassified = False # if there is contradiction or if the progenitor is unclassified based on comp & s_c @@ -2536,14 +2536,14 @@ def explod_crit(self, comp_val, sc_val, mu4M4_val, mu4_val, k1, k2): # final fate classification based on mu4M4 if mu4M4_val > mu4M4_crit2: - ff = 0 + ff = False elif mu4M4_val < mu4M4_crit1: - ff = 1 + ff = True # final fate classification based on reversed Ertl criterion elif k1 + k2*mu4M4_val - mu4_val > 0: - ff = 0 + ff = False else: - ff = 1 + ff = True return ff From 1d007336b7dc8ecc97c2c3a4078bc21b77b17f5e Mon Sep 17 00:00:00 2001 From: Jeff Andrews Date: Thu, 7 May 2026 09:59:49 -0400 Subject: [PATCH 365/389] Update step_SN.py --- posydon/binary_evol/SN/step_SN.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index 64035b7da5..3a3157ed75 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -2469,17 +2469,9 @@ def Maltsev25_corecollapse(self, star, engine, conserve_hydrogen_envelope=False) state = 'BH' elif (CO_core_mass > 2.5) and (CO_core_mass < 10.0): - ff = self.explod_crit(Xi, sc, mu4M4, mu4, k1, k2) - if ff == 0: - if conserve_hydrogen_envelope: - m_rem = star.mass - else: - m_rem = star.he_core_mass + successful_SN = self.explod_crit(Xi, sc, mu4M4, mu4, k1, k2) - f_fb = 1.0 - state = 'BH' - - else: + if successful_SN: rem = self.NS_vs_fallbackBH(Xi, CO_core_mass, M4, mu4M4) if rem == 'NS': # successful SN with NS m_rem = M4 @@ -2494,6 +2486,15 @@ def Maltsev25_corecollapse(self, star, engine, conserve_hydrogen_envelope=False) f_fb = 0.99 state = 'BH' + + else: + if conserve_hydrogen_envelope: + m_rem = star.mass + else: + m_rem = star.he_core_mass + + f_fb = 1.0 + state = 'BH' return m_rem, f_fb, state From 724c4452a6805f5fad8cdf83efc9508854ac8fc3 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 7 May 2026 13:59:59 +0000 Subject: [PATCH 366/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/binary_evol/SN/step_SN.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index 3a3157ed75..0dc0ad5437 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -2486,7 +2486,7 @@ def Maltsev25_corecollapse(self, star, engine, conserve_hydrogen_envelope=False) f_fb = 0.99 state = 'BH' - + else: if conserve_hydrogen_envelope: m_rem = star.mass From 773e66c84ece0a91df6e8a10083396aceb692622 Mon Sep 17 00:00:00 2001 From: Max <14039563+maxbriel@users.noreply.github.com> Date: Thu, 7 May 2026 16:08:12 +0200 Subject: [PATCH 367/389] Change indentation of comments --- posydon/binary_evol/SN/step_SN.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index 0dc0ad5437..b4b11e3fe0 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -2535,12 +2535,12 @@ def explod_crit(self, comp_val, sc_val, mu4M4_val, mu4_val, k1, k2): # if there is contradiction or if the progenitor is unclassified based on comp & s_c if (len(ff1) > 0 and len(ff2) > 0) or unclassified: - # final fate classification based on mu4M4 + # final fate classification based on mu4M4 if mu4M4_val > mu4M4_crit2: ff = False elif mu4M4_val < mu4M4_crit1: ff = True - # final fate classification based on reversed Ertl criterion + # final fate classification based on reversed Ertl criterion elif k1 + k2*mu4M4_val - mu4_val > 0: ff = False else: From 41975af86a063cd182abd8a781e60d42c677f1c3 Mon Sep 17 00:00:00 2001 From: Max Briel Date: Thu, 7 May 2026 16:14:50 +0200 Subject: [PATCH 368/389] change license --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 746f28c5c8..4f49f0fbe9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,7 @@ authors = [ maintainers = [ {name = "POSYDON Collaboration", email = "posydon.team@gmail.com"}, ] -license = "GPL-3.0-or-later" +license = "BSD 3-Clause" dynamic = ["version"] requires-python = ">=3.11, <3.12" readme = "README.md" From 87bbb53e73ddb08f1cbc831826affdc20001cd28 Mon Sep 17 00:00:00 2001 From: Max Briel Date: Thu, 7 May 2026 16:19:01 +0200 Subject: [PATCH 369/389] correct format --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4f49f0fbe9..11148d3b21 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,7 @@ authors = [ maintainers = [ {name = "POSYDON Collaboration", email = "posydon.team@gmail.com"}, ] -license = "BSD 3-Clause" +license = {text = "BSD 3-Clause"} dynamic = ["version"] requires-python = ">=3.11, <3.12" readme = "README.md" From 14e3ae7c2cc80fec077902ddd421cb1cb3cc36a9 Mon Sep 17 00:00:00 2001 From: Max Briel Date: Thu, 7 May 2026 16:22:00 +0200 Subject: [PATCH 370/389] add pre-commit autoupdate --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c8a697f65a..5e48ccfb0f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -35,7 +35,7 @@ repos: - id: requirements-txt-fixer - id: trailing-whitespace - repo: https://github.com/pycqa/isort - rev: 8.0.1 + rev: 9.0.0a3 hooks: - id: isort args: From d1cabfa5a8fef29440c8631238a41114eba39f21 Mon Sep 17 00:00:00 2001 From: Jeff Andrews Date: Thu, 7 May 2026 10:30:08 -0400 Subject: [PATCH 371/389] Update step_SN.py --- posydon/binary_evol/SN/step_SN.py | 1 - 1 file changed, 1 deletion(-) diff --git a/posydon/binary_evol/SN/step_SN.py b/posydon/binary_evol/SN/step_SN.py index b4b11e3fe0..0ccc3d86cc 100644 --- a/posydon/binary_evol/SN/step_SN.py +++ b/posydon/binary_evol/SN/step_SN.py @@ -34,7 +34,6 @@ import copy import json import os -import random import numpy as np import pandas as pd From f9608a94f4858ce6457207303ef079d854da2e36 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Fri, 8 May 2026 19:59:19 -0500 Subject: [PATCH 372/389] improve error text in case adding a column to PSyGrid fails. Add support for LazyHDF5, not just ndarray in add_field --- posydon/grids/psygrid.py | 5 +++-- posydon/utils/gridutils.py | 7 ++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/posydon/grids/psygrid.py b/posydon/grids/psygrid.py index 783b2c38d3..a364435a69 100644 --- a/posydon/grids/psygrid.py +++ b/posydon/grids/psygrid.py @@ -1475,8 +1475,9 @@ def add_column(self, colname, array, where="final_values", overwrite=True): raise ValueError("`array` has {} elements but the grid has {} runs" .format(len(arr), len(self))) - if not isinstance(self.final_values, np.ndarray): - raise TypeError("The final values have to be a ndarray.") + if not isinstance(self.final_values, (np.ndarray, LazyHDF5)): + raise TypeError("The final values have to be a ndarray or LazyHDF5 object." + "Instead, it is {}.".format(type(self.final_values))) if colname in self.final_values.dtype.names: if overwrite: diff --git a/posydon/utils/gridutils.py b/posydon/utils/gridutils.py index 8e77049da6..0d83b55ae8 100644 --- a/posydon/utils/gridutils.py +++ b/posydon/utils/gridutils.py @@ -9,6 +9,7 @@ from posydon.utils.common_functions import inspiral_timescale_from_orbital_period from posydon.utils.limits_thresholds import LG_MTRANSFER_RATE_THRESHOLD from posydon.utils.posydonwarning import Pwarn +from posydon.grids.psygrid import LazyHDF5 __authors__ = [ "Konstantinos Kovlakas ", @@ -141,10 +142,14 @@ def add_field(a, descr): """ if a.dtype.fields is None: - raise ValueError("'a' must be a structured numpy array") + raise ValueError("'a.dtype.fields' must not be None.") b = np.empty(a.shape, dtype=a.dtype.descr + descr) for name in a.dtype.names: b[name] = a[name] + + if isinstance(a, LazyHDF5): + b = LazyHDF5(b) + return b From 40460426b9f62f664a60899cf4c8e283decbb0e9 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 9 May 2026 01:02:48 +0000 Subject: [PATCH 373/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/grids/psygrid.py | 2 +- posydon/utils/gridutils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/posydon/grids/psygrid.py b/posydon/grids/psygrid.py index a364435a69..ef482d44b0 100644 --- a/posydon/grids/psygrid.py +++ b/posydon/grids/psygrid.py @@ -1476,7 +1476,7 @@ def add_column(self, colname, array, where="final_values", overwrite=True): .format(len(arr), len(self))) if not isinstance(self.final_values, (np.ndarray, LazyHDF5)): - raise TypeError("The final values have to be a ndarray or LazyHDF5 object." + raise TypeError("The final values have to be a ndarray or LazyHDF5 object." "Instead, it is {}.".format(type(self.final_values))) if colname in self.final_values.dtype.names: diff --git a/posydon/utils/gridutils.py b/posydon/utils/gridutils.py index 0d83b55ae8..7b33e3a37e 100644 --- a/posydon/utils/gridutils.py +++ b/posydon/utils/gridutils.py @@ -6,10 +6,10 @@ import numpy as np import pandas as pd +from posydon.grids.psygrid import LazyHDF5 from posydon.utils.common_functions import inspiral_timescale_from_orbital_period from posydon.utils.limits_thresholds import LG_MTRANSFER_RATE_THRESHOLD from posydon.utils.posydonwarning import Pwarn -from posydon.grids.psygrid import LazyHDF5 __authors__ = [ "Konstantinos Kovlakas ", From b7683d5bd12993e6d7901c62193c742a8e21895d Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Fri, 8 May 2026 21:09:53 -0500 Subject: [PATCH 374/389] fixing circular import by moving LazyHDF5 to gridutils, from psygrid --- posydon/grids/psygrid.py | 84 +------------------------------------- posydon/utils/gridutils.py | 84 +++++++++++++++++++++++++++++++++++++- 2 files changed, 85 insertions(+), 83 deletions(-) diff --git a/posydon/grids/psygrid.py b/posydon/grids/psygrid.py index a364435a69..61c4130513 100644 --- a/posydon/grids/psygrid.py +++ b/posydon/grids/psygrid.py @@ -176,6 +176,7 @@ "Devina Misra ", "Kyle Akira Rocha ", "Matthias Kruckow ", + "Seth Gossage ", @@ -19,8 +18,91 @@ "Kyle Akira Rocha ", "Jeffrey Andrews ", "Matthias Kruckow ", + "Seth Gossage Date: Sat, 9 May 2026 02:11:01 +0000 Subject: [PATCH 375/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/grids/psygrid.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/grids/psygrid.py b/posydon/grids/psygrid.py index 05ab275d7b..339b849245 100644 --- a/posydon/grids/psygrid.py +++ b/posydon/grids/psygrid.py @@ -219,12 +219,12 @@ ) from posydon.utils.configfile import ConfigFile from posydon.utils.gridutils import ( + LazyHDF5, add_field, fix_He_core, join_lists, read_EEP_data_file, read_MESA_data_file, - LazyHDF5 ) from posydon.utils.ignorereason import IgnoreReason from posydon.utils.limits_thresholds import ( From 1223f7e3085ebc795395403363488db7c948799d Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Fri, 8 May 2026 21:18:35 -0500 Subject: [PATCH 376/389] move LazyHDF5 class into its own file to resolve circular imports --- posydon/grids/lazy_hdf.py | 85 ++++++++++++++++++++++++++++++++++++++ posydon/grids/psygrid.py | 2 +- posydon/utils/gridutils.py | 84 +------------------------------------ 3 files changed, 87 insertions(+), 84 deletions(-) create mode 100644 posydon/grids/lazy_hdf.py diff --git a/posydon/grids/lazy_hdf.py b/posydon/grids/lazy_hdf.py new file mode 100644 index 0000000000..ef18d851fd --- /dev/null +++ b/posydon/grids/lazy_hdf.py @@ -0,0 +1,85 @@ +__authors__ = [ + "Seth Gossage " +] + +class LazyHDF5: + """ + Lazy wrapper around an HDF5 dataset with optional dtype conversion. + + This class provides a lightweight interface for accessing data from an + HDF5 dataset without immediately loading the entire dataset into memory. + Data are retrieved lazily when indexed. Optionally, a set of dtype + conversions can be applied when data are accessed. + + If dtype mappings are provided, retrieved data are cast to the specified + dtypes either per-field (for structured arrays) or for the selected field + when accessed by name. + + Assignments (via __setitem__) trigger full materialization of the dataset + in memory, after which the internal storage is replaced by the in-memory + array. + + Parameters + ---------- + dataset : h5py.Dataset or array-like + The underlying dataset providing the data. Typically an HDF5 dataset + object supporting NumPy-style indexing. + dtype_set : dict, optional + Mapping of field names to NumPy dtypes used to cast the returned data. + This is typically used for structured arrays where individual fields + require specific dtype conversions. + + Notes + ----- + - Data are only read from the dataset when accessed via ``__getitem__`` or + when converted to a NumPy array. + - Writing via ``__setitem__`` loads the entire dataset into memory before + modifying it. + - The ``dtype`` property reflects the converted dtype if ``dtype_set`` is + provided. + """ + def __init__(self, dataset, dtype_set=None): + self._dataset = dataset + self._dtype_set = dtype_set + if self._dtype_set is not None: + self._dtype_list = list(self._dtype_set.items()) + + def __getitem__(self, idx): + data = self._dataset[idx] + if self._dtype_set is not None: + if isinstance(idx, str): + data = data.astype(self._dtype_set[idx]) + else: + data = data.astype(self._dtype_list) + return data + + def __setitem__(self, idx, value): + # materialize full array in memory + arr = self.__array__() + # write new value + arr[idx] = value + + self._dataset = arr + + + def __array__(self): + data = self._dataset[()] + if self._dtype_set is not None: + data = data.astype(self._dtype_list) + return data + + @property + def dtype(self): + if self._dtype_set is not None: + return np.dtype(self._dtype_list) + return self._dataset.dtype + + @property + def shape(self): # pragma: no cover + return self._dataset.shape + + def __len__(self): # pragma: no cover + return len(self._dataset) + + def to_df(self): # pragma: no cover + return pd.DataFrame(self.__array__()) \ No newline at end of file diff --git a/posydon/grids/psygrid.py b/posydon/grids/psygrid.py index 05ab275d7b..0236412f20 100644 --- a/posydon/grids/psygrid.py +++ b/posydon/grids/psygrid.py @@ -224,8 +224,8 @@ join_lists, read_EEP_data_file, read_MESA_data_file, - LazyHDF5 ) +from posydon.grids.lazy_hdf import LazyHDF5 from posydon.utils.ignorereason import IgnoreReason from posydon.utils.limits_thresholds import ( THRESHOLD_CENTRAL_ABUNDANCE, diff --git a/posydon/utils/gridutils.py b/posydon/utils/gridutils.py index ea86c2350f..b289e01d49 100644 --- a/posydon/utils/gridutils.py +++ b/posydon/utils/gridutils.py @@ -6,7 +6,7 @@ import numpy as np import pandas as pd -from posydon.grids.psygrid import LazyHDF5 +from posydon.grids.lazy_hdf import LazyHDF5 from posydon.utils.common_functions import inspiral_timescale_from_orbital_period from posydon.utils.limits_thresholds import LG_MTRANSFER_RATE_THRESHOLD from posydon.utils.posydonwarning import Pwarn @@ -22,88 +22,6 @@ "Seth Gossage Date: Sat, 9 May 2026 02:18:57 +0000 Subject: [PATCH 377/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/grids/lazy_hdf.py | 2 +- posydon/grids/psygrid.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/posydon/grids/lazy_hdf.py b/posydon/grids/lazy_hdf.py index ef18d851fd..af6d699a7a 100644 --- a/posydon/grids/lazy_hdf.py +++ b/posydon/grids/lazy_hdf.py @@ -82,4 +82,4 @@ def __len__(self): # pragma: no cover return len(self._dataset) def to_df(self): # pragma: no cover - return pd.DataFrame(self.__array__()) \ No newline at end of file + return pd.DataFrame(self.__array__()) diff --git a/posydon/grids/psygrid.py b/posydon/grids/psygrid.py index 82dc6cf103..94574185ed 100644 --- a/posydon/grids/psygrid.py +++ b/posydon/grids/psygrid.py @@ -197,6 +197,7 @@ initial_values_from_dirname, read_initial_values, ) +from posydon.grids.lazy_hdf import LazyHDF5 from posydon.grids.scrubbing import ( keep_after_RLO, keep_till_central_abundance_He_C, @@ -226,7 +227,6 @@ read_EEP_data_file, read_MESA_data_file, ) -from posydon.grids.lazy_hdf import LazyHDF5 from posydon.utils.ignorereason import IgnoreReason from posydon.utils.limits_thresholds import ( THRESHOLD_CENTRAL_ABUNDANCE, From b6164479a6090f271c5dcc1063f0056cd45850a7 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Fri, 8 May 2026 22:36:55 -0500 Subject: [PATCH 378/389] fix imports --- posydon/grids/lazy_hdf.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/posydon/grids/lazy_hdf.py b/posydon/grids/lazy_hdf.py index ef18d851fd..c973a381ba 100644 --- a/posydon/grids/lazy_hdf.py +++ b/posydon/grids/lazy_hdf.py @@ -2,6 +2,9 @@ "Seth Gossage " ] +import numpy as np +import pandas as pd + class LazyHDF5: """ Lazy wrapper around an HDF5 dataset with optional dtype conversion. From 466b45a5a9df22a95fe622e6805fd9018fb88bc2 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 9 May 2026 03:37:17 +0000 Subject: [PATCH 379/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/grids/lazy_hdf.py | 1 + 1 file changed, 1 insertion(+) diff --git a/posydon/grids/lazy_hdf.py b/posydon/grids/lazy_hdf.py index ad756fcbed..4ce99ba3b7 100644 --- a/posydon/grids/lazy_hdf.py +++ b/posydon/grids/lazy_hdf.py @@ -5,6 +5,7 @@ import numpy as np import pandas as pd + class LazyHDF5: """ Lazy wrapper around an HDF5 dataset with optional dtype conversion. From 7f9f7d27cf8c8ece3b67800c2eb3d38a73662fff Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Fri, 8 May 2026 23:29:59 -0500 Subject: [PATCH 380/389] fixing compatibility in update_final_values --- posydon/grids/lazy_hdf.py | 3 +++ posydon/grids/psygrid.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/posydon/grids/lazy_hdf.py b/posydon/grids/lazy_hdf.py index ad756fcbed..6cc92c5eea 100644 --- a/posydon/grids/lazy_hdf.py +++ b/posydon/grids/lazy_hdf.py @@ -70,6 +70,9 @@ def __array__(self): if self._dtype_set is not None: data = data.astype(self._dtype_list) return data + + def astype(self, dtype): + return LazyHDF5(np.asarray(self).astype(dtype)) @property def dtype(self): diff --git a/posydon/grids/psygrid.py b/posydon/grids/psygrid.py index 94574185ed..8ac0b4fea5 100644 --- a/posydon/grids/psygrid.py +++ b/posydon/grids/psygrid.py @@ -1415,7 +1415,7 @@ def add_column(self, colname, array, where="final_values", overwrite=True): def update_final_values(self): """Update the final values in the HDF5 file.""" - if not isinstance(self.final_values, np.ndarray): + if not isinstance(self.final_values, (np.ndarray, LazyHDF5)): raise TypeError("The final values have to be a ndarray.") self._reload_hdf5_file(writeable=True) From bc0cd091a0668726d082d0b119e5f828f75edc82 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 9 May 2026 04:30:27 +0000 Subject: [PATCH 381/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/grids/lazy_hdf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/grids/lazy_hdf.py b/posydon/grids/lazy_hdf.py index ca6891e058..2529dc0f77 100644 --- a/posydon/grids/lazy_hdf.py +++ b/posydon/grids/lazy_hdf.py @@ -71,7 +71,7 @@ def __array__(self): if self._dtype_set is not None: data = data.astype(self._dtype_list) return data - + def astype(self, dtype): return LazyHDF5(np.asarray(self).astype(dtype)) From 9f169f5798f32c0dc801e47ec0cf4f5593cafbca Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Fri, 8 May 2026 23:36:13 -0500 Subject: [PATCH 382/389] fix unit tests --- posydon/unit_tests/grids/test_psygrid.py | 2 +- posydon/unit_tests/utils/test_gridutils.py | 2 +- posydon/utils/gridutils.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/posydon/unit_tests/grids/test_psygrid.py b/posydon/unit_tests/grids/test_psygrid.py index 2361b7d909..d2136c1ba9 100644 --- a/posydon/unit_tests/grids/test_psygrid.py +++ b/posydon/unit_tests/grids/test_psygrid.py @@ -68,7 +68,7 @@ def test_dir(self): 'PROPERTIES_ALLOWED', 'PROPERTIES_TO_BE_CONSISTENT',\ 'PROPERTIES_TO_BE_NONE', 'PROPERTIES_TO_BE_SET',\ 'PSyGrid', 'PSyGridIterator', 'PSyRunView', 'Pwarn',\ - 'LazyHDF5', 'TERMINATION_FLAG_COLUMNS',\ + 'TERMINATION_FLAG_COLUMNS',\ 'TERMINATION_FLAG_COLUMNS_SINGLE',\ 'THRESHOLD_CENTRAL_ABUNDANCE',\ 'THRESHOLD_CENTRAL_ABUNDANCE_LOOSE_C', 'TrackDownsampler',\ diff --git a/posydon/unit_tests/utils/test_gridutils.py b/posydon/unit_tests/utils/test_gridutils.py index 4fe8fbb78d..155685c128 100644 --- a/posydon/unit_tests/utils/test_gridutils.py +++ b/posydon/unit_tests/utils/test_gridutils.py @@ -487,7 +487,7 @@ def test_add_field(self, MESA_data): +"arguments: 'a' and 'descr'"): totest.add_field() # add to empty ndarray - with raises(ValueError, match="'a' must be a structured numpy array"): + with raises(ValueError, match="'a.dtype.fields' must not be empty or None."): totest.add_field(np.array([]), [('new', ' Date: Fri, 8 May 2026 23:40:58 -0500 Subject: [PATCH 383/389] fixing unit tests --- posydon/unit_tests/grids/test_psygrid.py | 2 +- posydon/unit_tests/utils/test_gridutils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/posydon/unit_tests/grids/test_psygrid.py b/posydon/unit_tests/grids/test_psygrid.py index d2136c1ba9..2361b7d909 100644 --- a/posydon/unit_tests/grids/test_psygrid.py +++ b/posydon/unit_tests/grids/test_psygrid.py @@ -68,7 +68,7 @@ def test_dir(self): 'PROPERTIES_ALLOWED', 'PROPERTIES_TO_BE_CONSISTENT',\ 'PROPERTIES_TO_BE_NONE', 'PROPERTIES_TO_BE_SET',\ 'PSyGrid', 'PSyGridIterator', 'PSyRunView', 'Pwarn',\ - 'TERMINATION_FLAG_COLUMNS',\ + 'LazyHDF5', 'TERMINATION_FLAG_COLUMNS',\ 'TERMINATION_FLAG_COLUMNS_SINGLE',\ 'THRESHOLD_CENTRAL_ABUNDANCE',\ 'THRESHOLD_CENTRAL_ABUNDANCE_LOOSE_C', 'TrackDownsampler',\ diff --git a/posydon/unit_tests/utils/test_gridutils.py b/posydon/unit_tests/utils/test_gridutils.py index 155685c128..0b400bb645 100644 --- a/posydon/unit_tests/utils/test_gridutils.py +++ b/posydon/unit_tests/utils/test_gridutils.py @@ -35,7 +35,7 @@ def test_dir(self): '__authors__', '__builtins__',\ '__cached__', '__doc__', '__file__', '__loader__',\ '__name__', '__package__', '__spec__', 'add_field',\ - 'clean_inlist_file',\ + 'clean_inlist_file', 'LazyHDF5',\ 'convert_output_to_table', 'find_index_nearest_neighbour',\ 'find_nearest', 'fix_He_core', 'get_cell_edges',\ 'get_final_proposed_points', 'get_new_grid_name', 'gzip',\ From 70880f904a3ec9af42d554ab4495eb5b7b63d12f Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Fri, 8 May 2026 23:48:33 -0500 Subject: [PATCH 384/389] fixing unit tests --- posydon/unit_tests/utils/test_gridutils.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/posydon/unit_tests/utils/test_gridutils.py b/posydon/unit_tests/utils/test_gridutils.py index 0b400bb645..9e29c52e86 100644 --- a/posydon/unit_tests/utils/test_gridutils.py +++ b/posydon/unit_tests/utils/test_gridutils.py @@ -6,6 +6,7 @@ ] # import the module which will be tested +from posydon.grids.lazy_hdf import LazyHDF5 import posydon.utils.gridutils as totest # aliases @@ -109,9 +110,9 @@ def no_path(self, tmp_path): def MESA_data(self): # mock data: 3 columns and 2 rows; it contains different # types(int, float) and different signs(positive, negative) - return np.array([(1, 2, 3.3), (1, -2, -3.3)],\ + return LazyHDF5(np.array([(1, 2, 3.3), (1, -2, -3.3)],\ dtype=[('COL1', ' Date: Sat, 9 May 2026 04:48:55 +0000 Subject: [PATCH 385/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/unit_tests/utils/test_gridutils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/posydon/unit_tests/utils/test_gridutils.py b/posydon/unit_tests/utils/test_gridutils.py index 9e29c52e86..a2fc231fd2 100644 --- a/posydon/unit_tests/utils/test_gridutils.py +++ b/posydon/unit_tests/utils/test_gridutils.py @@ -5,9 +5,10 @@ "Matthias Kruckow " ] +import posydon.utils.gridutils as totest + # import the module which will be tested from posydon.grids.lazy_hdf import LazyHDF5 -import posydon.utils.gridutils as totest # aliases np = totest.np From c2299400db7e248ebbfb960da97b3157058fae30 Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Fri, 8 May 2026 23:53:13 -0500 Subject: [PATCH 386/389] removing coverage from astype for LazyHDF5 --- posydon/grids/lazy_hdf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/grids/lazy_hdf.py b/posydon/grids/lazy_hdf.py index 2529dc0f77..28600b29b1 100644 --- a/posydon/grids/lazy_hdf.py +++ b/posydon/grids/lazy_hdf.py @@ -72,7 +72,7 @@ def __array__(self): data = data.astype(self._dtype_list) return data - def astype(self, dtype): + def astype(self, dtype): # pragma: no cover return LazyHDF5(np.asarray(self).astype(dtype)) @property From 9e6dadbd19661a07bde0f2ec416b76fb3b97754a Mon Sep 17 00:00:00 2001 From: Seth Gossage Date: Mon, 11 May 2026 13:08:58 -0700 Subject: [PATCH 387/389] update error message in update_final_values regarding ndarray requirement --- posydon/grids/psygrid.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/posydon/grids/psygrid.py b/posydon/grids/psygrid.py index 8ac0b4fea5..489f7400f8 100644 --- a/posydon/grids/psygrid.py +++ b/posydon/grids/psygrid.py @@ -1416,7 +1416,8 @@ def add_column(self, colname, array, where="final_values", overwrite=True): def update_final_values(self): """Update the final values in the HDF5 file.""" if not isinstance(self.final_values, (np.ndarray, LazyHDF5)): - raise TypeError("The final values have to be a ndarray.") + raise TypeError("The final values have to be a ndarray or LazyHDF5 object." + "Instead, it is {}.".format(type(self.final_values))) self._reload_hdf5_file(writeable=True) new_dtype = [] From 951b6321839db1a1144b7a8c804a6455d9976424 Mon Sep 17 00:00:00 2001 From: Max <14039563+maxbriel@users.noreply.github.com> Date: Tue, 19 May 2026 12:49:08 +0200 Subject: [PATCH 388/389] Set compression arguments in grid initialization Add compression arguments setup in the grid initialization. Otherwise they're never loaded --- posydon/grids/psygrid.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/posydon/grids/psygrid.py b/posydon/grids/psygrid.py index 489f7400f8..4fa590f6d2 100644 --- a/posydon/grids/psygrid.py +++ b/posydon/grids/psygrid.py @@ -1543,6 +1543,9 @@ def load(self, filepath=None, lazy=True): else: raise KeyError("Some runs are missing from the HDF5 grid.") + # set the compression arguments + self._make_compression_args() + self._say("\tDone.") def close(self): From 47b6ead49bd4ac61fb1d78c1e4ec878d9e2a93b7 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 19 May 2026 10:49:26 +0000 Subject: [PATCH 389/389] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- posydon/grids/psygrid.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posydon/grids/psygrid.py b/posydon/grids/psygrid.py index 4fa590f6d2..5c725004cf 100644 --- a/posydon/grids/psygrid.py +++ b/posydon/grids/psygrid.py @@ -1545,7 +1545,7 @@ def load(self, filepath=None, lazy=True): # set the compression arguments self._make_compression_args() - + self._say("\tDone.") def close(self):