Skip to content

Commit 9dc31e4

Browse files
AnningCheng-NOAAsanAkelBruceKropp-Raytheon
authored
fixed restart non-reproducing issue 2588 when using MERRA2 climatology + Add output of ocean scalar variables for quick diagnostics #2632 + Fix CICD Jenkinsfile change default RT suite to full #2628 (#2625)
* UFSWM - Add output of diagnostic ocean scalar variables: diag_table_cpld_sfs.IN * UFSWM - Jenkinsfile update * FV3 - * ccpp-physics - a few of lines of code modified in aerinterp.F90 --------- Co-authored-by: sanAkel <santha.akella@gmail.com> Co-authored-by: Bruce Kropp - Raytheon <104453151+BruceKropp-Raytheon@users.noreply.github.com>
1 parent 9c754c7 commit 9dc31e4

16 files changed

+2776
-2825
lines changed

‎.cicd/Jenkinsfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def generateStage(nodeLabel) {
7878
set +x
7979
8080
echo "Testing concluded...removing labels for $machine from $GIT_URL"
81-
echo "https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels /{$machine-RT,$machine-BL}"
81+
echo "https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels/{$machine-RT,$machine-BL}"
8282
curl --silent -X DELETE -H "Accept: application/vnd.github.v3+json" -H "Authorization: Bearer ${GITHUB_TOKEN}" https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels/{$machine-RT,$machine-BL}
8383
'''
8484
currentBuild.result = 'FAILURE'
@@ -131,7 +131,7 @@ def generateStage(nodeLabel) {
131131
set +x
132132
133133
echo "Testing concluded...removing label ${label} for ${machine} from ${GIT_URL}"
134-
echo "https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels /${machine}-${label}"
134+
echo "https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels/${machine}-${label}"
135135
curl --silent -X DELETE -H "Accept: application/vnd.github.v3+json" -H "Authorization: Bearer ${GITHUB_TOKEN}" https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels/{$machine-RT,$machine-BL}
136136
'''
137137
}
@@ -150,7 +150,7 @@ pipeline {
150150
parameters {
151151
booleanParam name: 'WM_BUILD', defaultValue: false, description: 'Whether to attempt to compile the model code tests'
152152
// Regression Test Suite ?
153-
choice(name: 'WM_OPERATIONAL_TESTS', choices: ['default', 'control_p8', 'cpld_control_p8', 'comprehensive', 'rt.sh', 'none'], description: 'Specify the suite of tests to run')
153+
choice(name: 'WM_OPERATIONAL_TESTS', choices: ['rt.conf', 'default', 'control_p8', 'cpld_control_p8', 'comprehensive', 'none'], description: 'Specify the suite of tests to run')
154154
}
155155
environment {
156156
ACCNR = 'epic'

‎.cicd/README.txt

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
This folder contains scripts to perform automated builds.
2+
It is intended to collect important performance metrics for trending.

‎FV3

Submodule FV3 updated 1 file

‎tests/logs/OpnReqTests_control_p8_hera.log

+24-24
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Tue Mar 4 13:59:06 UTC 2025
1+
Mon Mar 10 14:49:46 UTC 2025
22
Start Operation Requirement Test
33

44

55
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_gnu
6-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2432564/bit_base_bit_base
6+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2514225/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 = 264.470497
55-
0: The maximum resident set size (KB) = 1452008
54+
0: The total amount of wall time = 263.089636
55+
0: The maximum resident set size (KB) = 1450812
5656

5757
Test bit_base PASS
5858

5959

6060
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_gnu
61-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2432564/dbg_base_dbg_base
61+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2514225/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 = 873.295769
110-
0: The maximum resident set size (KB) = 1434860
109+
0: The total amount of wall time = 894.435022
110+
0: The maximum resident set size (KB) = 1424312
111111

112112
Test dbg_base PASS
113113

114114

115115
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
116-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2432564/dcp_dcp
116+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2514225/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 = 232.657622
164-
0: The maximum resident set size (KB) = 1431144
163+
0: The total amount of wall time = 255.195704
164+
0: The maximum resident set size (KB) = 1439372
165165

166166
Test dcp PASS
167167

168168

169169
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
170-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2432564/mpi_mpi
170+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2514225/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 = 237.140431
218-
0: The maximum resident set size (KB) = 1429124
217+
0: The total amount of wall time = 240.708492
218+
0: The maximum resident set size (KB) = 1431668
219219

220220
Test mpi PASS
221221

222222

223223
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
224-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2432564/rst_rst
224+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2514225/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 = 236.072984
272-
0: The maximum resident set size (KB) = 1429740
271+
0: The total amount of wall time = 236.404550
272+
0: The maximum resident set size (KB) = 1413844
273273

274274
Test rst PASS
275275

276276

277277
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
278-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2432564/std_base_std_base
278+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2514225/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 = 240.588488
327-
0: The maximum resident set size (KB) = 1427892
326+
0: The total amount of wall time = 241.799857
327+
0: The maximum resident set size (KB) = 1436660
328328

329329
Test std_base PASS
330330

331331

332332
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
333-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2432564/thr_thr
333+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2514225/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 = 236.799078
381-
0: The maximum resident set size (KB) = 1420744
380+
0: The total amount of wall time = 239.871402
381+
0: The maximum resident set size (KB) = 1418840
382382

383383
Test thr PASS
384384

385385
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
386-
Tue Mar 4 15:08:51 UTC 2025
387-
Elapsed time: 01h:09m:46s. Have a nice day!
386+
Mon Mar 10 16:09:35 UTC 2025
387+
Elapsed time: 01h:19m:49s. Have a nice day!

‎tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Tue Mar 4 12:17:24 UTC 2025
1+
Mon Mar 10 13:17:06 UTC 2025
22
Start Operation Requirement Test
33

44

55
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_dbg_base_gnu
6-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1723361/dbg_base_dbg_base
6+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2219240/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 = 2321.511982
70-
0: The maximum resident set size (KB) = 1508268
69+
0: The total amount of wall time = 2391.075563
70+
0: The maximum resident set size (KB) = 1509636
7171

7272
Test dbg_base PASS
7373

7474

7575
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
76-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1723361/rst_rst
76+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2219240/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 = 885.357109
139-
0: The maximum resident set size (KB) = 1500284
138+
0: The total amount of wall time = 673.364321
139+
0: The maximum resident set size (KB) = 1501156
140140

141141
Test rst PASS
142142

143143

144144
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
145-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1723361/std_base_std_base
145+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2219240/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 = 906.585920
209-
0: The maximum resident set size (KB) = 1515644
208+
0: The total amount of wall time = 681.176217
209+
0: The maximum resident set size (KB) = 1491940
210210

211211
Test std_base PASS
212212

213213
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
214-
Tue Mar 4 13:59:05 UTC 2025
215-
Elapsed time: 01h:41m:41s. Have a nice day!
214+
Mon Mar 10 14:49:46 UTC 2025
215+
Elapsed time: 01h:32m:40s. Have a nice day!

‎tests/logs/OpnReqTests_regional_control_hera.log

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Tue Mar 4 09:38:39 UTC 2025
1+
Mon Mar 10 10:38:42 UTC 2025
22
Start Operation Requirement Test
33

44

55
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_bit_base_gnu
6-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_594890/bit_base_bit_base
6+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1590323/bit_base_bit_base
77
Checking test bit_base results ....
88
Moving baseline bit_base files ....
99
Moving dynf000.nc .........OK
@@ -15,14 +15,14 @@ Moving baseline bit_base files ....
1515
Moving NATLEV.GrbF00 .........OK
1616
Moving NATLEV.GrbF06 .........OK
1717

18-
0: The total amount of wall time = 1398.696469
19-
0: The maximum resident set size (KB) = 769184
18+
0: The total amount of wall time = 1424.642932
19+
0: The maximum resident set size (KB) = 755568
2020

2121
Test bit_base PASS
2222

2323

2424
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
25-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_594890/dcp_dcp
25+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1590323/dcp_dcp
2626
Checking test dcp results ....
2727
Comparing dynf000.nc .....USING NCCMP......OK
2828
Comparing dynf006.nc .....USING NCCMP......OK
@@ -33,14 +33,14 @@ Checking test dcp results ....
3333
Comparing NATLEV.GrbF00 .....USING CMP......OK
3434
Comparing NATLEV.GrbF06 .....USING CMP......OK
3535

36-
0: The total amount of wall time = 2295.507380
37-
0: The maximum resident set size (KB) = 708740
36+
0: The total amount of wall time = 2290.668679
37+
0: The maximum resident set size (KB) = 730512
3838

3939
Test dcp PASS
4040

4141

4242
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
43-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_594890/std_base_std_base
43+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1590323/std_base_std_base
4444
Checking test std_base results ....
4545
Moving baseline std_base files ....
4646
Moving dynf000.nc .........OK
@@ -52,14 +52,14 @@ Moving baseline std_base files ....
5252
Moving NATLEV.GrbF00 .........OK
5353
Moving NATLEV.GrbF06 .........OK
5454

55-
0: The total amount of wall time = 2278.947058
56-
0: The maximum resident set size (KB) = 719796
55+
0: The total amount of wall time = 2295.886502
56+
0: The maximum resident set size (KB) = 722460
5757

5858
Test std_base PASS
5959

6060

6161
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
62-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_594890/thr_thr
62+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1590323/thr_thr
6363
Checking test thr results ....
6464
Comparing dynf000.nc .....USING NCCMP......OK
6565
Comparing dynf006.nc .....USING NCCMP......OK
@@ -70,11 +70,11 @@ Checking test thr results ....
7070
Comparing NATLEV.GrbF00 .....USING CMP......OK
7171
Comparing NATLEV.GrbF06 .....USING CMP......OK
7272

73-
0: The total amount of wall time = 2279.672631
74-
0: The maximum resident set size (KB) = 718664
73+
0: The total amount of wall time = 2291.726981
74+
0: The maximum resident set size (KB) = 729820
7575

7676
Test thr PASS
7777

7878
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
79-
Tue Mar 4 12:17:24 UTC 2025
80-
Elapsed time: 02h:38m:45s. Have a nice day!
79+
Mon Mar 10 13:17:06 UTC 2025
80+
Elapsed time: 02h:38m:25s. Have a nice day!

0 commit comments

Comments
 (0)