add enum

AMReX-Astro · Jul 10, 2024 · b2b9592 · b2b9592
1 parent 19b2713
commit b2b9592
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/Source/hydro/riemann.cpp b/Source/hydro/riemann.cpp
@@ -71,7 +71,8 @@ Castro::cmpflx_plus_godunov(const Box& bx,
     {
 
 
-        if (riemann_solver == 0 || riemann_solver == 1) {
+        if (riemann_solver == riemann_constants::TWO_SHOCK_CGF ||
+            riemann_solver == riemann_constants::TWO_SHOCK_CG) {
             // approximate state Riemann solvers
 
             // first find the interface state on the current interface
@@ -120,7 +121,7 @@ Castro::cmpflx_plus_godunov(const Box& bx,
                 }
             }
 
-        } else if (riemann_solver == 2) {
+        } else if (riemann_solver == riemann_constants::HLLC) {
             // HLLC
             HLL::HLLC(i, j, k, idir,
                       qm, qp,

diff --git a/Source/hydro/riemann_constants.H b/Source/hydro/riemann_constants.H
@@ -6,6 +6,14 @@
 using namespace amrex::literals;
 
 namespace riemann_constants {
+
+    enum RiemannSolver : std::uint8_t {
+        TWO_SHOCK_CGF=0,
+        TWO_SHOCK_CG,
+        HLLC,
+        EXACT
+    };
+
     constexpr amrex::Real smlp1 = 1.e-10_rt;
     constexpr amrex::Real small = 1.e-8_rt;
     constexpr amrex::Real smallu = 1.e-12_rt;

diff --git a/Source/hydro/riemann_solvers.H b/Source/hydro/riemann_solvers.H
@@ -318,12 +318,12 @@ riemann_state(const int i, const int j, const int k, const int idir,
 
 
   // Solve Riemann problem
-  if (riemann_solver == 0) {
+  if (riemann_solver == riemann_constants::TWO_SHOCK_CGF) {
       // Colella, Glaz, & Ferguson solver
 
       TwoShock::riemannus(ql, qr, raux, qint);
 
-  } else if (riemann_solver == 1) {
+  } else if (riemann_solver == riemann_constants::TWO_SHOCK_CG) {
       // Colella & Glaz solver
 
 #ifndef RADIATION