From 92da9992bde440389aa44a70ade8eb0b02e67a86 Mon Sep 17 00:00:00 2001
From: zmoon <zmoon92@gmail.com>
Date: Fri, 31 Mar 2023 10:43:37 -0600
Subject: [PATCH 1/5] Update stack-pt-merge invocation

---
 scripts/exregional_point_source.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/scripts/exregional_point_source.sh b/scripts/exregional_point_source.sh
index 1b2bd54265..11ced522f4 100755
--- a/scripts/exregional_point_source.sh
+++ b/scripts/exregional_point_source.sh
@@ -81,9 +81,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}"
 #
 #-----------------------------------------------------------------------
 #
@@ -92,7 +90,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

From 15e246568145ee17eb9f4019451f95dbc7c9df3b Mon Sep 17 00:00:00 2001
From: zmoon <zmoon92@gmail.com>
Date: Fri, 31 Mar 2023 10:44:35 -0600
Subject: [PATCH 2/5] Update config description

---
 ush/config_defaults.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ush/config_defaults.yaml b/ush/config_defaults.yaml
index de52981d03..2c6b2836aa 100644
--- a/ush/config_defaults.yaml
+++ b/ush/config_defaults.yaml
@@ -2998,7 +2998,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
@@ -3052,7 +3052,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"
 

From b9d2cd37819524fc5c7ab5f209567a5dac4a89fd Mon Sep 17 00:00:00 2001
From: zmoon <zmoon92@gmail.com>
Date: Fri, 31 Mar 2023 10:45:56 -0600
Subject: [PATCH 3/5] Update point source data dir on Hera

to Barry's location of the pre-combined files
---
 ush/machine/hera.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ush/machine/hera.yaml b/ush/machine/hera.yaml
index 6b27fb8584..3dd3cb9789 100644
--- a/ush/machine/hera.yaml
+++ b/ush/machine/hera.yaml
@@ -51,5 +51,5 @@ 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
 

From 762278746bc1b818deab154ecec9d55e267e59ba Mon Sep 17 00:00:00 2001
From: zmoon <zmoon92@gmail.com>
Date: Fri, 31 Mar 2023 12:25:02 -0600
Subject: [PATCH 4/5] Update AQM-utils hash

Includes the point source merge tool changes to support the
pre-combined input files
---
 Externals.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Externals.cfg b/Externals.cfg
index 48320c3f73..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 = b066931
+hash = 0a86f73
 local_path = sorc/AQM-utils
 required = True
 

From a157dfdd0e75b12f48f7ed7b58cb305f4bbe9c0c Mon Sep 17 00:00:00 2001
From: Zachary Moon <zachary.moon@noaa.gov>
Date: Tue, 4 Apr 2023 10:36:14 -0400
Subject: [PATCH 5/5] Update point source base dir on WCOSS2

---
 ush/machine/wcoss2.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ush/machine/wcoss2.yaml b/ush/machine/wcoss2.yaml
index 994a0f0fb9..c93519b7b4 100644
--- a/ush/machine/wcoss2.yaml
+++ b/ush/machine/wcoss2.yaml
@@ -52,5 +52,5 @@ 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