advection of rho corrections for manifold models

AMReX-Combustion · Sep 17, 2024 · 2670304 · 2670304
1 parent 5011423
commit 2670304
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/Source/PeleLMeX_Advection.cpp b/Source/PeleLMeX_Advection.cpp
@@ -488,9 +488,8 @@ PeleLM::computeScalarAdvTerms(std::unique_ptr<AdvanceAdvData>& advData)
                   afrac] AMREX_GPU_DEVICE(int i, int j, int k) noexcept {
               rho_ed(i, j, k) = 0.0;
               if (afrac(i, j, k) > 0.0) { // Uncovered faces
-                for (int n = 0; n < NUM_SPECIES; n++) {
-                  rho_ed(i, j, k) += rhoY_ed(i, j, k, n);
-                }
+                pele::physics::PhysicsType::eos_type::RY2R(
+                  array4_to_array(i, j, k, rhoY_ed).data(), rho_ed(i, j, k));
               }
             });
         } else // Regular boxes
@@ -499,10 +498,8 @@ PeleLM::computeScalarAdvTerms(std::unique_ptr<AdvanceAdvData>& advData)
           amrex::ParallelFor(
             ebx,
             [rho_ed, rhoY_ed] AMREX_GPU_DEVICE(int i, int j, int k) noexcept {
-              rho_ed(i, j, k) = 0.0;
-              for (int n = 0; n < NUM_SPECIES; n++) {
-                rho_ed(i, j, k) += rhoY_ed(i, j, k, n);
-              }
+              pele::physics::PhysicsType::eos_type::RY2R(
+                array4_to_array(i, j, k, rhoY_ed).data(), rho_ed(i, j, k));
             });
         }
       }
@@ -751,11 +748,9 @@ PeleLM::computeScalarAdvTerms(std::unique_ptr<AdvanceAdvData>& advData)
     amrex::ParallelFor(
       advData->AofS[lev],
       [=] AMREX_GPU_DEVICE(int box_no, int i, int j, int k) noexcept {
-        aofsma[box_no](i, j, k, DENSITY) = 0.0;
-        for (int n = 0; n < NUM_SPECIES; n++) {
-          aofsma[box_no](i, j, k, DENSITY) +=
-            aofsma[box_no](i, j, k, FIRSTSPEC + n);
-        }
+        pele::physics::PhysicsType::eos_type::RY2R(
+          array4_to_array(i, j, k, aofsma[box_no], FIRSTSPEC).data(),
+          aofsma[box_no](i, j, k, DENSITY));
       });
   }
   Gpu::streamSynchronize();

diff --git a/Source/PeleLMeX_Utils.H b/Source/PeleLMeX_Utils.H
@@ -1,5 +1,6 @@
 #ifndef PELELM_UTILS_H
 #define PELELM_UTILS_H
+
 template <class T>
 amrex::Gpu::DeviceVector<T>
 convertToDeviceVector(amrex::Vector<T> v)
@@ -13,4 +14,16 @@ convertToDeviceVector(amrex::Vector<T> v)
 #endif
   return v_d;
 }
+
+template <typename T = amrex::Real, unsigned int N = NUM_SPECIES>
+AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE amrex::GpuArray<T, N>
+array4_to_array(int i, int j, int k, amrex::Array4<T> array, int start_comp = 0)
+{
+  amrex::GpuArray<T, N> celldata;
+  for (unsigned int n = start_comp; n < N; i++) {
+    celldata[n] = array(i, j, k, n);
+  }
+  return celldata;
+}
+
 #endif