diff --git a/Source/BoundaryConditions/ERF_FillPatch.cpp b/Source/BoundaryConditions/ERF_FillPatch.cpp index 6c97bac07..4a98a01ba 100644 --- a/Source/BoundaryConditions/ERF_FillPatch.cpp +++ b/Source/BoundaryConditions/ERF_FillPatch.cpp @@ -563,6 +563,8 @@ ERF::FillIntermediatePatch (int lev, Real time, Geom(lev).Domain(), domain_bcs_type); } + + mfs_mom[Vars::cons]->FillBoundary(geom[lev].periodicity()); } /* diff --git a/Source/BoundaryConditions/ERF_PhysBCFunct.cpp b/Source/BoundaryConditions/ERF_PhysBCFunct.cpp index b3325a372..06becebfc 100644 --- a/Source/BoundaryConditions/ERF_PhysBCFunct.cpp +++ b/Source/BoundaryConditions/ERF_PhysBCFunct.cpp @@ -73,7 +73,7 @@ void ERFPhysBCFunct_cons::operator() (MultiFab& mf, int icomp, int ncomp, if (!gdomain.contains(cbx2)) { - const Array4 cons_arr = mf.array(mfi);; + const Array4 cons_arr = mf.array(mfi); if (!m_use_real_bcs) { @@ -145,7 +145,7 @@ void ERFPhysBCFunct_u::operator() (MultiFab& mf, int /*icomp*/, int /*ncomp*/, if (!gdomainx.contains(xbx2)) { - const Array4 velx_arr = mf.array(mfi);; + const Array4 velx_arr = mf.array(mfi); if (!m_use_real_bcs) { @@ -220,7 +220,7 @@ void ERFPhysBCFunct_v::operator() (MultiFab& mf, int /*icomp*/, int /*ncomp*/, if (!gdomainy.contains(ybx2)) { - const Array4 vely_arr = mf.array(mfi);; + const Array4 vely_arr = mf.array(mfi); if (!m_use_real_bcs) { @@ -296,9 +296,9 @@ void ERFPhysBCFunct_w::operator() (MultiFab& mf, MultiFab& xvel, MultiFab& yvel, z_nd_arr = z_nd_mf_loc.const_array(mfi); } - Array4 const& velx_arr = xvel.const_array(mfi);; - Array4 const& vely_arr = yvel.const_array(mfi);; - Array4< Real> const& velz_arr = mf.array(mfi);; + Array4 const& velx_arr = xvel.const_array(mfi); + Array4 const& vely_arr = yvel.const_array(mfi); + Array4< Real> const& velz_arr = mf.array(mfi); if (!m_use_real_bcs) { @@ -353,7 +353,7 @@ void ERFPhysBCFunct_base::operator() (MultiFab& mf, int /*icomp*/, int /*ncomp*/ if (!gdomain.contains(cbx2)) { - const Array4 cons_arr = mf.array(mfi);; + const Array4 cons_arr = mf.array(mfi); impose_lateral_basestate_bcs(cons_arr,cbx1,domain); } diff --git a/Source/DataStructs/ERF_AdvStruct.H b/Source/DataStructs/ERF_AdvStruct.H index f36e83f58..dfa5bc9f7 100644 --- a/Source/DataStructs/ERF_AdvStruct.H +++ b/Source/DataStructs/ERF_AdvStruct.H @@ -36,7 +36,7 @@ struct AdvChoice { pp.query("moistscal_vert_adv_type" , moistscal_vert_adv_string); if (use_efficient_advection){ - amrex::Print() << "Using efficient advection scheme" << std::endl;; + amrex::Print() << "Using efficient advection scheme" << std::endl; } if ( (dycore_horiz_adv_string == "Blended_3rd4th") || diff --git a/Source/ERF_prob_common.H b/Source/ERF_prob_common.H index 2b82df05e..070835c63 100644 --- a/Source/ERF_prob_common.H +++ b/Source/ERF_prob_common.H @@ -101,7 +101,7 @@ public: const SolverChoice& /*sc*/) { amrex::Print() << "No perturbation to background fields supplied for " - << name() << " problem" << std::endl;; + << name() << " problem" << std::endl; } /** diff --git a/Source/Prob/ERF_init_density_hse_dry.H b/Source/Prob/ERF_init_density_hse_dry.H index 824b3bf76..c03370e89 100644 --- a/Source/Prob/ERF_init_density_hse_dry.H +++ b/Source/Prob/ERF_init_density_hse_dry.H @@ -54,8 +54,8 @@ erf_init_dens_hse (amrex::MultiFab& rho_hse, amrex::ParallelFor(b2d, [=] AMREX_GPU_DEVICE (int i, int j, int) { - amrex::Array1D r;; - amrex::Array1D p;; + amrex::Array1D r; + amrex::Array1D p; HSEutils::init_isentropic_hse_terrain(i,j,rho_local_sfc,Thetabar,&(r(0)),&(p(0)),z_cc_arr,klo,khi); for (int k = klo; k <= khi; k++) { diff --git a/Source/TimeIntegration/ERF_fast_rhs_N.cpp b/Source/TimeIntegration/ERF_fast_rhs_N.cpp index 6fbfd04c5..fec38e38e 100644 --- a/Source/TimeIntegration/ERF_fast_rhs_N.cpp +++ b/Source/TimeIntegration/ERF_fast_rhs_N.cpp @@ -324,10 +324,10 @@ void erf_fast_rhs_N (int step, int nrk, // ********************************************************************* ParallelFor(bx, [=] AMREX_GPU_DEVICE (int i, int j, int k) noexcept { - Real xflux_lo = (temp_cur_xmom_arr(i ,j,k) - stage_xmom(i ,j,k)) / mf_u(i ,j,0);; - Real xflux_hi = (temp_cur_xmom_arr(i+1,j,k) - stage_xmom(i+1,j,k)) / mf_u(i+1,j,0);; - Real yflux_lo = (temp_cur_ymom_arr(i,j ,k) - stage_ymom(i,j ,k)) / mf_v(i,j ,0);; - Real yflux_hi = (temp_cur_ymom_arr(i,j+1,k) - stage_ymom(i,j+1,k)) / mf_v(i,j+1,0);; + Real xflux_lo = (temp_cur_xmom_arr(i ,j,k) - stage_xmom(i ,j,k)) / mf_u(i ,j,0); + Real xflux_hi = (temp_cur_xmom_arr(i+1,j,k) - stage_xmom(i+1,j,k)) / mf_u(i+1,j,0); + Real yflux_lo = (temp_cur_ymom_arr(i,j ,k) - stage_ymom(i,j ,k)) / mf_v(i,j ,0); + Real yflux_hi = (temp_cur_ymom_arr(i,j+1,k) - stage_ymom(i,j+1,k)) / mf_v(i,j+1,0); Real mfsq = mf_m(i,j,0) * mf_m(i,j,0); diff --git a/Source/TimeIntegration/ERF_fast_rhs_T.cpp b/Source/TimeIntegration/ERF_fast_rhs_T.cpp index 929660abf..a26289176 100644 --- a/Source/TimeIntegration/ERF_fast_rhs_T.cpp +++ b/Source/TimeIntegration/ERF_fast_rhs_T.cpp @@ -427,10 +427,10 @@ void erf_fast_rhs_T (int step, int nrk, ( z_nd(i ,j ,k+1) + z_nd(i+1,j ,k+1) -z_nd(i ,j ,k ) - z_nd(i+1,j ,k ) ); - Real xflux_lo = new_drho_u(i ,j,k)*h_zeta_cc_xface_lo / mf_u(i ,j,0);; - Real xflux_hi = new_drho_u(i+1,j,k)*h_zeta_cc_xface_hi / mf_u(i+1,j,0);; - Real yflux_lo = new_drho_v(i,j ,k)*h_zeta_cc_yface_lo / mf_v(i,j ,0);; - Real yflux_hi = new_drho_v(i,j+1,k)*h_zeta_cc_yface_hi / mf_v(i,j+1,0);; + Real xflux_lo = new_drho_u(i ,j,k)*h_zeta_cc_xface_lo / mf_u(i ,j,0); + Real xflux_hi = new_drho_u(i+1,j,k)*h_zeta_cc_xface_hi / mf_u(i+1,j,0); + Real yflux_lo = new_drho_v(i,j ,k)*h_zeta_cc_yface_lo / mf_v(i,j ,0); + Real yflux_hi = new_drho_v(i,j+1,k)*h_zeta_cc_yface_hi / mf_v(i,j+1,0); Real mfsq = mf_m(i,j,0) * mf_m(i,j,0); diff --git a/Source/TimeIntegration/ERF_slow_rhs_pre.cpp b/Source/TimeIntegration/ERF_slow_rhs_pre.cpp index 33171bf26..7cb16958b 100644 --- a/Source/TimeIntegration/ERF_slow_rhs_pre.cpp +++ b/Source/TimeIntegration/ERF_slow_rhs_pre.cpp @@ -718,7 +718,7 @@ void erf_slow_rhs_pre (int level, int finest_level, } if ( (bx.bigEnd(1) == domain.bigEnd(1)) && (bc_ptr_h[BCVars::yvel_bc].hi(1) == ERFBCType::ext_dir) ) { - Box hi_y_dom_face(bx); hi_y_dom_face.setSmall(1,bx.bigEnd(1)+1); hi_y_dom_face.setBig(1,bx.bigEnd(1)+1);; + Box hi_y_dom_face(bx); hi_y_dom_face.setSmall(1,bx.bigEnd(1)+1); hi_y_dom_face.setBig(1,bx.bigEnd(1)+1); ParallelFor(hi_y_dom_face, [=] AMREX_GPU_DEVICE (int i, int j, int k) { rho_v_rhs(i,j,k) = 0.; }); diff --git a/Source/Utils/ERF_TerrainMetrics.cpp b/Source/Utils/ERF_TerrainMetrics.cpp index caf42d3cc..1c3f05704 100644 --- a/Source/Utils/ERF_TerrainMetrics.cpp +++ b/Source/Utils/ERF_TerrainMetrics.cpp @@ -280,6 +280,9 @@ init_which_terrain_grid (int lev, Geometry const& geom, MultiFab& z_phys_nd, gbx.setBig(2,domhi_z); } else { gbx.growHi(2,-1); + if (gbx.bigEnd(2) > domhi_z) { + gbx.setBig(2,domhi_z); + } } Array4 const& z_arr = z_phys_nd.array(mfi);