cleaning up MultiFab::Multiply calls

Exawind · Aug 21, 2024 · e572c17 · e572c17
1 parent ba13062
commit e572c17
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 41 deletions.
diff --git a/amr-wind/equation_systems/icns/icns_advection.H b/amr-wind/equation_systems/icns/icns_advection.H
@@ -282,31 +282,21 @@ struct AdvectionOp<ICNS, fvm::Godunov>
 
             // Calculate fluxes using momentum directly
             if (!mphase_vof) {
-                amrex::MultiFab::Multiply(
-                    q, rho_o(lev), 0, 0, 1, fvm::Godunov::nghost_state);
-                amrex::MultiFab::Multiply(
-                    q, rho_o(lev), 0, 1, 1, fvm::Godunov::nghost_state);
-                amrex::MultiFab::Multiply(
-                    q, rho_o(lev), 0, 2, 1, fvm::Godunov::nghost_state);
-                // Source terms are at old state during calculation of advection
-                // terms
-                amrex::MultiFab::Multiply(
-                    fq, rho_o(lev), 0, 0, 1, fvm::Godunov::nghost_src);
-                amrex::MultiFab::Multiply(
-                    fq, rho_o(lev), 0, 1, 1, fvm::Godunov::nghost_src);
-                amrex::MultiFab::Multiply(
-                    fq, rho_o(lev), 0, 2, 1, fvm::Godunov::nghost_src);
-
-                // Ensure rho_nph is up-to-date and multiply for correct
-                // boundaries
+                // Ensure rho_nph is up-to-date
                 rho_nph.fillphysbc(
                     lev, time + 0.5 * dt, rho_nph(lev), rho_nph.num_grow());
-                amrex::MultiFab::Multiply(
-                    q_nph, rho_nph(lev), 0, 0, 1, fvm::Godunov::nghost_src);
-                amrex::MultiFab::Multiply(
-                    q_nph, rho_nph(lev), 0, 1, 1, fvm::Godunov::nghost_src);
-                amrex::MultiFab::Multiply(
-                    q_nph, rho_nph(lev), 0, 2, 1, fvm::Godunov::nghost_src);
+
+                for (int idim = 0; idim < dof_field.num_comp(); ++idim) {
+                    amrex::MultiFab::Multiply(
+                        q, rho_o(lev), 0, idim, 1, fvm::Godunov::nghost_state);
+                    // Source terms at old state during advection calculation
+                    amrex::MultiFab::Multiply(
+                        fq, rho_o(lev), 0, idim, 1, fvm::Godunov::nghost_src);
+
+                    amrex::MultiFab::Multiply(
+                        q_nph, rho_nph(lev), 0, idim, 1,
+                        fvm::Godunov::nghost_src);
+                }
             }
 
             amrex::MFItInfo mfi_info;

diff --git a/amr-wind/equation_systems/vof/vof_momentum_flux.H b/amr-wind/equation_systems/vof/vof_momentum_flux.H
@@ -71,18 +71,12 @@ static void hybrid_fluxes(
         amrex::MultiFab::Copy(
             fq, src_term(lev), 0, 0, ncomp, fvm::Godunov::nghost_src);
 
-        amrex::MultiFab::Multiply(
-            q, rho_o(lev), 0, 0, 1, fvm::Godunov::nghost_state);
-        amrex::MultiFab::Multiply(
-            q, rho_o(lev), 0, 1, 1, fvm::Godunov::nghost_state);
-        amrex::MultiFab::Multiply(
-            q, rho_o(lev), 0, 2, 1, fvm::Godunov::nghost_state);
-        amrex::MultiFab::Multiply(
-            fq, rho_o(lev), 0, 0, 1, fvm::Godunov::nghost_src);
-        amrex::MultiFab::Multiply(
-            fq, rho_o(lev), 0, 1, 1, fvm::Godunov::nghost_src);
-        amrex::MultiFab::Multiply(
-            fq, rho_o(lev), 0, 2, 1, fvm::Godunov::nghost_src);
+        for (int idim = 0; idim < dof_field.num_comp(); ++idim) {
+            amrex::MultiFab::Multiply(
+                q, rho_o(lev), 0, idim, 1, fvm::Godunov::nghost_state);
+            amrex::MultiFab::Multiply(
+                fq, rho_o(lev), 0, idim, 1, fvm::Godunov::nghost_src);
+        }
 
         amrex::MultiFab frho(
             src_term(lev).boxArray(), src_term(lev).DistributionMap(), 1,
@@ -96,12 +90,10 @@ static void hybrid_fluxes(
         dof_field.fillphysbc(lev, time + 0.5 * dt, q_nph, dof_field.num_grow());
         // Density at NPH is fully calculated a priori
         // Multiply to get momentum at NPH
-        amrex::MultiFab::Multiply(
-            q_nph, rho_nph(lev), 0, 0, 1, fvm::Godunov::nghost_state);
-        amrex::MultiFab::Multiply(
-            q_nph, rho_nph(lev), 0, 1, 1, fvm::Godunov::nghost_state);
-        amrex::MultiFab::Multiply(
-            q_nph, rho_nph(lev), 0, 2, 1, fvm::Godunov::nghost_state);
+        for (int idim = 0; idim < dof_field.num_comp(); ++idim) {
+            amrex::MultiFab::Multiply(
+                q_nph, rho_nph(lev), 0, idim, 1, fvm::Godunov::nghost_state);
+        }
 
         std::string advection_type = "Godunov";
         int limiter_type = PPM::UPWIND; // default