Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade MERRA2 climatology from 2003-2014 mean to 2014 to 2024 mean #2273

Merged
merged 28 commits into from
May 24, 2024
Merged

upgrade MERRA2 climatology from 2003-2014 mean to 2014 to 2024 mean #2273

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
916e7c1
MERRA2 climatology upgraded to 2014 to 2024 mean
AnningCheng-NOAA May 8, 2024
c29c139
updated MERRA2 climatology to 2014-2024 mean
AnningCheng-NOAA May 8, 2024
850c7ac
revert hera log: see attached
jkbk2004 May 22, 2024
b439d3d
Merge remote-tracking branch 'upstream/develop' into mr2_24
jkbk2004 May 22, 2024
869a754
Update bl_date.conf
zach1221 May 22, 2024
84aee85
Update control_run.IN
jkbk2004 May 22, 2024
9ee63e2
Update cpld_control_run.IN
jkbk2004 May 22, 2024
a290128
Update fv3_gocart.IN
jkbk2004 May 22, 2024
48119f1
Update lake_control_run.IN
jkbk2004 May 22, 2024
cd878fa
Update regional_rrfs_a_run.IN
jkbk2004 May 22, 2024
9adf5dc
Update regional_run.IN
jkbk2004 May 22, 2024
af9c4e9
Update test_changes.list
jkbk2004 May 22, 2024
f8c5637
Update test_changes.list
jkbk2004 May 22, 2024
01d18ab
add orion RT logs: passed
zach1221 May 23, 2024
012fc95
add hercules RT logs: passed
zach1221 May 23, 2024
d2b009b
add derecho RT logs: passed
zach1221 May 23, 2024
7400415
Update rt_utils.sh fix typo
zach1221 May 23, 2024
e2bcedf
add control_p8_gnu ORT logs: passed
zach1221 May 23, 2024
301d2bf
add regional_control_gnu ORT logs: passed
zach1221 May 23, 2024
70dbcfd
add cpld_control_gnu ORT logs: passed
zach1221 May 23, 2024
939f109
add derecho RT log: passed
jkbk2004 May 23, 2024
7739bac
add hera RT log: passed
jkbk2004 May 23, 2024
f77f8cc
add gaea RT log: passed
jkbk2004 May 23, 2024
e8a4447
updated test_changes.list with the windows carraige returns removed
BrianCurtis-NOAA May 23, 2024
ac5a2ee
Merge branch 'mr2_24' of github.com:AnningCheng-NOAA/ufs-weather-mode…
BrianCurtis-NOAA May 23, 2024
eb0c662
add jet RT log: passed
jkbk2004 May 24, 2024
af395d3
WCOS2 RT Log
BrianCurtis-NOAA May 24, 2024
982cade
Acorn RT Log
BrianCurtis-NOAA May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/fv3_conf/control_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ fi
#merra2
if [ $USE_MERRA2 = .true. ]; then
for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m${n}.nc aeroclim.m${n}.nc
cp /scratch1/NCEPDEV/global/Anning.Cheng/MERRA2_y14_24/merra2_1423_${n}.nc aeroclim.m${n}.nc
jkbk2004 marked this conversation as resolved.
Show resolved Hide resolved
done
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat optics_BC.dat
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_OC.v1_3.dat optics_OC.dat
Expand Down
2 changes: 1 addition & 1 deletion tests/fv3_conf/cpld_control_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ fi
#merra2
if [ $IAER = 1011 ]; then
for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m${n}.nc aeroclim.m${n}.nc
cp /scratch1/NCEPDEV/global/Anning.Cheng/MERRA2_y14_24/merra2_1423_${n}.nc aeroclim.m${n}.nc
done
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat optics_BC.dat
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_OC.v1_3.dat optics_OC.dat
Expand Down
3 changes: 1 addition & 2 deletions tests/fv3_conf/fv3_gocart.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ else
cp -r @[INPUTDATA_ROOT]/FV3_input_data/RESTART/* ./INPUT
fi
cp @[INPUTDATA_ROOT]/FV3_input_data/*grb .
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2C.aerclim.2003-2014.*nc .
for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
ln -sf merra2C.aerclim.2003-2014.m${n}.nc aeroclim.m${n}.nc
cp /scratch1/NCEPDEV/global/Anning.Cheng/MERRA2_y14_24/merra2_1423_${n}.nc aeroclim.m${n}.nc
done
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/mg2_IN_CCN/cam5_4_143_NAAI_monclimo2.nc cam5_4_143_NAAI_monclimo2.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/mg2_IN_CCN/cam5_4_143_NPCCN_monclimo2.nc cam5_4_143_NPCCN_monclimo2.nc
Expand Down
2 changes: 1 addition & 1 deletion tests/fv3_conf/lake_control_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ fi
#merra2
if [ $USE_MERRA2 = .true. ]; then
for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m${n}.nc aeroclim.m${n}.nc
cp /scratch1/NCEPDEV/global/Anning.Cheng/MERRA2_y14_24/merra2_1423_${n}.nc aeroclim.m${n}.nc
done
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat optics_BC.dat
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_OC.v1_3.dat optics_OC.dat
Expand Down
15 changes: 3 additions & 12 deletions tests/fv3_conf/regional_rrfs_a_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,9 @@ mkdir INPUT RESTART

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

cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m01.nc aeroclim.m01.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m02.nc aeroclim.m02.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m03.nc aeroclim.m03.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m04.nc aeroclim.m04.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m05.nc aeroclim.m05.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m06.nc aeroclim.m06.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m07.nc aeroclim.m07.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m08.nc aeroclim.m08.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m09.nc aeroclim.m09.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m10.nc aeroclim.m10.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m11.nc aeroclim.m11.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m12.nc aeroclim.m12.nc
for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
cp /scratch1/NCEPDEV/global/Anning.Cheng/MERRA2_y14_24/merra2_1423_${n}.nc aeroclim.m${n}.nc
done

cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat optics_BC.dat
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_DU.v15_3.dat optics_DU.dat
Expand Down
16 changes: 4 additions & 12 deletions tests/fv3_conf/regional_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,10 @@ rsync -arv @[INPUTDATA_ROOT]/FV3_regional/INPUT/. INPUT/.

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

cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m01.nc aeroclim.m01.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m02.nc aeroclim.m02.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m03.nc aeroclim.m03.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m04.nc aeroclim.m04.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m05.nc aeroclim.m05.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m06.nc aeroclim.m06.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m07.nc aeroclim.m07.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m08.nc aeroclim.m08.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m09.nc aeroclim.m09.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m10.nc aeroclim.m10.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m12.nc aeroclim.m11.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m12.nc aeroclim.m12.nc
for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
cp /scratch1/NCEPDEV/global/Anning.Cheng/MERRA2_y14_24/merra2_1423_${n}.nc aeroclim.m${n}.nc
done


cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat optics_BC.dat
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_DU.v15_3.dat optics_DU.dat
Expand Down
Loading