Merge remote-tracking branch 'upstream/develop' into develop

Fixes ufs-community#1977.
GeorgeGayno-NOAA · Jan 18, 2024 · 9b6f347 · 9b6f347
2 parents a705c41 + e7380dd
commit 9b6f347
Show file tree

Hide file tree

Showing 11 changed files with 5,184 additions and 4,169 deletions.
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -461,7 +461,6 @@ export HYBEDMF=.true.
 export SHINHONG=.false.
 export DO_YSU=.false.
 export DO_MYNNEDMF=.false.
-export DO_MYJPBL=.false.
 export HURR_PBL=.false.
 export MONINQ_FAC=1.0
 export SFCLAY_COMPUTE_FLUX=.false.
@@ -1392,7 +1391,6 @@ export LSM=3
 export LSOIL_LSM=9
 export DO_MYNNSFCLAY=.true.
 export DO_MYNNEDMF=.true.
-export DO_MYJPBL=.true
 export HYBEDMF=.false.
 export SHAL_CNV=.false.
 export DO_SAT_ADJ=.false.

diff --git a/tests/logs/OpnReqTests_control_p8_hera.log b/tests/logs/OpnReqTests_control_p8_hera.log
@@ -1,9 +1,9 @@
-Fri Jan 12 19:48:57 UTC 2024
+Wed Jan 17 04:12:52 UTC 2024
 Start Operation Requirement Test
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_185141/control_p8_gnu_bit_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_160883/control_p8_gnu_bit_base
 Checking test bit_base control_p8_gnu results ....
 Moving baseline bit_base control_p8_gnu files ....
  Moving sfcf000.nc .........OK
@@ -51,14 +51,14 @@ Moving baseline bit_base control_p8_gnu 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                        = 280.692175
-  0: The maximum resident set size (KB)                   = 1308524
+  0: The total amount of wall time                        = 287.973242
+  0: The maximum resident set size (KB)                   = 1291024
 
 Test bit_base control_p8_gnu PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_185141/control_p8_gnu_dbg_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_160883/control_p8_gnu_dbg_base
 Checking test dbg_base control_p8_gnu results ....
 Moving baseline dbg_base control_p8_gnu files ....
  Moving sfcf000.nc .........OK
@@ -106,14 +106,14 @@ Moving baseline dbg_base control_p8_gnu 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                        = 940.734293
-  0: The maximum resident set size (KB)                   = 1289040
+  0: The total amount of wall time                        = 919.574496
+  0: The maximum resident set size (KB)                   = 1265904
 
 Test dbg_base control_p8_gnu PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_185141/control_p8_gnu_dcp
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_160883/control_p8_gnu_dcp
 Checking test dcp control_p8_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -160,14 +160,14 @@ Checking test dcp control_p8_gnu results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 256.297716
-  0: The maximum resident set size (KB)                   = 1287656
+  0: The total amount of wall time                        = 265.867521
+  0: The maximum resident set size (KB)                   = 1267704
 
 Test dcp control_p8_gnu PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_185141/control_p8_gnu_mpi
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_160883/control_p8_gnu_mpi
 Checking test mpi control_p8_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -214,14 +214,14 @@ Checking test mpi control_p8_gnu results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 263.293767
-  0: The maximum resident set size (KB)                   = 1271204
+  0: The total amount of wall time                        = 258.989619
+  0: The maximum resident set size (KB)                   = 1266600
 
 Test mpi control_p8_gnu PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_185141/control_p8_gnu_rst
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_160883/control_p8_gnu_rst
 Checking test rst control_p8_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -268,14 +268,14 @@ Checking test rst control_p8_gnu results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 254.624691
-  0: The maximum resident set size (KB)                   = 1279072
+  0: The total amount of wall time                        = 248.421663
+  0: The maximum resident set size (KB)                   = 1269608
 
 Test rst control_p8_gnu PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_185141/control_p8_gnu_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_160883/control_p8_gnu_std_base
 Checking test std_base control_p8_gnu results ....
 Moving baseline std_base control_p8_gnu files ....
  Moving sfcf000.nc .........OK
@@ -323,14 +323,14 @@ Moving baseline std_base control_p8_gnu 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                        = 254.478570
-  0: The maximum resident set size (KB)                   = 1287088
+  0: The total amount of wall time                        = 264.494539
+  0: The maximum resident set size (KB)                   = 1266788
 
 Test std_base control_p8_gnu PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_185141/control_p8_gnu_thr
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_160883/control_p8_gnu_thr
 Checking test thr control_p8_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -377,11 +377,11 @@ Checking test thr control_p8_gnu results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 248.638375
-  0: The maximum resident set size (KB)                   = 1286604
+  0: The total amount of wall time                        = 256.591074
+  0: The maximum resident set size (KB)                   = 1265908
 
 Test thr control_p8_gnu PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Fri Jan 12 21:08:01 UTC 2024
-Elapsed time: 01h:19m:04s. Have a nice day!
+Wed Jan 17 05:41:37 UTC 2024
+Elapsed time: 01h:28m:46s. Have a nice day!
diff --git a/tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log b/tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log
@@ -1,9 +1,9 @@
-Mon Jan 15 06:18:58 UTC 2024
+Tue Jan 16 21:19:42 UTC 2024
 Start Operation Requirement Test
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_dbg_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_274868/cpld_control_nowave_noaero_p8_gnu_dbg_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_4449/cpld_control_nowave_noaero_p8_gnu_dbg_base
 Checking test dbg_base cpld_control_nowave_noaero_p8_gnu results ....
 Moving baseline dbg_base cpld_control_nowave_noaero_p8_gnu files ....
  Moving sfcf021.tile1.nc .........OK
@@ -66,14 +66,14 @@ Moving baseline dbg_base cpld_control_nowave_noaero_p8_gnu files ....
  Moving RESTART/iced.2021-03-23-21600.nc .........OK
  Moving RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
 
-  0: The total amount of wall time                        = 1271.160940
-  0: The maximum resident set size (KB)                   = 1406920
+  0: The total amount of wall time                        = 1243.825496
+  0: The maximum resident set size (KB)                   = 1385800
 
 Test dbg_base cpld_control_nowave_noaero_p8_gnu PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_274868/cpld_control_nowave_noaero_p8_gnu_rst
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_4449/cpld_control_nowave_noaero_p8_gnu_rst
 Checking test rst cpld_control_nowave_noaero_p8_gnu results ....
  Comparing sfcf021.tile1.nc .........OK
  Comparing sfcf021.tile2.nc .........OK
@@ -135,14 +135,14 @@ Checking test rst cpld_control_nowave_noaero_p8_gnu results ....
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
 
-  0: The total amount of wall time                        = 387.529839
-  0: The maximum resident set size (KB)                   = 1401924
+  0: The total amount of wall time                        = 393.342243
+  0: The maximum resident set size (KB)                   = 1382812
 
 Test rst cpld_control_nowave_noaero_p8_gnu PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_274868/cpld_control_nowave_noaero_p8_gnu_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_4449/cpld_control_nowave_noaero_p8_gnu_std_base
 Checking test std_base cpld_control_nowave_noaero_p8_gnu results ....
 Moving baseline std_base cpld_control_nowave_noaero_p8_gnu files ....
  Moving sfcf021.tile1.nc .........OK
@@ -205,11 +205,11 @@ Moving baseline std_base cpld_control_nowave_noaero_p8_gnu files ....
  Moving RESTART/iced.2021-03-23-21600.nc .........OK
  Moving RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
 
-  0: The total amount of wall time                        = 388.134959
-  0: The maximum resident set size (KB)                   = 1400976
+  0: The total amount of wall time                        = 390.186220
+  0: The maximum resident set size (KB)                   = 1387468
 
 Test std_base cpld_control_nowave_noaero_p8_gnu PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Mon Jan 15 07:17:55 UTC 2024
-Elapsed time: 00h:58m:58s. Have a nice day!
+Tue Jan 16 22:28:16 UTC 2024
+Elapsed time: 01h:08m:35s. Have a nice day!
diff --git a/tests/logs/OpnReqTests_regional_control_hera.log b/tests/logs/OpnReqTests_regional_control_hera.log
@@ -1,9 +1,9 @@
-Mon Jan 15 05:38:53 UTC 2024
+Wed Jan 17 13:07:19 UTC 2024
 Start Operation Requirement Test
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_232569/regional_control_gnu_dcp
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_175216/regional_control_gnu_dcp
 Checking test dcp regional_control_gnu results ....
  Comparing dynf000.nc .........OK
  Comparing dynf006.nc .........OK
@@ -14,14 +14,14 @@ Checking test dcp regional_control_gnu results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF06 .........OK
 
-  0: The total amount of wall time                        = 521.047614
-  0: The maximum resident set size (KB)                   = 587072
+  0: The total amount of wall time                        = 521.407355
+  0: The maximum resident set size (KB)                   = 574736
 
 Test dcp regional_control_gnu PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_232569/regional_control_gnu_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_175216/regional_control_gnu_std_base
 Checking test std_base regional_control_gnu results ....
 Moving baseline std_base regional_control_gnu files ....
  Moving dynf000.nc .........OK
@@ -33,14 +33,14 @@ Moving baseline std_base regional_control_gnu files ....
  Moving NATLEV.GrbF00 .........OK
  Moving NATLEV.GrbF06 .........OK
 
-  0: The total amount of wall time                        = 528.718784
-  0: The maximum resident set size (KB)                   = 589816
+  0: The total amount of wall time                        = 538.319200
+  0: The maximum resident set size (KB)                   = 580656
 
 Test std_base regional_control_gnu PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_232569/regional_control_gnu_thr
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_175216/regional_control_gnu_thr
 Checking test thr regional_control_gnu results ....
  Comparing dynf000.nc .........OK
  Comparing dynf006.nc .........OK
@@ -51,11 +51,11 @@ Checking test thr regional_control_gnu results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF06 .........OK
 
-  0: The total amount of wall time                        = 534.221812
-  0: The maximum resident set size (KB)                   = 587052
+  0: The total amount of wall time                        = 529.208085
+  0: The maximum resident set size (KB)                   = 576972
 
 Test thr regional_control_gnu PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Mon Jan 15 06:17:20 UTC 2024
-Elapsed time: 00h:38m:28s. Have a nice day!
+Wed Jan 17 13:45:36 UTC 2024
+Elapsed time: 00h:38m:17s. Have a nice day!