Skip to content

Commit 81336a3

Browse files
BinLiu-NOAABinLiu-NOAA
committed
Merge remote-tracking branch 'remotes/origin/feature/hafs.v2.1.1' into feature/EMC_mn_noahmp
2 parents a428d5b + 6991de8 commit 81336a3

38 files changed

+4480
-2426
lines changed

‎CMEPS-interface/CMEPS

‎FV3

‎MOM6-interface/MOM6

Submodule MOM6 updated 175 files

‎MOM6-interface/mom6_files.cmake

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,23 @@ list(APPEND mom6_src_files
2121
MOM6/src/ALE/regrid_edge_values.F90
2222
MOM6/src/ALE/regrid_interp.F90
2323
MOM6/src/ALE/regrid_solvers.F90
24-
MOM6/src/ALE/remapping_attic.F90
24+
MOM6/src/ALE/Recon1d_EMPLM_CWK.F90
25+
MOM6/src/ALE/Recon1d_EMPLM_WA.F90
26+
MOM6/src/ALE/Recon1d_EMPLM_WA_poly.F90
27+
MOM6/src/ALE/Recon1d_EPPM_CWK.F90
28+
MOM6/src/ALE/Recon1d_MPLM_CWK.F90
29+
MOM6/src/ALE/Recon1d_MPLM_WA.F90
30+
MOM6/src/ALE/Recon1d_MPLM_WA_poly.F90
31+
MOM6/src/ALE/Recon1d_PCM.F90
32+
MOM6/src/ALE/Recon1d_PLM_CW.F90
33+
MOM6/src/ALE/Recon1d_PLM_CWK.F90
34+
MOM6/src/ALE/Recon1d_PLM_hybgen.F90
35+
MOM6/src/ALE/Recon1d_PPM_CW.F90
36+
MOM6/src/ALE/Recon1d_PPM_CWK.F90
37+
MOM6/src/ALE/Recon1d_PPM_H4_2018.F90
38+
MOM6/src/ALE/Recon1d_PPM_H4_2019.F90
39+
MOM6/src/ALE/Recon1d_PPM_hybgen.F90
40+
MOM6/src/ALE/Recon1d_type.F90
2541

2642
MOM6/src/core/MOM.F90
2743
MOM6/src/core/MOM_CoriolisAdv.F90
@@ -61,6 +77,7 @@ list(APPEND mom6_src_files
6177
MOM6/src/diagnostics/MOM_obsolete_params.F90
6278
MOM6/src/diagnostics/MOM_sum_output.F90
6379
MOM6/src/diagnostics/MOM_wave_speed.F90
80+
MOM6/src/diagnostics/MOM_diagnose_KdWork.F90
6481

6582
MOM6/src/equation_of_state/MOM_EOS_base_type.F90
6683
MOM6/src/equation_of_state/MOM_EOS.F90
@@ -141,6 +158,8 @@ list(APPEND mom6_src_files
141158
MOM6/src/framework/MOM_unit_testing.F90
142159
MOM6/src/framework/MOM_write_cputime.F90
143160
MOM6/src/framework/testing/MOM_file_parser_tests.F90
161+
MOM6/src/framework/MOM_murmur_hash.F90
162+
MOM6/src/framework/numerical_testing_type.F90
144163

145164
MOM6/src/ice_shelf/MOM_ice_shelf.F90
146165
MOM6/src/ice_shelf/MOM_ice_shelf_diag_mediator.F90
@@ -208,13 +227,13 @@ list(APPEND mom6_src_files
208227
MOM6/src/parameterizations/CVmix/cvmix_utils.F90
209228

210229
MOM6/src/parameterizations/stochastic/MOM_stochastics.F90
230+
MOM6/src/parameterizations/lateral/MOM_wave_drag.F90
211231

212232
MOM6/src/tracer/DOME_tracer.F90
213233

214234
MOM6/src/tracer/ISOMIP_tracer.F90
215235

216236
MOM6/src/tracer/MOM_OCMIP2_CFC.F90
217-
MOM6/src/tracer/MOM_generic_tracer.F90
218237
MOM6/src/tracer/MOM_hor_bnd_diffusion.F90
219238
MOM6/src/tracer/MOM_neutral_diffusion.F90
220239
MOM6/src/tracer/nw2_tracers.F90
@@ -239,6 +258,7 @@ list(APPEND mom6_src_files
239258
MOM6/src/tracer/MOM_CFC_cap.F90
240259
MOM6/src/tracer/MARBL_forcing_mod.F90
241260
MOM6/src/tracer/MARBL_tracers.F90
261+
MOM6/src/tracer/MOM_tracer_advect_schemes.F90
242262

243263
MOM6/src/user/BFB_initialization.F90
244264
MOM6/src/user/BFB_surface_forcing.F90
@@ -282,6 +302,7 @@ list(APPEND mom6_src_files
282302
MOM6/config_src/external/GFDL_ocean_BGC/FMS_coupler_util.F90
283303
MOM6/config_src/external/GFDL_ocean_BGC/generic_tracer.F90
284304
MOM6/config_src/external/GFDL_ocean_BGC/generic_tracer_utils.F90
305+
MOM6/config_src/external/GFDL_ocean_BGC/MOM_generic_tracer.F90
285306
MOM6/config_src/external/ODA_hooks/kdtree.f90
286307
MOM6/config_src/external/ODA_hooks/ocean_da_core.F90
287308
MOM6/config_src/external/ODA_hooks/ocean_da_types.F90
@@ -324,6 +345,7 @@ list(APPEND mom6_nuopc_src_files
324345
MOM6/config_src/drivers/unit_tests/test_MOM_remapping.F90
325346
MOM6/config_src/drivers/timing_tests/time_MOM_EOS.F90
326347
MOM6/config_src/drivers/timing_tests/time_MOM_remapping.F90
348+
MOM6/config_src/drivers/unit_tests/test_numerical_testing_type.F90
327349
)
328350

329351
list(APPEND mom6_nuopc_src_files

‎WW3

‎tests/bl_date.conf

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

‎tests/default_vars.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -681,6 +681,7 @@ export EFFR_IN=.false.
681681
# Thompson MP
682682
export LRADAR=.false.
683683
export LTAEROSOL=.false.
684+
export LTHAILAWARE=.false.
684685
export EXT_DIAG_THOMPSON=.false.
685686
export SEDI_SEMI=.true.
686687
export DECFL=10
@@ -1833,6 +1834,7 @@ export LTAEROSOL=.false.
18331834
export CDMBWD=1.0,1.0,1.0,1.0
18341835
export LHEATSTRG=.false.
18351836
export LRADAR=.true.
1837+
export ICPLOCN2ATM=0
18361838

18371839
export FV_CORE_TAU=5.
18381840
export RF_CUTOFF=30.e2

‎tests/fv3_conf/control_run.IN

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,18 @@ if [ $IMP_PHYSICS = 8 ]; then
166166
cp @[INPUTDATA_ROOT]/FV3_fix/CCN_ACTIVATE.BIN .
167167
fi
168168

169+
#TEMPO
170+
if [ $IMP_PHYSICS = 88 ]; then
171+
cp @[INPUTDATA_ROOT]/FV3_fix/CCN_ACTIVATE.BIN .
172+
rm qr_acr_qsV2.dat
173+
rm qr_acr_qgV2.dat
174+
rm freezeH2O.dat
175+
cp /scratch2/BMC/wrfruc/jensen/ufs_tables/MP_TEMPO_freezeH2O.dat .
176+
cp /scratch2/BMC/wrfruc/jensen/ufs_tables/MP_TEMPO_QRacrQG.dat .
177+
cp /scratch2/BMC/wrfruc/jensen/ufs_tables/MP_TEMPO_HAILAWARE_QRacrQG.dat .
178+
cp /scratch2/BMC/wrfruc/jensen/ufs_tables/MP_TEMPO_QRacrQS.dat .
179+
fi
180+
169181
#prognostic aerosols
170182
if [ $CPLCHM = .true. ]; then
171183
cp ${PATHRT}/parm/gocart/*.rc .

‎tests/fv3_conf/hafs_fv3_run.IN

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,15 @@ if [ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn_wav_inline" ] ||
6464
cp @[INPUTDATA_ROOT]/FV3_hafs_input_data/CDEPS_input_data/gfs_mesh.nc ./INPUT/
6565
cp @[INPUTDATA_ROOT]/FV3_hafs_input_data/CDEPS_input_data/gfs_forcings.nc ./INPUT/
6666
fi
67+
68+
#merra2
69+
if [ $USE_MERRA2 = .true. ]; then
70+
for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
71+
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2_y14_24/merra2_1423_${n}.nc aeroclim.m${n}.nc
72+
done
73+
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat optics_BC.dat
74+
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_OC.v1_3.dat optics_OC.dat
75+
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_DU.v15_3.dat optics_DU.dat
76+
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SS.v3_3.dat optics_SS.dat
77+
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SU.v1_3.dat optics_SU.dat
78+
fi

‎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 Jun 9 17:49:46 UTC 2025
1+
Tue Jul 1 05:49:55 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_3387674/bit_base_bit_base
6+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2421790/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 = 252.280707
55-
0: The maximum resident set size (KB) = 1578400
54+
0: The total amount of wall time = 253.252771
55+
0: The maximum resident set size (KB) = 1550896
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_3387674/dbg_base_dbg_base
61+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2421790/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 = 870.371962
110-
0: The maximum resident set size (KB) = 1543872
109+
0: The total amount of wall time = 882.325081
110+
0: The maximum resident set size (KB) = 1539160
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_3387674/dcp_dcp
116+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2421790/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 = 227.004289
164-
0: The maximum resident set size (KB) = 1555108
163+
0: The total amount of wall time = 222.475628
164+
0: The maximum resident set size (KB) = 1541348
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_3387674/mpi_mpi
170+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2421790/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 = 225.418264
218-
0: The maximum resident set size (KB) = 1554736
217+
0: The total amount of wall time = 227.495494
218+
0: The maximum resident set size (KB) = 1529872
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_3387674/rst_rst
224+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2421790/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.671980
272-
0: The maximum resident set size (KB) = 1555920
271+
0: The total amount of wall time = 224.637331
272+
0: The maximum resident set size (KB) = 1532464
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_3387674/std_base_std_base
278+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2421790/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 = 224.741484
327-
0: The maximum resident set size (KB) = 1540228
326+
0: The total amount of wall time = 222.048497
327+
0: The maximum resident set size (KB) = 1553200
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_3387674/thr_thr
333+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2421790/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 = 227.256296
381-
0: The maximum resident set size (KB) = 1551176
380+
0: The total amount of wall time = 227.578610
381+
0: The maximum resident set size (KB) = 1553352
382382

383383
Test thr PASS
384384

385385
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
386-
Mon Jun 9 19:09:54 UTC 2025
387-
Elapsed time: 01h:20m:09s. Have a nice day!
386+
Tue Jul 1 06:54:49 UTC 2025
387+
Elapsed time: 01h:04m:54s. Have a nice day!

0 commit comments

Comments
 (0)