Skip to content

Commit 22d5dbc

Browse files
natalie-perlinnatalie-perlin
authored
Merge branch 'develop' into dev_macosx
2 parents 416346f + c7412fa commit 22d5dbc

40 files changed

+3335
-2777
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=20241230
1+
export BL_DATE=20250107

‎tests/default_vars.sh‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,6 @@ export FNABSC="'global_mxsnoalb.uariz.t126.384.190.rg.grb'"
526526
export RF_CUTOFF=30.0
527527
export FAST_TAU_W_SEC=0.0
528528

529-
export ATMRES=C96
530529
export TILEDFIX=.false.
531530
export DO_CA=.false.
532531
export CA_SGS=.false.
@@ -820,6 +819,7 @@ export HWRF_SAMFDEEP=.false.
820819
export RAS=.false.
821820
export RANDOM_CLDS=.false.
822821
export CNVCLD=.true.
822+
export XR_CNVCLD=.false.
823823
export PROGSIGMA=.false.
824824
export BETASCU=8.0
825825
export BETAMCU=1.0
@@ -1215,8 +1215,11 @@ export_ugwpv1() {
12151215
esac
12161216

12171217
if [[ ${DO_GSL_DRAG_SS} = .true. ]]; then export CDMBGWD=${CDMBGWD_GSL}; fi
1218-
if [[ ${SEDI_SEMI} = .true. ]]; then export DT_ATMOS=$((DT_ATMOS/2)); fi
1219-
export DT_INNER=${DT_ATMOS}
1218+
if [[ ${SEDI_SEMI} = .false. ]]; then
1219+
export DT_INNER=$((DT_ATMOS/2))
1220+
else
1221+
export DT_INNER=${DT_ATMOS}
1222+
fi
12201223
export default_dt_atmos=0
12211224
}
12221225

‎tests/logs/OpnReqTests_control_p8_hera.log‎

Lines changed: 385 additions & 1 deletion
Large diffs are not rendered by default.

‎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-
Tue Jan 7 03:15:28 UTC 2025
1+
Thu Jan 9 02:59:38 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_278179/dbg_base_dbg_base
6+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1874715/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 = 4369.524954
70-
0: The maximum resident set size (KB) = 1493280
69+
0: The total amount of wall time = 2326.114069
70+
0: The maximum resident set size (KB) = 1489800
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_278179/rst_rst
76+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1874715/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 = 1284.724733
139-
0: The maximum resident set size (KB) = 1482880
138+
0: The total amount of wall time = 790.318058
139+
0: The maximum resident set size (KB) = 1482288
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_278179/std_base_std_base
145+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1874715/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 = 1139.037288
209-
0: The maximum resident set size (KB) = 1488884
208+
0: The total amount of wall time = 705.815910
209+
0: The maximum resident set size (KB) = 1483264
210210

211211
Test std_base PASS
212212

213213
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
214-
Tue Jan 7 05:37:25 UTC 2025
215-
Elapsed time: 02h:21m:57s. Have a nice day!
214+
Thu Jan 9 04:34:00 UTC 2025
215+
Elapsed time: 01h:34m:22s. 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 Jan 6 12:24:27 UTC 2025
1+
Thu Jan 9 00:22:22 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_3494311/bit_base_bit_base
6+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1259269/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 = 1407.193487
19-
0: The maximum resident set size (KB) = 780976
18+
0: The total amount of wall time = 1395.474569
19+
0: The maximum resident set size (KB) = 748696
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_3494311/dcp_dcp
25+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1259269/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 = 2195.740053
37-
0: The maximum resident set size (KB) = 725748
36+
0: The total amount of wall time = 2283.182601
37+
0: The maximum resident set size (KB) = 711084
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_3494311/std_base_std_base
43+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1259269/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 = 2291.331176
56-
0: The maximum resident set size (KB) = 734184
55+
0: The total amount of wall time = 2207.702175
56+
0: The maximum resident set size (KB) = 692680
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_3494311/thr_thr
62+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1259269/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 = 2194.246673
74-
0: The maximum resident set size (KB) = 723192
73+
0: The total amount of wall time = 2278.935561
74+
0: The maximum resident set size (KB) = 711160
7575

7676
Test thr PASS
7777

7878
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
79-
Mon Jan 6 14:57:59 UTC 2025
80-
Elapsed time: 02h:33m:33s. Have a nice day!
79+
Thu Jan 9 02:59:38 UTC 2025
80+
Elapsed time: 02h:37m:17s. Have a nice day!

0 commit comments

Comments
 (0)