Update RadSphere

AMReX-Astro · Oct 15, 2023 · 203d8f3 · 203d8f3
1 parent 4a8d157
commit 203d8f3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/Exec/radiation_tests/RadSphere/Problem_Derive.cpp b/Exec/radiation_tests/RadSphere/Problem_Derive.cpp
@@ -2,11 +2,12 @@
 
 #include <Derive.H>
 #include <Castro.H>
+#include <Radiation.H>
 #include <prob_parameters.H>
 #include <extern_parameters.H>
+#include <global.H>
 #include <gravity_params.H>
 #include <problem_util.H>
-#include <RAD_F.H>
 
 using namespace amrex;
 
@@ -23,10 +24,12 @@ void deranalytic(const Box& bx, FArrayBox& derfab, int dcomp, int /*ncomp*/,
   auto const der = derfab.array();
 
   GpuArray<Real, NGROUPS> nugroup = {0.0};
-  ca_get_nugroup(nugroup.begin());
-
   GpuArray<Real, NGROUPS> dnugroup = {0.0};
-  ca_get_dnugroup(dnugroup.begin());
+
+  for (int i = 0; i < NGROUPS; ++i) {
+      nugroup[i] = global::the_radiation_ptr->nugroup[i];
+      dnugroup[i] = global::the_radiation_ptr->dnugroup[i];
+  }
 
   amrex::ParallelFor(bx,
   [=] AMREX_GPU_HOST_DEVICE (int i, int j, int k)

diff --git a/Source/driver/Castro.cpp b/Source/driver/Castro.cpp
@@ -15,6 +15,7 @@
 #include <AMReX_Utility.H>
 #include <AMReX_CONSTANTS.H>
 #include <Castro.H>
+#include <global.H>
 #include <runtime_parameters.H>
 #include <AMReX_VisMF.H>
 #include <AMReX_TagBox.H>
@@ -722,6 +723,7 @@ Castro::Castro (Amr&            papa,
       if (radiation == nullptr) {
         // radiation is a static object, only alloc if not already there
         radiation = new Radiation(parent, this);
+        global::the_radiation_ptr = radiation;
       }
       radiation->regrid(level, grids, dmap);
 

diff --git a/Source/driver/global.H b/Source/driver/global.H
@@ -6,6 +6,7 @@
 namespace global
 {
     AMREX_INLINE Amr* the_amr_ptr;
+    AMREX_INLINE Radiation* the_radiation_ptr;
 }
 
 #endif