sync up react_state's return type (#2570)

react_state says it returns bool, but we always return an int shouldn't matter, but this makes it consistent
AMReX-Astro · Sep 24, 2023 · 28e646a · 28e646a
1 parent 69d0d8c
commit 28e646a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 19 deletions.
diff --git a/Source/reactions/Castro_react.H b/Source/reactions/Castro_react.H
@@ -16,19 +16,19 @@
 /// @param time         current time
 /// @param dt           reaction timestep
 ///
-    bool react_state(amrex::MultiFab& state,
-                     amrex::MultiFab& reactions,
-                     amrex::Real time,
-                     amrex::Real dt,
-                     const int strang_half);
+    int react_state(amrex::MultiFab& state,
+                    amrex::MultiFab& reactions,
+                    amrex::Real time,
+                    amrex::Real dt,
+                    const int strang_half);
 
 ///
 /// Simplified SDC version of react_state. Reacts the current state through a single timestep.
 ///
 /// @param time     current time
 /// @param dt       timestep
 ///
-    bool react_state(amrex::Real time, amrex::Real dt);
+    int react_state(amrex::Real time, amrex::Real dt);
 
 ///
 /// Are there any zones in ``State`` that can burn?

diff --git a/Source/reactions/Castro_react.cpp b/Source/reactions/Castro_react.cpp
@@ -20,7 +20,7 @@ Castro::do_old_reactions (Real time, Real dt)
     advance_status status {};
 
 #ifndef SIMPLIFIED_SDC
-    bool burn_success = true;
+    int burn_success{1};
 
     MultiFab& R_old = get_old_data(Reactions_Type);
     MultiFab& R_new = get_new_data(Reactions_Type);
@@ -29,7 +29,7 @@ Castro::do_old_reactions (Real time, Real dt)
         // The result of the reactions is added directly to Sborder.
         burn_success = react_state(Sborder, R_old, time, 0.5 * dt, 0);
 
-        if (!burn_success) {
+        if (burn_success != 1) {
             status.success = false;
             status.reason = "burn unsuccessful";
 
@@ -57,7 +57,7 @@ Castro::do_new_reactions (Real time, Real dt)
 
     advance_status status {};
 
-    bool burn_success = true;
+    int burn_success{1};
 
     MultiFab& R_new = get_new_data(Reactions_Type);
     MultiFab& S_new = get_new_data(State_Type);
@@ -73,7 +73,7 @@ Castro::do_new_reactions (Real time, Real dt)
 
             burn_success = react_state(time, dt);
 
-            if (!burn_success) {
+            if (burn_success != 1) {
                 status.success = false;
                 status.reason = "burn unsuccessful";
 
@@ -107,7 +107,7 @@ Castro::do_new_reactions (Real time, Real dt)
 
         burn_success = react_state(S_new, R_new, time - 0.5 * dt, 0.5 * dt, 1);
 
-        if (!burn_success) {
+        if (burn_success != 1) {
             status.success = false;
             status.reason = "burn unsuccessful";
 
@@ -129,7 +129,7 @@ Castro::do_new_reactions (Real time, Real dt)
 
 // Strang version
 
-bool
+int
 Castro::react_state(MultiFab& s, MultiFab& r, Real time, Real dt, const int strang_half)
 {
 
@@ -452,7 +452,7 @@ Castro::react_state(MultiFab& s, MultiFab& r, Real time, Real dt, const int stra
 #ifdef SIMPLIFIED_SDC
 // Simplified SDC version
 
-bool
+int
 Castro::react_state(Real time, Real dt)
 {
 
@@ -804,7 +804,9 @@ Castro::react_state(Real time, Real dt)
     ReduceTuple hv = reduce_data.value();
     Real burn_failed = amrex::get<0>(hv);
 
-    if (burn_failed != 0.0) burn_success = 0;
+    if (burn_failed != 0.0) {
+        burn_success = 0;
+    }
 
     ParallelDescriptor::ReduceIntMin(burn_success);
 
@@ -843,11 +845,7 @@ Castro::react_state(Real time, Real dt)
 
     }
 
-    if (burn_success) {
-        return true;
-    } else {
-        return false;
-    }
+    return burn_success;
 
 }
 #endif