Skip to content

some cleaning of check_for_negative_density #3191

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
zingale merged 2 commits into from
Jan 11, 2026
Merged

some cleaning of check_for_negative_density #3191

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68cddda
some cleaning of check_for_negative_density
zingale Jan 7, 2026
71d7811
Merge branch 'development' into clean-up-check_for_negative_density
zingale Jan 11, 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
20 changes: 10 additions & 10 deletions Source/driver/Castro.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3325,17 +3325,17 @@ Castro::check_for_negative_density ()
for (MFIter mfi(S_new, TilingIfNotGPU()); mfi.isValid(); ++mfi) {
const Box& bx = mfi.tilebox();

auto S_old_arr = S_old.array(mfi);
auto S_new_arr = S_new.array(mfi);
const auto S_old_arr = S_old.array(mfi);
const auto S_new_arr = S_new.array(mfi);

reduce_op.eval(bx, reduce_data,
[=] AMREX_GPU_DEVICE (int i, int j, int k) -> ReduceTuple
[=] AMREX_GPU_DEVICE (int i, int j, int k) noexcept -> ReduceTuple
{
int rho_check_failed = 0;
int X_check_failed = 0;

Real rho = S_new_arr(i,j,k,URHO);
Real rhoInv = 1.0_rt / rho;
const Real rho = S_new_arr(i,j,k,URHO);
const Real rhoInv = 1.0_rt / rho;

// Optionally, the user can ignore this if the starting
// density is lower than a certain threshold. This is useful
Expand All @@ -3349,7 +3349,7 @@ Castro::check_for_negative_density ()
rho_check_failed = 1;
}

if (S_new_arr(i,j,k,URHO) >= castro::abundance_failure_rho_cutoff) {
if (rho >= castro::abundance_failure_rho_cutoff) {

for (int n = 0; n < NumSpec; ++n) {
Real X = S_new_arr(i,j,k,UFS+n) * rhoInv;
Expand Down Expand Up @@ -3383,17 +3383,17 @@ Castro::check_for_negative_density ()
int rho_check_failed = amrex::get<0>(hv);
int X_check_failed = amrex::get<1>(hv);

ParallelDescriptor::ReduceIntMax(rho_check_failed);
ParallelDescriptor::ReduceIntMax(X_check_failed);
int fails[] = {rho_check_failed, X_check_failed};
ParallelDescriptor::ReduceIntMax(fails, 2);

advance_status status {};

if (rho_check_failed == 1) {
if (fails[0] == 1) {
status.success = false;
status.reason = "invalid density";
}

if (X_check_failed == 1) {
if (fails[1] == 1) {
status.success = false;
status.reason = "invalid X";
}
Expand Down