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

Merra2 #254

Merged
merged 18 commits into from
May 19, 2021
Merged

Merra2 #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3bdc629
merra2 workflow for orion
AnningCheng-NOAA Dec 1, 2020
947bbad
added merra2 input and update diag_table
AnningCheng-NOAA Dec 1, 2020
79f23fa
fixed a bug related to orion
AnningCheng-NOAA Dec 1, 2020
81442ad
high resolution MERRA2 data used
AnningCheng-NOAA Dec 1, 2020
378953d
udate config.base.emc.dyn
AnningCheng-NOAA Dec 2, 2020
29bd69b
update merra2 before a new pull request
AnningCheng-NOAA Feb 2, 2021
1ea07da
testing merra2 workflow in hera
AnningCheng-NOAA Feb 9, 2021
960ca42
updated config.fcst
AnningCheng-NOAA Mar 1, 2021
0f97ccd
Merge branch 'merra2' of https://github.com/AnningCheng-NOAA/global-w…
AnningCheng-NOAA Mar 1, 2021
ac76613
Merge remote-tracking branch 'upstream/develop' into merra2
AnningCheng-NOAA Mar 8, 2021
be564bb
changes on build_fv3.sh and symlinks to optical data files instead of cp
AnningCheng-NOAA Apr 22, 2021
101905c
changed fix dir for link_fv3gfs
AnningCheng-NOAA Apr 27, 2021
587ac0c
changes added in link_fv3gfs for fix_aer
AnningCheng-NOAA Apr 28, 2021
bf5d110
fixed line 43 of link_fv3gfs.sh, build_fv3.sh v15 to v16
AnningCheng-NOAA May 3, 2021
dfc8aa9
Merge remote-tracking branch 'upstream/develop' into merra2
AnningCheng-NOAA May 12, 2021
6b57416
build_fv3.sh with ATM
AnningCheng-NOAA May 14, 2021
283c4a0
fixed a compilation error, NEMs/exe existing, in hera
AnningCheng-NOAA May 17, 2021
fa5d1e2
change fv3gfs checkout head
AnningCheng-NOAA May 18, 2021
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
6 changes: 3 additions & 3 deletions parm/config/config.base.emc.dyn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ export CASE="@CASECTL@"
export CASE_ENKF="@CASEENS@"

# Run with CCPP physics
export RUN_CCPP="NO"
export CCPP_SUITE="FV3_GFS_v16beta"
export RUN_CCPP="YES"
KateFriedman-NOAA marked this conversation as resolved.
Show resolved Hide resolved
export CCPP_SUITE="FV3_GFS_v16"

# Surface cycle update frequency
if [[ "$CDUMP" == "gdas" ]] ; then
Expand Down Expand Up @@ -222,7 +222,7 @@ export DO_GLDAS="YES"
export gldas_cyc=00

# run wave component
export DO_WAVE="YES"
export DO_WAVE="NO"
KateFriedman-NOAA marked this conversation as resolved.
Show resolved Hide resolved
export WAVE_CDUMP="both"

# Microphysics Options: 99-ZhaoCarr, 8-Thompson; 6-WSM6, 10-MG, 11-GFDL
Expand Down
7 changes: 4 additions & 3 deletions parm/config/config.fcst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ else
fi

# Radiation options
export IAER=5111 ;#spectral band mapping method for aerosol optical properties
export IAER=1011 ;#spectral band mapping method for aerosol optical properties
export iovr_lw=3 ;#de-correlation length cloud overlap method (Barker, 2008)
export iovr_sw=3 ;#de-correlation length cloud overlap method (Barker, 2008)
export iovr=3 ;#de-correlation length cloud overlap method (Barker, 2008)
Expand Down Expand Up @@ -186,7 +186,8 @@ if [[ "$CDUMP" == "gdas" ]] ; then # GDAS cycle specific parameters

# Variables used in DA cycling
if [ $QUILTING = ".true." -a $OUTPUT_GRID = "gaussian_grid" ]; then
export DIAG_TABLE="$HOMEgfs/parm/parm_fv3diag/diag_table_da"
##export DIAG_TABLE="$HOMEgfs/parm/parm_fv3diag/diag_table_da"
export DIAG_TABLE="$HOMEgfs/parm/parm_fv3diag/diag_table_aod"
else
export DIAG_TABLE="$HOMEgfs/parm/parm_fv3diag/diag_table_da_orig"
fi
Expand Down Expand Up @@ -217,7 +218,7 @@ elif [[ "$CDUMP" == "gfs" ]] ; then # GFS cycle specific parameters

# Write more variables to output
if [ $QUILTING = ".true." -a $OUTPUT_GRID = "gaussian_grid" ]; then
export DIAG_TABLE="$HOMEgfs/parm/parm_fv3diag/diag_table"
export DIAG_TABLE="$HOMEgfs/parm/parm_fv3diag/diag_table_aod"
else
export DIAG_TABLE="$HOMEgfs/parm/parm_fv3diag/diag_table_orig"
fi
Expand Down
213 changes: 213 additions & 0 deletions parm/parm_fv3diag/diag_table_aod
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions scripts/exglobal_forecast.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ NWPROD=${NWPROD:-${NWROOT:-$pwd}}
HOMEgfs=${HOMEgfs:-$NWPROD}
FIX_DIR=${FIX_DIR:-$HOMEgfs/fix}
FIX_AM=${FIX_AM:-$FIX_DIR/fix_am}
export FIX_AER=${FIX_AER:-$FIX_DIR/fix_aer}
export FIX_LUT=${FIX_LUT:-$FIX_DIR/fix_lut}
KateFriedman-NOAA marked this conversation as resolved.
Show resolved Hide resolved
FIXfv3=${FIXfv3:-$FIX_DIR/fix_fv3_gmted2010}
DATA=${DATA:-$pwd/fv3tmp$$} # temporary running directory
ROTDIR=${ROTDIR:-$pwd} # rotating archive directory
Expand Down Expand Up @@ -402,6 +404,16 @@ $NLN $FIX_AM/${H2OFORC} $DATA/global_h2oprdlos.f77
$NLN $FIX_AM/global_solarconstant_noaa_an.txt $DATA/solarconstant_noaa_an.txt
$NLN $FIX_AM/global_sfc_emissivity_idx.txt $DATA/sfc_emissivity_idx.txt

## merra2 aerosol climo
for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
$NLN $FIX_AER/merra2.aerclim.2003-2014.m${n}.nc $DATA/aeroclim.m${n}.nc
done
$NLN $FIX_LUT/optics_BC.v1_3.dat $DATA/optics_BC.dat
$NLN $FIX_LUT/optics_OC.v1_3.dat $DATA/optics_OC.dat
$NLN $FIX_LUT/optics_DU.v15_3.dat $DATA/optics_DU.dat
$NLN $FIX_LUT/optics_SS.v3_3.dat $DATA/optics_SS.dat
$NLN $FIX_LUT/optics_SU.v1_3.dat $DATA/optics_SU.dat

$NLN $FIX_AM/global_co2historicaldata_glob.txt $DATA/co2historicaldata_glob.txt
$NLN $FIX_AM/co2monthlycyc.txt $DATA/co2monthlycyc.txt
if [ $ICO2 -gt 0 ]; then
Expand Down
6 changes: 3 additions & 3 deletions sorc/build_fv3.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ if [ $target = orion ]; then target=orion.intel ; fi
cd fv3gfs.fd/
FV3=$( pwd -P )/FV3
cd tests/

if [ ${RUN_CCPP:-${1:-"NO"}} = "NO" ]; then
if [ ! -d ../NEMS/exe ]; then mkdir ../NEMS/exe ; fi
if [ ${RUN_CCPP:-${1:-"YES"}} = "NO" ]; then
./compile.sh "$FV3" "$target" "WW3=Y 32BIT=Y" 1
mv -f fv3_1.exe ../NEMS/exe/global_fv3gfs.x
else
./compile.sh "$target" "CCPP=Y 32BIT=Y SUITES=FV3_GFS_v15,FV3_GFS_v16beta" 2 NO NO
./compile.sh "$target" "APP=ATM CCPP=Y 32BIT=Y SUITES=FV3_GFS_v16,FV3_GFS_v16_RRTMGP" 2 YES NO
mv -f fv3_2.exe ../NEMS/exe/global_fv3gfs.x
fi
2 changes: 1 addition & 1 deletion sorc/checkout.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ if [[ ! -d fv3gfs.fd ]] ; then
if [ ${run_ccpp:-"NO"} = "NO" ]; then
git checkout GFS.v16.0.16
else
git checkout b771e5be7e35eaea5ee7f762d644afccab019ed3
git checkout 9350745855aebe0790813e0ed2ba5ad680e3f75c
fi
git submodule update --init --recursive
cd ${topdir}
Expand Down
10 changes: 5 additions & 5 deletions sorc/link_fv3gfs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@ pwd=$(pwd -P)
#--model fix fields
#------------------------------
if [ $machine == "cray" ]; then
FIX_DIR="/gpfs/hps3/emc/global/noscrub/emc.glopara/git/fv3gfs/fix_nco_gfsv16"
FIX_DIR="/gpfs/hps3/emc/global/noscrub/emc.glopara/git/fv3gfs/fix"
elif [ $machine = "dell" ]; then
FIX_DIR="/gpfs/dell2/emc/modeling/noscrub/emc.glopara/git/fv3gfs/fix_nco_gfsv16"
FIX_DIR="/gpfs/dell2/emc/modeling/noscrub/emc.glopara/git/fv3gfs/fix"
elif [ $machine = "hera" ]; then
FIX_DIR="/scratch1/NCEPDEV/global/glopara/fix_nco_gfsv16"
FIX_DIR="/scratch1/NCEPDEV/global/glopara/fix"
elif [ $machine = "orion" ]; then
FIX_DIR="/work/noaa/global/glopara/fix_nco_gfsv16"
FIX_DIR="/work/noaa/global/glopara/fix"
fi
cd ${pwd}/../fix ||exit 8
for dir in fix_am fix_fv3_gmted2010 fix_gldas fix_orog fix_verif fix_wave_gfs ; do
for dir in fix_aer fix_am fix_chem fix_fv3_gmted2010 fix_gldas fix_lut fix_orog fix_sfc_climo fix_verif fix_wave_gfs ; do
if [ -d $dir ]; then
[[ $RUN_ENVIR = nco ]] && chmod -R 755 $dir
rm -rf $dir
Expand Down