Code update for HR4_roughness (#2022)

CCPP physics code update for HR4 related to surface roughness, background diffusivity and shallow convection + CI fix

tests/bl_date.conf

@@ -1 +1 @@
-export BL_DATE=20240124
+export BL_DATE=20240126

tests/logs/OpnReqTests_control_p8_hera.log

@@ -1,9 +1,9 @@
-Thu Jan 25 00:14:58 UTC 2024
+Sun Jan 28 16:32:13 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_22005/control_p8_gnu_bit_base
+working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_133564/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 = 289.507218
- 0: The maximum resident set size (KB) = 1302800
+ 0: The total amount of wall time = 278.853553
+ 0: The maximum resident set size (KB) = 1302232
 
 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_22005/control_p8_gnu_dbg_base
+working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_133564/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 = 920.193789
- 0: The maximum resident set size (KB) = 1291092
+ 0: The total amount of wall time = 922.917139
+ 0: The maximum resident set size (KB) = 1289764
 
 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_22005/control_p8_gnu_dcp
+working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_133564/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 = 249.698449
- 0: The maximum resident set size (KB) = 1289136
+ 0: The total amount of wall time = 252.167939
+ 0: The maximum resident set size (KB) = 1283512
 
 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_22005/control_p8_gnu_mpi
+working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_133564/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 = 255.024703
- 0: The maximum resident set size (KB) = 1281676
+ 0: The total amount of wall time = 252.424186
+ 0: The maximum resident set size (KB) = 1283312
 
 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_22005/control_p8_gnu_rst
+working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_133564/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 = 253.566435
- 0: The maximum resident set size (KB) = 1283956
+ 0: The total amount of wall time = 247.974541
+ 0: The maximum resident set size (KB) = 1280424
 
 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_22005/control_p8_gnu_std_base
+working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_133564/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 = 252.075442
- 0: The maximum resident set size (KB) = 1282292
+ 0: The total amount of wall time = 249.823617
+ 0: The maximum resident set size (KB) = 1284564
 
 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_22005/control_p8_gnu_thr
+working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_133564/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 = 257.398059
- 0: The maximum resident set size (KB) = 1280936
+ 0: The total amount of wall time = 249.735462
+ 0: The maximum resident set size (KB) = 1278852
 
 Test thr control_p8_gnu PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Thu Jan 25 01:47:24 UTC 2024
-Elapsed time: 01h:32m:27s. Have a nice day!
+Sun Jan 28 17:59:17 UTC 2024
+Elapsed time: 01h:27m:05s. Have a nice day!

tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log

@@ -1,9 +1,9 @@
-Thu Jan 25 14:11:46 UTC 2024
+Sun Jan 28 21:16:34 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_7212/cpld_control_nowave_noaero_p8_gnu_dbg_base
+working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_231242/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 = 1252.676387
- 0: The maximum resident set size (KB) = 1408568
+ 0: The total amount of wall time = 1234.748841
+ 0: The maximum resident set size (KB) = 1406372
 
 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_7212/cpld_control_nowave_noaero_p8_gnu_rst
+working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_231242/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 = 383.989754
- 0: The maximum resident set size (KB) = 1400216
+ 0: The total amount of wall time = 382.529275
+ 0: The maximum resident set size (KB) = 1403776
 
 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_7212/cpld_control_nowave_noaero_p8_gnu_std_base
+working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_231242/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 = 394.576006
- 0: The maximum resident set size (KB) = 1398416
+ 0: The total amount of wall time = 379.082148
+ 0: The maximum resident set size (KB) = 1404752
 
 Test std_base cpld_control_nowave_noaero_p8_gnu PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Thu Jan 25 15:16:06 UTC 2024
-Elapsed time: 01h:04m:21s. Have a nice day!
+Sun Jan 28 22:35:52 UTC 2024
+Elapsed time: 01h:19m:23s. Have a nice day!

tests/logs/OpnReqTests_regional_control_hera.log

@@ -1,9 +1,9 @@
-Thu Jan 25 13:24:17 UTC 2024
+Sun Jan 28 20:28:36 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_25718/regional_control_gnu_dcp
+working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_250740/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 = 525.719740
- 0: The maximum resident set size (KB) = 596764
+ 0: The total amount of wall time = 516.156988
+ 0: The maximum resident set size (KB) = 587984
 
 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_25718/regional_control_gnu_std_base
+working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_250740/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 = 518.523857
- 0: The maximum resident set size (KB) = 588336
+ 0: The total amount of wall time = 521.015913
+ 0: The maximum resident set size (KB) = 592036
 
 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_25718/regional_control_gnu_thr
+working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_250740/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 = 517.537517
- 0: The maximum resident set size (KB) = 590312
+ 0: The total amount of wall time = 528.747607
+ 0: The maximum resident set size (KB) = 590612
 
 Test thr regional_control_gnu PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Thu Jan 25 14:04:35 UTC 2024
-Elapsed time: 00h:40m:18s. Have a nice day!
+Sun Jan 28 21:14:31 UTC 2024
+Elapsed time: 00h:45m:55s. Have a nice day!