Skip to content

Commit bf65ceb

Browse files
natalie-perlinnatalie-perlin
authored
Merge branch 'ufs-community:develop' into fix/gaeac6-ecflow
2 parents 83846e2 + 61e54d9 commit bf65ceb

23 files changed

+3135
-3070
lines changed

‎CMEPS-interface/CMEPS‎

‎MOM6-interface/MOM6‎

‎WW3‎

‎tests/bl_date.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export BL_DATE=20250729
1+
export BL_DATE=20250806

‎tests/default_vars.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1861,6 +1861,7 @@ export MRAEROSOL=.false.
18611861
export CDMBWD=1.0,1.0,1.0,1.0
18621862
export LHEATSTRG=.false.
18631863
export LRADAR=.true.
1864+
export ICPLOCN2ATM=0
18641865

18651866
export FV_CORE_TAU=5.
18661867
export RF_CUTOFF=30.e2

‎tests/logs/OpnReqTests_control_p8_hera.log‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Tue Aug 5 06:18:08 UTC 2025
1+
Thu Aug 7 21:15:08 UTC 2025
22
Start Operation Requirement Test
33

44

5-
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_intel
6-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_474058/bit_base_bit_base
5+
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_3593997/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 = 197.490614
55-
0: The maximum resident set size (KB) = 2076860
54+
0: The total amount of wall time = 250.691060
55+
0: The maximum resident set size (KB) = 1567076
5656

5757
Test bit_base PASS
5858

5959

60-
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_intel
61-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_474058/dbg_base_dbg_base
60+
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_3593997/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 = 1768.110299
110-
0: The maximum resident set size (KB) = 2045856
109+
0: The total amount of wall time = 868.416753
110+
0: The maximum resident set size (KB) = 1554348
111111

112112
Test dbg_base PASS
113113

114114

115-
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
116-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_474058/dcp_dcp
115+
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_3593997/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 = 169.383039
164-
0: The maximum resident set size (KB) = 2019716
163+
0: The total amount of wall time = 232.942864
164+
0: The maximum resident set size (KB) = 1542368
165165

166166
Test dcp PASS
167167

168168

169-
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
170-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_474058/mpi_mpi
169+
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_3593997/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 = 168.978486
218-
0: The maximum resident set size (KB) = 2019008
217+
0: The total amount of wall time = 229.012956
218+
0: The maximum resident set size (KB) = 1514324
219219

220220
Test mpi PASS
221221

222222

223-
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
224-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_474058/rst_rst
223+
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_3593997/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 = 168.609790
272-
0: The maximum resident set size (KB) = 2018824
271+
0: The total amount of wall time = 230.517260
272+
0: The maximum resident set size (KB) = 1519300
273273

274274
Test rst PASS
275275

276276

277-
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
278-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_474058/std_base_std_base
277+
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_3593997/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 = 170.863450
327-
0: The maximum resident set size (KB) = 2015208
326+
0: The total amount of wall time = 229.174248
327+
0: The maximum resident set size (KB) = 1532716
328328

329329
Test std_base PASS
330330

331331

332-
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
333-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_474058/thr_thr
332+
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_3593997/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 = 170.023648
381-
0: The maximum resident set size (KB) = 2019008
380+
0: The total amount of wall time = 226.191036
381+
0: The maximum resident set size (KB) = 1532000
382382

383383
Test thr PASS
384384

385385
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
386-
Tue Aug 5 07:42:51 UTC 2025
387-
Elapsed time: 01h:24m:44s. Have a nice day!
386+
Thu Aug 7 22:23:01 UTC 2025
387+
Elapsed time: 01h:07m:54s. Have a nice day!

‎tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Tue Aug 5 04:18:08 UTC 2025
1+
Thu Aug 7 19:48:50 UTC 2025
22
Start Operation Requirement Test
33

44

5-
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_dbg_base_intel
6-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_216546/dbg_base_dbg_base
5+
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_3125544/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 = 4515.043148
70-
0: The maximum resident set size (KB) = 2215740
69+
0: The total amount of wall time = 2311.998438
70+
0: The maximum resident set size (KB) = 1663984
7171

7272
Test dbg_base PASS
7373

7474

75-
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_intel
76-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_216546/rst_rst
75+
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_3125544/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 = 376.288509
139-
0: The maximum resident set size (KB) = 2179272
138+
0: The total amount of wall time = 585.427345
139+
0: The maximum resident set size (KB) = 1629772
140140

141141
Test rst PASS
142142

143143

144-
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_intel
145-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_216546/std_base_std_base
144+
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_3125544/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 = 369.408408
209-
0: The maximum resident set size (KB) = 2194476
208+
0: The total amount of wall time = 579.445871
209+
0: The maximum resident set size (KB) = 1644760
210210

211211
Test std_base PASS
212212

213213
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
214-
Tue Aug 5 06:08:52 UTC 2025
215-
Elapsed time: 01h:50m:45s. Have a nice day!
214+
Thu Aug 7 21:15:07 UTC 2025
215+
Elapsed time: 01h:26m:18s. 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-
Mon Aug 4 21:53:39 UTC 2025
1+
Thu Aug 7 18:50:30 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_166714/bit_base_bit_base
6+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2909697/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 = 606.127742
19-
0: The maximum resident set size (KB) = 903448
18+
0: The total amount of wall time = 610.967202
19+
0: The maximum resident set size (KB) = 900380
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_166714/dcp_dcp
25+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2909697/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 = 492.763746
37-
0: The maximum resident set size (KB) = 874556
36+
0: The total amount of wall time = 490.119031
37+
0: The maximum resident set size (KB) = 870580
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_166714/std_base_std_base
43+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2909697/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 = 490.832093
56-
0: The maximum resident set size (KB) = 870232
55+
0: The total amount of wall time = 494.985931
56+
0: The maximum resident set size (KB) = 867440
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_166714/thr_thr
62+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2909697/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 = 491.549811
74-
0: The maximum resident set size (KB) = 854380
73+
0: The total amount of wall time = 487.886508
74+
0: The maximum resident set size (KB) = 858580
7575

7676
Test thr PASS
7777

7878
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
79-
Mon Aug 4 22:49:00 UTC 2025
80-
Elapsed time: 00h:55m:22s. Have a nice day!
79+
Thu Aug 7 19:48:49 UTC 2025
80+
Elapsed time: 00h:58m:19s. Have a nice day!

0 commit comments

Comments
 (0)