diff --git a/CHANGES b/CHANGES index 76926febd..d2c88265b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,17 @@ -#23.11 +# 23.12 + -- AMReX submodule set to 23.12 release hash (9b733ec) + + -- Inclusion of Kessler microphysics option (#1324) + + -- Fix for particles with redistribute call (#1314) + + -- Inclusion of radiation (#1311) + + -- Inclusion of refluxing for two-way coupling (#1289) + + -- Metgrid initialization with SST and LandMask (#1280) + +# 23.11 -- AMReX submodule set to 23.11 release hash (ae7b64b) diff --git a/Source/IO/Plotfile.cpp b/Source/IO/Plotfile.cpp index b2312d467..d31036ddd 100644 --- a/Source/IO/Plotfile.cpp +++ b/Source/IO/Plotfile.cpp @@ -206,11 +206,21 @@ ERF::WritePlotFile (int which, Vector plot_var_names) const Array4& derdat = mf[lev].array(mfi); const Array4& p0_arr = p_hse.const_array(mfi); const Array4& S_arr = vars_new[lev][Vars::cons].const_array(mfi); +#if defined(ERF_USE_MOISTURE) + const Array4 & qv_arr = qmoist[0].const_array(mfi); +#endif - ParallelFor(bx, [=] AMREX_GPU_DEVICE(int i, int j, int k) noexcept { - + ParallelFor(bx, [=] AMREX_GPU_DEVICE(int i, int j, int k) noexcept + { +#if defined(ERF_USE_MOISTURE) + Real qv_for_p = qv_arr(i,j,k); +#elif defined(ERF_USE_WARM_NO_PRECIP) + Real qv_for_p = S_arr(i,j,k,RhoQv_comp) / S_arr(i,j,k,Rho_comp); +#else + Real qv_for_p = 0.; +#endif const Real rhotheta = S_arr(i,j,k,RhoTheta_comp); - derdat(i, j, k, mf_comp) = getPgivenRTh(rhotheta) - p0_arr(i,j,k); + derdat(i, j, k, mf_comp) = getPgivenRTh(rhotheta,qv_for_p) - p0_arr(i,j,k); }); } mf_comp += 1; diff --git a/Submodules/AMReX b/Submodules/AMReX index b2052f2d2..9b733ec45 160000 --- a/Submodules/AMReX +++ b/Submodules/AMReX @@ -1 +1 @@ -Subproject commit b2052f2d2e5ce44317450ba13de705a3e01ef0ea +Subproject commit 9b733ec45cd93a80234a7c98248b6eb4816589d5 diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index b0c6f4c4e..c6a2aa8b0 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1,3 +1,3 @@ -set(FCOMPARE_EXE ${CMAKE_BINARY_DIR}/Submodules/AMReX/Tools/Plotfile/fcompare CACHE INTERNAL "Path to fcompare executable for regression tests") +set(FCOMPARE_EXE ${CMAKE_BINARY_DIR}/Submodules/AMReX/Tools/Plotfile/amrex_fcompare CACHE INTERNAL "Path to fcompare executable for regression tests") include(${CMAKE_CURRENT_SOURCE_DIR}/CTestList.cmake)