Skip to content

[fix] Corrected/enhanced merger process #785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
astroJeff merged 33 commits into from
Mar 26, 2026
+530 −332
Merged

[fix] Corrected/enhanced merger process #785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
617bd07
started a new branch and some pint statements
ezapartas Jan 15, 2026
b057d47
started process for HMS+HMS: the mass change occurs after the mass we…
ezapartas Jan 15, 2026
253fc72
in postMS+MS merger, some central attributes do not become np.nan, th…
ezapartas Jan 15, 2026
c0c41f3
no working with HMS+postMS mergers, where the merger is the companion…
ezapartas Jan 15, 2026
a8ae476
also not erasing core properties
ezapartas Jan 15, 2026
bba592a
finished postMS+He stars and opposite
ezapartas Jan 15, 2026
ed37883
now finished (issue with which star became massless)
ezapartas Jan 15, 2026
e434db5
finished until the beginning of He+He
ezapartas Jan 15, 2026
5aa5602
finished step_merged
ezapartas Jan 15, 2026
12f97e5
added co_core_mass as a potential option in the matching criteria at …
ezapartas Jan 15, 2026
37b64b6
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 15, 2026
dd7078a
removed old code line
ezapartas Feb 12, 2026
a5c4a85
ZeroDivisionError added
ezapartas Feb 12, 2026
68a57e0
deleted a TODO comment
ezapartas Feb 12, 2026
6921230
typo fix, add additional c_avg to opposite merger postMS+HeMS
maxbriel Mar 1, 2026
6057f8f
move mass_weighted out of other function
maxbriel Mar 2, 2026
0a196d7
simplify setting the parameters
maxbriel Mar 2, 2026
47edaa4
cleanup comments
maxbriel Mar 2, 2026
fdb8344
add explicity mass_weight2 to all calls
maxbriel Mar 13, 2026
7f5db49
move set outside of default call, since it's shared
maxbriel Mar 13, 2026
82f531d
Merge branch 'main' into manos_merger_copiedattributes
maxbriel Mar 13, 2026
3c39ecb
add np.nan instead of None as default output
maxbriel Mar 13, 2026
a6a5b4d
add np.nan
maxbriel Mar 13, 2026
f4433c5
add additional checks for A1, A2, M1, and M2
maxbriel Mar 13, 2026
4bfdd77
Update posydon/binary_evol/DT/step_merged.py
sgossage Mar 20, 2026
c1dfa19
Update posydon/binary_evol/DT/step_merged.py
sgossage Mar 20, 2026
5530ed7
Update posydon/binary_evol/DT/step_merged.py
sgossage Mar 20, 2026
10af496
Update posydon/binary_evol/DT/step_merged.py
sgossage Mar 20, 2026
6f265ce
Update posydon/binary_evol/DT/step_merged.py
sgossage Mar 20, 2026
9b3aa9f
Update posydon/binary_evol/DT/step_merged.py
sgossage Mar 20, 2026
c0976d8
Update posydon/binary_evol/DT/step_merged.py
sgossage Mar 20, 2026
f013d56
close parentheses
sgossage Mar 20, 2026
d019ef4
commenting out binary.event = None
sgossage Mar 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Loading