diff --git a/CHANGES b/CHANGES index fca9a6c0c..37eba0439 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,18 @@ +# 24.05 + -- AMReX submodule set to 24.05 release hash (76d09f5) + + -- Explict MOST as runtime option (#1605) + + -- High order extrapolation (#1602) + + -- Various radiation module fixes (#1601 etc) + + -- Correct FITCH (#1595) + + -- Read entire Lat/Lon data from netcdf (#1589) + # 24.04 - -- AMReX submodule set to 24.03 release hash (bb7d5cf) + -- AMReX submodule set to 24.04 release hash (bb7d5cf) -- Start of EB functionality (#1541) diff --git a/Exec/DevTests/Bomex/input_SAM b/Exec/DevTests/Bomex/input_SAM index 4e0215ae3..7007bcd19 100644 --- a/Exec/DevTests/Bomex/input_SAM +++ b/Exec/DevTests/Bomex/input_SAM @@ -82,7 +82,7 @@ prob.advection_moisture_rate = -1.2E-8 prob.moisture_source_cutoff = 300.0 prob.moisture_source_cutoff_transition = 200.0 -prob.wbar_sub_max = -0.65 +prob.wbar_sub_max = -0.0065 prob.wbar_cutoff_max = 1500.0 prob.wbar_cutoff_min = 2100.0 diff --git a/Source/SourceTerms/ERF_make_mom_sources.cpp b/Source/SourceTerms/ERF_make_mom_sources.cpp index cbfcecbaf..fce73b14a 100644 --- a/Source/SourceTerms/ERF_make_mom_sources.cpp +++ b/Source/SourceTerms/ERF_make_mom_sources.cpp @@ -280,12 +280,12 @@ void make_mom_sources (int /*level*/, if (solverChoice.custom_w_subsidence) { ParallelFor(tbx, [=] AMREX_GPU_DEVICE (int i, int j, int k) noexcept { - xmom_src_arr(i, j, k) += dptr_wbar_sub[k] * + xmom_src_arr(i, j, k) -= dptr_wbar_sub[k] * 0.5 * (dptr_u_plane(k+1) - dptr_u_plane(k-1)) * dxInv[2]; }); ParallelFor(tby, [=] AMREX_GPU_DEVICE (int i, int j, int k) noexcept { - ymom_src_arr(i, j, k) += dptr_wbar_sub[k] * + ymom_src_arr(i, j, k) -= dptr_wbar_sub[k] * 0.5 * (dptr_v_plane(k+1) - dptr_v_plane(k-1)) * dxInv[2]; }); } diff --git a/Source/SourceTerms/ERF_make_sources.cpp b/Source/SourceTerms/ERF_make_sources.cpp index c4ea1db24..e2b3f1033 100644 --- a/Source/SourceTerms/ERF_make_sources.cpp +++ b/Source/SourceTerms/ERF_make_sources.cpp @@ -219,7 +219,7 @@ void make_sources (int level, const int n = RhoTheta_comp; ParallelFor(bx, [=] AMREX_GPU_DEVICE (int i, int j, int k) noexcept { - cell_src(i, j, k, n) += dptr_wbar_sub[k] * + cell_src(i, j, k, n) -= dptr_wbar_sub[k] * 0.5 * (dptr_t_plane(k+1) - dptr_t_plane(k-1)) * dxInv[2]; }); @@ -232,7 +232,7 @@ void make_sources (int level, const int n = RhoQ1_comp; ParallelFor(bx, [=] AMREX_GPU_DEVICE (int i, int j, int k) noexcept { - cell_src(i,j,k,n) += dptr_wbar_sub[k] * + cell_src(i,j,k,n) -= dptr_wbar_sub[k] * 0.5 * (dptr_q_plane(k+1) - dptr_q_plane(k-1)) * dxInv[2]; }); } diff --git a/Submodules/AMReX b/Submodules/AMReX index bb7d5cfbf..76d09f554 160000 --- a/Submodules/AMReX +++ b/Submodules/AMReX @@ -1 +1 @@ -Subproject commit bb7d5cfbfd503f2f014746c32a9646a6ef6dcc5b +Subproject commit 76d09f554c3e5b8b4ecd4b8bf0c39d0fefddffa4