change interface for flux registers in LES due to warning

baperry2 · Jun 21, 2024 · da8e523 · da8e523
1 parent 228a1aa
commit da8e523
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/Source/LES.cpp b/Source/LES.cpp
@@ -215,14 +215,12 @@ PeleC::updateFluxRegistersLES(
   amrex::Real dt,
   const amrex::MFIter& mfi,
   amrex::FabType typ,
-  amrex::FArrayBox flux_ec[AMREX_SPACEDIM])
+  const std::array<amrex::FArrayBox const*, AMREX_SPACEDIM>& flux_ec)
 {
   if (do_reflux && reflux_factor != 0) {
     amrex::FArrayBox dm_as_fine(
       amrex::Box::TheUnitBox(), LESTerm.nComp(), amrex::The_Async_Arena());
-    update_flux_registers(
-      reflux_factor * dt, mfi, typ,
-      {AMREX_D_DECL(&flux_ec[0], &flux_ec[1], &flux_ec[2])}, dm_as_fine);
+    update_flux_registers(reflux_factor * dt, mfi, typ, flux_ec, dm_as_fine);
   }
 }
 
@@ -324,7 +322,9 @@ PeleC::getSmagorinskyLESTerm(
       computeFluxDiv(LESTerm, mfi, vbox, flx, volume);
 
       // Refluxing
-      updateFluxRegistersLES(reflux_factor, LESTerm, dt, mfi, typ, flux_ec);
+      updateFluxRegistersLES(
+        reflux_factor, LESTerm, dt, mfi, typ,
+        {AMREX_D_DECL(&flux_ec[0], &flux_ec[1], &flux_ec[2])});
     } // End of MFIter scope
   }   // End of OMP scope
 #endif
@@ -602,7 +602,9 @@ PeleC::getDynamicSmagorinskyLESTerm(
       computeFluxDiv(LESTerm, mfi, vbox, flx, volume);
 
       // Refluxing
-      updateFluxRegistersLES(reflux_factor, LESTerm, dt, mfi, typ, flux_ec);
+      updateFluxRegistersLES(
+        reflux_factor, LESTerm, dt, mfi, typ,
+        {AMREX_D_DECL(&flux_ec[0], &flux_ec[1], &flux_ec[2])});
     }
   }
 #endif
@@ -705,7 +707,9 @@ PeleC::getWALELESTerm(
       computeFluxDiv(LESTerm, mfi, vbox, flx, volume);
 
       // Refluxing
-      updateFluxRegistersLES(reflux_factor, LESTerm, dt, mfi, typ, flux_ec);
+      updateFluxRegistersLES(
+        reflux_factor, LESTerm, dt, mfi, typ,
+        {AMREX_D_DECL(&flux_ec[0], &flux_ec[1], &flux_ec[2])});
     } // End of MFIter scope
   }   // End of OMP scope
 #endif
@@ -809,7 +813,9 @@ PeleC::getVremanLESTerm(
       computeFluxDiv(LESTerm, mfi, vbox, flx, volume);
 
       // Refluxing
-      updateFluxRegistersLES(reflux_factor, LESTerm, dt, mfi, typ, flux_ec);
+      updateFluxRegistersLES(
+        reflux_factor, LESTerm, dt, mfi, typ,
+        {AMREX_D_DECL(&flux_ec[0], &flux_ec[1], &flux_ec[2])});
     } // End of MFIter scope
   }   // End of OMP scope
 #endif

diff --git a/Source/PeleC.H b/Source/PeleC.H
@@ -386,7 +386,7 @@ public:
     amrex::Real dt,
     const amrex::MFIter& mfi,
     amrex::FabType typ,
-    amrex::FArrayBox flux_ec[AMREX_SPACEDIM]);
+    const std::array<amrex::FArrayBox const*, AMREX_SPACEDIM>& flux_ec);
 
   void getSmagorinskyLESTerm(
     amrex::Real time,