Skip to content
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

If microphysics burn fails, retry hydro #615

Merged
merged 14 commits into from
Apr 21, 2024
Merged

If microphysics burn fails, retry hydro #615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3b1b93f
Print timestep info in scientific notation
psharda Apr 19, 2024
3b1d851
Merge branch 'quokka-astro:development' into dtsci
psharda Apr 20, 2024
09a713d
If burn fails, retry with reduced timestep
Apr 20, 2024
92bc053
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 20, 2024
0a78ca9
add braces
Apr 20, 2024
11e906b
reset file
Apr 20, 2024
527f15e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 20, 2024
7888ac4
return burn_success as a boolean
Apr 20, 2024
72aaa8f
retry hydro if chemistry burn failed
Apr 20, 2024
41bbe80
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 20, 2024
7d0c3f5
silence clang-tidy
Apr 20, 2024
0eae594
correct spelling
Apr 20, 2024
45e0918
exit already if first burn failed
Apr 21, 2024
8f83804
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 21, 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
8 changes: 6 additions & 2 deletions src/Chemistry.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace quokka::chemistry

AMREX_GPU_DEVICE void chemburner(burn_t &chemstate, Real dt);

template <typename problem_t> void computeChemistry(amrex::MultiFab &mf, const Real dt, const Real max_density_allowed, const Real min_density_allowed)
template <typename problem_t> auto computeChemistry(amrex::MultiFab &mf, const Real dt, const Real max_density_allowed, const Real min_density_allowed) -> bool
{

// Start off by assuming a successful burn.
Expand Down Expand Up @@ -164,8 +164,12 @@ template <typename problem_t> void computeChemistry(amrex::MultiFab &mf, const R
amrex::ParallelDescriptor::ReduceIntMin(burn_success);

if (!burn_success) {
amrex::Abort("Burn failed in VODE. Aborting.");
// amrex::Abort("Burn failed in VODE. Aborting.");
amrex::Print() << "\t>> WARNING: Unsuccessful burn. Retrying hydro step."
<< "\n";
}

return burn_success;
}

} // namespace quokka::chemistry
Expand Down
25 changes: 18 additions & 7 deletions src/RadhydroSimulation.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ template <typename problem_t> class RadhydroSimulation : public AMRSimulation<pr
amrex::Real time, amrex::Real dt_lev) -> bool;

void addStrangSplitSources(amrex::MultiFab &state, int lev, amrex::Real time, amrex::Real dt_lev);
void addStrangSplitSourcesWithBuiltin(amrex::MultiFab &state, int lev, amrex::Real time, amrex::Real dt_lev);
auto addStrangSplitSourcesWithBuiltin(amrex::MultiFab &state, int lev, amrex::Real time, amrex::Real dt_lev) -> bool;

auto isCflViolated(int lev, amrex::Real time, amrex::Real dt_actual) -> bool;

Expand Down Expand Up @@ -507,8 +507,12 @@ template <typename problem_t> void RadhydroSimulation<problem_t>::addStrangSplit
}

template <typename problem_t>
void RadhydroSimulation<problem_t>::addStrangSplitSourcesWithBuiltin(amrex::MultiFab &state, int lev, amrex::Real time, amrex::Real dt)
auto RadhydroSimulation<problem_t>::addStrangSplitSourcesWithBuiltin(amrex::MultiFab &state, int lev, amrex::Real time, amrex::Real dt) -> bool
{

// start by assuming chemistry burn is successful.
bool burn_success = true; // NOLINT

if (enableCooling_ == 1) {
// compute cooling
if (coolingTableType_ == "grackle") {
Expand All @@ -523,12 +527,14 @@ void RadhydroSimulation<problem_t>::addStrangSplitSourcesWithBuiltin(amrex::Mult
#ifdef PRIMORDIAL_CHEM
if (enableChemistry_ == 1) {
// compute chemistry
quokka::chemistry::computeChemistry<problem_t>(state, dt, max_density_allowed, min_density_allowed);
burn_success = quokka::chemistry::computeChemistry<problem_t>(state, dt, max_density_allowed, min_density_allowed);
}
#endif

// compute user-specified sources
addStrangSplitSources(state, lev, time, dt);

return burn_success;
}

template <typename problem_t>
Expand Down Expand Up @@ -1028,7 +1034,12 @@ auto RadhydroSimulation<problem_t>::advanceHydroAtLevel(amrex::MultiFab &state_o
auto dx = geom[lev].CellSizeArray();

// do Strang split source terms (first half-step)
addStrangSplitSourcesWithBuiltin(state_old_cc_tmp, lev, time, 0.5 * dt_lev);
auto burn_success_first = addStrangSplitSourcesWithBuiltin(state_old_cc_tmp, lev, time, 0.5 * dt_lev);

// check if burn failed in chemistry. If it did, return
if (!burn_success_first) {
return burn_success_first;
}

// create temporary multifab for intermediate state
amrex::MultiFab state_inter_cc_(grids[lev], dmap[lev], Physics_Indices<problem_t>::nvarTotal_cc, nghost_cc_);
Expand Down Expand Up @@ -1290,10 +1301,10 @@ auto RadhydroSimulation<problem_t>::advanceHydroAtLevel(amrex::MultiFab &state_o
#endif

// do Strang split source terms (second half-step)
addStrangSplitSourcesWithBuiltin(state_new_cc_[lev], lev, time + dt_lev, 0.5 * dt_lev);
auto burn_success_second = addStrangSplitSourcesWithBuiltin(state_new_cc_[lev], lev, time + dt_lev, 0.5 * dt_lev);

// check if we have violated the CFL timestep
return !isCflViolated(lev, time, dt_lev);
// check if we have violated the CFL timestep or burn failed in chemistry
return (!isCflViolated(lev, time, dt_lev) && burn_success_second);
}

template <typename problem_t>
Expand Down