Skip to content

Commit 26cb9e6

Browse files
AnningCheng-NOAAAnningCheng-NOAA
authored
fixed excessive evaporation when both innerloop and mraerosol=T (#2221)
* NWFA Induced evaporation is turn off , but evaporation not related to aerosol is turned on to prevent excessive evaporation when Inner loop and mraerosol=T * ccpp/framework hash update * Cleanup unused code and variables, fix wcoss2 issue starting ecflow * Bring in @DusanJovic-NOAA trap changes * Merge some machine ecflow starts together and move to case statements
1 parent f234a3e commit 26cb9e6

16 files changed

+2377
-2742
lines changed

‎FV3

‎tests/bl_date.conf

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

‎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 Apr 29 18:57:13 UTC 2024
1+
Wed May 1 16:47:10 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_2538358/bit_base_bit_base
6+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1433614/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 = 269.680202
55-
0: The maximum resident set size (KB) = 1266668
54+
0: The total amount of wall time = 273.804433
55+
0: The maximum resident set size (KB) = 1253420
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_2538358/dbg_base_dbg_base
61+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1433614/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 = 949.326805
110-
0: The maximum resident set size (KB) = 1255152
109+
0: The total amount of wall time = 960.167656
110+
0: The maximum resident set size (KB) = 1231384
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_2538358/dcp_dcp
116+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1433614/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 = 240.344326
164-
0: The maximum resident set size (KB) = 1245676
163+
0: The total amount of wall time = 247.343877
164+
0: The maximum resident set size (KB) = 1232416
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_2538358/mpi_mpi
170+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1433614/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 = 237.351607
218-
0: The maximum resident set size (KB) = 1245716
217+
0: The total amount of wall time = 245.896195
218+
0: The maximum resident set size (KB) = 1231104
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_2538358/rst_rst
224+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1433614/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.201971
272-
0: The maximum resident set size (KB) = 1246024
271+
0: The total amount of wall time = 251.053244
272+
0: The maximum resident set size (KB) = 1228068
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_2538358/std_base_std_base
278+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1433614/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 = 238.461943
327-
0: The maximum resident set size (KB) = 1245616
326+
0: The total amount of wall time = 253.154960
327+
0: The maximum resident set size (KB) = 1233000
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_2538358/thr_thr
333+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1433614/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 = 249.430767
381-
0: The maximum resident set size (KB) = 1247248
380+
0: The total amount of wall time = 242.649383
381+
0: The maximum resident set size (KB) = 1233424
382382

383383
Test thr PASS
384384

385385
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
386-
Mon Apr 29 20:17:04 UTC 2024
387-
Elapsed time: 01h:19m:51s. Have a nice day!
386+
Wed May 1 17:54:31 UTC 2024
387+
Elapsed time: 01h:07m:25s. 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 Apr 29 23:05:39 UTC 2024
1+
Wed May 1 15:19:59 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_3667018/dbg_base_dbg_base
6+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2945403/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 = 1323.060262
70-
0: The maximum resident set size (KB) = 1364380
69+
0: The total amount of wall time = 1448.267808
70+
0: The maximum resident set size (KB) = 1364020
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_3667018/rst_rst
76+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2945403/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 = 393.654864
139-
0: The maximum resident set size (KB) = 1360348
138+
0: The total amount of wall time = 444.246604
139+
0: The maximum resident set size (KB) = 1359328
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_3667018/std_base_std_base
145+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2945403/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 = 398.993468
209-
0: The maximum resident set size (KB) = 1358812
208+
0: The total amount of wall time = 448.797587
209+
0: The maximum resident set size (KB) = 1359444
210210

211211
Test std_base PASS
212212

213213
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
214-
Tue Apr 30 00:03:24 UTC 2024
215-
Elapsed time: 00h:57m:46s. Have a nice day!
214+
Wed May 1 16:30:01 UTC 2024
215+
Elapsed time: 01h:10m:03s. Have a nice day!

‎tests/logs/OpnReqTests_regional_control_hera.log

Lines changed: 31 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,28 @@
1-
Tue Apr 30 00:26:07 UTC 2024
1+
Wed May 1 12:44:33 UTC 2024
22
Start Operation Requirement Test
33

44

5+
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_3929078/bit_base_bit_base
7+
Checking test bit_base results ....
8+
Moving baseline bit_base files ....
9+
Moving dynf000.nc .........OK
10+
Moving dynf006.nc .........OK
11+
Moving phyf000.nc .........OK
12+
Moving phyf006.nc .........OK
13+
Moving PRSLEV.GrbF00 .........OK
14+
Moving PRSLEV.GrbF06 .........OK
15+
Moving NATLEV.GrbF00 .........OK
16+
Moving NATLEV.GrbF06 .........OK
17+
18+
0: The total amount of wall time = 1265.539423
19+
0: The maximum resident set size (KB) = 593464
20+
21+
Test bit_base PASS
22+
23+
524
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
6-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_4130396/dcp_dcp
25+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_3929078/dcp_dcp
726
Checking test dcp results ....
827
Comparing dynf000.nc .....USING NCCMP......OK
928
Comparing dynf006.nc .....USING NCCMP......OK
@@ -14,14 +33,14 @@ Checking test dcp results ....
1433
Comparing NATLEV.GrbF00 .....USING CMP......OK
1534
Comparing NATLEV.GrbF06 .....USING CMP......OK
1635

17-
0: The total amount of wall time = 2131.450659
18-
0: The maximum resident set size (KB) = 555224
36+
0: The total amount of wall time = 2156.871537
37+
0: The maximum resident set size (KB) = 548144
1938

2039
Test dcp PASS
2140

2241

2342
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
24-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_4130396/std_base_std_base
43+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_3929078/std_base_std_base
2544
Checking test std_base results ....
2645
Moving baseline std_base files ....
2746
Moving dynf000.nc .........OK
@@ -33,14 +52,14 @@ Moving baseline std_base files ....
3352
Moving NATLEV.GrbF00 .........OK
3453
Moving NATLEV.GrbF06 .........OK
3554

36-
0: The total amount of wall time = 2150.481127
37-
0: The maximum resident set size (KB) = 553380
55+
0: The total amount of wall time = 2145.775444
56+
0: The maximum resident set size (KB) = 556196
3857

3958
Test std_base PASS
4059

4160

4261
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_4130396/thr_thr
62+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_3929078/thr_thr
4463
Checking test thr results ....
4564
Comparing dynf000.nc .....USING NCCMP......OK
4665
Comparing dynf006.nc .....USING NCCMP......OK
@@ -51,36 +70,11 @@ Checking test thr results ....
5170
Comparing NATLEV.GrbF00 .....USING CMP......OK
5271
Comparing NATLEV.GrbF06 .....USING CMP......OK
5372

54-
0: The total amount of wall time = 2147.836334
55-
0: The maximum resident set size (KB) = 554792
73+
0: The total amount of wall time = 2148.252094
74+
0: The maximum resident set size (KB) = 561788
5675

5776
Test thr PASS
5877

5978
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
60-
Tue Apr 30 02:20:21 UTC 2024
61-
Elapsed time: 01h:54m:14s. Have a nice day!
62-
Tue Apr 30 16:20:31 UTC 2024
63-
Start Operation Requirement Test
64-
65-
66-
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_bit_base_gnu
67-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1270533/bit_base_bit_base
68-
Checking test bit_base results ....
69-
Moving baseline bit_base files ....
70-
Moving dynf000.nc .........OK
71-
Moving dynf006.nc .........OK
72-
Moving phyf000.nc .........OK
73-
Moving phyf006.nc .........OK
74-
Moving PRSLEV.GrbF00 .........OK
75-
Moving PRSLEV.GrbF06 .........OK
76-
Moving NATLEV.GrbF00 .........OK
77-
Moving NATLEV.GrbF06 .........OK
78-
79-
0: The total amount of wall time = 1420.618445
80-
0: The maximum resident set size (KB) = 583292
81-
82-
Test bit_base PASS
83-
84-
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
85-
Tue Apr 30 16:49:13 UTC 2024
86-
Elapsed time: 00h:28m:43s. Have a nice day!
79+
Wed May 1 15:05:29 UTC 2024
80+
Elapsed time: 02h:20m:57s. Have a nice day!

0 commit comments

Comments
 (0)