Hotfix/cubed sphere hash fix: HAILCAST diagnostic code (units issue) (u…

…fs-community#2223) cubed_sphere hash update: f060e85 for a bug- fix in the HAILCAST diagnostic code (units issue)
zhanglikate · Apr 4, 2024 · 45c8b2a · 45c8b2a
1 parent 26e6db6
commit 45c8b2a
Show file tree

Hide file tree

Showing 13 changed files with 2,087 additions and 2,049 deletions.
diff --git a/.github/workflows/aux.yml b/.github/workflows/aux.yml
@@ -1,9 +1,12 @@
-name: Helpers
+name: Repo Check
 on:
-  workflow_run:
-    workflows: ["Pull Request Tests"]
-    types:
-      - requested
+  #workflow_run:
+  #  workflows: ["Pull Request Tests"]
+  #  types:
+  #    - requested
+  pull_request:
+    branches:
+      - develop
 env:
   app: Accept:application/vnd.github.v3+json
   base_url: $GITHUB_API_URL/repos/$GITHUB_REPOSITORY/actions/runs
@@ -30,6 +33,7 @@ jobs:
     steps:
     - name: Check up-to-dateness and post comment
       run: |
+        trap 'echo "exit-code=$?" >> "$GITHUB_OUTPUT"' EXIT
         head_sha=${{ github.event.pull_request.head.sha }}
         head_brc=${{ github.event.pull_request.head.ref }}
         head_url=${{ github.event.pull_request.head.repo.html_url }}
@@ -43,13 +47,14 @@ jobs:
         echo "pr_number is $pr_number"
         pr_uid=${{ github.event.pull_request.head.repo.owner.login }}
         echo "pr_uid is $pr_uid"
-        comment="$(./repo_check.sh $pr_uid 2>/dev/null)"
-        echo "comment is $comment"
-        if [[ -n $comment ]]; then
-          curl -sS -X POST -H $app -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
-            $url/issues/$pr_number/comments -d '{"body": "'"${comment}"'"}'
-          echo -n "failure" >~/repocheck_file
-        else
-          echo -n "success" >~/repocheck_file
-        fi
+        ./repo_check.sh
+        #comment="$(./repo_check.sh 2>/dev/null)"
+        #echo "comment is $comment"
+        #if [[ -n $comment ]]; then
+        #  curl -sS -X POST -H $app -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+        #    $url/issues/$pr_number/comments -d '{"body": "'"${comment}"'"}'
+        #  echo -n "failure" >~/repocheck_file
+        #else
+        #  echo -n "success" >~/repocheck_file
+        #fi
         
diff --git a/FV3 b/FV3
diff --git a/tests/ci/repo_check.sh b/tests/ci/repo_check.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -eu
+#set -eu
 
 get_shas () {
     cwd=$(pwd)
@@ -24,10 +24,8 @@ get_shas () {
 
 flag_sync=true
 
-ownerID=$1
-
 declare -A urls branches pathes
-submodules="base fv3 mom6 cice ww3 stoch gocart cmeps cdeps hycom cmake ccpp_physics ccpp_framework aqm noahmp"
+submodules="base fv3 mom6 cice ww3 stoch cmeps cdeps hycom ccpp_physics aqm noahmp cubed_sphere"
 
 urls[base]='https://github.com/ufs-community/ufs-weather-model'
 branches[base]='develop'
@@ -93,9 +91,9 @@ pathes[noahmp]='NOAHMP-interface/noahmp'
 #branches[upp]='develop'
 #pathes[upp]='upp'
 
-#urls[cubed_sphere]='https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere'
-#branches[cubed_sphere]='dev/emc'
-#pathes[cubed_sphere]='FV3/atmos_cubed_sphere'
+urls[cubed_sphere]='https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere'
+branches[cubed_sphere]='dev/emc'
+pathes[cubed_sphere]='FV3/atmos_cubed_sphere'
 
 for submodule in $submodules; do
     url=${urls[$submodule]}
@@ -105,8 +103,11 @@ for submodule in $submodules; do
     get_shas $url $gitapi $branch $workspace
 done
 
-if [[ $flag_sync=='true' ]]; then
-    exit 0
-else
-    exit 0
+if [[ ! $flag_sync ]]; then
+    echo "** ${GITHUB_WORKSPACE} **NOT** up to date"
+    exit 1
 fi
+
+echo "** ${GITHUB_WORKSPACE} up to date **"
+
+exit 0
diff --git a/tests/logs/OpnReqTests_control_p8_hera.log b/tests/logs/OpnReqTests_control_p8_hera.log
@@ -1,9 +1,9 @@
-Wed Apr  3 13:03:42 UTC 2024
+Thu Apr  4 13:45:26 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_1734208/bit_base_bit_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_478288/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                        = 270.499708
-  0: The maximum resident set size (KB)                   = 1267976
+  0: The total amount of wall time                        = 273.384410
+  0: The maximum resident set size (KB)                   = 1252756
 
 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_1734208/dbg_base_dbg_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_478288/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                        = 949.421879
-  0: The maximum resident set size (KB)                   = 1254204
+  0: The total amount of wall time                        = 948.187410
+  0: The maximum resident set size (KB)                   = 1232512
 
 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_1734208/dcp_dcp
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_478288/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                        = 238.203503
-  0: The maximum resident set size (KB)                   = 1247000
+  0: The total amount of wall time                        = 246.989736
+  0: The maximum resident set size (KB)                   = 1235588
 
 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_1734208/mpi_mpi
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_478288/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                        = 238.209192
-  0: The maximum resident set size (KB)                   = 1246248
+  0: The total amount of wall time                        = 243.345326
+  0: The maximum resident set size (KB)                   = 1230288
 
 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_1734208/rst_rst
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_478288/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                        = 239.223169
-  0: The maximum resident set size (KB)                   = 1247272
+  0: The total amount of wall time                        = 243.496287
+  0: The maximum resident set size (KB)                   = 1237700
 
 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_1734208/std_base_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_478288/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                        = 242.202633
-  0: The maximum resident set size (KB)                   = 1247172
+  0: The total amount of wall time                        = 238.877192
+  0: The maximum resident set size (KB)                   = 1230820
 
 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_1734208/thr_thr
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_478288/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                        = 242.018158
-  0: The maximum resident set size (KB)                   = 1247888
+  0: The total amount of wall time                        = 239.056770
+  0: The maximum resident set size (KB)                   = 1231348
 
 Test thr PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Wed Apr  3 14:13:02 UTC 2024
-Elapsed time: 01h:09m:20s. Have a nice day!
+Thu Apr  4 14:57:18 UTC 2024
+Elapsed time: 01h:11m:52s. 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 Apr  3 18:01:51 UTC 2024
+Thu Apr  4 18:07:00 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_1612891/dbg_base_dbg_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1261607/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                        = 1309.881667
-  0: The maximum resident set size (KB)                   = 1366736
+  0: The total amount of wall time                        = 1344.317893
+  0: The maximum resident set size (KB)                   = 1342820
 
 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_1612891/rst_rst
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1261607/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                        = 385.164336
-  0: The maximum resident set size (KB)                   = 1359652
+  0: The total amount of wall time                        = 391.350241
+  0: The maximum resident set size (KB)                   = 1343528
 
 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_1612891/std_base_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1261607/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                        = 386.874326
-  0: The maximum resident set size (KB)                   = 1362372
+  0: The total amount of wall time                        = 389.898125
+  0: The maximum resident set size (KB)                   = 1341344
 
 Test std_base PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Wed Apr  3 19:06:01 UTC 2024
-Elapsed time: 01h:04m:10s. Have a nice day!
+Thu Apr  4 19:08:57 UTC 2024
+Elapsed time: 01h:01m:57s. 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 Apr  3 15:46:00 UTC 2024
+Thu Apr  4 16:05:04 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_1137011/dcp_dcp
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_768169/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                        = 2148.497446
-  0: The maximum resident set size (KB)                   = 557116
+  0: The total amount of wall time                        = 2149.189352
+  0: The maximum resident set size (KB)                   = 541572
 
 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_1137011/std_base_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_768169/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                        = 2165.195419
-  0: The maximum resident set size (KB)                   = 563120
+  0: The total amount of wall time                        = 2148.974341
+  0: The maximum resident set size (KB)                   = 544628
 
 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_1137011/thr_thr
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_768169/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                        = 2186.776168
-  0: The maximum resident set size (KB)                   = 554324
+  0: The total amount of wall time                        = 2179.538342
+  0: The maximum resident set size (KB)                   = 543816
 
 Test thr PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Wed Apr  3 17:45:29 UTC 2024
-Elapsed time: 01h:59m:30s. Have a nice day!
+Thu Apr  4 18:04:34 UTC 2024
+Elapsed time: 01h:59m:31s. Have a nice day!