Sync with MPAS-Dev v8.4.2 release

.github/workflows/run_mpas.yml

@@ -26,9 +26,9 @@ on: [push, pull_request, workflow_dispatch]
 #
 # Tests:
 #        Baseline Codebase Repository:Branch   Physics                       build type
-# 1/7)   MPAS-Dev:v8.4.1                       mesoscale_reference           Release/Debug
-# 2/8)   MPAS-Dev:v8.4.1                       convection_permitting         Release/Debug
-# 3/9)   MPAS-Dev:v8.4.1                       mesoscale_reference_noahmp    Release/Debug
+# 1/7)   MPAS-Dev:v8.4.2                       mesoscale_reference           Release/Debug
+# 2/8)   MPAS-Dev:v8.4.2                       convection_permitting         Release/Debug
+# 3/9)   MPAS-Dev:v8.4.2                       mesoscale_reference_noahmp    Release/Debug
 # 4/10)  ufs-community:noaa/develop            mesoscale_reference           Release/Debug
 # 5/11)  ufs-community:noaa/develop            convection_permitting         Release/Debug
 # 6/12)  ufs-community:noaa/develop            mesoscale_reference_noahmp    Release/Debug
@@ -43,13 +43,13 @@ jobs:
         f-compiler: [gfortran]#,ifx]
         physics:    [mesoscale_reference, convection_permitting, mesoscale_reference_noahmp]
         repo:       [ufs-community, MPAS-Dev]
-        branch:     [noaa/develop, v8.4.1]
+        branch:     [noaa/develop, v8.4.2]
         build-type: [Debug, Release]
         exclude:
           - repo: MPAS-Dev
             branch: noaa/develop
           - repo: ufs-community
-            branch: v8.4.1
+            branch: v8.4.2
         include:
         # Set container images for each compiler
         - f-compiler: gfortran

README.md

@@ -1,4 +1,4 @@
-MPAS-v8.4.1-1.8
+MPAS-v8.4.2-1.9
 ====
 
 The Model for Prediction Across Scales (MPAS) is a collaborative project for

src/core_atmosphere/Registry.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<registry model="mpas" core="atmosphere" core_abbrev="atm" version="8.4.1-noaa">
+<registry model="mpas" core="atmosphere" core_abbrev="atm" version="8.4.2-noaa">
 
 <!-- **************************************************************************************** -->
 <!-- ************************************** Dimensions ************************************** -->
@@ -110,10 +110,10 @@
                      description="Whether to super-cycle scalar transport"
                      possible_values="Logical values"/>
 
-                <nml_option name="config_number_of_sub_steps" type="integer" default_value="2"
+                <nml_option name="config_number_of_sub_steps" type="integer" default_value="4"
                      units="-"
                      description="Number of acoustic steps per full RK step"
-                     possible_values="Positive, even integer values, typically 2 or 6 depending on transport splitting"/>
+                     possible_values="Positive, even integer values, typically 2, 4, or 6 depending on transport splitting"/>
 
                 <nml_option name="config_dynamics_split_steps" type="integer" default_value="3"
                      units="-"
@@ -2659,14 +2659,14 @@
                         <var name="lbc_qh" name_in_code="qh" array_group="moist"  packages="mp_nssl2m_in" units="kg kg^{-1} s^{-1}"
                              description="Lateral boundary tendency of hail mixing ratio"/>
 
-                        <var name="lbc_nr" name_in_code="nr" array_group="number" packages="mp_thompson_in;mp_nssl2m_in;mp_thompson_aers_in;mp_tempo_in"
-                             units="m^{-3} s^{-1}"
-                             description="Lateral boundary tendency of rain number concentration"/>
-
                         <var name="lbc_ni" name_in_code="ni" array_group="number" packages="bl_mynn_in;bl_mynnedmf_in;mp_thompson_in;mp_thompson_aers_in;mp_nssl2m_in;mp_tempo_in"
                              units="m^{-3} s^{-1}"
                              description="Lateral boundary tendency of ice number concentration"/>
 
+                        <var name="lbc_nr" name_in_code="nr" array_group="number" packages="mp_thompson_in;mp_nssl2m_in;mp_thompson_aers_in;mp_tempo_in"
+                             units="m^{-3} s^{-1}"
+                             description="Lateral boundary tendency of rain number concentration"/>
+
                         <var name="lbc_ns" name_in_code="ns" array_group="number" packages="mp_nssl2m_in" units="m^{-3} s^{-1}"
                              description="Lateral boundary tendency of snow number concentration"/>
 

src/core_atmosphere/dynamics/mpas_atm_dissipation_models.F

@@ -407,8 +407,10 @@ subroutine les_models( les_model_opt, les_surface_opt, dynamics_substep, eddy_vi
                ! eddy viscocities set here if we are running the 1.5 order prognostic tke scheme
                eddy_visc_h = c_k*l_horizontal*sqrt(scalars(index_tke,k,iCell))
                eddy_visc_h = min(eddy_visc_h,(0.01*config_len_disp**2) * invDt)
+               eddy_visc_h = max(0.01, eddy_visc_h)
                eddy_visc_v = c_k*l_vertical*sqrt(scalars(index_tke,k,iCell))
                eddy_visc_v = min(eddy_visc_v,(0.01*delta_z**2) * invDt)
+               eddy_visc_v = max(0.01, eddy_visc_v)
 
                eddy_visc_horz(k,iCell) = eddy_visc_h
                eddy_visc_vert(k,iCell) = eddy_visc_v

src/core_atmosphere/dynamics/mpas_atm_time_integration.F

@@ -597,7 +597,7 @@ subroutine mpas_atm_pre_compute_solve_diagnostics(block)
       MPAS_ACC_TIMER_START('first_compute_solve_diagnostics [ACC_data_xfer]')
 
       call mpas_pool_get_array(state, 'rho_zz', h, 1)
-      !$acc enter data create(h)
+      !$acc enter data copyin(h)
 
       call mpas_pool_get_array(state, 'u', u, 1)
       !$acc enter data copyin(u)

src/core_init_atmosphere/Registry.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<registry model="mpas" core="init_atmosphere" core_abbrev="init_atm" version="8.4.1-noaa">
+<registry model="mpas" core="init_atmosphere" core_abbrev="init_atm" version="8.4.2-noaa">
 
 <!-- **************************************************************************************** -->
 <!-- ************************************** Dimensions ************************************** -->

src/core_landice/Registry.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<registry model="mpas" core="landice" core_abbrev="li" version="8.4.1">
+<registry model="mpas" core="landice" core_abbrev="li" version="8.4.2">
 
 
 <!-- ======================================================================= -->

src/core_ocean/Registry.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<registry model="mpas" core="ocean" core_abbrev="ocn" version="8.4.1">
+<registry model="mpas" core="ocean" core_abbrev="ocn" version="8.4.2">
 
 	<dims>
 		<dim name="nCells" units="unitless"

src/core_seaice/Registry.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<registry model="mpas" core="seaice" core_abbrev="seaice" version="8.4.1">
+<registry model="mpas" core="seaice" core_abbrev="seaice" version="8.4.2">
 
 	<dims>
 		<dim name="nCells"

src/core_sw/Registry.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<registry model="mpas" core="sw" core_abbrev="sw" version="8.4.1">
+<registry model="mpas" core="sw" core_abbrev="sw" version="8.4.2">
 	<dims>
 		<dim name="nCells"/>
 		<dim name="nEdges"/>

src/core_test/Registry.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<registry model="mpas" core="test" core_abbrev="test" version="8.4.1">
+<registry model="mpas" core="test" core_abbrev="test" version="8.4.2">
 	<dims>
 		<dim name="nCells"/>
 		<dim name="nEdges"/>

src/external/esmf_time_f90/CMakeLists.txt

@@ -22,6 +22,12 @@ add_library(esmf ${_esmf_time_src})
 mpas_fortran_target(esmf)
 add_library(${PROJECT_NAME}::external::esmf ALIAS esmf)
 
+# This library is MPAS's bundled ESMF time-manager stubs, not the full ESMF. Naming the
+# file libesmf lets the loader substitute a real ESMF found via LD_LIBRARY_PATH,
+# breaking every MPAS executable. Changing the output name results in the library
+# being installed as libesmf_time.{so,a} and resolves the name conflict.
+set_target_properties(esmf PROPERTIES OUTPUT_NAME esmf_time)
+
 target_compile_definitions(esmf PRIVATE HIDE_MPI=1)
 
 target_include_directories(esmf PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)

src/tools/registry/gen_inc.c

@@ -3013,7 +3013,11 @@ void gen_pkg_debug_info(FILE *fd, regex_t *preg, ezxml_t registry,
 	regoff_t next = 0;
 
 	fortprintf(fd, "      PACKAGE_LOGIC_PRINT('')\n");
+#ifdef CPRPGI
+	fprintf(fd, "      PACKAGE_LOGIC_PRINT(\"  %s is active when (%s)\")\n", packagename, packagewhen);
+#else
 	fortprintf(fd, "      PACKAGE_LOGIC_PRINT(\"  %s is active when (%s)\")\n", packagename, packagewhen);
+#endif
 	fortprintf(fd, "      PACKAGE_LOGIC_PRINT('    namelist settings:')\n");
 	fortprintf(fd, "      PACKAGE_LOGIC_PRINT('    ------------------')\n");