New regression tests for V2 surface coldstart files

tests/fv3_conf/control_run.IN

@@ -13,10 +13,15 @@ fi
 echo "inputdir=$inputdir,NPX=$NPX"
 
 OPNREQ_TEST=${OPNREQ_TEST:-false}
+V2_SFC_FILE=${V2_SFC_FILE:-false}
 SUFFIX=${RT_SUFFIX}
 if [ $WARM_START = .false. ]; then
   mkdir INPUT RESTART
-  cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT_L127/* ./INPUT/.
+  if [ "$V2_SFC_FILE" = "true" ]; then
+    cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT_L127_v2_sfc/* ./INPUT/.
+  else
+    cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT_L127/* ./INPUT/.
+  fi
 else
   mkdir INPUT RESTART
 

tests/fv3_conf/cpld_control_run.IN

@@ -15,6 +15,8 @@ fi
 
 ICERES=${OCNRES:0:1}.${OCNRES:1}
 
+V2_SFC_FILE=${V2_SFC_FILE:-false}
+
 if [[ $BMIC == .true. ]]; then
   FV3_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/@[FV3BMIC]/@[ATMRES]_L@[NPZ]/INPUT
   MOM_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/mom6_da
@@ -25,7 +27,11 @@ else
      MOM_IC=@[INPUTDATA_ROOT]/MOM6_IC/${OCNRES}/${SYEAR}${SMONTH}${SDAY}${SHOUR}
      ICE_IC=@[INPUTDATA_ROOT]/CICE_IC/${OCNRES}/${SYEAR}${SMONTH}${SDAY}${SHOUR}
   else
-     FV3_IC=@[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127_mx${OCNRES}
+     if [ "$V2_SFC_FILE" = "true" ]; then
+       FV3_IC=@[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127_mx${OCNRES}_v2_sfc
+     else
+       FV3_IC=@[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127_mx${OCNRES}
+     fi
      MOM_IC=@[INPUTDATA_ROOT]/MOM6_IC
      ICE_IC=@[INPUTDATA_ROOT]/CICE_IC/${OCNRES}
   fi

tests/logs/OpnReqTests_control_p8_hera.log

@@ -1,9 +1,9 @@
-Fri Feb  2 02:17:07 UTC 2024
+Wed Feb  7 15:21:44 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_7057/control_p8_gnu_bit_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_230699/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.516405
-  0: The maximum resident set size (KB)                   = 1307816
+  0: The total amount of wall time                        = 279.101386
+  0: The maximum resident set size (KB)                   = 1303960
 
 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_7057/control_p8_gnu_dbg_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_230699/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                        = 915.713491
-  0: The maximum resident set size (KB)                   = 1292056
+  0: The total amount of wall time                        = 909.113285
+  0: The maximum resident set size (KB)                   = 1288940
 
 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_7057/control_p8_gnu_dcp
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_230699/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                        = 251.429761
-  0: The maximum resident set size (KB)                   = 1278592
+  0: The total amount of wall time                        = 247.389257
+  0: The maximum resident set size (KB)                   = 1282176
 
 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_7057/control_p8_gnu_mpi
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_230699/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                        = 250.829038
-  0: The maximum resident set size (KB)                   = 1281948
+  0: The total amount of wall time                        = 248.494145
+  0: The maximum resident set size (KB)                   = 1285116
 
 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_7057/control_p8_gnu_rst
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_230699/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                        = 250.474906
-  0: The maximum resident set size (KB)                   = 1285948
+  0: The total amount of wall time                        = 250.300567
+  0: The maximum resident set size (KB)                   = 1282776
 
 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_7057/control_p8_gnu_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_230699/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                        = 258.712522
-  0: The maximum resident set size (KB)                   = 1281208
+  0: The total amount of wall time                        = 251.844583
+  0: The maximum resident set size (KB)                   = 1279596
 
 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_7057/control_p8_gnu_thr
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_230699/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.574949
-  0: The maximum resident set size (KB)                   = 1279744
+  0: The total amount of wall time                        = 247.282302
+  0: The maximum resident set size (KB)                   = 1282532
 
 Test thr control_p8_gnu PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Fri Feb  2 12:53:19 UTC 2024
-Elapsed time: 10h:36m:13s. Have a nice day!
+Wed Feb  7 17:37:17 UTC 2024
+Elapsed time: 02h:15m:34s. Have a nice day!

tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log

@@ -1,9 +1,9 @@
-Fri Feb  2 14:02:45 UTC 2024
+Wed Feb  7 18:45:23 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_250216/cpld_control_nowave_noaero_p8_gnu_dbg_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_101366/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                        = 1251.653326
-  0: The maximum resident set size (KB)                   = 1407584
+  0: The total amount of wall time                        = 1238.891075
+  0: The maximum resident set size (KB)                   = 1412672
 
 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_250216/cpld_control_nowave_noaero_p8_gnu_rst
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_101366/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                        = 377.186122
-  0: The maximum resident set size (KB)                   = 1394572
+  0: The total amount of wall time                        = 390.905866
+  0: The maximum resident set size (KB)                   = 1402368
 
 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_250216/cpld_control_nowave_noaero_p8_gnu_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_101366/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                        = 380.074651
-  0: The maximum resident set size (KB)                   = 1407552
+  0: The total amount of wall time                        = 380.815768
+  0: The maximum resident set size (KB)                   = 1404516
 
 Test std_base cpld_control_nowave_noaero_p8_gnu PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Fri Feb  2 15:19:23 UTC 2024
-Elapsed time: 01h:16m:38s. Have a nice day!
+Wed Feb  7 21:01:45 UTC 2024
+Elapsed time: 02h:16m:23s. Have a nice day!

tests/logs/OpnReqTests_regional_control_hera.log

@@ -1,9 +1,9 @@
-Fri Feb  2 15:30:30 UTC 2024
+Wed Feb  7 17:48:14 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_234117/regional_control_gnu_dcp
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_18410/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                        = 511.454957
-  0: The maximum resident set size (KB)                   = 591204
+  0: The total amount of wall time                        = 514.965169
+  0: The maximum resident set size (KB)                   = 589908
 
 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_234117/regional_control_gnu_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_18410/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                        = 517.871253
-  0: The maximum resident set size (KB)                   = 594916
+  0: The total amount of wall time                        = 513.938502
+  0: The maximum resident set size (KB)                   = 589468
 
 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_234117/regional_control_gnu_thr
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_18410/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                        = 521.291672
-  0: The maximum resident set size (KB)                   = 592712
+  0: The total amount of wall time                        = 515.645515
+  0: The maximum resident set size (KB)                   = 592364
 
 Test thr regional_control_gnu PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Fri Feb  2 16:42:10 UTC 2024
-Elapsed time: 01h:11m:40s. Have a nice day!
+Wed Feb  7 18:44:38 UTC 2024
+Elapsed time: 00h:56m:24s. Have a nice day!