Skip to content

Commit 3a48a64

Browse files
AnningCheng-NOAAAnningCheng-NOAA
authored
upgrade MERRA2 climatology from 2003-2014 mean to 2014 to 2024 mean (ufs-community#2273)
* MERRA2 climatology upgraded to 2014 to 2024 mean
1 parent 635890c commit 3a48a64

20 files changed

+2780
-2602
lines changed

‎tests/bl_date.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export BL_DATE=20240516
1+
export BL_DATE=20240522

‎tests/fv3_conf/control_run.IN

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ fi
133133
#merra2
134134
if [ $USE_MERRA2 = .true. ]; then
135135
for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
136-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m${n}.nc aeroclim.m${n}.nc
136+
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2_y14_24/merra2_1423_${n}.nc aeroclim.m${n}.nc
137137
done
138138
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat optics_BC.dat
139139
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_OC.v1_3.dat optics_OC.dat

‎tests/fv3_conf/cpld_control_run.IN

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ fi
173173
#merra2
174174
if [ $IAER = 1011 ]; then
175175
for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
176-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m${n}.nc aeroclim.m${n}.nc
176+
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2_y14_24/merra2_1423_${n}.nc aeroclim.m${n}.nc
177177
done
178178
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat optics_BC.dat
179179
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_OC.v1_3.dat optics_OC.dat

‎tests/fv3_conf/fv3_gocart.IN

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ else
77
cp -r @[INPUTDATA_ROOT]/FV3_input_data/RESTART/* ./INPUT
88
fi
99
cp @[INPUTDATA_ROOT]/FV3_input_data/*grb .
10-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2C.aerclim.2003-2014.*nc .
1110
for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
12-
ln -sf merra2C.aerclim.2003-2014.m${n}.nc aeroclim.m${n}.nc
11+
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2_y14_24/merra2_1423_${n}.nc aeroclim.m${n}.nc
1312
done
1413
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/mg2_IN_CCN/cam5_4_143_NAAI_monclimo2.nc cam5_4_143_NAAI_monclimo2.nc
1514
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/mg2_IN_CCN/cam5_4_143_NPCCN_monclimo2.nc cam5_4_143_NPCCN_monclimo2.nc

‎tests/fv3_conf/lake_control_run.IN

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ fi
123123
#merra2
124124
if [ $USE_MERRA2 = .true. ]; then
125125
for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
126-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m${n}.nc aeroclim.m${n}.nc
126+
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2_y14_24/merra2_1423_${n}.nc aeroclim.m${n}.nc
127127
done
128128
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat optics_BC.dat
129129
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_OC.v1_3.dat optics_OC.dat

‎tests/fv3_conf/regional_rrfs_a_run.IN

+3-12
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,9 @@ mkdir INPUT RESTART
55

66
rsync -arv @[INPUTDATA_ROOT]/FV3_regional_rrfs_a/INPUT/. INPUT/.
77

8-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m01.nc aeroclim.m01.nc
9-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m02.nc aeroclim.m02.nc
10-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m03.nc aeroclim.m03.nc
11-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m04.nc aeroclim.m04.nc
12-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m05.nc aeroclim.m05.nc
13-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m06.nc aeroclim.m06.nc
14-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m07.nc aeroclim.m07.nc
15-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m08.nc aeroclim.m08.nc
16-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m09.nc aeroclim.m09.nc
17-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m10.nc aeroclim.m10.nc
18-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m11.nc aeroclim.m11.nc
19-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m12.nc aeroclim.m12.nc
8+
for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
9+
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2_y14_24/merra2_1423_${n}.nc aeroclim.m${n}.nc
10+
done
2011

2112
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat optics_BC.dat
2213
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_DU.v15_3.dat optics_DU.dat

‎tests/fv3_conf/regional_run.IN

+4-12
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,10 @@ rsync -arv @[INPUTDATA_ROOT]/FV3_regional/INPUT/. INPUT/.
55

66
cp @[INPUTDATA_ROOT]/FV3_fix/CCN_ACTIVATE.BIN .
77

8-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m01.nc aeroclim.m01.nc
9-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m02.nc aeroclim.m02.nc
10-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m03.nc aeroclim.m03.nc
11-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m04.nc aeroclim.m04.nc
12-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m05.nc aeroclim.m05.nc
13-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m06.nc aeroclim.m06.nc
14-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m07.nc aeroclim.m07.nc
15-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m08.nc aeroclim.m08.nc
16-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m09.nc aeroclim.m09.nc
17-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m10.nc aeroclim.m10.nc
18-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m12.nc aeroclim.m11.nc
19-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m12.nc aeroclim.m12.nc
8+
for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
9+
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2_y14_24/merra2_1423_${n}.nc aeroclim.m${n}.nc
10+
done
11+
2012

2113
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat optics_BC.dat
2214
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_DU.v15_3.dat optics_DU.dat

‎tests/logs/OpnReqTests_control_p8_hera.log

+31-31
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Mon May 20 18:51:03 UTC 2024
1+
Thu May 23 02:18:32 UTC 2024
22
Start Operation Requirement Test
33

44

5-
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_1703729/bit_base_bit_base
5+
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_intel
6+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1263645/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 = 276.086219
55-
0: The maximum resident set size (KB) = 1266612
54+
0: The total amount of wall time = 204.782273
55+
0: The maximum resident set size (KB) = 1918420
5656

5757
Test bit_base PASS
5858

5959

60-
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_1703729/dbg_base_dbg_base
60+
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_intel
61+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1263645/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 = 967.204562
110-
0: The maximum resident set size (KB) = 1252256
109+
0: The total amount of wall time = 2007.430306
110+
0: The maximum resident set size (KB) = 1871000
111111

112112
Test dbg_base PASS
113113

114114

115-
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_1703729/dcp_dcp
115+
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
116+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1263645/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 = 244.057605
164-
0: The maximum resident set size (KB) = 1245204
163+
0: The total amount of wall time = 177.403984
164+
0: The maximum resident set size (KB) = 1878948
165165

166166
Test dcp PASS
167167

168168

169-
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_1703729/mpi_mpi
169+
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
170+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1263645/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 = 242.281799
218-
0: The maximum resident set size (KB) = 1245960
217+
0: The total amount of wall time = 174.810235
218+
0: The maximum resident set size (KB) = 1874436
219219

220220
Test mpi PASS
221221

222222

223-
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_1703729/rst_rst
223+
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
224+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1263645/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.457949
272-
0: The maximum resident set size (KB) = 1245616
271+
0: The total amount of wall time = 177.301718
272+
0: The maximum resident set size (KB) = 1878152
273273

274274
Test rst PASS
275275

276276

277-
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_1703729/std_base_std_base
277+
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
278+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1263645/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 = 247.352735
327-
0: The maximum resident set size (KB) = 1245076
326+
0: The total amount of wall time = 176.738736
327+
0: The maximum resident set size (KB) = 1878320
328328

329329
Test std_base PASS
330330

331331

332-
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_1703729/thr_thr
332+
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
333+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1263645/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 = 242.402115
381-
0: The maximum resident set size (KB) = 1245280
380+
0: The total amount of wall time = 176.752293
381+
0: The maximum resident set size (KB) = 1876656
382382

383383
Test thr PASS
384384

385385
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
386-
Mon May 20 21:14:11 UTC 2024
387-
Elapsed time: 02h:23m:09s. Have a nice day!
386+
Thu May 23 04:05:32 UTC 2024
387+
Elapsed time: 01h:47m:00s. Have a nice day!

0 commit comments

Comments
 (0)