From 386cc4c275078f8e53209ef70df6d608745cd1d9 Mon Sep 17 00:00:00 2001 From: Michael Duda Date: Fri, 13 Jun 2025 13:35:50 -0600 Subject: [PATCH 1/6] Update version number to 8.3.1 --- README.md | 2 +- src/core_atmosphere/Registry.xml | 2 +- src/core_init_atmosphere/Registry.xml | 2 +- src/core_landice/Registry.xml | 2 +- src/core_ocean/Registry.xml | 2 +- src/core_seaice/Registry.xml | 2 +- src/core_sw/Registry.xml | 2 +- src/core_test/Registry.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 5e4df2480f..a4f23e5523 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -MPAS-v8.3.0 +MPAS-v8.3.1 ==== The Model for Prediction Across Scales (MPAS) is a collaborative project for diff --git a/src/core_atmosphere/Registry.xml b/src/core_atmosphere/Registry.xml index 2f6820d719..4281c40bba 100644 --- a/src/core_atmosphere/Registry.xml +++ b/src/core_atmosphere/Registry.xml @@ -1,5 +1,5 @@ - + diff --git a/src/core_init_atmosphere/Registry.xml b/src/core_init_atmosphere/Registry.xml index ceec72efd8..cf4934a81b 100644 --- a/src/core_init_atmosphere/Registry.xml +++ b/src/core_init_atmosphere/Registry.xml @@ -1,5 +1,5 @@ - + diff --git a/src/core_landice/Registry.xml b/src/core_landice/Registry.xml index 9edf2853d0..1153d48c25 100644 --- a/src/core_landice/Registry.xml +++ b/src/core_landice/Registry.xml @@ -1,5 +1,5 @@ - + diff --git a/src/core_ocean/Registry.xml b/src/core_ocean/Registry.xml index 5b30da8525..29cf098fef 100644 --- a/src/core_ocean/Registry.xml +++ b/src/core_ocean/Registry.xml @@ -1,5 +1,5 @@ - + - + - + diff --git a/src/core_test/Registry.xml b/src/core_test/Registry.xml index 000ca901e3..4c3f48bc7a 100644 --- a/src/core_test/Registry.xml +++ b/src/core_test/Registry.xml @@ -1,5 +1,5 @@ - + From 5fd856a1732567a6c82d4b7e8d5d21a907b07433 Mon Sep 17 00:00:00 2001 From: Michael Duda Date: Fri, 13 Jun 2025 13:41:33 -0600 Subject: [PATCH 2/6] Fix bug in vertical interp of humidity for LBCs when levels are given top-to-bottom Note: The changes in this commit mirror those in commit f232665e, but this commit concerns to the code for producing LBCs rather than the code for producing ICs. The code in the init_atm_case_lbc routine for vertically interpolating relative humidity and specific humidity for LBCs assumed that first-guess levels would be given in bottom-to-top order when attempting to vertically extrapolate to model levels below the lowest first-guess level. The relevant code for relative humidity read as follows -- the code for specific humidity is similar. if (target_z < z_fg(1,iCell) .and. k < nVertLevels) relhum(k,iCell) = relhum(k+1,iCell) If first-guess levels are not given in bottom-to-top order, then z_fg(1,iCell) does not necessarily contain the height of the surface in the first-guess data, resulting in a copy of vertically interpolated relative humidity level k+1 to level k. One possible fix for this issue might be to compare target_z with sorted_arr(1,1). Since sorted_arr is always sorted in ascending order by its first index, the check to decide when to copy/extrapolate relative humidity would be independent of the order in which first-guess levels were provided. If the comparison were to be made against sorted_arr(1,1) rather than against z_fg(1,iCell), the effect would be to copy the lowest *interpolated* level downward to model levels below the first-guess ground. An alternative fix adopted in this commit is to simply delete the logic to explicitly copy/extrapolate downward, since both relative humidity and specific humidity are vertically interpolated with extrap=0, which specifies constant- value extrapolation. In this case, the lowest *first-guess* level -- rather than the lowest *interpolated* level -- is copied downward. Note: The issue being addressed by this commit is a dependence on the order in which levels are given in the input intermediate file, and not on the direction in which the first-guess model indexes its levels. --- src/core_init_atmosphere/mpas_init_atm_cases.F | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/core_init_atmosphere/mpas_init_atm_cases.F b/src/core_init_atmosphere/mpas_init_atm_cases.F index cfd3f3d27b..3c5320c9f3 100644 --- a/src/core_init_atmosphere/mpas_init_atm_cases.F +++ b/src/core_init_atmosphere/mpas_init_atm_cases.F @@ -5459,7 +5459,6 @@ subroutine init_atm_case_lbc(timestamp, block, mesh, nCells, nEdges, nVertLevels target_z = 0.5 * (zgrid(k,iCell) + zgrid(k+1,iCell)) relhum(k,iCell) = vertical_interp(target_z, nfglevels_actual-1, & sorted_arr(:,1:nfglevels_actual-1), order=1, extrap=0) - if (target_z < z_fg(1,iCell) .and. k < nVertLevels) relhum(k,iCell) = relhum(k+1,iCell) end do @@ -5477,7 +5476,6 @@ subroutine init_atm_case_lbc(timestamp, block, mesh, nCells, nEdges, nVertLevels target_z = 0.5 * (zgrid(k,iCell) + zgrid(k+1,iCell)) spechum(k,iCell) = vertical_interp(target_z, nfglevels_actual-1, & sorted_arr(:,1:nfglevels_actual-1), order=1, extrap=0) - if (target_z < z_fg(1,iCell) .and. k < nVertLevels) spechum(k,iCell) = spechum(k+1,iCell) end do From ddc98648bfb2ab6c3fd98ca5e8d4b96f4c082922 Mon Sep 17 00:00:00 2001 From: Michael Duda Date: Mon, 16 Jun 2025 13:50:31 -0600 Subject: [PATCH 3/6] Update MMM-physics tag in Externals.cfg to fix .F90 re-compilation issue This commit updates the tag to 20250616-MPASv8.3 for the MMM-physics external in the src/core_atmosphere/Externals.cfg file to address an issue with .F90 files not being re-compiled to .o files if a .F90 file was modified. With the updated tag, compiling the atmosphere core, then making changes to any of the .F90 files in src/core_atmosphere/physics/physics_mmm/, then running 'make' again (without first cleaning) leads to the modified .F90 files correctly being re-compiled. --- src/core_atmosphere/Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core_atmosphere/Externals.cfg b/src/core_atmosphere/Externals.cfg index 3fe143bea7..84dc47d1d8 100644 --- a/src/core_atmosphere/Externals.cfg +++ b/src/core_atmosphere/Externals.cfg @@ -2,7 +2,7 @@ local_path = ./physics_mmm protocol = git repo_url = https://github.com/NCAR/MMM-physics.git -tag = 20240626-MPASv8.2 +tag = 20250616-MPASv8.3 required = True [GSL_UGWP] From 068baa406b2016e332849f838411d85c17e9e93c Mon Sep 17 00:00:00 2001 From: Clark Evans Date: Thu, 18 Sep 2025 09:42:21 -0600 Subject: [PATCH 4/6] Merge gsl/develop --- src/core_atmosphere/physics/physics_noaa/GFL | 2 +- src/core_atmosphere/physics/physics_noaa/MYNN-EDMF | 2 +- src/core_atmosphere/physics/physics_noaa/TEMPO | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core_atmosphere/physics/physics_noaa/GFL b/src/core_atmosphere/physics/physics_noaa/GFL index 9f55b90145..bb85663877 160000 --- a/src/core_atmosphere/physics/physics_noaa/GFL +++ b/src/core_atmosphere/physics/physics_noaa/GFL @@ -1 +1 @@ -Subproject commit 9f55b9014506619083b6b8ccacb26bceafbacad6 +Subproject commit bb8566387728d1e1e1e15e82d9837d75997557ec diff --git a/src/core_atmosphere/physics/physics_noaa/MYNN-EDMF b/src/core_atmosphere/physics/physics_noaa/MYNN-EDMF index 7c14493e29..c1ba7d97e1 160000 --- a/src/core_atmosphere/physics/physics_noaa/MYNN-EDMF +++ b/src/core_atmosphere/physics/physics_noaa/MYNN-EDMF @@ -1 +1 @@ -Subproject commit 7c14493e294c18f0318dd859b6fe328439cc7e3b +Subproject commit c1ba7d97e1553519c82b11ca9fbca91ead21a9c9 diff --git a/src/core_atmosphere/physics/physics_noaa/TEMPO b/src/core_atmosphere/physics/physics_noaa/TEMPO index f325c9d778..1ddf4e2030 160000 --- a/src/core_atmosphere/physics/physics_noaa/TEMPO +++ b/src/core_atmosphere/physics/physics_noaa/TEMPO @@ -1 +1 @@ -Subproject commit f325c9d778ca34ecb781ed92757791749a373a52 +Subproject commit 1ddf4e20303412bff68e380a516cf33d0f023140 From 7b67e0376df3820310e7c69d207b64d69cedc69f Mon Sep 17 00:00:00 2001 From: Clark Evans Date: Thu, 18 Sep 2025 09:57:48 -0600 Subject: [PATCH 5/6] Update version, sync SMOKE submodule --- README.md | 2 +- src/core_atmosphere/Registry.xml | 2 +- src/core_init_atmosphere/Registry.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 024d3e6133..b45b7bc932 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -MPAS-v8.3.0-2.0 +MPAS-v8.3.1-2.1 ==== The Model for Prediction Across Scales (MPAS) is a collaborative project for diff --git a/src/core_atmosphere/Registry.xml b/src/core_atmosphere/Registry.xml index e62a1a63d8..f469dd438a 100644 --- a/src/core_atmosphere/Registry.xml +++ b/src/core_atmosphere/Registry.xml @@ -1,5 +1,5 @@ - + diff --git a/src/core_init_atmosphere/Registry.xml b/src/core_init_atmosphere/Registry.xml index 3837f51f68..afb04853e9 100644 --- a/src/core_init_atmosphere/Registry.xml +++ b/src/core_init_atmosphere/Registry.xml @@ -1,5 +1,5 @@ - + From 62a0a222e39cc8cfc51e28d83afc42df96c559ce Mon Sep 17 00:00:00 2001 From: Clark Evans Date: Thu, 18 Sep 2025 10:45:59 -0600 Subject: [PATCH 6/6] Updating submodule pointers --- src/core_atmosphere/physics/physics_noaa/GFL | 2 +- src/core_atmosphere/physics/physics_noaa/MYNN-EDMF | 2 +- src/core_atmosphere/physics/physics_noaa/TEMPO | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core_atmosphere/physics/physics_noaa/GFL b/src/core_atmosphere/physics/physics_noaa/GFL index bb85663877..9f55b90145 160000 --- a/src/core_atmosphere/physics/physics_noaa/GFL +++ b/src/core_atmosphere/physics/physics_noaa/GFL @@ -1 +1 @@ -Subproject commit bb8566387728d1e1e1e15e82d9837d75997557ec +Subproject commit 9f55b9014506619083b6b8ccacb26bceafbacad6 diff --git a/src/core_atmosphere/physics/physics_noaa/MYNN-EDMF b/src/core_atmosphere/physics/physics_noaa/MYNN-EDMF index c1ba7d97e1..7c14493e29 160000 --- a/src/core_atmosphere/physics/physics_noaa/MYNN-EDMF +++ b/src/core_atmosphere/physics/physics_noaa/MYNN-EDMF @@ -1 +1 @@ -Subproject commit c1ba7d97e1553519c82b11ca9fbca91ead21a9c9 +Subproject commit 7c14493e294c18f0318dd859b6fe328439cc7e3b diff --git a/src/core_atmosphere/physics/physics_noaa/TEMPO b/src/core_atmosphere/physics/physics_noaa/TEMPO index 1ddf4e2030..f325c9d778 160000 --- a/src/core_atmosphere/physics/physics_noaa/TEMPO +++ b/src/core_atmosphere/physics/physics_noaa/TEMPO @@ -1 +1 @@ -Subproject commit 1ddf4e20303412bff68e380a516cf33d0f023140 +Subproject commit f325c9d778ca34ecb781ed92757791749a373a52