Skip to content

Commit 635890c

Browse files
climbfujiclimbfuji
authored
Add support for optional arguments in ccpp physics and framework AND add end of run restart functionality to MOM6 (was ufs-community#2286) (ufs-community#2205)
* UFSWM - Add support for optional arguments in ccpp physics and framework * FV3 - [Add support for optional arguments in ccpp physics and framework](NOAA-EMC/fv3atm#807 (comment)) * ccpp-physics - Introduce optional arguments in ccpp schemes and metadata * ccpp-framework - Add support (and tests) for optional arguments in ccpp_prebuild * atmos_cubed_sphere - Set cdata%thrd_cnt in driver/fvGFS/atmosphere.F90 * MOM6 - Add end of run restart functionality to MOM6 * stochastic_physics - Add optional attribute for variables where necessary
1 parent d55f1b8 commit 635890c

19 files changed

+2515
-2478
lines changed

‎FV3

‎MOM6-interface/MOM6

‎stochastic_physics

‎tests/logs/OpnReqTests_control_p8_hera.log

+24-24
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Thu May 16 20:24:57 UTC 2024
1+
Mon May 20 18:51:03 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_197061/bit_base_bit_base
6+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1703729/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 = 278.785657
55-
0: The maximum resident set size (KB) = 1253096
54+
0: The total amount of wall time = 276.086219
55+
0: The maximum resident set size (KB) = 1266612
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_197061/dbg_base_dbg_base
61+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1703729/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 = 945.032567
110-
0: The maximum resident set size (KB) = 1233484
109+
0: The total amount of wall time = 967.204562
110+
0: The maximum resident set size (KB) = 1252256
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_197061/dcp_dcp
116+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1703729/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 = 244.990573
164-
0: The maximum resident set size (KB) = 1232508
163+
0: The total amount of wall time = 244.057605
164+
0: The maximum resident set size (KB) = 1245204
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_197061/mpi_mpi
170+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1703729/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 = 241.154280
218-
0: The maximum resident set size (KB) = 1233296
217+
0: The total amount of wall time = 242.281799
218+
0: The maximum resident set size (KB) = 1245960
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_197061/rst_rst
224+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1703729/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 = 242.646838
272-
0: The maximum resident set size (KB) = 1233060
271+
0: The total amount of wall time = 242.457949
272+
0: The maximum resident set size (KB) = 1245616
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_197061/std_base_std_base
278+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1703729/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 = 263.767716
327-
0: The maximum resident set size (KB) = 1233204
326+
0: The total amount of wall time = 247.352735
327+
0: The maximum resident set size (KB) = 1245076
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_197061/thr_thr
333+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1703729/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 = 246.202485
381-
0: The maximum resident set size (KB) = 1231200
380+
0: The total amount of wall time = 242.402115
381+
0: The maximum resident set size (KB) = 1245280
382382

383383
Test thr PASS
384384

385385
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
386-
Thu May 16 21:50:50 UTC 2024
387-
Elapsed time: 01h:27m:39s. Have a nice day!
386+
Mon May 20 21:14:11 UTC 2024
387+
Elapsed time: 02h:23m:09s. 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-
Fri May 17 15:45:56 UTC 2024
1+
Tue May 21 16:24:30 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_1600376/dbg_base_dbg_base
6+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/cpld/FV3_OPNREQ_TEST/opnReqTest_21842/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 = 1313.057110
70-
0: The maximum resident set size (KB) = 1342956
69+
0: The total amount of wall time = 1578.173654
70+
0: The maximum resident set size (KB) = 1343768
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_1600376/rst_rst
76+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/cpld/FV3_OPNREQ_TEST/opnReqTest_21842/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 = 518.573154
139-
0: The maximum resident set size (KB) = 1341724
138+
0: The total amount of wall time = 550.910855
139+
0: The maximum resident set size (KB) = 1339328
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_1600376/std_base_std_base
145+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/cpld/FV3_OPNREQ_TEST/opnReqTest_21842/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 = 393.159431
209-
0: The maximum resident set size (KB) = 1342660
208+
0: The total amount of wall time = 608.236433
209+
0: The maximum resident set size (KB) = 1338792
210210

211211
Test std_base PASS
212212

213213
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
214-
Fri May 17 16:50:15 UTC 2024
215-
Elapsed time: 01h:04m:19s. Have a nice day!
214+
Tue May 21 17:39:42 UTC 2024
215+
Elapsed time: 01h:15m:12s. 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-
Fri May 17 13:09:07 UTC 2024
1+
Tue May 21 16:03:46 UTC 2024
22
Start Operation Requirement Test
33

44

55
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_bit_base_gnu
6-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_959654/bit_base_bit_base
6+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_4148204/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 = 1380.751535
19-
0: The maximum resident set size (KB) = 575872
18+
0: The total amount of wall time = 1256.367157
19+
0: The maximum resident set size (KB) = 575888
2020

2121
Test bit_base PASS
2222

2323

2424
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
25-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_959654/dcp_dcp
25+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_4148204/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 = 2250.847202
37-
0: The maximum resident set size (KB) = 545220
36+
0: The total amount of wall time = 2182.888769
37+
0: The maximum resident set size (KB) = 543284
3838

3939
Test dcp 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_959654/std_base_std_base
43+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_4148204/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 = 2153.300954
56-
0: The maximum resident set size (KB) = 541236
55+
0: The total amount of wall time = 2087.568729
56+
0: The maximum resident set size (KB) = 540656
5757

5858
Test std_base PASS
5959

6060

6161
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
62-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_959654/thr_thr
62+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_4148204/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 = 2143.988793
74-
0: The maximum resident set size (KB) = 542088
73+
0: The total amount of wall time = 2251.752676
74+
0: The maximum resident set size (KB) = 543636
7575

7676
Test thr PASS
7777

7878
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
79-
Fri May 17 15:35:34 UTC 2024
80-
Elapsed time: 02h:26m:28s. Have a nice day!
79+
Tue May 21 18:31:11 UTC 2024
80+
Elapsed time: 02h:27m:25s. Have a nice day!

0 commit comments

Comments
 (0)