ufs-community · gspetro-NOAA · Apr 29, 2026 · Aug 12, 2025 · Aug 13, 2025 · Aug 13, 2025
diff --git a/UFSATM b/UFSATM
diff --git a/tests/bl_date.conf b/tests/bl_date.conf
@@ -1 +1 @@
-export BL_DATE=20260417
+export BL_DATE=20260427
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -455,15 +455,8 @@ export_mpas ()
     export_gfs_physics
     # ufs.configure defaults
     export UFS_CONFIGURE=ufs.configure.atm.IN
-    export MODEL_CONFIGURE=mpasatm_configure.IN
     export atm_model=mpas
 
-    export DIAG_TABLE=diag_table_rrfs_a
-    export FIELD_TABLE=field_table_regional_rrfs_a
-    export FV3_RUN=rrfs_mpas_run.IN
-    export INPUT_NML=control_mpas.nml.IN
-    export CCPP_SUITE=MPAS_RRFS
-
     #
     export MPAS=true
     export FV3=false
@@ -495,14 +488,14 @@ export_mpas ()
 
     export DAYS=1
     export ENS_NUM=1
-    export SYEAR=2016 #mpasatm_configure.IN
-    export SMONTH=10 #mpasatm_configure.IN
-    export SDAY=03 #mpasatm_configure.IN
-    export SHOUR=00 #mpasatm_configure.IN
-    export SECS=$(( SHOUR*3600 )) #mpasatm_configure.IN
-    export FHMAX=$(( DAYS*24 )) #mpasatm_configure.IN
+    export SYEAR=2016
+    export SMONTH=10
+    export SDAY=03
+    export SHOUR=00
+    export SECS=$(( SHOUR*3600 ))
+    export FHMAX=$(( DAYS*24 ))
     export FHCYC=0
-    export FHROT=0 #mpasatm_configure.IN
+    export FHROT=0
     export LDIAG3D=.false.
     export QDIAG3D=.false.
     export PRINT_DIFF_PGR=.false.
@@ -558,6 +551,36 @@ export_mpas ()
 
     export DOMAINS_STACK_SIZE=3000000
 }
+export_mpas_rrfs ()
+{
+    # RRFS agnostic MPAS settings
+    export_mpas
+
+    # RRFS specific MPAS settings.
+    export DIAG_TABLE=diag_table_mpas
+    export FIELD_TABLE=field_table_rrfs_mpas
+    export FV3_RUN=rrfs_mpas_run.IN
+    export INPUT_NML=control_rrfs_mpas.nml.IN
+    export CCPP_SUITE=MPAS_RRFS
+
+    MODEL_CONFIGURE=mpasrrfs_configure.IN
+}
+
+export_mpas_gfs ()
+{
+    # GFS agnostic MPAS settings.
+    export_mpas
+
+    # GFS specific MPAS setting
+    export DIAG_TABLE=diag_table_mpas
+    export FIELD_TABLE=field_table_gfsv17_mpas
+    export FV3_RUN=gfs_mpas_run.IN
+    export INPUT_NML=control_gfs_mpas.nml.IN
+    # Use regional physics for now.
+    export CCPP_SUITE=MPAS_RRFS
+
+    MODEL_CONFIGURE=mpasgfs_configure.IN
+}
 
 export_gfs_physics ()
 {

diff --git a/tests/logs/OpnReqTests_control_p8_ursa.log b/tests/logs/OpnReqTests_control_p8_ursa.log
@@ -1,9 +1,9 @@
-Tue Apr 21 12:35:39 UTC 2026
+Mon Apr 27 18:28:02 UTC 2026
 Start Operation Requirement Test
 
 
-baseline dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-stmp/Gillian.Petro/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_intel
-working dir  = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-ptmp/Gillian.Petro/FV3_OPNREQ_TEST/opnReqTest_3005930/bit_base_bit_base
+baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_intel
+working dir  = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_755384/bit_base_bit_base
 Checking test bit_base results ....
 Moving baseline bit_base files ....
  Moving sfcf000.nc .........OK
@@ -51,14 +51,14 @@ Moving baseline bit_base files ....
  Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 649.751382
-  0: The maximum resident set size (KB)                   = 2618076
+  0: The total amount of wall time                        = 149.683236
+  0: The maximum resident set size (KB)                   = 2596036
 
 Test bit_base PASS
 
 
-baseline dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-stmp/Gillian.Petro/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_intel
-working dir  = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-ptmp/Gillian.Petro/FV3_OPNREQ_TEST/opnReqTest_3005930/dbg_base_dbg_base
+baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_intel
+working dir  = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_755384/dbg_base_dbg_base
 Checking test dbg_base results ....
 Moving baseline dbg_base files ....
  Moving sfcf000.nc .........OK
@@ -106,14 +106,14 @@ Moving baseline dbg_base files ....
  Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 1317.416775
-  0: The maximum resident set size (KB)                   = 2504188
+  0: The total amount of wall time                        = 1279.051199
+  0: The maximum resident set size (KB)                   = 2538808
 
 Test dbg_base PASS
 
 
-baseline dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-stmp/Gillian.Petro/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
-working dir  = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-ptmp/Gillian.Petro/FV3_OPNREQ_TEST/opnReqTest_3005930/dcp_dcp
+baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
+working dir  = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_755384/dcp_dcp
 Checking test dcp results ....
  Comparing sfcf000.nc .....USING NCCMP......OK
  Comparing sfcf021.nc .....USING NCCMP......OK
@@ -160,14 +160,14 @@ Checking test dcp results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
 
-  0: The total amount of wall time                        = 117.446488
-  0: The maximum resident set size (KB)                   = 2521912
+  0: The total amount of wall time                        = 879.238295
+  0: The maximum resident set size (KB)                   = 2513444
 
 Test dcp PASS
 
 
-baseline dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-stmp/Gillian.Petro/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
-working dir  = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-ptmp/Gillian.Petro/FV3_OPNREQ_TEST/opnReqTest_3005930/mpi_mpi
+baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
+working dir  = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_755384/mpi_mpi
 Checking test mpi results ....
  Comparing sfcf000.nc .....USING NCCMP......OK
  Comparing sfcf021.nc .....USING NCCMP......OK
@@ -214,14 +214,14 @@ Checking test mpi results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
 
-  0: The total amount of wall time                        = 676.921160
-  0: The maximum resident set size (KB)                   = 2527408
+  0: The total amount of wall time                        = 128.049718
+  0: The maximum resident set size (KB)                   = 2495904
 
 Test mpi PASS
 
 
-baseline dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-stmp/Gillian.Petro/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
-working dir  = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-ptmp/Gillian.Petro/FV3_OPNREQ_TEST/opnReqTest_3005930/rst_rst
+baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
+working dir  = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_755384/rst_rst
 Checking test rst results ....
  Comparing sfcf000.nc .....USING NCCMP......OK
  Comparing sfcf021.nc .....USING NCCMP......OK
@@ -268,14 +268,14 @@ Checking test rst results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
 
-  0: The total amount of wall time                        = 118.593250
-  0: The maximum resident set size (KB)                   = 2511000
+  0: The total amount of wall time                        = 123.325079
+  0: The maximum resident set size (KB)                   = 2509856
 
 Test rst PASS
 
 
-baseline dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-stmp/Gillian.Petro/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
-working dir  = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-ptmp/Gillian.Petro/FV3_OPNREQ_TEST/opnReqTest_3005930/std_base_std_base
+baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
+working dir  = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_755384/std_base_std_base
 Checking test std_base results ....
 Moving baseline std_base files ....
  Moving sfcf000.nc .........OK
@@ -323,14 +323,14 @@ Moving baseline std_base files ....
  Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 662.151742
-  0: The maximum resident set size (KB)                   = 2511452
+  0: The total amount of wall time                        = 132.561078
+  0: The maximum resident set size (KB)                   = 2517640
 
 Test std_base PASS
 
 
-baseline dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-stmp/Gillian.Petro/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
-working dir  = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-ptmp/Gillian.Petro/FV3_OPNREQ_TEST/opnReqTest_3005930/thr_thr
+baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
+working dir  = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_755384/thr_thr
 Checking test thr results ....
  Comparing sfcf000.nc .....USING NCCMP......OK
  Comparing sfcf021.nc .....USING NCCMP......OK
@@ -377,11 +377,11 @@ Checking test thr results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
 
-  0: The total amount of wall time                        = 518.140909
-  0: The maximum resident set size (KB)                   = 2521228
+  0: The total amount of wall time                        = 118.370139
+  0: The maximum resident set size (KB)                   = 2506304
 
 Test thr PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Tue Apr 21 14:16:59 UTC 2026
-Elapsed time: 01h:41m:20s. Have a nice day!
+Mon Apr 27 19:47:10 UTC 2026
+Elapsed time: 01h:19m:08s. Have a nice day!
diff --git a/tests/logs/OpnReqTests_regional_control_ursa.log b/tests/logs/OpnReqTests_regional_control_ursa.log
@@ -1,9 +1,9 @@
-Tue Apr 21 12:36:36 UTC 2026
+Mon Apr 27 18:28:04 UTC 2026
 Start Operation Requirement Test
 
 
-baseline dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-stmp/Gillian.Petro/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_bit_base_intel
-working dir  = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-ptmp/Gillian.Petro/FV3_OPNREQ_TEST/opnReqTest_3014635/bit_base_bit_base
+baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_bit_base_intel
+working dir  = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_756147/bit_base_bit_base
 Checking test bit_base results ....
 Moving baseline bit_base files ....
  Moving dynf000.nc .........OK
@@ -15,14 +15,14 @@ Moving baseline bit_base files ....
  Moving NATLEV.GrbF00 .........OK
  Moving NATLEV.GrbF06 .........OK
 
-  0: The total amount of wall time                        = 303.434152
-  0: The maximum resident set size (KB)                   = 2072304
+  0: The total amount of wall time                        = 298.706833
+  0: The maximum resident set size (KB)                   = 2070824
 
 Test bit_base PASS
 
 
-baseline dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-stmp/Gillian.Petro/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
-working dir  = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-ptmp/Gillian.Petro/FV3_OPNREQ_TEST/opnReqTest_3014635/dcp_dcp
+baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
+working dir  = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_756147/dcp_dcp
 Checking test dcp results ....
  Comparing dynf000.nc .....USING NCCMP......OK
  Comparing dynf006.nc .....USING NCCMP......OK
@@ -33,14 +33,14 @@ Checking test dcp results ....
  Comparing NATLEV.GrbF00 .....USING CMP......OK
  Comparing NATLEV.GrbF06 .....USING CMP......OK
 
-  0: The total amount of wall time                        = 203.765230
-  0: The maximum resident set size (KB)                   = 1712744
+  0: The total amount of wall time                        = 202.691148
+  0: The maximum resident set size (KB)                   = 1705064
 
 Test dcp PASS
 
 
-baseline dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-stmp/Gillian.Petro/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
-working dir  = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-ptmp/Gillian.Petro/FV3_OPNREQ_TEST/opnReqTest_3014635/std_base_std_base
+baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
+working dir  = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_756147/std_base_std_base
 Checking test std_base results ....
 Moving baseline std_base files ....
  Moving dynf000.nc .........OK
@@ -52,14 +52,14 @@ Moving baseline std_base files ....
  Moving NATLEV.GrbF00 .........OK
  Moving NATLEV.GrbF06 .........OK
 
-  0: The total amount of wall time                        = 211.916375
-  0: The maximum resident set size (KB)                   = 1725800
+  0: The total amount of wall time                        = 204.744698
+  0: The maximum resident set size (KB)                   = 1722680
 
 Test std_base PASS
 
 
-baseline dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-stmp/Gillian.Petro/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
-working dir  = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-ptmp/Gillian.Petro/FV3_OPNREQ_TEST/opnReqTest_3014635/thr_thr
+baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
+working dir  = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_756147/thr_thr
 Checking test thr results ....
  Comparing dynf000.nc .....USING NCCMP......OK
  Comparing dynf006.nc .....USING NCCMP......OK
@@ -70,11 +70,11 @@ Checking test thr results ....
  Comparing NATLEV.GrbF00 .....USING CMP......OK
  Comparing NATLEV.GrbF06 .....USING CMP......OK
 
-  0: The total amount of wall time                        = 202.261375
-  0: The maximum resident set size (KB)                   = 1708456
+  0: The total amount of wall time                        = 206.231970
+  0: The maximum resident set size (KB)                   = 1721152
 
 Test thr PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Tue Apr 21 13:14:03 UTC 2026
-Elapsed time: 00h:37m:28s. Have a nice day!
+Mon Apr 27 19:07:38 UTC 2026
+Elapsed time: 00h:39m:34s. Have a nice day!
+4 −0		CMakeLists.txt
+53 −23		ccpp/data/GFS_typedefs.F90
+1 −1		ccpp/physics
+2 −0		mpas/CMakeLists.txt
+1 −1		mpas/MPAS-Model
+259 −155		mpas/atmos_coupling.F90
+117 −71		mpas/atmos_model.F90
+92 −6		mpas/module_fcst_grid_comp.F90
+21 −6		mpas/module_mpas_config.F90
+363 −0		mpas/ufs_mpas_boundaries.F90
+341 −0		mpas/ufs_mpas_constituents.F90
+1,994 −0		mpas/ufs_mpas_io.F90
+305 −2,307		mpas/ufs_mpas_subdriver.F90
+188 −0		mpas/ufs_mpas_tools.F90
+18 −13		ufsatm_cap.F90