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

Update to MERRA2 aerosol climatology #380

Merged
merged 4 commits into from
Jul 28, 2021
Merged

Update to MERRA2 aerosol climatology #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c56751
Update to tiled fix files, UGWD v1, NOAH-MP
WalterKolczynski-NOAA Jul 24, 2021
a079e38
Ensure CCPP_SUITE is set and suite file exists
WalterKolczynski-NOAA Jul 27, 2021
36a203b
Update to MERRA2 aerosol climatology
WalterKolczynski-NOAA Jul 27, 2021
a89e098
Merge branch feature/coupled-crow into feature/merra2
WalterKolczynski-NOAA Jul 27, 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
209 changes: 1 addition & 208 deletions parm/parm_fv3diag/diag_table_aod
View file
Open in desktop

Large diffs are not rendered by default.

19 changes: 17 additions & 2 deletions ush/forecast_postdet.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,12 +242,12 @@ FV3_GFS_postdet(){
knob_ugwp_version="0"
launch_level=${launch_level:-$(echo "$LEVS/2.35" |bc)}
fi

# GFS standard input data
IALB=${IALB:-1}
IEMS=${IEMS:-1}
ISOL=${ISOL:-2}
IAER=${IAER:-111}
IAER=${IAER:-1011}
ICO2=${ICO2:-2}

if [ ${new_o3forc:-YES} = YES ]; then
Expand Down Expand Up @@ -286,6 +286,21 @@ FV3_GFS_postdet(){
done
fi

# MERRA 2
if [ $IAER -eq "1011" ]; then
FIX_AER="${FIX_DIR}/fix_aer"
for month in $(seq 1 12); do
MM=$(printf %02d $month)
$NLN "${FIX_AER}/merra2.aerclim.2003-2014.m${MM}.nc" "aeroclim.m${MM}.nc"
done
FIX_LUT="${FIX_DIR}/fix_lut"
$NLN "${FIX_LUT}/optics_BC.v1_3.dat" "optics_BC.dat"
$NLN "${FIX_LUT}/optics_OC.v1_3.dat" "optics_OC.dat"
$NLN "${FIX_LUT}/optics_DU.v15_3.dat" "optics_DU.dat"
$NLN "${FIX_LUT}/optics_SS.v3_3.dat" "optics_SS.dat"
$NLN "${FIX_LUT}/optics_SU.v1_3.dat" "optics_SU.dat"
fi

# inline post fix files
if [ $WRITE_DOPOST = ".true." ]; then
$NLN $PARM_POST/post_tag_gfs${LEVS} $DATA/itag
Expand Down
6 changes: 6 additions & 0 deletions ush/parsing_namelists_FV3.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ FV3_namelists(){

# copy over the tables
DIAG_TABLE=${DIAG_TABLE:-$PARM_FV3DIAG/diag_table}
DIAG_TABLE_AOD=${DIAG_TABLE_AOD:-$PARM_FV3DIAG/diag_table_aod}
DATA_TABLE=${DATA_TABLE:-$PARM_FV3DIAG/data_table}
FIELD_TABLE=${FIELD_TABLE:-$PARM_FV3DIAG/field_table}

Expand All @@ -30,6 +31,11 @@ EOF
cat $DIAG_TABLE >> diag_table
fi

# Append AOD diag table for MERRA2
if [ $IAER = "1011" ]; then
cat $DIAG_TABLE_AOD >> diag_table
fi

$NCP $DATA_TABLE data_table
$NCP $FIELD_TABLE field_table

Expand Down
10 changes: 5 additions & 5 deletions workflow/config/fcst.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,11 @@ config_fcst:
export n_split={doc.fv3_gfs_settings.n_split}
export adjust_dry_mass=".false."

export IALB=1
export IEMS=1
export ISOL=2
export IAER=5111
export ICO2=2
export IALB={doc.fv3_gfs_settings.IALB}
export IEMS={doc.fv3_gfs_settings.IEMS}
export ISOL={doc.fv3_gfs_settings.ISOL}
export IAER={doc.fv3_gfs_settings.IAER}
export ICO2={doc.fv3_gfs_settings.ICO2}

export icliq_sw=2
export iovr=3
Expand Down
2 changes: 1 addition & 1 deletion workflow/defaults/fv3_enkf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ fv3_enkf_defaults: &fv3_enkf_defaults
IEMS: 1
IALB: 1
ISOL: 2
IAER: 111
IAER: 1011
ICO2: 2
warm_start: true
read_increment: no
Expand Down
2 changes: 1 addition & 1 deletion workflow/defaults/fv3_gdas.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ fv3_gdas_defaults: &fv3_gdas_defaults
IEMS: 1
IALB: 1
ISOL: 2
IAER: 111
IAER: 1011
ICO2: 2
warm_start: true
read_increment: no
Expand Down
2 changes: 1 addition & 1 deletion workflow/defaults/fv3_gfs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ fv3_gfs_defaults: &fv3_gfs_defaults
IEMS: 1
IALB: 1
ISOL: 2
IAER: 111
IAER: 1011
ICO2: 2
warm_start: true
read_increment: no
Expand Down