Skip to content

Commit

Permalink
ERF Release (#1606)
Browse files Browse the repository at this point in the history
* ERF release.

* Add Chandru's fixes for bomex case.
  • Loading branch information
AMLattanzi authored May 7, 2024
1 parent 7ed2e8f commit 22931d4
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 7 deletions.
15 changes: 14 additions & 1 deletion CHANGES
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
2 changes: 1 addition & 1 deletion Exec/DevTests/Bomex/input_SAM
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions Source/SourceTerms/ERF_make_mom_sources.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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];
});
}
Expand Down
4 changes: 2 additions & 2 deletions Source/SourceTerms/ERF_make_sources.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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];

});
Expand All @@ -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];
});
}
Expand Down
2 changes: 1 addition & 1 deletion Submodules/AMReX
Submodule AMReX updated 90 files
+3 −0 .clang-tidy
+4 −4 .github/workflows/bittree.yml
+6 −6 .github/workflows/clang.yml
+13 −25 .github/workflows/hip.yml
+4 −4 .github/workflows/hypre.yml
+1 −0 .github/workflows/intel.yml
+2 −2 .github/workflows/petsc.yml
+2 −2 .github/workflows/smoke.yml
+2 −2 .github/workflows/sundials.yml
+39 −0 CHANGES
+2 −2 Docs/sphinx_documentation/source/Basics.rst
+6 −0 Docs/sphinx_documentation/source/BuildingAMReX.rst
+2 −1 README.md
+3 −0 Src/Amr/AMReX_Amr.H
+11 −6 Src/Amr/AMReX_Amr.cpp
+5 −4 Src/Amr/AMReX_AmrLevel.cpp
+11 −11 Src/AmrCore/AMReX_FillPatchUtil_I.H
+6 −6 Src/AmrCore/AMReX_FillPatcher.H
+5 −1 Src/AmrCore/AMReX_Interp_2D_C.H
+5 −1 Src/AmrCore/AMReX_Interp_3D_C.H
+0 −4 Src/AmrCore/AMReX_MFInterp_C.H
+1 −8 Src/Base/AMReX_BLProfiler.H
+31 −31 Src/Base/AMReX_FabArray.H
+2 −5 Src/Base/AMReX_GpuDevice.H
+22 −0 Src/Base/AMReX_GpuDevice.cpp
+12 −1 Src/Base/AMReX_MultiFab.H
+97 −1 Src/Base/AMReX_MultiFab.cpp
+9 −0 Src/Base/AMReX_PODVector.H
+20 −0 Src/Base/AMReX_Scan.H
+4 −10 Src/Base/AMReX_TinyProfiler.H
+78 −174 Src/Base/AMReX_TinyProfiler.cpp
+24 −0 Src/Base/AMReX_Tuple.H
+4 −0 Src/Base/Parser/AMReX_IParser_Exe.H
+4 −0 Src/Base/Parser/AMReX_Parser_Exe.H
+12 −2 Src/Base/Parser/AMReX_Parser_Y.H
+1 −0 Src/Base/Parser/amrex_parser.l
+129 −125 Src/Base/Parser/amrex_parser.lex.nolint.H
+4 −6 Src/Boundary/AMReX_YAFluxRegister_K.H
+8 −0 Src/CMakeLists.txt
+3 −1 Src/EB/AMReX_EB2_2D_C.H
+6 −2 Src/EB/AMReX_EB2_3D_C.H
+31 −23 Src/EB/AMReX_EB2_3D_C.cpp
+1 −0 Src/EB/AMReX_EB2_C.H
+1 −1 Src/EB/AMReX_EB2_Level.H
+10 −12 Src/EB/AMReX_EBFluxRegister_2D_C.H
+10 −12 Src/EB/AMReX_EBFluxRegister_3D_C.H
+0 −3 Src/EB/AMReX_EB_Slopes_2D_K.H
+0 −3 Src/EB/AMReX_EB_Slopes_3D_K.H
+3 −3 Src/Extern/HYPRE/AMReX_Hypre.cpp
+1 −1 Src/Extern/HYPRE/AMReX_HypreABecLap.cpp
+1 −1 Src/Extern/HYPRE/AMReX_HypreABecLap2.cpp
+1 −1 Src/Extern/HYPRE/AMReX_HypreABecLap3.cpp
+8 −8 Src/Extern/HYPRE/AMReX_HypreIJIface.cpp
+1 −1 Src/Extern/HYPRE/AMReX_HypreNodeLap.cpp
+2 −2 Src/Extern/HYPRE/AMReX_HypreSolver.H
+3 −3 Src/Extern/PETSc/AMReX_PETSc.cpp
+1 −1 Src/Extern/SUNDIALS/AMReX_Sundials.H
+2 −2 Src/LinearSolvers/MLMG/AMReX_MLEBABecLap_K.H
+1 −1 Src/LinearSolvers/MLMG/AMReX_MLNodeABecLaplacian.cpp
+31 −12 Src/LinearSolvers/MLMG/AMReX_MLNodeLap_2D_K.H
+39 −13 Src/LinearSolvers/MLMG/AMReX_MLNodeLap_3D_K.H
+2 −3 Src/LinearSolvers/MLMG/AMReX_MLNodeLap_K.H
+2 −2 Src/LinearSolvers/MLMG/AMReX_MLNodeLaplacian.cpp
+12 −12 Src/LinearSolvers/MLMG/AMReX_MLNodeLaplacian_hypre.cpp
+5 −1 Src/LinearSolvers/MLMG/AMReX_MLNodeTensorLap_2D_K.H
+5 −1 Src/LinearSolvers/MLMG/AMReX_MLNodeTensorLap_3D_K.H
+0 −19 Src/LinearSolvers/MLMG/AMReX_MLNodeTensorLap_K.H
+4 −4 Src/LinearSolvers/MLMG/AMReX_MLNodeTensorLaplacian.cpp
+3 −3 Src/Particle/AMReX_NeighborList.H
+1 −1 Src/Particle/AMReX_NeighborParticlesI.H
+0 −3 Src/Particle/AMReX_Particle.H
+1 −1 Src/Particle/AMReX_ParticleCommunication.H
+13 −2 Src/Particle/AMReX_ParticleContainer.H
+13 −0 Src/Particle/AMReX_ParticleContainerI.H
+2 −2 Src/Particle/AMReX_ParticleIO.H
+16 −23 Tests/EB_CNS/Source/hydro/CNS_hydro_K.H
+16 −20 Tests/EB_CNS/Source/hydro/CNS_hydro_eb_K.H
+16 −23 Tests/GPU/CNS/Source/hydro/CNS_hydro_K.H
+0 −4 Tests/LinearSolvers/CellEB2/MyTest_K.H
+1 −1 Tools/CMake/AMReXClangTidy.cmake
+2 −0 Tools/CMake/AMReXConfig.cmake.in
+12 −0 Tools/CMake/AMReXFlagsTargets.cmake
+14 −0 Tools/CMake/AMReXOptions.cmake
+9 −2 Tools/CMake/AMReXSetDefines.cmake
+1 −0 Tools/CMake/AMReX_Config_ND.H.in
+1 −1 Tools/C_scripts/mmclt.py
+7 −0 Tools/GNUMake/Make.defs
+5 −0 Tools/GNUMake/comps/gnu.mak
+1 −1 Tools/GNUMake/tools/Make.clang-tidy
+13 −4 Tools/Plotfile/fcompare.cpp

0 comments on commit 22931d4

Please sign in to comment.