Updates of ccpp-framework and ccpp-physics (merge ccpp-framework feat…

…ure/capgen into main/20240308) Combined PR #2190 (#2181) * FV3 - Update submodule pointers for ccpp-framework and ccpp-physics. Change units flashes 5 min-1 to flashes min-1 and update long name to make clear this is per 5 minutes. * ccpp-physics - In physics/Interstitials/UFS_SCM_NEPTUNE/maximum_hourly_diagnostics.meta: change units flashes 5 min-1 to flashes min-1 and update long name to make clear this is per 5 minutes. * ccpp-framework - Update main from feature/capgen as of 2024-03-08 (includes optional argument updates in feature/capgen). Only commit on top of the merge is NCAR/ccpp-framework@6cdd38a which is required to parse the metadata in the Unified Forecast System / ccpp-physics (underscores in units, e.g. degree_north).
ufs-community · Mar 18, 2024 · 86b7773 · 86b7773
1 parent e4961eb
commit 86b7773
Show file tree

Hide file tree

Showing 14 changed files with 2,128 additions and 2,042 deletions.
diff --git a/FV3 b/FV3
diff --git a/tests/bl_date.conf b/tests/bl_date.conf
@@ -1 +1 @@
-export BL_DATE=20240312
+export BL_DATE=20240315
diff --git a/tests/ci/Jenkinsfile.combined b/tests/ci/Jenkinsfile.combined
@@ -258,6 +258,8 @@ pipeline {
     agent none
     environment {
         ACCNR = 'epic'
+        AWS_PROD_ACCOUNT_ID = credentials('AWS_PROD_ACCOUNT_ID')
+        AWS_PROD_SNS_TOPIC = credentials('AWS_PROD_SNS_TOPIC')
         GITHUB_TOKEN = credentials('GithubJenkinsNew')
         GIT_URL = 'https://github.com/ufs-community/ufs-weather-model.git'
     }
@@ -285,15 +287,15 @@ pipeline {
              node('built-in') {
                 echo 'This will run only if successful.'
                 sh '''
-                  aws sns publish --topic-arn "arn:aws:sns:us-east-1:211527314271:Jenkins-CICD-Notifications" --region us-east-1 --message '{"version":"1.0","source":"custom","content":{"description":":sunny: Jenkins build *'"$JOB_NAME"' '"$BUILD_NUMBER"'* with *PR-'"$CHANGE_ID"'*  *succeeded*"}}'
+                  aws sns publish --topic-arn "arn:aws:sns:us-east-1:${AWS_PROD_ACCOUNT_ID}:${AWS_PROD_SNS_TOPIC}" --region us-east-1 --message '{"version":"1.0","source":"custom","content":{"description":":sunny: Jenkins build *'"$JOB_NAME"' '"$BUILD_NUMBER"'* with *PR-'"$CHANGE_ID"'*  *succeeded*"}}'
                '''
              }
          }
          failure {
              node('built-in') {
                 echo 'This will run only if the run was marked as unstable.'
                 sh '''
-                  aws sns publish --topic-arn "arn:aws:sns:us-east-1:211527314271:Jenkins-CICD-Notifications" --region us-east-1 --message '{"version":"1.0","source":"custom","content":{"description":":warning: Jenkins build *'"$JOB_NAME"' '"$BUILD_NUMBER"'* with *PR-'"$CHANGE_ID"'*  *failed!*"}}'
+                  aws sns publish --topic-arn "arn:aws:sns:us-east-1:${AWS_PROD_ACCOUNT_ID}:${AWS_PROD_SNS_TOPIC}" --region us-east-1 --message '{"version":"1.0","source":"custom","content":{"description":":warning: Jenkins build *'"$JOB_NAME"' '"$BUILD_NUMBER"'* with *PR-'"$CHANGE_ID"'*  *failed!*"}}'
                '''
              }
          }

diff --git a/tests/logs/OpnReqTests_control_p8_hera.log b/tests/logs/OpnReqTests_control_p8_hera.log
@@ -1,9 +1,9 @@
-Wed Mar 13 16:00:32 UTC 2024
+Fri Mar 15 14:30:32 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_226640/bit_base_bit_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_63946/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                        = 330.604077
-  0: The maximum resident set size (KB)                   = 1306700
+  0: The total amount of wall time                        = 280.403230
+  0: The maximum resident set size (KB)                   = 1301268
 
 Test bit_base 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_226640/dbg_base_dbg_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_63946/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                        = 929.248031
-  0: The maximum resident set size (KB)                   = 1291568
+  0: The total amount of wall time                        = 914.973019
+  0: The maximum resident set size (KB)                   = 1289712
 
 Test dbg_base 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_226640/dcp_dcp
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_63946/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                        = 250.255270
-  0: The maximum resident set size (KB)                   = 1278404
+  0: The total amount of wall time                        = 254.193285
+  0: The maximum resident set size (KB)                   = 1277804
 
 Test dcp 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_226640/mpi_mpi
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_63946/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                        = 252.275080
-  0: The maximum resident set size (KB)                   = 1281536
+  0: The total amount of wall time                        = 250.421070
+  0: The maximum resident set size (KB)                   = 1278668
 
 Test mpi 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_226640/rst_rst
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_63946/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                        = 257.921526
-  0: The maximum resident set size (KB)                   = 1278656
+  0: The total amount of wall time                        = 267.943348
+  0: The maximum resident set size (KB)                   = 1275920
 
 Test rst 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_226640/std_base_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_63946/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                        = 248.830644
-  0: The maximum resident set size (KB)                   = 1281968
+  0: The total amount of wall time                        = 249.896889
+  0: The maximum resident set size (KB)                   = 1276116
 
 Test std_base 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_226640/thr_thr
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_63946/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                        = 250.246300
-  0: The maximum resident set size (KB)                   = 1282284
+  0: The total amount of wall time                        = 256.272146
+  0: The maximum resident set size (KB)                   = 1278636
 
 Test thr PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Wed Mar 13 17:40:13 UTC 2024
-Elapsed time: 01h:39m:42s. Have a nice day!
+Fri Mar 15 15:51:09 UTC 2024
+Elapsed time: 01h:20m:37s. 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 @@
-Wed Mar 13 18:29:02 UTC 2024
+Fri Mar 15 17:05:46 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_216513/dbg_base_dbg_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_183838/dbg_base_dbg_base
 Checking test dbg_base results ....
 Moving baseline dbg_base files ....
  Moving sfcf021.tile1.nc .........OK
@@ -66,14 +66,14 @@ Moving baseline dbg_base 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                        = 1390.651720
-  0: The maximum resident set size (KB)                   = 1411516
+  0: The total amount of wall time                        = 1356.631044
+  0: The maximum resident set size (KB)                   = 1411552
 
 Test dbg_base 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_216513/rst_rst
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_183838/rst_rst
 Checking test rst results ....
  Comparing sfcf021.tile1.nc .....USING NCCMP......OK
  Comparing sfcf021.tile2.nc .....USING NCCMP......OK
@@ -135,14 +135,14 @@ Checking test rst results ....
  Comparing RESTART/iced.2021-03-23-21600.nc .....USING NCCMP......OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......OK
 
-  0: The total amount of wall time                        = 388.568533
-  0: The maximum resident set size (KB)                   = 1404964
+  0: The total amount of wall time                        = 388.496545
+  0: The maximum resident set size (KB)                   = 1403852
 
 Test rst 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_216513/std_base_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_183838/std_base_std_base
 Checking test std_base results ....
 Moving baseline std_base files ....
  Moving sfcf021.tile1.nc .........OK
@@ -205,11 +205,11 @@ Moving baseline std_base 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                        = 429.798207
-  0: The maximum resident set size (KB)                   = 1403184
+  0: The total amount of wall time                        = 390.554898
+  0: The maximum resident set size (KB)                   = 1403928
 
 Test std_base PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Wed Mar 13 19:38:16 UTC 2024
-Elapsed time: 01h:09m:15s. Have a nice day!
+Fri Mar 15 22:24:11 UTC 2024
+Elapsed time: 05h:18m:26s. 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 @@
-Wed Mar 13 19:39:46 UTC 2024
+Fri Mar 15 16:17:17 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_294049/dcp_dcp
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_135871/dcp_dcp
 Checking test dcp results ....
  Comparing dynf000.nc .....USING NCCMP......OK
  Comparing dynf006.nc .....USING NCCMP......OK
@@ -14,14 +14,14 @@ Checking test dcp results ....
  Comparing NATLEV.GrbF00 .....USING CMP......OK
  Comparing NATLEV.GrbF06 .....USING CMP......OK
 
-  0: The total amount of wall time                        = 518.481376
-  0: The maximum resident set size (KB)                   = 589344
+  0: The total amount of wall time                        = 511.975861
+  0: The maximum resident set size (KB)                   = 589832
 
 Test dcp 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_294049/std_base_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_135871/std_base_std_base
 Checking test std_base results ....
 Moving baseline std_base files ....
  Moving dynf000.nc .........OK
@@ -33,14 +33,14 @@ Moving baseline std_base files ....
  Moving NATLEV.GrbF00 .........OK
  Moving NATLEV.GrbF06 .........OK
 
-  0: The total amount of wall time                        = 511.698032
-  0: The maximum resident set size (KB)                   = 588824
+  0: The total amount of wall time                        = 519.974209
+  0: The maximum resident set size (KB)                   = 589384
 
 Test std_base 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_294049/thr_thr
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_135871/thr_thr
 Checking test thr results ....
  Comparing dynf000.nc .....USING NCCMP......OK
  Comparing dynf006.nc .....USING NCCMP......OK
@@ -51,11 +51,11 @@ Checking test thr results ....
  Comparing NATLEV.GrbF00 .....USING CMP......OK
  Comparing NATLEV.GrbF06 .....USING CMP......OK
 
-  0: The total amount of wall time                        = 514.740790
-  0: The maximum resident set size (KB)                   = 590320
+  0: The total amount of wall time                        = 532.386605
+  0: The maximum resident set size (KB)                   = 589932
 
 Test thr PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Wed Mar 13 20:34:36 UTC 2024
-Elapsed time: 00h:54m:51s. Have a nice day!
+Fri Mar 15 17:01:36 UTC 2024
+Elapsed time: 00h:44m:20s. Have a nice day!
+3 −3		ccpp/data/GFS_typedefs.meta
+6 −0		ccpp/driver/GFS_diagnostics.F90
+1 −1		ccpp/framework
+1 −1		ccpp/physics