Skip to content

Modifications to Maltsev prescription #1423

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
merged 42 commits into from
Aug 19, 2025
Merged

Modifications to Maltsev prescription #1423

Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
8f4b514
replaced muller mandel remnant masses with pseudo-NS masses for non-d…
reinhold-willcox Oct 22, 2024
e412560
simplified kiril model, in compas
reinhold-willcox Oct 22, 2024
73a0833
added 50% fallback
reinhold-willcox Oct 22, 2024
2e947dc
cosmetic changes
reinhold-willcox Oct 30, 2024
dac91a8
Merge branch 'dev' into kiril_modifications
reinhold-willcox Apr 14, 2025
4ed7183
changed extrapolotion of maltsev remnant masses to be nearest neighbo…
reinhold-willcox May 10, 2025
3220e4c
added rlof T and L
reinhold-willcox May 10, 2025
68d9c0e
added pre and post RLOF values for Teff, L in basebinarystar
reinhold-willcox May 10, 2025
cf54311
cleaned up Maltsev function
reinhold-willcox May 21, 2025
b8b621f
fixed fallback setup for Maltsev BH kicks
reinhold-willcox May 25, 2025
a442071
Merge branch 'dev' into kiril_modifications
reinhold-willcox May 27, 2025
eb5f2f4
Merge branch 'dev' into kiril_modifications
reinhold-willcox Jun 7, 2025
3c6a8cd
modified Kiril options
reinhold-willcox Jun 11, 2025
1a4ffb8
cleanup
reinhold-willcox Jun 11, 2025
a2dd430
fixed bug in upper limit of Maltsev variations
reinhold-willcox Jun 14, 2025
4528763
removed print statements
reinhold-willcox Jun 14, 2025
0dc8e1b
added Klencki linear AM loss prescription, variant of MacLeod linear
reinhold-willcox Jun 15, 2025
88829de
fixed bug with klencki gamma
reinhold-willcox Jun 24, 2025
fedfb98
updated to latest dev, modified the definition of Zsol
reinhold-willcox Jul 2, 2025
2d941b6
minor fix for one of the Maltsev values
reinhold-willcox Jul 22, 2025
ffacf3f
updated Kiril prescription with extra flag for self-stripped Case B s…
reinhold-willcox Aug 18, 2025
412a8fd
removed code that wasn't specifically relevant to just the Maltsev mo…
reinhold-willcox Aug 18, 2025
62c58fe
comment cleanup
reinhold-willcox Aug 18, 2025
e0c11b1
typo fix
reinhold-willcox Aug 18, 2025
3e77a91
changelog
reinhold-willcox Aug 18, 2025
99a959d
documentation
reinhold-willcox Aug 18, 2025
71a6464
typo
reinhold-willcox Aug 18, 2025
479de92
fixed teffX and lumX to temperatureX and luminosityX for X in {1,2}
reinhold-willcox Aug 18, 2025
89338e9
forgot to update version in changelog
reinhold-willcox Aug 18, 2025
a89d9b9
new program options for maltsev model
reinhold-willcox Aug 18, 2025
fbebc9c
cleaned up MALTSEV treatment of NS masses, now all are the canonical …
reinhold-willcox Aug 18, 2025
7672fda
yaml
reinhold-willcox Aug 18, 2025
3234036
yaml
reinhold-willcox Aug 18, 2025
218eb55
teff -> temperature, lum -> luminosity
reinhold-willcox Aug 18, 2025
409982c
Update GiantBranch.cpp - formatting
jeffriley Aug 19, 2025
d1c33d6
changelog
reinhold-willcox Aug 19, 2025
02e624d
added constexpr and description of M1, M2, M3 for PR
reinhold-willcox Aug 19, 2025
fbd0992
Merge branch 'kiril_modifications' of github.com:reinhold-willcox/COM…
reinhold-willcox Aug 19, 2025
5202288
what's new
reinhold-willcox Aug 19, 2025
ed178fb
what's new, more detail
reinhold-willcox Aug 19, 2025
e9f4682
typo
reinhold-willcox Aug 19, 2025
a9708a8
typo
reinhold-willcox Aug 19, 2025
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
12 changes: 12 additions & 0 deletions src/BaseBinaryStar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,10 @@ COMPAS_VARIABLE BaseBinaryStar::BinaryPropertyValue(const T_ANY_PROPERTY p_Prope
case BINARY_PROPERTY::RLOF_POST_MT_STAR2_MASS: value = RLOFDetails().propsPostMT->mass2; break;
case BINARY_PROPERTY::RLOF_POST_MT_STAR1_RADIUS: value = RLOFDetails().propsPostMT->radius1; break;
case BINARY_PROPERTY::RLOF_POST_MT_STAR2_RADIUS: value = RLOFDetails().propsPostMT->radius2; break;
case BINARY_PROPERTY::RLOF_POST_MT_STAR1_TEFF: value = RLOFDetails().propsPostMT->teff1; break;
case BINARY_PROPERTY::RLOF_POST_MT_STAR2_TEFF: value = RLOFDetails().propsPostMT->teff2; break;
case BINARY_PROPERTY::RLOF_POST_MT_STAR1_LUM: value = RLOFDetails().propsPostMT->lum1; break;
case BINARY_PROPERTY::RLOF_POST_MT_STAR2_LUM: value = RLOFDetails().propsPostMT->lum2; break;
case BINARY_PROPERTY::RLOF_POST_MT_STAR1_RLOF: value = RLOFDetails().propsPostMT->isRLOF1; break;
case BINARY_PROPERTY::RLOF_POST_MT_STAR2_RLOF: value = RLOFDetails().propsPostMT->isRLOF2; break;
case BINARY_PROPERTY::RLOF_POST_MT_STAR1_STELLAR_TYPE: value = RLOFDetails().propsPostMT->stellarType1; break;
Expand All @@ -586,6 +590,10 @@ COMPAS_VARIABLE BaseBinaryStar::BinaryPropertyValue(const T_ANY_PROPERTY p_Prope
case BINARY_PROPERTY::RLOF_PRE_MT_STAR2_MASS: value = RLOFDetails().propsPreMT->mass2; break;
case BINARY_PROPERTY::RLOF_PRE_MT_STAR1_RADIUS: value = RLOFDetails().propsPreMT->radius1; break;
case BINARY_PROPERTY::RLOF_PRE_MT_STAR2_RADIUS: value = RLOFDetails().propsPreMT->radius2; break;
case BINARY_PROPERTY::RLOF_PRE_MT_STAR1_TEFF: value = RLOFDetails().propsPreMT->teff1; break;
case BINARY_PROPERTY::RLOF_PRE_MT_STAR2_TEFF: value = RLOFDetails().propsPreMT->teff2; break;
case BINARY_PROPERTY::RLOF_PRE_MT_STAR1_LUM: value = RLOFDetails().propsPreMT->lum1; break;
case BINARY_PROPERTY::RLOF_PRE_MT_STAR2_LUM: value = RLOFDetails().propsPreMT->lum2; break;
case BINARY_PROPERTY::RLOF_PRE_MT_STAR1_RLOF: value = RLOFDetails().propsPreMT->isRLOF1; break;
case BINARY_PROPERTY::RLOF_PRE_MT_STAR2_RLOF: value = RLOFDetails().propsPreMT->isRLOF2; break;
case BINARY_PROPERTY::RLOF_PRE_MT_STAR1_STELLAR_TYPE: value = RLOFDetails().propsPreMT->stellarType1; break;
Expand Down Expand Up @@ -906,6 +914,10 @@ void BaseBinaryStar::StashRLOFProperties(const MT_TIMING p_Which) {
rlofPropertiesToReset->massLossRateFromDonor = m_MassLossRateInRLOF;
rlofPropertiesToReset->accretionEfficiency = m_FractionAccreted;
rlofPropertiesToReset->massTransferTimescale = m_MassTransferTimescale;
rlofPropertiesToReset->teff1 = m_Star1->Temperature();
rlofPropertiesToReset->teff2 = m_Star2->Temperature();
rlofPropertiesToReset->lum1 = m_Star1->Luminosity();
rlofPropertiesToReset->lum2 = m_Star2->Luminosity();
}


Expand Down
2 changes: 2 additions & 0 deletions src/ErrorCatalog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ enum class ERROR: int {
UNKNOWN_KICK_MAGNITUDE_DISTRIBUTION, // unknown kick magnitude distribution
UNKNOWN_LOGFILE, // unknown log file
UNKNOWN_LBV_MASS_LOSS_PRESCRIPTION, // unknown LBV mass loss prescription
UNKNOWN_MALTSEV_MODE, // unknown maltsev mode
UNKNOWN_MT_ACCRETION_EFFICIENCY_PRESCRIPTION, // unknown mass transfer accretion efficiency prescription
UNKNOWN_MT_ANGULAR_MOMENTUM_LOSS_PRESCRIPTION, // unknown mass transfer angular momentum loss prescription
UNKNOWN_MASS_LOSS_PRESCRIPTION, // unknown mass loss prescription
Expand Down Expand Up @@ -342,6 +343,7 @@ const COMPASUnorderedMap<ERROR, std::tuple<ERROR_SCOPE, std::string>> ERROR_CATA
{ ERROR::UNKNOWN_KICK_MAGNITUDE_DISTRIBUTION, { ERROR_SCOPE::ALWAYS, "Unknown kick magnitude distribution" }},
{ ERROR::UNKNOWN_LBV_MASS_LOSS_PRESCRIPTION, { ERROR_SCOPE::ALWAYS, "Unknown LBV mass loss prescription" }},
{ ERROR::UNKNOWN_LOGFILE, { ERROR_SCOPE::ALWAYS, "Unknown log file" }},
{ ERROR::UNKNOWN_MALTSEV_MODE, { ERROR_SCOPE::ALWAYS, "Unknown Maltsev remnant mass mode" }},
{ ERROR::UNKNOWN_MT_CASE, { ERROR_SCOPE::ALWAYS, "Unknown mass transfer case" }},
{ ERROR::UNKNOWN_MT_ACCRETION_EFFICIENCY_PRESCRIPTION, { ERROR_SCOPE::ALWAYS, "Unknown mass transfer accretion efficiency prescription" }},
{ ERROR::UNKNOWN_MT_ANGULAR_MOMENTUM_LOSS_PRESCRIPTION, { ERROR_SCOPE::ALWAYS, "Unknown mass transfer angular momentum loss prescription" }},
Expand Down
Loading