ufs-community · jkbk2004 · Nov 14, 2023 · Oct 12, 2023 · Oct 12, 2023 · Oct 31, 2023
diff --git a/FV3 b/FV3
diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
diff --git a/MOM6-interface/mom6_files.cmake b/MOM6-interface/mom6_files.cmake
@@ -209,7 +209,7 @@ list(APPEND mom6_src_files
 
   MOM6/src/tracer/MOM_OCMIP2_CFC.F90
   MOM6/src/tracer/MOM_generic_tracer.F90
-  MOM6/src/tracer/MOM_lateral_boundary_diffusion.F90
+  MOM6/src/tracer/MOM_hor_bnd_diffusion.F90
   MOM6/src/tracer/MOM_neutral_diffusion.F90
   MOM6/src/tracer/nw2_tracers.F90
   MOM6/src/tracer/MOM_offline_aux.F90

diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -174,6 +174,8 @@ elif [[ $MACHINE_ID = jet ]]; then
   INPES_thrd=3 ; JNPES_thrd=4
   INPES_c384=6 ; JNPES_c384=12 ; THRD_c384=1
   INPES_c768=8 ; JNPES_c768=16 ; THRD_c768=2
+  WRTTASK_PER_GROUP_c384=84
+  WRTTASK_PER_GROUP_c384gdas=88
 
   THRD_cpl_atmw_gdas=2
   INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8; WPG_cpl_atmw_gdas=24
@@ -357,7 +359,7 @@ export INPES=$INPES_dflt
 export JNPES=$JNPES_dflt
 export RESTART_INTERVAL=0
 export QUILTING=.true.
-export QUILTING_RESTART=.false.
+export QUILTING_RESTART=.true.
 export WRITE_GROUP=1
 export WRTTASK_PER_GROUP=6
 export ITASKS=1
@@ -698,6 +700,8 @@ export JNPES=$JNPES_cpl_dflt
 export THRD=$THRD_cpl_dflt
 export WRTTASK_PER_GROUP=$WPG_cpl_dflt
 
+export QUILTING_RESTART=.false.
+
 OCN_tasks=$OCN_tasks_cpl_dflt
 ICE_tasks=$ICE_tasks_cpl_dflt
 WAV_tasks=$WAV_tasks_cpl_dflt
@@ -1147,7 +1151,6 @@ export RESTART_INTERVAL=0
 export FHROT=0
 export coupling_interval_fast_sec=0
 export QUILTING=.true.
-export QUILTING_RESTART=.false.
 export WRITE_GROUP=1
 export WRTTASK_PER_GROUP=6
 export OUTPUT_HISTORY=.true.

diff --git a/tests/logs/RegressionTests_acorn.log b/tests/logs/RegressionTests_acorn.log
diff --git a/tests/logs/RegressionTests_gaea.log b/tests/logs/RegressionTests_gaea.log
diff --git a/tests/logs/RegressionTests_hera.log b/tests/logs/RegressionTests_hera.log
diff --git a/tests/logs/RegressionTests_hercules.log b/tests/logs/RegressionTests_hercules.log
diff --git a/tests/logs/RegressionTests_jet.log b/tests/logs/RegressionTests_jet.log
diff --git a/tests/logs/RegressionTests_orion.log b/tests/logs/RegressionTests_orion.log
diff --git a/tests/logs/RegressionTests_wcoss2.log b/tests/logs/RegressionTests_wcoss2.log
diff --git a/tests/rt.conf b/tests/rt.conf
@@ -99,8 +99,8 @@ RUN | control_iovr5                                     |
 RUN | control_p8                                        | - noaacloud                | baseline |
 RUN | control_p8_ugwpv1                                 | - noaacloud                | baseline |
 RUN | control_restart_p8                                | - noaacloud                |          | control_p8
-RUN | control_qr_p8                                     | - noaacloud                |          |
-RUN | control_restart_qr_p8                             | - noaacloud                |          | control_qr_p8
+RUN | control_noqr_p8                                   | - noaacloud                |          |
+RUN | control_restart_noqr_p8                           | - noaacloud                |          | control_noqr_p8
 RUN | control_decomp_p8                                 | - noaacloud                |          |
 RUN | control_2threads_p8                               | - noaacloud                |          |
 RUN | control_p8_lndp                                   |                            | baseline |
@@ -109,8 +109,6 @@ RUN | control_p8_mynn                                   | - noaacloud
 RUN | merra2_thompson                                   | - noaacloud                | baseline |
 RUN | regional_control                                  |                            | baseline |
 RUN | regional_restart                                  | - noaacloud                |          | regional_control
-RUN | regional_control_qr                               | - noaacloud                |          |
-RUN | regional_restart_qr                               | - noaacloud                |          | regional_control_qr
 RUN | regional_decomp                                   | - noaacloud                |          |
 RUN | regional_2threads                                 | - noaacloud                |          |
 RUN | regional_noquilt                                  | - jet s4                   | baseline |
@@ -133,11 +131,9 @@ RUN | rap_sfcdiff                                       | - noaacloud
 RUN | rap_sfcdiff_decomp                                | - noaacloud                |          |
 RUN | rap_sfcdiff_restart                               | - noaacloud                |          | rap_sfcdiff
 RUN | hrrr_control                                      | - noaacloud                | baseline |
-RUN | hrrr_control_qr                                   | - noaacloud                |          |
 RUN | hrrr_control_decomp                               | - noaacloud                |          |
 RUN | hrrr_control_2threads                             | - noaacloud                |          |
 RUN | hrrr_control_restart                              | - noaacloud                |          | hrrr_control
-RUN | hrrr_control_restart_qr                           | - noaacloud                |          | hrrr_control_qr
 RUN | rrfs_v1beta                                       |                            | baseline |
 RUN | rrfs_v1nssl                                       |                            | baseline |
 RUN | rrfs_v1nssl_nohailnoccn                           |                            | baseline |
@@ -192,13 +188,11 @@ COMPILE | rrfs_dyn32_phy32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -D
 RUN | regional_spp_sppt_shum_skeb_dyn32_phy32           | - noaacloud                  | baseline |
 RUN | rap_control_dyn32_phy32                           | - noaacloud                  | baseline |
 RUN | hrrr_control_dyn32_phy32                          | - noaacloud                  | baseline |
-RUN | hrrr_control_qr_dyn32_phy32                       | - noaacloud                  |          |
 RUN | rap_2threads_dyn32_phy32                          | - noaacloud                  |          |
 RUN | hrrr_control_2threads_dyn32_phy32                 | - noaacloud                  |          |
 RUN | hrrr_control_decomp_dyn32_phy32                   | - noaacloud                  |          |
 RUN | rap_restart_dyn32_phy32                           | - noaacloud                  |          | rap_control_dyn32_phy32
 RUN | hrrr_control_restart_dyn32_phy32                  | - noaacloud                  |          | hrrr_control_dyn32_phy32
-RUN | hrrr_control_restart_qr_dyn32_phy32               | - noaacloud                  |          | hrrr_control_qr_dyn32_phy32
 
 COMPILE | rrfs_dyn32_phy32_faster | intel | -DAPP=ATM -DFASTER=ON -DCCPP_SUITES=FV3_HRRR -D32BIT=ON -DCCPP_32BIT=ON | - noaacloud  | fv3 |
 RUN | conus13km_control             | - noaacloud                                      | baseline |
@@ -234,15 +228,11 @@ RUN | hafs_regional_atm_ocn                             |
 RUN | hafs_regional_atm_wav                             |                               | baseline |
 RUN | hafs_regional_atm_ocn_wav                         | - noaacloud                   | baseline |
 RUN | hafs_regional_1nest_atm                           | - jet s4  noaacloud           | baseline |
-RUN | hafs_regional_1nest_atm_qr                        | - jet s4 cheyenne noaacloud   |          |
 RUN | hafs_regional_telescopic_2nests_atm               | - jet s4  noaacloud           | baseline |
 RUN | hafs_global_1nest_atm                             | - jet s4  noaacloud           | baseline |
-RUN | hafs_global_1nest_atm_qr                          | - jet s4 cheyenne noaacloud   |          |
 RUN | hafs_global_multiple_4nests_atm                   | - jet s4  noaacloud           | baseline |
-RUN | hafs_global_multiple_4nests_atm_qr                | - jet s4 cheyenne noaacloud   |          |
 RUN | hafs_regional_specified_moving_1nest_atm          | - jet s4  noaacloud           | baseline |
 RUN | hafs_regional_storm_following_1nest_atm           | - jet s4  noaacloud           | baseline |
-RUN | hafs_regional_storm_following_1nest_atm_qr        | - jet s4 cheyenne noaacloud   |          |
 RUN | hafs_regional_storm_following_1nest_atm_ocn       | - jet s4  noaacloud           | baseline |
 RUN | hafs_global_storm_following_1nest_atm             | - jet s4  noaacloud           | baseline |
 
@@ -333,11 +323,11 @@ RUN | rap_sfcdiff                                       | + hera cheyenne hercul
 RUN | rap_sfcdiff_decomp                                | + hera cheyenne hercules            |          |
 RUN | rap_sfcdiff_restart                               | + hera cheyenne hercules            |          | rap_sfcdiff
 RUN | hrrr_control                                      | + hera cheyenne hercules            | baseline |
-RUN | hrrr_control_qr                                   | + hera cheyenne hercules            |          |
+RUN | hrrr_control_noqr                                 | + hera cheyenne hercules            |          |
 RUN | hrrr_control_2threads                             | + hera cheyenne hercules            |          |
 RUN | hrrr_control_decomp                               | + hera cheyenne hercules            |          |
 RUN | hrrr_control_restart                              | + hera cheyenne hercules            |          | hrrr_control
-RUN | hrrr_control_restart_qr                           | + hera cheyenne hercules            |          | hrrr_control_qr
+RUN | hrrr_control_restart_noqr                         | + hera cheyenne hercules            |          | hrrr_control_noqr
 RUN | rrfs_v1beta                                       | + hera cheyenne hercules            | baseline |
 
 ### CCPP DEBUG tests ###
@@ -368,13 +358,11 @@ RUN | control_wam_debug                                 | + hera cheyenne
 COMPILE | rrfs_dyn32_phy32 | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -D32BIT=ON -DCCPP_32BIT=ON | + hera cheyenne hercules | fv3 |
 RUN | rap_control_dyn32_phy32                           | + hera cheyenne hercules            | baseline |
 RUN | hrrr_control_dyn32_phy32                          | + hera cheyenne hercules            | baseline |
-RUN | hrrr_control_qr_dyn32_phy32                       | + hera cheyenne hercules            |          |
 RUN | rap_2threads_dyn32_phy32                          | + hera cheyenne hercules            |          |
 RUN | hrrr_control_2threads_dyn32_phy32                 | + hera cheyenne hercules            |          |
 RUN | hrrr_control_decomp_dyn32_phy32                   | + hera cheyenne hercules            |          |
 RUN | rap_restart_dyn32_phy32                           | + hera cheyenne hercules            |          | rap_control_dyn32_phy32
 RUN | hrrr_control_restart_dyn32_phy32                  | + hera cheyenne hercules            |          | hrrr_control_dyn32_phy32
-RUN | hrrr_control_restart_qr_dyn32_phy32               | + hera cheyenne hercules            |          | hrrr_control_qr_dyn32_phy32
 RUN | conus13km_control                                 | + hera cheyenne hercules            | baseline |
 RUN | conus13km_2threads                                | + hera cheyenne hercules            |          | conus13km_control
 RUN | conus13km_restart_mismatch                        | + hera cheyenne hercules            | baseline | conus13km_control

diff --git a/tests/tests/control_c384 b/tests/tests/control_c384
@@ -22,7 +22,7 @@ export atm_omp_num_threads=${THRD_c384}
 export INPES=${INPES_c384}
 export JNPES=${JNPES_c384}
 export WRITE_GROUP=1
-export WRTTASK_PER_GROUP=48
+export WRTTASK_PER_GROUP=${WRTTASK_PER_GROUP_c384:-48}
 export FHMAX=12
 export NPZ=127
 export NPZP=128

diff --git a/tests/tests/control_c384gdas b/tests/tests/control_c384gdas
@@ -54,7 +54,7 @@ export atm_omp_num_threads=${THRD_c384}
 export INPES=${INPES_c384}
 export JNPES=${JNPES_c384}
 export WRITE_GROUP=1
-export WRTTASK_PER_GROUP=48
+export WRTTASK_PER_GROUP=${WRTTASK_PER_GROUP_c384gdas:-48}
 export FHMAX=12
 export NPZ=127
 export NPZP=128
@@ -98,3 +98,6 @@ export INPUT_NML=control_gdas.nml.IN
 if [[ $MACHINE_ID = gaea || $MACHINE_ID = cheyenne ]]; then
   TPN=18
 fi
+if [[ $MACHINE_ID = jet ]] ; then
+  TPN=20
+fi
diff --git a/tests/tests/control_qr_p8 → tests/tests/control_noqr_p8 b/tests/tests/control_qr_p8 → tests/tests/control_noqr_p8
@@ -62,7 +62,7 @@ export SYEAR=2021
 export SMONTH=03
 export SDAY=22
 export SHOUR=06
-export QUILTING_RESTART=.true.
+export QUILTING_RESTART=.false.
 export RESTART_INTERVAL="12 -1"
 export OUTPUT_GRID='gaussian_grid'
 export WRITE_DOPOST=.true.

diff --git a/tests/tests/control_restart_qr_p8 → tests/tests/control_restart_noqr_p8 b/tests/tests/control_restart_qr_p8 → tests/tests/control_restart_noqr_p8
@@ -56,7 +56,7 @@ export SDAY=22
 export SHOUR=06
 export OUTPUT_GRID='gaussian_grid'
 export WRITE_DOPOST=.true.
-export QUILTING_RESTART=.true.
+export QUILTING_RESTART=.false.
 export FHROT=12
 export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${SHOUR} + ${FHROT}  )))0000"
 

diff --git a/tests/tests/conus13km_2threads b/tests/tests/conus13km_2threads
@@ -24,3 +24,4 @@ export atm_omp_num_threads=2
 export INPES=12
 export JNPES=12
 export WRTTASK_PER_GROUP=6
+export QUILTING_RESTART=.false.
diff --git a/tests/tests/conus13km_control b/tests/tests/conus13km_control
@@ -27,6 +27,7 @@ export LIST_FILES="sfcf000.nc \
 
 export_hrrr_conus13km
 export RESTART_INTERVAL=1
+export QUILTING_RESTART=.false.
 
 if [[ " hera orion hercules gaea jet " =~ " ${MACHINE_ID} " ]] ; then
   ZSTANDARD_LEVEL=5

diff --git a/tests/tests/conus13km_debug b/tests/tests/conus13km_debug
@@ -26,3 +26,4 @@ export LIST_FILES="sfcf000.nc \
 export_hrrr_conus13km
 export RESTART_INTERVAL=1
 export FHMAX=1
+export QUILTING_RESTART=.false.
diff --git a/tests/tests/conus13km_debug_2threads b/tests/tests/conus13km_debug_2threads
@@ -23,3 +23,4 @@ export atm_omp_num_threads=2
 export INPES=12
 export JNPES=12
 export WRTTASK_PER_GROUP=6
+export QUILTING_RESTART=.false.
diff --git a/tests/tests/conus13km_debug_decomp b/tests/tests/conus13km_debug_decomp
@@ -21,3 +21,4 @@ export RESTART_INTERVAL=1
 export FHMAX=1
 export INPES=16
 export JNPES=9
+export QUILTING_RESTART=.false.
diff --git a/tests/tests/conus13km_debug_qr b/tests/tests/conus13km_debug_qr
@@ -25,5 +25,4 @@ export LIST_FILES="sfcf000.nc \
 
 export_hrrr_conus13km
 export RESTART_INTERVAL=1
-export QUILTING_RESTART=.true.
 export FHMAX=1
diff --git a/tests/tests/conus13km_decomp b/tests/tests/conus13km_decomp
@@ -22,3 +22,4 @@ export_hrrr_conus13km
 export RESTART_INTERVAL=1
 export INPES=16
 export JNPES=9
+export QUILTING_RESTART=.false.
diff --git a/tests/tests/conus13km_radar_tten_debug b/tests/tests/conus13km_radar_tten_debug
@@ -20,3 +20,4 @@ export_hrrr_conus13km
 export RESTART_INTERVAL=1
 export FH_DFI_RADAR='0.0, 0.25, 0.50, 0.75, 1.0'
 export FHMAX=1
+export QUILTING_RESTART=.false.
diff --git a/tests/tests/conus13km_restart b/tests/tests/conus13km_restart
@@ -18,3 +18,4 @@ export_hrrr_conus13km
 export FHROT=1
 export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${SHOUR} + ${FHROT}  )))0000"
 export RRFS_RESTART=YES
+export QUILTING_RESTART=.false.
diff --git a/tests/tests/conus13km_restart_mismatch b/tests/tests/conus13km_restart_mismatch
@@ -18,3 +18,4 @@ export_hrrr_conus13km
 export FHROT=1
 export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${SHOUR} + ${FHROT}  )))0000"
 export RRFS_RESTART=YES
+export QUILTING_RESTART=.false.
diff --git a/tests/tests/cpld_control_p8 b/tests/tests/cpld_control_p8
@@ -85,7 +85,3 @@ export FV3_RUN=cpld_control_run.IN
 if [[ $MACHINE_ID = cheyenne ]]; then
   TPN=18
 fi
-
-if [[ $MACHINE_ID = hera ]] && [[ $RT_COMPILER = gnu ]]; then
-  WLCLK=40
-fi
+0 −4		.github/workflows/coupled-api.yml
+9 −2		.readthedocs.yml
+0 −7		.testing/Makefile
+8 −0		config_src/drivers/FMS_cap/ocean_model_MOM.F90
+0 −0		config_src/drivers/STALE_mct_cap/mom_ocean_model_mct.F90
+0 −0		config_src/drivers/STALE_mct_cap/mom_surface_forcing_mct.F90
+0 −0		config_src/drivers/STALE_mct_cap/ocn_cap_methods.F90
+0 −0		config_src/drivers/STALE_mct_cap/ocn_comp_mct.F90
+0 −0		config_src/drivers/STALE_mct_cap/ocn_cpl_indices.F90
+46 −19		config_src/drivers/nuopc_cap/mom_cap.F90
+13 −7		config_src/drivers/nuopc_cap/mom_ocean_model_nuopc.F90
+3 −40		config_src/drivers/nuopc_cap/mom_surface_forcing_nuopc.F90
+2 −1		config_src/drivers/solo_driver/MOM_surface_forcing.F90
+10 −3		config_src/infra/FMS1/MOM_ensemble_manager_infra.F90
+10 −3		config_src/infra/FMS2/MOM_ensemble_manager_infra.F90
+2 −0		docs/requirements.txt
+5 −3		src/core/MOM.F90
+77 −3		src/core/MOM_dynamics_split_RK2.F90
+27 −42		src/core/MOM_forcing_type.F90
+1 −1		src/core/MOM_unit_tests.F90
+2 −13		src/core/MOM_variables.F90
+2 −0		src/diagnostics/MOM_obsolete_params.F90
+8 −1		src/framework/MOM_file_parser.F90
+1 −1		src/framework/MOM_get_input.F90
+345 −34		src/parameterizations/lateral/MOM_hor_visc.F90
+16 −0		src/parameterizations/vertical/MOM_CVMix_KPP.F90
+2 −1		src/parameterizations/vertical/MOM_set_viscosity.F90
+396 −0		src/parameterizations/vertical/MOM_vert_friction.F90
+195 −144		src/tracer/MOM_CFC_cap.F90
+272 −146		src/tracer/MOM_hor_bnd_diffusion.F90
+376 −88		src/tracer/MOM_neutral_diffusion.F90
+7 −4		src/tracer/MOM_tracer_flow_control.F90
+176 −99		src/tracer/MOM_tracer_hor_diff.F90
+31 −43		src/tracer/MOM_tracer_registry.F90
+13 −17		src/tracer/MOM_tracer_types.F90
+1 −1		src/tracer/oil_tracer.F90
+31 −6		src/user/MOM_wave_interface.F90