Fix EOS call and make device functions not host.

erf-model · Oct 28, 2024 · b04479a · b04479a
1 parent c513a1a
commit b04479a
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/Source/SourceTerms/ERF_buoyancy_utils.H b/Source/SourceTerms/ERF_buoyancy_utils.H
@@ -4,7 +4,7 @@
 #include <ERF_EOS.H>
 #include <ERF_Constants.H>
 
-AMREX_GPU_HOST
+AMREX_GPU_DEVICE
 AMREX_FORCE_INLINE
 amrex::Real
 buoyancy_dry_anelastic (int& i,
@@ -31,7 +31,7 @@ buoyancy_dry_anelastic (int& i,
 }
 
 
-AMREX_GPU_HOST
+AMREX_GPU_DEVICE
 AMREX_FORCE_INLINE
 amrex::Real
 buoyancy_moist_anelastic (int& i,
@@ -81,19 +81,19 @@ buoyancy_dry_default (int& i,
 {
     amrex::Real rt0_hi = getRhoThetagivenP(p0_arr(i,j,k));
     amrex::Real  t0_hi = getTgivenPandTh(p0_arr(i,j,k), rt0_hi/r0_arr(i,j,k), rd_over_cp);
-    amrex::Real   t_hi = getTgivenPandTh(cell_data(i,j,k  ,Rho_comp), cell_data(i,j,k  ,RhoTheta_comp));
+    amrex::Real   t_hi = getTgivenRandRTh(cell_data(i,j,k  ,Rho_comp), cell_data(i,j,k  ,RhoTheta_comp));
     amrex::Real qplus  = (t_hi-t0_hi)/t0_hi;
 
     amrex::Real rt0_lo = getRhoThetagivenP(p0_arr(i,j,k-1));
     amrex::Real  t0_lo = getTgivenPandTh(p0_arr(i,j,k-1), rt0_lo/r0_arr(i,j,k-1), rd_over_cp);
-    amrex::Real   t_lo = getTgivenPandTh(cell_data(i,j,k-1,Rho_comp), cell_data(i,j,k-1,RhoTheta_comp));
+    amrex::Real   t_lo = getTgivenRandRTh(cell_data(i,j,k-1,Rho_comp), cell_data(i,j,k-1,RhoTheta_comp));
     amrex::Real qminus = (t_lo-t0_lo)/t0_lo;
 
     amrex::Real r0_q_avg = amrex::Real(0.5) * (r0_arr(i,j,k) * qplus + r0_arr(i,j,k-1) * qminus);
     return (-r0_q_avg * grav_gpu);
 }
 
-AMREX_GPU_HOST
+AMREX_GPU_DEVICE
 AMREX_FORCE_INLINE
 amrex::Real
 buoyancy_type1 (int& i,
@@ -114,7 +114,7 @@ buoyancy_type1 (int& i,
 }
 
 
-AMREX_GPU_HOST
+AMREX_GPU_DEVICE
 AMREX_FORCE_INLINE
 amrex::Real
 buoyancy_type2 (int& i,
@@ -166,7 +166,7 @@ buoyancy_type2 (int& i,
 }
 
 
-AMREX_GPU_HOST
+AMREX_GPU_DEVICE
 AMREX_FORCE_INLINE
 amrex::Real
 buoyancy_type3 (int& i,
@@ -210,7 +210,7 @@ buoyancy_type3 (int& i,
 }
 
 
-AMREX_GPU_HOST
+AMREX_GPU_DEVICE
 AMREX_FORCE_INLINE
 amrex::Real
 buoyancy_type4 (int& i,