Skip to content

Commit 5171e95

Browse files
climbfujiclimbfuji
committed
Merge branch 'develop' of https://github.com/ufs-community/ufs-weather-model into feature/ufs_compiler_suite
2 parents 36d63b8 + a8c1628 commit 5171e95

29 files changed

+2938
-3447
lines changed

‎AQM

Submodule AQM updated 35 files

‎FV3

Submodule FV3 updated from a46b8cb to b1b3454

‎WW3

Submodule WW3 updated 124 files

‎tests/bl_date.conf

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

‎tests/fv3_conf/cpld_control_run.IN

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ else
170170
cp ${FV3_IC}/ca_data*nc ./INPUT
171171
cp ${FV3_IC}/ufs.cpld.cpl*nc .
172172
ls -1 ufs.cpld.cpl*nc>rpointer.cpl
173-
cp ${WAV_IC}/ufs.cpld.ww3.r.${RESTART_FILE_SUFFIX_SECS} .
173+
cp ${WAV_IC}/ufs.cpld.ww3.r.${RESTART_FILE_SUFFIX_SECS}.nc .
174174
else
175175
# C48mx500 warm start from ICs
176176
cp ${FV3_IC}/*.nc ./INPUT

‎tests/fv3_conf/fv3_aqm.IN

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎tests/fv3_conf/regional_atmaq.IN

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
rm -rf INPUT RESTART
2+
mkdir RESTART
3+
4+
cp -r @[INPUTDATA_ROOT]/AQM/v8/INPUT .
5+
cp -r @[INPUTDATA_ROOT]/AQM/v8/NEXUS .
6+
7+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/C775.facsf.tile1.nc .
8+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/C775.facsf.tile7.nc .
9+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/C775.maximum_snow_albedo.tile1.nc .
10+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/C775.maximum_snow_albedo.tile7.nc .
11+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/C775.slope_type.tile1.nc .
12+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/C775.slope_type.tile7.nc .
13+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/C775.snowfree_albedo.tile1.nc .
14+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/C775.snowfree_albedo.tile7.nc .
15+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/C775.soil_type.tile1.nc .
16+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/C775.soil_type.tile7.nc .
17+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/C775.substrate_temperature.tile1.nc .
18+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/C775.substrate_temperature.tile7.nc .
19+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/C775.vegetation_greenness.tile1.nc .
20+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/C775.vegetation_greenness.tile7.nc .
21+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/C775.vegetation_type.tile1.nc .
22+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/C775.vegetation_type.tile7.nc .
23+
24+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/AE_cb6r5_ae7_aq.nml .
25+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/BEIS_RRFScmaq_C775.ncf .
26+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/CSQY_DATA_cb6r5_ae7_aq .
27+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/GC_cb6r5_ae7_aq.nml .
28+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/NR_cb6r5_ae7_aq.nml .
29+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/PHOT_OPTICS.dat .
30+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/Species_Table_TR_0.nml .
31+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/CMAQ_Control_DESID.nml .
32+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/CMAQ_Control_DESID_cb6r5_ae7_aq.nml .
33+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/CMAQ_Control_Misc.nml .
34+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/gspro_biogenics_1mar2017.txt .
35+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/FENGSHA_p8_10km_inputs_CONUS_775.nc .
36+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/omi_cmaq_2015_361X179.dat .
37+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/Hourly_Emissions_regrid_rrfs_13km_20190801_t12z_h72.nc .
38+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/pt-2019080112.nc .
39+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/atmos_4xdaily.nc .
40+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/RTGSST.1982.2012.monthly.clim.grb .
41+
cp @[INPUTDATA_ROOT]/AQM/v8/fix/gfs.t12z.geo.08.canopy_regrid.nc .
42+
43+
cp @[INPUTDATA_ROOT]/FV3_input_data/global_soilmgldas.t126.384.190.grb .

‎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-
Mon Mar 10 14:49:46 UTC 2025
1+
Fri Mar 21 22:40:42 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_2514225/bit_base_bit_base
6+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_165353/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 = 263.089636
55-
0: The maximum resident set size (KB) = 1450812
54+
0: The total amount of wall time = 264.910651
55+
0: The maximum resident set size (KB) = 1456540
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_2514225/dbg_base_dbg_base
61+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_165353/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 = 894.435022
110-
0: The maximum resident set size (KB) = 1424312
109+
0: The total amount of wall time = 881.796825
110+
0: The maximum resident set size (KB) = 1423588
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_2514225/dcp_dcp
116+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_165353/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 = 255.195704
164-
0: The maximum resident set size (KB) = 1439372
163+
0: The total amount of wall time = 238.888610
164+
0: The maximum resident set size (KB) = 1432068
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_2514225/mpi_mpi
170+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_165353/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 = 240.708492
218-
0: The maximum resident set size (KB) = 1431668
217+
0: The total amount of wall time = 243.187446
218+
0: The maximum resident set size (KB) = 1419036
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_2514225/rst_rst
224+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_165353/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.404550
272-
0: The maximum resident set size (KB) = 1413844
271+
0: The total amount of wall time = 236.266312
272+
0: The maximum resident set size (KB) = 1414488
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_2514225/std_base_std_base
278+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_165353/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 = 241.799857
327-
0: The maximum resident set size (KB) = 1436660
326+
0: The total amount of wall time = 242.201327
327+
0: The maximum resident set size (KB) = 1428032
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_2514225/thr_thr
333+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_165353/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 = 239.871402
381-
0: The maximum resident set size (KB) = 1418840
380+
0: The total amount of wall time = 236.785706
381+
0: The maximum resident set size (KB) = 1424916
382382

383383
Test thr PASS
384384

385385
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
386-
Mon Mar 10 16:09:35 UTC 2025
387-
Elapsed time: 01h:19m:49s. Have a nice day!
386+
Sat Mar 22 00:04:46 UTC 2025
387+
Elapsed time: 01h:24m:04s. 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-
Mon Mar 10 13:17:06 UTC 2025
1+
Fri Mar 21 20:53:36 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_2219240/dbg_base_dbg_base
6+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1563489/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 = 2391.075563
70-
0: The maximum resident set size (KB) = 1509636
69+
0: The total amount of wall time = 2459.983477
70+
0: The maximum resident set size (KB) = 1511084
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_2219240/rst_rst
76+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1563489/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 = 673.364321
139-
0: The maximum resident set size (KB) = 1501156
138+
0: The total amount of wall time = 665.398907
139+
0: The maximum resident set size (KB) = 1513720
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_2219240/std_base_std_base
145+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1563489/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 = 681.176217
209-
0: The maximum resident set size (KB) = 1491940
208+
0: The total amount of wall time = 667.987526
209+
0: The maximum resident set size (KB) = 1500980
210210

211211
Test std_base PASS
212212

213213
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
214-
Mon Mar 10 14:49:46 UTC 2025
215-
Elapsed time: 01h:32m:40s. Have a nice day!
214+
Fri Mar 21 22:40:42 UTC 2025
215+
Elapsed time: 01h:47m:06s. 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 Mar 10 10:38:42 UTC 2025
1+
Fri Mar 21 17:54:49 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_1590323/bit_base_bit_base
6+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3890710/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 = 1424.642932
19-
0: The maximum resident set size (KB) = 755568
18+
0: The total amount of wall time = 1464.423839
19+
0: The maximum resident set size (KB) = 766612
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_1590323/dcp_dcp
25+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3890710/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 = 2290.668679
37-
0: The maximum resident set size (KB) = 730512
36+
0: The total amount of wall time = 2198.187816
37+
0: The maximum resident set size (KB) = 737588
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_1590323/std_base_std_base
43+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3890710/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 = 2295.886502
56-
0: The maximum resident set size (KB) = 722460
55+
0: The total amount of wall time = 2305.499642
56+
0: The maximum resident set size (KB) = 713404
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_1590323/thr_thr
62+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3890710/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 = 2291.726981
74-
0: The maximum resident set size (KB) = 729820
73+
0: The total amount of wall time = 2283.946320
74+
0: The maximum resident set size (KB) = 719408
7575

7676
Test thr PASS
7777

7878
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
79-
Mon Mar 10 13:17:06 UTC 2025
80-
Elapsed time: 02h:38m:25s. Have a nice day!
79+
Fri Mar 21 21:10:26 UTC 2025
80+
Elapsed time: 03h:15m:37s. Have a nice day!

0 commit comments

Comments
 (0)