Skip to content

Commit 45c8b2a

Browse files
jkbk2004jkbk2004
authored
Hotfix/cubed sphere hash fix: HAILCAST diagnostic code (units issue) (#2223)
cubed_sphere hash update: f060e85 for a bug- fix in the HAILCAST diagnostic code (units issue)
1 parent 26e6db6 commit 45c8b2a

13 files changed

+2087
-2049
lines changed

‎.github/workflows/aux.yml

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
name: Helpers
1+
name: Repo Check
22
on:
3-
workflow_run:
4-
workflows: ["Pull Request Tests"]
5-
types:
6-
- requested
3+
#workflow_run:
4+
# workflows: ["Pull Request Tests"]
5+
# types:
6+
# - requested
7+
pull_request:
8+
branches:
9+
- develop
710
env:
811
app: Accept:application/vnd.github.v3+json
912
base_url: $GITHUB_API_URL/repos/$GITHUB_REPOSITORY/actions/runs
@@ -30,6 +33,7 @@ jobs:
3033
steps:
3134
- name: Check up-to-dateness and post comment
3235
run: |
36+
trap 'echo "exit-code=$?" >> "$GITHUB_OUTPUT"' EXIT
3337
head_sha=${{ github.event.pull_request.head.sha }}
3438
head_brc=${{ github.event.pull_request.head.ref }}
3539
head_url=${{ github.event.pull_request.head.repo.html_url }}
@@ -43,13 +47,14 @@ jobs:
4347
echo "pr_number is $pr_number"
4448
pr_uid=${{ github.event.pull_request.head.repo.owner.login }}
4549
echo "pr_uid is $pr_uid"
46-
comment="$(./repo_check.sh $pr_uid 2>/dev/null)"
47-
echo "comment is $comment"
48-
if [[ -n $comment ]]; then
49-
curl -sS -X POST -H $app -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
50-
$url/issues/$pr_number/comments -d '{"body": "'"${comment}"'"}'
51-
echo -n "failure" >~/repocheck_file
52-
else
53-
echo -n "success" >~/repocheck_file
54-
fi
50+
./repo_check.sh
51+
#comment="$(./repo_check.sh 2>/dev/null)"
52+
#echo "comment is $comment"
53+
#if [[ -n $comment ]]; then
54+
# curl -sS -X POST -H $app -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
55+
# $url/issues/$pr_number/comments -d '{"body": "'"${comment}"'"}'
56+
# echo -n "failure" >~/repocheck_file
57+
#else
58+
# echo -n "success" >~/repocheck_file
59+
#fi
5560

‎FV3

‎tests/ci/repo_check.sh

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
set -eu
2+
#set -eu
33

44
get_shas () {
55
cwd=$(pwd)
@@ -24,10 +24,8 @@ get_shas () {
2424

2525
flag_sync=true
2626

27-
ownerID=$1
28-
2927
declare -A urls branches pathes
30-
submodules="base fv3 mom6 cice ww3 stoch gocart cmeps cdeps hycom cmake ccpp_physics ccpp_framework aqm noahmp"
28+
submodules="base fv3 mom6 cice ww3 stoch cmeps cdeps hycom ccpp_physics aqm noahmp cubed_sphere"
3129

3230
urls[base]='https://github.com/ufs-community/ufs-weather-model'
3331
branches[base]='develop'
@@ -93,9 +91,9 @@ pathes[noahmp]='NOAHMP-interface/noahmp'
9391
#branches[upp]='develop'
9492
#pathes[upp]='upp'
9593

96-
#urls[cubed_sphere]='https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere'
97-
#branches[cubed_sphere]='dev/emc'
98-
#pathes[cubed_sphere]='FV3/atmos_cubed_sphere'
94+
urls[cubed_sphere]='https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere'
95+
branches[cubed_sphere]='dev/emc'
96+
pathes[cubed_sphere]='FV3/atmos_cubed_sphere'
9997

10098
for submodule in $submodules; do
10199
url=${urls[$submodule]}
@@ -105,8 +103,11 @@ for submodule in $submodules; do
105103
get_shas $url $gitapi $branch $workspace
106104
done
107105

108-
if [[ $flag_sync=='true' ]]; then
109-
exit 0
110-
else
111-
exit 0
106+
if [[ ! $flag_sync ]]; then
107+
echo "** ${GITHUB_WORKSPACE} **NOT** up to date"
108+
exit 1
112109
fi
110+
111+
echo "** ${GITHUB_WORKSPACE} up to date **"
112+
113+
exit 0

‎tests/logs/OpnReqTests_control_p8_hera.log

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Wed Apr 3 13:03:42 UTC 2024
1+
Thu Apr 4 13:45:26 UTC 2024
22
Start Operation Requirement Test
33

44

55
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_gnu
6-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1734208/bit_base_bit_base
6+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_478288/bit_base_bit_base
77
Checking test bit_base results ....
88
Moving baseline bit_base files ....
99
Moving sfcf000.nc .........OK
@@ -51,14 +51,14 @@ Moving baseline bit_base files ....
5151
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
5252
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
5353

54-
0: The total amount of wall time = 270.499708
55-
0: The maximum resident set size (KB) = 1267976
54+
0: The total amount of wall time = 273.384410
55+
0: The maximum resident set size (KB) = 1252756
5656

5757
Test bit_base PASS
5858

5959

6060
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_gnu
61-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1734208/dbg_base_dbg_base
61+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_478288/dbg_base_dbg_base
6262
Checking test dbg_base results ....
6363
Moving baseline dbg_base files ....
6464
Moving sfcf000.nc .........OK
@@ -106,14 +106,14 @@ Moving baseline dbg_base files ....
106106
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
107107
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
108108

109-
0: The total amount of wall time = 949.421879
110-
0: The maximum resident set size (KB) = 1254204
109+
0: The total amount of wall time = 948.187410
110+
0: The maximum resident set size (KB) = 1232512
111111

112112
Test dbg_base PASS
113113

114114

115115
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
116-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1734208/dcp_dcp
116+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_478288/dcp_dcp
117117
Checking test dcp results ....
118118
Comparing sfcf000.nc .....USING NCCMP......OK
119119
Comparing sfcf021.nc .....USING NCCMP......OK
@@ -160,14 +160,14 @@ Checking test dcp results ....
160160
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
161161
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
162162

163-
0: The total amount of wall time = 238.203503
164-
0: The maximum resident set size (KB) = 1247000
163+
0: The total amount of wall time = 246.989736
164+
0: The maximum resident set size (KB) = 1235588
165165

166166
Test dcp PASS
167167

168168

169169
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
170-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1734208/mpi_mpi
170+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_478288/mpi_mpi
171171
Checking test mpi results ....
172172
Comparing sfcf000.nc .....USING NCCMP......OK
173173
Comparing sfcf021.nc .....USING NCCMP......OK
@@ -214,14 +214,14 @@ Checking test mpi results ....
214214
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
215215
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
216216

217-
0: The total amount of wall time = 238.209192
218-
0: The maximum resident set size (KB) = 1246248
217+
0: The total amount of wall time = 243.345326
218+
0: The maximum resident set size (KB) = 1230288
219219

220220
Test mpi PASS
221221

222222

223223
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
224-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1734208/rst_rst
224+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_478288/rst_rst
225225
Checking test rst results ....
226226
Comparing sfcf000.nc .....USING NCCMP......OK
227227
Comparing sfcf021.nc .....USING NCCMP......OK
@@ -268,14 +268,14 @@ Checking test rst results ....
268268
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
269269
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
270270

271-
0: The total amount of wall time = 239.223169
272-
0: The maximum resident set size (KB) = 1247272
271+
0: The total amount of wall time = 243.496287
272+
0: The maximum resident set size (KB) = 1237700
273273

274274
Test rst PASS
275275

276276

277277
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
278-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1734208/std_base_std_base
278+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_478288/std_base_std_base
279279
Checking test std_base results ....
280280
Moving baseline std_base files ....
281281
Moving sfcf000.nc .........OK
@@ -323,14 +323,14 @@ Moving baseline std_base files ....
323323
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
324324
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
325325

326-
0: The total amount of wall time = 242.202633
327-
0: The maximum resident set size (KB) = 1247172
326+
0: The total amount of wall time = 238.877192
327+
0: The maximum resident set size (KB) = 1230820
328328

329329
Test std_base PASS
330330

331331

332332
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
333-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1734208/thr_thr
333+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_478288/thr_thr
334334
Checking test thr results ....
335335
Comparing sfcf000.nc .....USING NCCMP......OK
336336
Comparing sfcf021.nc .....USING NCCMP......OK
@@ -377,11 +377,11 @@ Checking test thr results ....
377377
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
378378
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
379379

380-
0: The total amount of wall time = 242.018158
381-
0: The maximum resident set size (KB) = 1247888
380+
0: The total amount of wall time = 239.056770
381+
0: The maximum resident set size (KB) = 1231348
382382

383383
Test thr PASS
384384

385385
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
386-
Wed Apr 3 14:13:02 UTC 2024
387-
Elapsed time: 01h:09m:20s. Have a nice day!
386+
Thu Apr 4 14:57:18 UTC 2024
387+
Elapsed time: 01h:11m:52s. Have a nice day!

‎tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Wed Apr 3 18:01:51 UTC 2024
1+
Thu Apr 4 18:07:00 UTC 2024
22
Start Operation Requirement Test
33

44

55
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_dbg_base_gnu
6-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1612891/dbg_base_dbg_base
6+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1261607/dbg_base_dbg_base
77
Checking test dbg_base results ....
88
Moving baseline dbg_base files ....
99
Moving sfcf021.tile1.nc .........OK
@@ -66,14 +66,14 @@ Moving baseline dbg_base files ....
6666
Moving RESTART/iced.2021-03-23-21600.nc .........OK
6767
Moving RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
6868

69-
0: The total amount of wall time = 1309.881667
70-
0: The maximum resident set size (KB) = 1366736
69+
0: The total amount of wall time = 1344.317893
70+
0: The maximum resident set size (KB) = 1342820
7171

7272
Test dbg_base PASS
7373

7474

7575
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
76-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1612891/rst_rst
76+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1261607/rst_rst
7777
Checking test rst results ....
7878
Comparing sfcf021.tile1.nc .....USING NCCMP......OK
7979
Comparing sfcf021.tile2.nc .....USING NCCMP......OK
@@ -135,14 +135,14 @@ Checking test rst results ....
135135
Comparing RESTART/iced.2021-03-23-21600.nc .....USING NCCMP......OK
136136
Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......OK
137137

138-
0: The total amount of wall time = 385.164336
139-
0: The maximum resident set size (KB) = 1359652
138+
0: The total amount of wall time = 391.350241
139+
0: The maximum resident set size (KB) = 1343528
140140

141141
Test rst PASS
142142

143143

144144
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
145-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1612891/std_base_std_base
145+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1261607/std_base_std_base
146146
Checking test std_base results ....
147147
Moving baseline std_base files ....
148148
Moving sfcf021.tile1.nc .........OK
@@ -205,11 +205,11 @@ Moving baseline std_base files ....
205205
Moving RESTART/iced.2021-03-23-21600.nc .........OK
206206
Moving RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
207207

208-
0: The total amount of wall time = 386.874326
209-
0: The maximum resident set size (KB) = 1362372
208+
0: The total amount of wall time = 389.898125
209+
0: The maximum resident set size (KB) = 1341344
210210

211211
Test std_base PASS
212212

213213
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
214-
Wed Apr 3 19:06:01 UTC 2024
215-
Elapsed time: 01h:04m:10s. Have a nice day!
214+
Thu Apr 4 19:08:57 UTC 2024
215+
Elapsed time: 01h:01m:57s. Have a nice day!

‎tests/logs/OpnReqTests_regional_control_hera.log

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Wed Apr 3 15:46:00 UTC 2024
1+
Thu Apr 4 16:05:04 UTC 2024
22
Start Operation Requirement Test
33

44

55
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
6-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1137011/dcp_dcp
6+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_768169/dcp_dcp
77
Checking test dcp results ....
88
Comparing dynf000.nc .....USING NCCMP......OK
99
Comparing dynf006.nc .....USING NCCMP......OK
@@ -14,14 +14,14 @@ Checking test dcp results ....
1414
Comparing NATLEV.GrbF00 .....USING CMP......OK
1515
Comparing NATLEV.GrbF06 .....USING CMP......OK
1616

17-
0: The total amount of wall time = 2148.497446
18-
0: The maximum resident set size (KB) = 557116
17+
0: The total amount of wall time = 2149.189352
18+
0: The maximum resident set size (KB) = 541572
1919

2020
Test dcp PASS
2121

2222

2323
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
24-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1137011/std_base_std_base
24+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_768169/std_base_std_base
2525
Checking test std_base results ....
2626
Moving baseline std_base files ....
2727
Moving dynf000.nc .........OK
@@ -33,14 +33,14 @@ Moving baseline std_base files ....
3333
Moving NATLEV.GrbF00 .........OK
3434
Moving NATLEV.GrbF06 .........OK
3535

36-
0: The total amount of wall time = 2165.195419
37-
0: The maximum resident set size (KB) = 563120
36+
0: The total amount of wall time = 2148.974341
37+
0: The maximum resident set size (KB) = 544628
3838

3939
Test std_base PASS
4040

4141

4242
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
43-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1137011/thr_thr
43+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_768169/thr_thr
4444
Checking test thr results ....
4545
Comparing dynf000.nc .....USING NCCMP......OK
4646
Comparing dynf006.nc .....USING NCCMP......OK
@@ -51,11 +51,11 @@ Checking test thr results ....
5151
Comparing NATLEV.GrbF00 .....USING CMP......OK
5252
Comparing NATLEV.GrbF06 .....USING CMP......OK
5353

54-
0: The total amount of wall time = 2186.776168
55-
0: The maximum resident set size (KB) = 554324
54+
0: The total amount of wall time = 2179.538342
55+
0: The maximum resident set size (KB) = 543816
5656

5757
Test thr PASS
5858

5959
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
60-
Wed Apr 3 17:45:29 UTC 2024
61-
Elapsed time: 01h:59m:30s. Have a nice day!
60+
Thu Apr 4 18:04:34 UTC 2024
61+
Elapsed time: 01h:59m:31s. Have a nice day!

0 commit comments

Comments
 (0)