Skip to content

Fix for issue 1310 - run terminates prematurely if error in grid file #1313

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
ilyamandel merged 2 commits into from
Dec 16, 2024
Merged

Fix for issue 1310 - run terminates prematurely if error in grid file #1313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81d2c2b
Fix for issue #1310
jeffriley Dec 15, 2024
20aa889
Merge pull request #1312 from jeffriley/issue-1310
jeffriley Dec 15, 2024
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
13 changes: 9 additions & 4 deletions src/BaseBinaryStar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,14 @@ BaseBinaryStar::BaseBinaryStar(const unsigned long int p_Seed, const long int p_

if (!done) error = ERROR::INVALID_INITIAL_ATTRIBUTES; // too many iterations - bad initial conditions

if (error != ERROR::NONE) THROW_ERROR(error); // throw error if necessary

SetRemainingValues(); // complete the construction of the binary
if (error != ERROR::NONE) { // ok?
m_EvolutionStatus = EVOLUTION_STATUS::BINARY_ERROR; // set evolutionary status
(void)PrintBinarySystemParameters(); // no - print (log) binary system parameters
THROW_ERROR(error); // throw error - can't return it...
}
else { // yes - ok
SetRemainingValues(); // complete the construction of the binary
}
}


Expand Down Expand Up @@ -1644,7 +1649,7 @@ void BaseBinaryStar::ResolveCommonEnvelopeEvent() {
}
}

if (utils::Compare(m_SemiMajorAxis, 0.0) <= 0 || utils::Compare(m_Star1->CalculateRemnantRadius() + m_Star2->CalculateRemnantRadius(), m_SemiMajorAxis * AU_TO_RSOL) > 0) { // catch merger in CE here, do not update stars
if (utils::Compare(m_SemiMajorAxis, 0.0) <= 0 || utils::Compare(m_Star1->CalculateRemnantRadius() + m_Star2->CalculateRemnantRadius(), m_SemiMajorAxis * AU_TO_RSOL) > 0) { // catch merger in CE here, do not update stars
m_MassTransferTrackerHistory = MT_TRACKING::MERGER;
m_Flags.stellarMerger = true;
}
Expand Down
5 changes: 4 additions & 1 deletion src/changelog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1419,6 +1419,9 @@
// 03.10.02 IM - Dec 13, 2024 - Defect repair:
// - if the Hurley supernova criteria are met yet ECSN criteria based on mass transfer history are not met, a normal CCSN ensues as opposed to an ONeWD
// - exactly preserve the product of semi-major axis * total mass on wind mass loss
const std::string VERSION_STRING = "03.10.02";
// 03.10.03 JR - Dec 16, 2024 - Defect repair:
// - fix for issue #1310 - run terminates prematurely if error in grid file

const std::string VERSION_STRING = "03.10.03";

# endif // __changelog_h__
Loading
Loading