fix compilation with POISSON_SOLVE (#1613)

erf-model · May 10, 2024 · 44e68bf · 44e68bf
1 parent 084af37
commit 44e68bf
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/Source/TimeIntegration/ERF_slow_rhs_inc.cpp b/Source/TimeIntegration/ERF_slow_rhs_inc.cpp
@@ -122,7 +122,6 @@ void erf_slow_rhs_inc (int level, int nrk,
     const bool l_use_diff       = ( (dc.molec_diff_type != MolecDiffType::None) ||
                                     (tc.les_type        !=       LESType::None) ||
                                     (tc.pbl_type        !=       PBLType::None) );
-    const bool l_use_constAlpha = ( dc.molec_diff_type == MolecDiffType::ConstantAlpha );
     const bool l_use_turb       = ( tc.les_type == LESType::Smagorinsky ||
                                     tc.les_type == LESType::Deardorff   ||
                                     tc.pbl_type == PBLType::MYNN25      ||

diff --git a/Source/TimeIntegration/ERF_slow_rhs_pre.cpp b/Source/TimeIntegration/ERF_slow_rhs_pre.cpp
@@ -139,7 +139,6 @@ void erf_slow_rhs_pre (int level, int finest_level,
     const bool l_use_diff       = ( (dc.molec_diff_type != MolecDiffType::None) ||
                                     (tc.les_type        !=       LESType::None) ||
                                     (tc.pbl_type        !=       PBLType::None) );
-    const bool l_use_constAlpha = ( dc.molec_diff_type == MolecDiffType::ConstantAlpha );
     const bool l_use_turb       = ( tc.les_type == LESType::Smagorinsky ||
                                     tc.les_type == LESType::Deardorff   ||
                                     tc.pbl_type == PBLType::MYNN25      ||

diff --git a/Source/TimeIntegration/TI_slow_headers.H b/Source/TimeIntegration/TI_slow_headers.H
@@ -202,9 +202,9 @@ void erf_slow_rhs_inc (int level, int nrk,
                        std::unique_ptr<amrex::MultiFab>& az,
                        std::unique_ptr<amrex::MultiFab>& dJ,
                        const amrex::MultiFab* p0,
+                       const amrex::MultiFab& pp_inc,
                        std::unique_ptr<amrex::MultiFab>& mapfac_m,
                        std::unique_ptr<amrex::MultiFab>& mapfac_u,
-                       std::unique_ptr<amrex::MultiFab>& mapfac_v,
-                       const amrex::MultiFab& pp_inc);
+                       std::unique_ptr<amrex::MultiFab>& mapfac_v);
 #endif
 #endif
diff --git a/Source/TimeIntegration/TI_slow_rhs_fun.H b/Source/TimeIntegration/TI_slow_rhs_fun.H
@@ -421,8 +421,8 @@
                          Tau13_lev[level].get(), Tau21_lev[level].get(), Tau23_lev[level].get(), Tau31_lev[level].get(),
                          Tau32_lev[level].get(), SmnSmn, eddyDiffs, Hfx3, Diss,
                          fine_geom, solverChoice, m_most, domain_bcs_type_d, domain_bcs_type,
-                         z_phys_nd[level], ax[level], ay[level], az[level], detJ_cc[level], p0,
-                         mapfac_m[level], mapfac_u[level], mapfac_v[level], pp_inc[level]);
+                         z_phys_nd[level], ax[level], ay[level], az[level], detJ_cc[level], p0, pp_inc[level],
+                         mapfac_m[level], mapfac_u[level], mapfac_v[level]);
 
          add_thin_body_sources(xmom_src, ymom_src, zmom_src,
                                xflux_imask[level], yflux_imask[level], zflux_imask[level],