From 3700590cd0dfb4c8e85c0814f97f69d38534c303 Mon Sep 17 00:00:00 2001
From: Michael Zingale <michael.zingale@stonybrook.edu>
Date: Thu, 4 Jan 2024 15:03:39 -0500
Subject: [PATCH] constexpr some helm EOS table parameters (#1440)

---
 EOS/helmholtz/actual_eos.H        |  8 --------
 EOS/helmholtz/actual_eos_data.H   | 23 +++++++++++------------
 EOS/helmholtz/actual_eos_data.cpp | 13 -------------
 3 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/EOS/helmholtz/actual_eos.H b/EOS/helmholtz/actual_eos.H
index a4b40bd91f..b6e83e1fc6 100644
--- 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
index 12d4b40682..25c706df61 100644
--- 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
index 75065db97c..26f960be41 100644
--- 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;