Skip to content

Commit

Permalink
Update UPP and diag table for CATChem workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
zhanglikate committed Mar 20, 2024
1 parent c172c6e commit a39f78f
Show file tree
Hide file tree
Showing 17 changed files with 404 additions and 41 deletions.
21 changes: 21 additions & 0 deletions jobs/JGLOBAL_STAGE_IC_S2S
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#! /usr/bin/env bash

source "${HOMEgfs}/ush/preamble.sh"
source "${HOMEgfs}/ush/jjob_header.sh" -e "stage_ic" -c "base stage_ic"

# Restart conditions for GFS cycle come from GDAS
# shellcheck disable=SC2153
rCDUMP=${CDUMP}
[[ ${CDUMP} = "gfs" ]] && export rCDUMP="gdas"
export rCDUMP

# Execute the Script
"${HOMEgfs}/scripts/exglobal_stage_ic_s2s.sh"

##########################################
# Remove the Temporary working directory
##########################################
cd "${DATAROOT}" || (echo "${DATAROOT} does not exist. ABORT!"; exit 1)
[[ ${KEEPDATA} = "NO" ]] && rm -rf "${DATA}"

exit 0
5 changes: 3 additions & 2 deletions jobs/rocoto/prepchem.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ status=$?

###############################################################
export DATA="$RUNDIR/$CDATE"
export FIXgfs_2022="/scratch1/BMC/gsd-fv3-dev/lzhang/fix_orog_20220805"

[[ ! -d $DATA ]] && mkdir -p $DATA
cd $DATA || exit 10
Expand Down Expand Up @@ -152,7 +153,7 @@ for n in $(seq 1 6); do
nlon = ${res}
nlat = ${res}
outfile = "$NCGB/${emiss_date1}/FIRE_GBBEPx_data.tile${n}.nc"
pathoro = "$FIXgfs/fix_orog/${CASE}/${CASE}_oro_data.tile${n}.nc"
pathoro = "$FIXgfs_2022/${CASE}/${CASE}_oro_data.tile${n}.nc"
pathebc = "$DIRGB/${emiss_date1}/$BC"
patheoc = "$DIRGB/${emiss_date1}/$OC"
pathepm25 = "$DIRGB/${emiss_date1}/$PM25"
Expand Down Expand Up @@ -218,7 +219,7 @@ EOF
nlon = ${res}
nlat = ${res}
outfile = "$NCGB/${SYEAR}${nmonth}${nday}/FIRE_GBBEPx_data.tile${n}.nc"
pathoro = "$FIXgfs/fix_orog/${CASE}/${CASE}_oro_data.tile${n}.nc"
pathoro = "$FIXgfs_2022/${CASE}/${CASE}_oro_data.tile${n}.nc"
pathebc = "$DIRGB/${SYEAR}${nmonth}${nday}/$BC"
patheoc = "$DIRGB/${SYEAR}${nmonth}${nday}/$OC"
pathepm25 = "$DIRGB/${SYEAR}${nmonth}${nday}/$PM25"
Expand Down
18 changes: 18 additions & 0 deletions jobs/rocoto/stage_ic_s2s.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#! /usr/bin/env bash

source "${HOMEgfs}/ush/preamble.sh"

# Source FV3GFS workflow modules
. "${HOMEgfs}/ush/load_fv3gfs_modules.sh"
status=$?
[[ "${status}" -ne 0 ]] && exit "${status}"

export job="stage_ic"
export jobid="${job}.$$"

# Execute the JJOB
"${HOMEgfs}/jobs/JGLOBAL_STAGE_IC_S2S"
status=$?


exit "${status}"
2 changes: 1 addition & 1 deletion parm/config/gfs/config.base.emc.dyn
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ export DO_WAVE="NO"
export DO_OCN="NO"
export DO_ICE="NO"
export DO_AERO="NO"
export DO_CATChem="YES"
export DO_CATChem="NO"
export WAVE_CDUMP="" # When to include wave suite: gdas, gfs, or both
export DOBNDPNT_WAVE="NO"
export FRAC_GRID=".true."
Expand Down
1 change: 1 addition & 0 deletions parm/post/postxconfig-NT-CCPP-CHEM-F00.txt
1 change: 1 addition & 0 deletions parm/post/postxconfig-NT-CCPP-CHEM.txt
27 changes: 0 additions & 27 deletions parm/ufs/fv3/diag_table.catchem
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,3 @@
"gfs_dyn", "seas4", "seas4", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "seas5", "seas5", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "pp10", "pp10", "fv3_history", "all", .false., "none", 2

# chemical diag 2D variables
#"gfs_phys", "maod", "maod", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "maoddt", "maoddt", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "maodbc", "maodbc", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "maodoc", "maodoc", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "maodsu", "maodsu", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "maodss", "maodss", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "bcembb", "bcembb", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "bceman", "bceman", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "ocembb", "ocembb", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "oceman", "oceman", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "so2embb", "so2embb", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "so2eman", "so2eman", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "duem001", "duem001", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "duem002", "duem002", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "duem003", "duem003", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "duem004", "duem004", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "duem005", "duem005", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "ssem001", "ssem001", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "ssem002", "ssem002", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "ssem003", "ssem003", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "ssem004", "ssem004", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "ssem005", "ssem005", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "oc1wtl", "oc1wtl", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "oc2wtl", "oc2wtl", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "sulfwtc", "sulfwtc", "fv3_history2d", "all", .false., "none", 2
67 changes: 67 additions & 0 deletions parm/ufs/fv3/diag_table.catchem-aerosolonly
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
# chemical tracers advected by FV3
###
"gfs_dyn", "so2", "so2", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "sulf", "sulf", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "DMS", "DMS", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "msa", "msa", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "pp25", "pp25", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "bc1", "bc1", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "bc2", "bc2", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "oc1", "oc1", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "oc2", "oc2", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "dust1", "dust1", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "dust2", "dust2", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "dust3", "dust3", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "dust4", "dust4", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "dust5", "dust5", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "seas1", "seas1", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "seas2", "seas2", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "seas3", "seas3", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "seas4", "seas4", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "seas5", "seas5", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "pp10", "pp10", "fv3_history", "all", .false., "none", 2

# chemical diag 2D variables
"gfs_phys", "maod", "maod", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "maoddt", "maoddt", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "maodbc", "maodbc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "maodoc", "maodoc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "maodsu", "maodsu", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "maodss", "maodss", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "bcembb", "bcembb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "bceman", "bceman", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ocembb", "ocembb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "oceman", "oceman", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "so2embb", "so2embb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "so2eman", "so2eman", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "duem001", "duem001", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "duem002", "duem002", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "duem003", "duem003", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "duem004", "duem004", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "duem005", "duem005", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ssem001", "ssem001", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ssem002", "ssem002", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ssem003", "ssem003", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ssem004", "ssem004", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ssem005", "ssem005", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "oc1wtl", "oc1wtl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "oc2wtl", "oc2wtl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "bc1wtl", "bc1wtl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "bc2wtl", "bc2wtl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "bc1wtc", "bc1wtc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "bc2wtc", "bc2wtc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "oc1wtc", "oc1wtc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "oc2wtc", "oc2wtc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "dust1wtc", "dust1wtc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "dust2wtc", "dust2wtc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "dust3wtc", "dust3wtc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "dust4wtc", "dust4wtc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "dust5wtc", "dust5wtc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "seas1wtc", "seas1wtc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "seas2wtc", "seas2wtc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "seas3wtc", "seas3wtc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "seas4wtc", "seas4wtc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "seas5wtc", "seas5wtc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "sulfwtc", "sulfwtc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pp25wtc", "pp25wtc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pp10wtc", "pp10wtc", "fv3_history2d", "all", .false., "none", 2
14 changes: 7 additions & 7 deletions parm/ufs/fv3/diag_table.catchem-allchem
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@

# chemical diag 2D variables
"gfs_phys", "maod", "maod", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "maoddt", "maoddt", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "maodbc", "maodbc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "maodoc", "maodoc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "maodsu", "maodsu", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "maodss", "maodss", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "maoddt", "maoddt", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "maodbc", "maodbc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "maodoc", "maodoc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "maodsu", "maodsu", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "maodss", "maodss", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "bcembb", "bcembb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "bceman", "bceman", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ocembb", "ocembb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "oceman", "oceman", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "so2embb", "so2embb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "so2eman", "so2eman", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "so2embb", "so2embb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "so2eman", "so2eman", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "duem001", "duem001", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "duem002", "duem002", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "duem003", "duem003", "fv3_history2d", "all", .false., "none", 2
Expand Down
2 changes: 1 addition & 1 deletion parm/ufs/fv3/diag_table_aod
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
"gfs_phys", "SU_AOD_550", "su_aod550", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "BC_AOD_550", "bc_aod550", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "OC_AOD_550", "oc_aod550", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "SS_AOD_550", "ss_aod550", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "SS_AOD_550", "ss_aod550", "fv3_history2d", "all", .false., "none", 2
101 changes: 101 additions & 0 deletions parm/ufs/fv3/field_table.gchem-org
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
# prognostic aerosols
"TRACER", "atmos_mod", "so2"
"longname", "so2 mixing ratio"
"units", "ppm"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=1.e-30" /
"TRACER", "atmos_mod", "sulf"
"longname", "sulfate mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=1.e-30" /
"TRACER", "atmos_mod", "dms"
"longname", "DMS mixing ratio"
"units", "ppm"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=1.e-30" /
"TRACER", "atmos_mod", "msa"
"longname", "msa mixing ratio"
"units", "ppm"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=1.e-30" /
"TRACER", "atmos_mod", "pp25"
"longname", "primary PM25 mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=1.e-30" /
"TRACER", "atmos_mod", "bc1"
"longname", "hydrophobic black carbon mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=1.e-30" /
"TRACER", "atmos_mod", "bc2"
"longname", "hydrophillic black carbon mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=1.e-30" /
"TRACER", "atmos_mod", "oc1"
"longname", "hydrophobic organic carbon mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=1.e-30" /
"TRACER", "atmos_mod", "oc2"
"longname", "hydrophillic organic carbon mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=1.e-30" /
"TRACER", "atmos_mod", "dust1"
"longname", "fine dust1 mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=1.e-30" /
"TRACER", "atmos_mod", "dust2"
"longname", "fine dust2 mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=1.e-30" /
"TRACER", "atmos_mod", "dust3"
"longname", "coarse dust3 mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=1.e-30" /
"TRACER", "atmos_mod", "dust4"
"longname", "coarse dust4 mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=1.e-30" /
"TRACER", "atmos_mod", "dust5"
"longname", "coarse dust5 mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=1.e-30" /
"TRACER", "atmos_mod", "seas1"
"longname", "seasalt1 mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=1.e-30" /
"TRACER", "atmos_mod", "seas2"
"longname", "seasalt2 mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=1.e-30" /
"TRACER", "atmos_mod", "seas3"
"longname", "seasalt3 mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=1.e-30" /
"TRACER", "atmos_mod", "seas4"
"longname", "seasalt4 mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=1.e-30" /
"TRACER", "atmos_mod", "seas5"
"longname", "seasalt5 mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=1.e-30" /
"TRACER", "atmos_mod", "pp10"
"longname", "primary PM10 mixing ratio"
"units", "ug/kg"
"tracer_usage", "chemistry"
"profile_type", "fixed", "surface_value=1.e-30" /
Loading

0 comments on commit a39f78f

Please sign in to comment.