diff --git a/Externals.cfg b/Externals.cfg index 6f1bfddc53..541bff335e 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -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 diff --git a/scripts/exregional_point_source.sh b/scripts/exregional_point_source.sh index a5191a1647..072f0ba726 100755 --- a/scripts/exregional_point_source.sh +++ b/scripts/exregional_point_source.sh @@ -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}" # #----------------------------------------------------------------------- # @@ -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 diff --git a/ush/config_defaults.yaml b/ush/config_defaults.yaml index 2ea8fb349e..4532bc66cc 100644 --- a/ush/config_defaults.yaml +++ b/ush/config_defaults.yaml @@ -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 @@ -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" diff --git a/ush/machine/hera.yaml b/ush/machine/hera.yaml index b3caacf97b..ffbe931f1e 100644 --- a/ush/machine/hera.yaml +++ b/ush/machine/hera.yaml @@ -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 diff --git a/ush/machine/wcoss2.yaml b/ush/machine/wcoss2.yaml index b0997381c0..595b387451 100644 --- a/ush/machine/wcoss2.yaml +++ b/ush/machine/wcoss2.yaml @@ -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: