Merge branch 'development' into constexprallthethings

AMReX-Astro · Jan 4, 2024 · 3db18f5 · 3db18f5
2 parents 3355fda + 3700590
commit 3db18f5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 33 deletions.
diff --git a/EOS/helmholtz/actual_eos.H b/EOS/helmholtz/actual_eos.H
@@ -1315,14 +1315,6 @@ void actual_eos_init ()
     dtol = eos_dtol;
 
     //    read the helmholtz free energy table
-    tlo   = 3.0e0_rt;
-    thi   = 13.0e0_rt;
-    tstp  = (thi - tlo) / ((Real) (jmax-1));
-    tstpi = 1.0e0_rt / tstp;
-    dlo   = -12.0e0_rt;
-    dhi   = 15.0e0_rt;
-    dstp  = (dhi - dlo) / ((Real) (imax-1));
-    dstpi = 1.0e0_rt / dstp;
 
     for (int j = 0; j < jmax; ++j) {
         Real tsav = tlo + j * tstp;

diff --git a/EOS/helmholtz/actual_eos_data.H b/EOS/helmholtz/actual_eos_data.H
@@ -6,6 +6,9 @@
 
 namespace helmholtz
 {
+
+    using namespace amrex::literals;
+
     extern AMREX_GPU_MANAGED int do_coulomb;
     extern AMREX_GPU_MANAGED int input_is_constant;
 
@@ -14,22 +17,18 @@ namespace helmholtz
     constexpr int imax = 541;
     constexpr int jmax = 201;
 
-    extern AMREX_GPU_MANAGED int itmax;
-    extern AMREX_GPU_MANAGED int jtmax;
+    constexpr amrex::Real tlo   = 3.0e0_rt;
+    constexpr amrex::Real thi   = 13.0e0_rt;
+    constexpr amrex::Real tstp  = (thi - tlo) / (static_cast<amrex::Real>(jmax-1));
+    constexpr amrex::Real tstpi = 1.0e0_rt / tstp;
+    constexpr amrex::Real dlo   = -12.0e0_rt;
+    constexpr amrex::Real dhi   = 15.0e0_rt;
+    constexpr amrex::Real dstp  = (dhi - dlo) / (static_cast<amrex::Real>(imax-1));
+    constexpr amrex::Real dstpi = 1.0e0_rt / dstp;
 
     extern AMREX_GPU_MANAGED amrex::Real d[imax];
     extern AMREX_GPU_MANAGED amrex::Real t[jmax];
 
-    extern AMREX_GPU_MANAGED amrex::Real tlo;
-    extern AMREX_GPU_MANAGED amrex::Real thi;
-    extern AMREX_GPU_MANAGED amrex::Real tstp;
-    extern AMREX_GPU_MANAGED amrex::Real tstpi;
-
-    extern AMREX_GPU_MANAGED amrex::Real dlo;
-    extern AMREX_GPU_MANAGED amrex::Real dhi;
-    extern AMREX_GPU_MANAGED amrex::Real dstp;
-    extern AMREX_GPU_MANAGED amrex::Real dstpi;
-
     extern AMREX_GPU_MANAGED amrex::Real ttol;
     extern AMREX_GPU_MANAGED amrex::Real dtol;
 

diff --git a/EOS/helmholtz/actual_eos_data.cpp b/EOS/helmholtz/actual_eos_data.cpp
@@ -3,22 +3,9 @@
 AMREX_GPU_MANAGED int helmholtz::do_coulomb;
 AMREX_GPU_MANAGED int helmholtz::input_is_constant;
 
-AMREX_GPU_MANAGED int helmholtz::itmax;
-AMREX_GPU_MANAGED int helmholtz::jtmax;
-
 AMREX_GPU_MANAGED amrex::Real helmholtz::d[imax];
 AMREX_GPU_MANAGED amrex::Real helmholtz::t[jmax];
 
-AMREX_GPU_MANAGED amrex::Real helmholtz::tlo;
-AMREX_GPU_MANAGED amrex::Real helmholtz::thi;
-AMREX_GPU_MANAGED amrex::Real helmholtz::tstp;
-AMREX_GPU_MANAGED amrex::Real helmholtz::tstpi;
-
-AMREX_GPU_MANAGED amrex::Real helmholtz::dlo;
-AMREX_GPU_MANAGED amrex::Real helmholtz::dhi;
-AMREX_GPU_MANAGED amrex::Real helmholtz::dstp;
-AMREX_GPU_MANAGED amrex::Real helmholtz::dstpi;
-
 AMREX_GPU_MANAGED amrex::Real helmholtz::ttol;
 AMREX_GPU_MANAGED amrex::Real helmholtz::dtol;