Skip to content

Commit 6f22f57

Browse files
DeniseWorthenDeniseWorthen
authored
diag_table clean up ; Disable concurrent builds with the same PR label (was #3006); fix time-averaged radiation (was #2996) (#3004)
* UFSWM - cleanup diag_tables, retaining current baselines * UFSWM - Disable concurrent Jenkins CI/CD builds * UFSATM - Fix calculation of averaged radiation fields
1 parent dc0d038 commit 6f22f57

File tree

80 files changed

+2557
-4784
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+2557
-4784
lines changed

‎UFSATM‎

‎tests/ci/Jenkinsfile.ort‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
pipeline {
22
agent none
3+
options {
4+
disableConcurrentBuilds()
5+
}
36
stages {
47
stage('Run ORTs') {
58
agent {

‎tests/default_vars.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ export_fv3
471471
export USE_MERRA2=.false.
472472
export WRITE_NSFLIP=.false.
473473

474-
export DIAG_TABLE=diag_table_gfsv16
474+
export DIAG_TABLE=diag_table_gfsv16.IN
475475
export FIELD_TABLE=field_table_gfsv16
476476
export FV3_RUN=control_run.IN
477477
export INPUT_NML=control.nml.IN
@@ -1968,6 +1968,7 @@ export_datm_cdeps ()
19681968
export SMONTH=10
19691969
export SDAY=01
19701970
export SHOUR=00
1971+
export CHOUR=00
19711972
export FHMAX=24
19721973
export DT_ATMOS=900
19731974
export FHROT=0
@@ -2017,7 +2018,7 @@ export_datm_cdeps ()
20172018

20182019
# datm defaults
20192020
export INPUT_NML=input.mom6.nml.IN
2020-
export DIAG_TABLE=diag_table_template
2021+
export DIAG_TABLE=diag_table_cpld.IN
20212022
export DATM_SRC=CFSR
20222023
export FILEBASE_DATM=cfsr
20232024
export MESH_ATM=mesh.datm.1760x880.nc

‎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-
Thu Dec 4 22:11:09 UTC 2025
1+
Tue Dec 9 20:50:21 UTC 2025
22
Start Operation Requirement Test
33

44

55
baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_gnu
6-
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_4184803/bit_base_bit_base
6+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2094011/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 = 254.475986
55-
0: The maximum resident set size (KB) = 1532416
54+
0: The total amount of wall time = 256.746573
55+
0: The maximum resident set size (KB) = 1553320
5656

5757
Test bit_base PASS
5858

5959

6060
baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_gnu
61-
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_4184803/dbg_base_dbg_base
61+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2094011/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 = 874.177735
110-
0: The maximum resident set size (KB) = 1527972
109+
0: The total amount of wall time = 883.998240
110+
0: The maximum resident set size (KB) = 1529536
111111

112112
Test dbg_base PASS
113113

114114

115115
baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
116-
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_4184803/dcp_dcp
116+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2094011/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.051773
164-
0: The maximum resident set size (KB) = 1527828
163+
0: The total amount of wall time = 234.587542
164+
0: The maximum resident set size (KB) = 1511816
165165

166166
Test dcp PASS
167167

168168

169169
baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
170-
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_4184803/mpi_mpi
170+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2094011/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 = 230.377104
218-
0: The maximum resident set size (KB) = 1533748
217+
0: The total amount of wall time = 231.297307
218+
0: The maximum resident set size (KB) = 1523920
219219

220220
Test mpi PASS
221221

222222

223223
baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
224-
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_4184803/rst_rst
224+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2094011/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 = 229.309643
272-
0: The maximum resident set size (KB) = 1522600
271+
0: The total amount of wall time = 229.601282
272+
0: The maximum resident set size (KB) = 1522332
273273

274274
Test rst PASS
275275

276276

277277
baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
278-
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_4184803/std_base_std_base
278+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2094011/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 = 230.860865
327-
0: The maximum resident set size (KB) = 1499132
326+
0: The total amount of wall time = 230.782627
327+
0: The maximum resident set size (KB) = 1523964
328328

329329
Test std_base PASS
330330

331331

332332
baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
333-
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_4184803/thr_thr
333+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2094011/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 = 232.808908
381-
0: The maximum resident set size (KB) = 1522508
380+
0: The total amount of wall time = 232.546040
381+
0: The maximum resident set size (KB) = 1524000
382382

383383
Test thr PASS
384384

385385
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
386-
Thu Dec 4 23:17:28 UTC 2025
387-
Elapsed time: 01h:06m:19s. Have a nice day!
386+
Tue Dec 9 22:00:28 UTC 2025
387+
Elapsed time: 01h:10m:08s. 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-
Thu Dec 4 20:42:51 UTC 2025
1+
Tue Dec 9 19:11:21 UTC 2025
22
Start Operation Requirement Test
33

44

55
baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_dbg_base_gnu
6-
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3635548/dbg_base_dbg_base
6+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1648499/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 = 2345.585180
70-
0: The maximum resident set size (KB) = 1639812
69+
0: The total amount of wall time = 2297.514651
70+
0: The maximum resident set size (KB) = 1643212
7171

7272
Test dbg_base PASS
7373

7474

7575
baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
76-
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3635548/rst_rst
76+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1648499/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 = 579.203190
139-
0: The maximum resident set size (KB) = 1636696
138+
0: The total amount of wall time = 593.198980
139+
0: The maximum resident set size (KB) = 1635728
140140

141141
Test rst PASS
142142

143143

144144
baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
145-
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3635548/std_base_std_base
145+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1648499/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 = 590.306844
209-
0: The maximum resident set size (KB) = 1633844
208+
0: The total amount of wall time = 586.378138
209+
0: The maximum resident set size (KB) = 1625260
210210

211211
Test std_base PASS
212212

213213
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
214-
Thu Dec 4 22:11:09 UTC 2025
215-
Elapsed time: 01h:28m:18s. Have a nice day!
214+
Tue Dec 9 20:50:20 UTC 2025
215+
Elapsed time: 01h:39m:00s. Have a nice day!

‎tests/logs/OpnReqTests_regional_control_hera.log‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Thu Dec 4 19:49:16 UTC 2025
1+
Tue Dec 9 18:16:55 UTC 2025
22
Start Operation Requirement Test
33

44

55
baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_bit_base_gnu
6-
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3471151/bit_base_bit_base
6+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1536564/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 = 614.943262
19-
0: The maximum resident set size (KB) = 881004
18+
0: The total amount of wall time = 617.561148
19+
0: The maximum resident set size (KB) = 899520
2020

2121
Test bit_base PASS
2222

2323

2424
baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
25-
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3471151/dcp_dcp
25+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1536564/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 = 511.238259
37-
0: The maximum resident set size (KB) = 863788
36+
0: The total amount of wall time = 494.731562
37+
0: The maximum resident set size (KB) = 854572
3838

3939
Test dcp PASS
4040

4141

4242
baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
43-
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3471151/std_base_std_base
43+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1536564/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 = 502.099435
56-
0: The maximum resident set size (KB) = 864864
55+
0: The total amount of wall time = 501.140853
56+
0: The maximum resident set size (KB) = 853688
5757

5858
Test std_base PASS
5959

6060

6161
baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
62-
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3471151/thr_thr
62+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1536564/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 = 497.216111
74-
0: The maximum resident set size (KB) = 837772
73+
0: The total amount of wall time = 503.806547
74+
0: The maximum resident set size (KB) = 862260
7575

7676
Test thr PASS
7777

7878
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
79-
Thu Dec 4 20:42:51 UTC 2025
80-
Elapsed time: 00h:53m:35s. Have a nice day!
79+
Tue Dec 9 19:11:20 UTC 2025
80+
Elapsed time: 00h:54m:25s. Have a nice day!

0 commit comments

Comments
 (0)