Skip to content

[develop] Point source pre-combine #708

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

Merged
MichaelLueken merged 6 commits into from
Apr 7, 2023
Merged

[develop] Point source pre-combine #708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
92da999
Update stack-pt-merge invocation
zmoon Mar 31, 2023
15e2465
Update config description
zmoon Mar 31, 2023
b9d2cd3
Update point source data dir on Hera
zmoon Mar 31, 2023
7622787
Update AQM-utils hash
zmoon Mar 31, 2023
a157dfd
Update point source base dir on WCOSS2
zmoon Apr 4, 2023
2d34860
Merge branch 'develop' into feature/point-source-pre-combine
zmoon Apr 5, 2023
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 Externals.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ protocol = git
repo_url = https://github.com/NOAA-EMC/AQM-utils
# Specify either a branch name or a hash but not both.
#branch = develop
hash = 8e084f9
hash = 0a86f73
local_path = sorc/AQM-utils
required = True

Expand Down
6 changes: 2 additions & 4 deletions scripts/exregional_point_source.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,7 @@ cd_vrfy $DATA
#
#-----------------------------------------------------------------------
#
PT_SRC_CONUS="${PT_SRC_BASEDIR}/12US1"
PT_SRC_HI="${PT_SRC_BASEDIR}/3HI1"
PT_SRC_AK="${PT_SRC_BASEDIR}/9AK1"
PT_SRC_PRECOMB="${PT_SRC_BASEDIR}"
#
#-----------------------------------------------------------------------
#
Expand All @@ -88,7 +86,7 @@ PT_SRC_AK="${PT_SRC_BASEDIR}/9AK1"
#-----------------------------------------------------------------------
#
if [ ! -s "${DATA}/pt-${yyyymmddhh}.nc" ]; then
python3 ${HOMEdir}/sorc/AQM-utils/python_utils/stack-pt-merge.py -s ${yyyymmddhh} -n ${nstep} -conus ${PT_SRC_CONUS} -hi ${PT_SRC_HI} -ak ${PT_SRC_AK}
python3 ${HOMEdir}/sorc/AQM-utils/python_utils/stack-pt-merge.py -s ${yyyymmddhh} -n ${nstep} -i ${PT_SRC_PRECOMB}
fi

# Move to COMIN
Expand Down
4 changes: 2 additions & 2 deletions ush/config_defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2299,7 +2299,7 @@ cpl_aqm_parm:
# Path to archive directory for gfs surface files on HPSS
#
# PT_SRC_BASEDIR:
# Parent directory containing point source files for CONUS/AK/HI
# Parent directory containing point source files
#
# AQM_AIRNOW_HIST_DIR:
# Path to the directory where the historical AIRNOW data are located
Expand Down Expand Up @@ -2353,7 +2353,7 @@ cpl_aqm_parm:
NEXUS_GFS_SFC_DIR: ""
NEXUS_GFS_SFC_ARCHV_DIR: "/NCEPPROD/hpssprod/runhistory"

PT_SRC_BASEDIR: "/path/to/point/source/base/directory/for/conus/hi/ak"
PT_SRC_BASEDIR: "/path/to/point/source/base/directory"

AQM_AIRNOW_HIST_DIR: "/path/to/historical/airnow/data/dir"

Expand Down
2 changes: 1 addition & 1 deletion ush/machine/hera.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,6 @@ cpl_aqm_parm:
AQM_GEFS_DIR: /scratch2/NCEPDEV/naqfc/RRFS_CMAQ/GEFS_DATA
NEXUS_INPUT_DIR: /scratch2/NCEPDEV/naqfc/RRFS_CMAQ/emissions/nexus
NEXUS_FIX_DIR: /scratch2/NCEPDEV/naqfc/RRFS_CMAQ/nexus/fix
PT_SRC_BASEDIR: /scratch1/RDARCH/rda-arl-gpu/YouHua.Tang/nei2016v1-pt
PT_SRC_BASEDIR: /scratch1/RDARCH/rda-arl-gpu/Barry.Baker/emissions/nexus/NEI2016v1/v2023-01-PT


2 changes: 1 addition & 1 deletion ush/machine/wcoss2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ cpl_aqm_parm:
NEXUS_INPUT_DIR: /lfs/h2/emc/lam/noscrub/RRFS_CMAQ/nexus_emissions
NEXUS_FIX_DIR: /lfs/h2/emc/lam/noscrub/RRFS_CMAQ/nexus/fix
NEXUS_GFS_SFC_DIR: /lfs/h2/emc/lam/noscrub/RRFS_CMAQ/GFS_DATA
PT_SRC_BASEDIR: /lfs/h2/emc/physics/noscrub/Youhua.Tang/nei2016v1-pt
PT_SRC_BASEDIR: /lfs/h2/emc/physics/noscrub/Youhua.Tang/nei2016v1-pt/v2023-01-PT

rocoto:
tasks:
Expand Down