Skip to content

Commit 27d25d7

Browse files
BinLiu-NOAABinLiu-NOAA
committed
Merge remote-tracking branch 'remotes/origin/develop' into feature/3dtke_update
2 parents 6b3fac8 + e39a250 commit 27d25d7

40 files changed

+5834
-2795
lines changed

‎AQM

‎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=20250701
1+
export BL_DATE=20250721

‎tests/default_vars.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,7 @@ export SATMEDMF=.false.
485485
export ISATMEDMF=0
486486
export LRADAR=.true.
487487
export LTAEROSOL=.true.
488+
export MRAEROSOL=.false.
488489

489490
export LSM=1
490491
export LANDICE=.true.
@@ -542,6 +543,8 @@ export FV3=true
542543
export S2S=false
543544
export HAFS=false
544545
export AQM=false
546+
export DO_AQM_CANOPY=.false.
547+
export aqm_rc_file=aqm.rc
545548
export FIRE_BEHAVIOR=false
546549
export DATM_CDEPS=false
547550
export DOCN_CDEPS=false
@@ -703,6 +706,8 @@ export EFFR_IN=.false.
703706
# Thompson MP
704707
export LRADAR=.false.
705708
export LTAEROSOL=.false.
709+
export MRAEROSOL=.false.
710+
export LTHAILAWARE=.false.
706711
export EXT_DIAG_THOMPSON=.false.
707712
export SEDI_SEMI=.true.
708713
export DECFL=10
@@ -1852,6 +1857,7 @@ export IMP_PHYSICS=11
18521857
export IAER=111
18531858
export CNVGWD=.false.
18541859
export LTAEROSOL=.false.
1860+
export MRAEROSOL=.false.
18551861
export CDMBWD=1.0,1.0,1.0,1.0
18561862
export LHEATSTRG=.false.
18571863
export LRADAR=.true.
@@ -2014,6 +2020,7 @@ export DNATS=0
20142020
export DO_SAT_ADJ=.false.
20152021
export LRADAR=.true.
20162022
export LTAEROSOL=.true.
2023+
export MRAEROSOL=.false.
20172024
export IALB=2
20182025
export IEMS=2
20192026
export HYBEDMF=.false.
@@ -2160,6 +2167,7 @@ export DNATS=0
21602167
export DO_SAT_ADJ=.false.
21612168
export LRADAR=.true.
21622169
export LTAEROSOL=.true.
2170+
export MRAEROSOL=.false.
21632171
export IALB=2
21642172
export IEMS=2
21652173
export HYBEDMF=.false.

‎tests/fv3_conf/control_run.IN

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,15 @@ fi
135135

136136
#merra2
137137
if [ $USE_MERRA2 = .true. ]; then
138+
if [ $IAER = 1011 ]; then
138139
for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
139140
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2_y14_24/merra2_1423_${n}.nc aeroclim.m${n}.nc
140141
done
142+
fi
143+
if [ $IAER = 6011 ]; then
144+
ln -sf @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2_40y/2021_03/MERRA2_400.inst3_3d_aer_Nv.20210322.nc4 merra2_20210322.nc
145+
ln -sf @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2_40y/2021_03/MERRA2_400.inst3_3d_aer_Nv.20210323.nc4 merra2_20210323.nc
146+
fi
141147
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat optics_BC.dat
142148
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_OC.v1_3.dat optics_OC.dat
143149
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_DU.v15_3.dat optics_DU.dat
@@ -166,6 +172,18 @@ if [ $IMP_PHYSICS = 8 ]; then
166172
cp @[INPUTDATA_ROOT]/FV3_fix/CCN_ACTIVATE.BIN .
167173
fi
168174

175+
#TEMPO
176+
if [ $IMP_PHYSICS = 88 ]; then
177+
cp @[INPUTDATA_ROOT]/FV3_fix/CCN_ACTIVATE.BIN .
178+
rm qr_acr_qsV2.dat
179+
rm qr_acr_qgV2.dat
180+
rm freezeH2O.dat
181+
cp @[INPUTDATA_ROOT]/FV3_input_data_TEMPO/MP_TEMPO_freezeH2O.dat .
182+
cp @[INPUTDATA_ROOT]/FV3_input_data_TEMPO/MP_TEMPO_QRacrQG.dat .
183+
cp @[INPUTDATA_ROOT]/FV3_input_data_TEMPO/MP_TEMPO_HAILAWARE_QRacrQG.dat .
184+
cp @[INPUTDATA_ROOT]/FV3_input_data_TEMPO/MP_TEMPO_QRacrQS.dat .
185+
fi
186+
169187
#prognostic aerosols
170188
if [ $CPLCHM = .true. ]; then
171189
cp ${PATHRT}/parm/gocart/*.rc .

‎tests/fv3_conf/hafs_fv3_run.IN

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ for file in $(find @[INPUTDATA_ROOT]/FV3_hafs_input_data/ -maxdepth 1 -type f);
66
done
77

88
if [ ${CNTL_DIR} = "hafs_regional_atm" ] || \
9+
[ ${CNTL_DIR} = "hafs_regional_atm_gfdlmpv3" ] || \
910
[ ${CNTL_DIR} = "hafs_regional_atm_thompson_gfdlsf" ] || \
1011
[ ${CNTL_DIR} = "hafs_regional_atm_ocn" ] || \
1112
[ ${CNTL_DIR} = "hafs_regional_atm_wav" ] || \
@@ -64,3 +65,15 @@ if [ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn_wav_inline" ] ||
6465
cp @[INPUTDATA_ROOT]/FV3_hafs_input_data/CDEPS_input_data/gfs_mesh.nc ./INPUT/
6566
cp @[INPUTDATA_ROOT]/FV3_hafs_input_data/CDEPS_input_data/gfs_forcings.nc ./INPUT/
6667
fi
68+
69+
#merra2
70+
if [ $USE_MERRA2 = .true. ]; then
71+
for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
72+
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2_y14_24/merra2_1423_${n}.nc aeroclim.m${n}.nc
73+
done
74+
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat optics_BC.dat
75+
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_OC.v1_3.dat optics_OC.dat
76+
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_DU.v15_3.dat optics_DU.dat
77+
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SS.v3_3.dat optics_SS.dat
78+
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SU.v1_3.dat optics_SU.dat
79+
fi

‎tests/logs/OpnReqTests_control_p8_hera.log

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Thu Jul 3 07:15:44 UTC 2025
1+
Tue Jul 22 02:03:52 UTC 2025
22
Start Operation Requirement Test
33

44

5-
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_3141132/bit_base_bit_base
5+
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_intel
6+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_780279/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 = 246.651740
55-
0: The maximum resident set size (KB) = 1561056
54+
0: The total amount of wall time = 192.476370
55+
0: The maximum resident set size (KB) = 2078584
5656

5757
Test bit_base PASS
5858

5959

60-
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_3141132/dbg_base_dbg_base
60+
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_intel
61+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_780279/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 = 868.906112
110-
0: The maximum resident set size (KB) = 1554020
109+
0: The total amount of wall time = 1794.516626
110+
0: The maximum resident set size (KB) = 2049316
111111

112112
Test dbg_base PASS
113113

114114

115-
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_3141132/dcp_dcp
115+
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
116+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_780279/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.935205
164-
0: The maximum resident set size (KB) = 1543376
163+
0: The total amount of wall time = 169.661851
164+
0: The maximum resident set size (KB) = 2026520
165165

166166
Test dcp PASS
167167

168168

169-
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_3141132/mpi_mpi
169+
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
170+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_780279/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 = 221.439436
218-
0: The maximum resident set size (KB) = 1535768
217+
0: The total amount of wall time = 174.031219
218+
0: The maximum resident set size (KB) = 2024880
219219

220220
Test mpi PASS
221221

222222

223-
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_3141132/rst_rst
223+
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
224+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_780279/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 = 225.718658
272-
0: The maximum resident set size (KB) = 1563396
271+
0: The total amount of wall time = 170.156556
272+
0: The maximum resident set size (KB) = 2021288
273273

274274
Test rst PASS
275275

276276

277-
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_3141132/std_base_std_base
277+
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
278+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_780279/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 = 223.339183
327-
0: The maximum resident set size (KB) = 1512820
326+
0: The total amount of wall time = 171.007856
327+
0: The maximum resident set size (KB) = 2023440
328328

329329
Test std_base PASS
330330

331331

332-
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_3141132/thr_thr
332+
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
333+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_780279/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 = 224.129492
381-
0: The maximum resident set size (KB) = 1549024
380+
0: The total amount of wall time = 169.038006
381+
0: The maximum resident set size (KB) = 2022076
382382

383383
Test thr PASS
384384

385385
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
386-
Thu Jul 3 08:30:55 UTC 2025
387-
Elapsed time: 01h:15m:50s. Have a nice day!
386+
Tue Jul 22 03:37:16 UTC 2025
387+
Elapsed time: 01h:33m:24s. Have a nice day!

‎tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Thu Jul 3 05:47:36 UTC 2025
1+
Mon Jul 21 23:31:18 UTC 2025
22
Start Operation Requirement Test
33

44

5-
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_2466812/dbg_base_dbg_base
5+
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_dbg_base_intel
6+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_631561/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 = 2300.096099
70-
0: The maximum resident set size (KB) = 1644784
69+
0: The total amount of wall time = 4508.986343
70+
0: The maximum resident set size (KB) = 2211068
7171

7272
Test dbg_base PASS
7373

7474

75-
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_2466812/rst_rst
75+
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_intel
76+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_631561/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 = 581.432591
139-
0: The maximum resident set size (KB) = 1639648
138+
0: The total amount of wall time = 370.112402
139+
0: The maximum resident set size (KB) = 2186380
140140

141141
Test rst PASS
142142

143143

144-
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_2466812/std_base_std_base
144+
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_intel
145+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_631561/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 = 577.739088
209-
0: The maximum resident set size (KB) = 1653240
208+
0: The total amount of wall time = 370.521007
209+
0: The maximum resident set size (KB) = 2190324
210210

211211
Test std_base PASS
212212

213213
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
214-
Thu Jul 3 07:15:05 UTC 2025
215-
Elapsed time: 01h:27m:33s. Have a nice day!
214+
Tue Jul 22 01:24:32 UTC 2025
215+
Elapsed time: 01h:53m:14s. Have a nice day!

0 commit comments

Comments
 (0)