Skip to content

Commit 990ca94

Browse files
BrianCurtis-NOAABrianCurtis-NOAA
authored
Update tests such that LSM and LANDICE are set appropriately (ufs-community#2772)
* UFSWM - Update default_vars and tests so that LSM 1/2 sets LANDICE true/false appropriately.
1 parent d3caf3e commit 990ca94

File tree

70 files changed

+2472
-3087
lines changed

Some content is hidden

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

70 files changed

+2472
-3087
lines changed

‎tests/bl_date.conf‎

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

‎tests/default_vars.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1429,6 +1429,7 @@ export_tiled() {
14291429
export FNVMXC="'${ATMRES}.vegetation_greenness.tileX.nc'"
14301430
export FNSLPC="'${ATMRES}.slope_type.tileX.nc'"
14311431
export FNABSC="'${ATMRES}.maximum_snow_albedo.tileX.nc'"
1432+
export LSM=2
14321433
export LANDICE=".false."
14331434
}
14341435

@@ -1845,6 +1846,7 @@ export FHZERO=6
18451846
export IALB=2
18461847
export IEMS=2
18471848
export LSM=2
1849+
export LANDICE=.false.
18481850
export IOPT_DVEG=4
18491851
export IOPT_CRS=2
18501852
export IOPT_RAD=3
@@ -2172,6 +2174,7 @@ export IOPT_RAD=1
21722174
export IOPT_ALB=2
21732175
export IOPT_STC=1
21742176
export LSM=1
2177+
export LANDICE=.true.
21752178
export DO_GSL_DRAG_LS_BL=.true.
21762179
export DO_GSL_DRAG_SS=.true.
21772180
export DO_GSL_DRAG_TOFD=.true.
@@ -2536,4 +2539,5 @@ export_rrfs_v1()
25362539
export LHEATSTRG=.false.
25372540
export LSM=2
25382541
export LSOIL_LSM=4
2542+
export LANDICE=.false.
25392543
}

‎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 Sep 11 20:57:56 UTC 2025
1+
Mon Sep 15 22:40:15 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_5133/bit_base_bit_base
6+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_702291/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 = 248.435842
55-
0: The maximum resident set size (KB) = 1557648
54+
0: The total amount of wall time = 250.799002
55+
0: The maximum resident set size (KB) = 1566252
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_5133/dbg_base_dbg_base
61+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_702291/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 = 896.908058
110-
0: The maximum resident set size (KB) = 1542396
109+
0: The total amount of wall time = 874.359080
110+
0: The maximum resident set size (KB) = 1543452
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_5133/dcp_dcp
116+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_702291/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 = 225.554497
164-
0: The maximum resident set size (KB) = 1547840
163+
0: The total amount of wall time = 227.106996
164+
0: The maximum resident set size (KB) = 1534408
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_5133/mpi_mpi
170+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_702291/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 = 228.682329
218-
0: The maximum resident set size (KB) = 1544624
217+
0: The total amount of wall time = 232.819402
218+
0: The maximum resident set size (KB) = 1545340
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_5133/rst_rst
224+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_702291/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 = 227.451526
272-
0: The maximum resident set size (KB) = 1549020
271+
0: The total amount of wall time = 226.874875
272+
0: The maximum resident set size (KB) = 1537112
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_5133/std_base_std_base
278+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_702291/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 = 231.718687
327-
0: The maximum resident set size (KB) = 1536928
326+
0: The total amount of wall time = 228.995076
327+
0: The maximum resident set size (KB) = 1533160
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_5133/thr_thr
333+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_702291/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 = 226.918196
381-
0: The maximum resident set size (KB) = 1535024
380+
0: The total amount of wall time = 227.240667
381+
0: The maximum resident set size (KB) = 1536048
382382

383383
Test thr PASS
384384

385385
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
386-
Thu Sep 11 22:21:43 UTC 2025
387-
Elapsed time: 01h:23m:48s. Have a nice day!
386+
Mon Sep 15 23:51:07 UTC 2025
387+
Elapsed time: 01h:10m:54s. 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 Sep 11 19:31:01 UTC 2025
1+
Mon Sep 15 21:16:09 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_3856063/dbg_base_dbg_base
6+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_25301/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 = 2305.709842
70-
0: The maximum resident set size (KB) = 1659580
69+
0: The total amount of wall time = 2314.722123
70+
0: The maximum resident set size (KB) = 1649004
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_3856063/rst_rst
76+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_25301/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 = 589.246601
139-
0: The maximum resident set size (KB) = 1638076
138+
0: The total amount of wall time = 581.104517
139+
0: The maximum resident set size (KB) = 1632388
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_3856063/std_base_std_base
145+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_25301/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 = 585.000271
209-
0: The maximum resident set size (KB) = 1632412
208+
0: The total amount of wall time = 588.674921
209+
0: The maximum resident set size (KB) = 1640712
210210

211211
Test std_base PASS
212212

213213
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
214-
Thu Sep 11 20:57:55 UTC 2025
215-
Elapsed time: 01h:26m:55s. Have a nice day!
214+
Mon Sep 15 22:40:13 UTC 2025
215+
Elapsed time: 01h:24m:04s. 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 Sep 11 18:36:17 UTC 2025
1+
Mon Sep 15 20:19:01 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_3627644/bit_base_bit_base
6+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3676816/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 = 618.615416
19-
0: The maximum resident set size (KB) = 887876
18+
0: The total amount of wall time = 614.840560
19+
0: The maximum resident set size (KB) = 900992
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_3627644/dcp_dcp
25+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3676816/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 = 493.356681
37-
0: The maximum resident set size (KB) = 864740
36+
0: The total amount of wall time = 494.864097
37+
0: The maximum resident set size (KB) = 855764
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_3627644/std_base_std_base
43+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3676816/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 = 493.811962
56-
0: The maximum resident set size (KB) = 867032
55+
0: The total amount of wall time = 494.656386
56+
0: The maximum resident set size (KB) = 865020
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_3627644/thr_thr
62+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3676816/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 = 490.811133
74-
0: The maximum resident set size (KB) = 866448
73+
0: The total amount of wall time = 491.840313
74+
0: The maximum resident set size (KB) = 856708
7575

7676
Test thr PASS
7777

7878
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
79-
Thu Sep 11 19:31:22 UTC 2025
80-
Elapsed time: 00h:55m:05s. Have a nice day!
79+
Mon Sep 15 21:16:09 UTC 2025
80+
Elapsed time: 00h:57m:08s. Have a nice day!

0 commit comments

Comments
 (0)