From b3eb96afb97cf9ecafae82ae75e4f65a67e37030 Mon Sep 17 00:00:00 2001
From: "Chan-Hoo.Jeon-NOAA" <60152248+chan-hoo@users.noreply.github.com>
Date: Tue, 20 Sep 2022 16:33:17 -0400
Subject: [PATCH] [develop] Update hashes of UFS_UTILS, ufs-weather-model, and
 UPP (#354)

* update hashes and module list

* update docs

* update hash of ufs weather model

* remove emc_exec_dir

* back crtm to 2.3.0

* back g2tmpl to 1.10.0

* edit comment for bin-dir
---
 Externals.cfg                                | 6 +++---
 devbuild.sh                                  | 2 +-
 docs/UsersGuide/source/ContributorsGuide.rst | 2 +-
 modulefiles/srw_common                       | 8 ++++----
 sorc/CMakeLists.txt                          | 8 ++------
 5 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/Externals.cfg b/Externals.cfg
index 21ab8ad192..926839020b 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -3,7 +3,7 @@ protocol = git
 repo_url = https://github.com/ufs-community/UFS_UTILS
 # Specify either a branch name or a hash but not both.
 #branch = develop
-hash = c5cfcf4
+hash = ca9bed8
 local_path = sorc/UFS_UTILS
 required = True
 
@@ -12,7 +12,7 @@ protocol = git
 repo_url = https://github.com/ufs-community/ufs-weather-model
 # Specify either a branch name or a hash but not both.
 #branch = develop
-hash = 65cf401
+hash = 52072c5
 local_path = sorc/ufs-weather-model
 required = True
 
@@ -21,7 +21,7 @@ protocol = git
 repo_url = https://github.com/NOAA-EMC/UPP
 # Specify either a branch name or a hash but not both.
 #branch = develop
-hash = 8767929
+hash = a644aaa
 local_path = sorc/UPP
 required = True
 
diff --git a/devbuild.sh b/devbuild.sh
index 232719e33c..d9326388c6 100755
--- a/devbuild.sh
+++ b/devbuild.sh
@@ -38,7 +38,7 @@ OPTIONS
   --install-dir=INSTALL_DIR
       installation prefix
   --bin-dir=BIN_DIR
-      installation binary directory name ("bin" or "exec")
+      installation binary directory name ("bin" by default; any name is available)
   --build-type=BUILD_TYPE
       build type; defaults to RELEASE
       (e.g. DEBUG | RELEASE | RELWITHDEBINFO)
diff --git a/docs/UsersGuide/source/ContributorsGuide.rst b/docs/UsersGuide/source/ContributorsGuide.rst
index e7b99f00f3..8a41cbd739 100644
--- a/docs/UsersGuide/source/ContributorsGuide.rst
+++ b/docs/UsersGuide/source/ContributorsGuide.rst
@@ -30,7 +30,7 @@ Scientists from across multiple labs and organizations have volunteered to revie
     +------------------+------------------------------------------------+-----------------------------------------------------------------------------------+
     | **Organization** | **Reviewers**                                  | **Areas of Expertise**                                                            |
     +==================+================================================+===================================================================================+
-    | EMC              | Chan-Hoo Jeon (@chan-hoo)                      | Workflow, NCO requirements, and operational platform testing                      |
+    | EMC              | Chan-Hoo Jeon (@chan-hoo)                      | Workflow, Operational platform testing (WCOSS/NCO), and Air quality modeling (Online-CMAQ)  |
     |                  +------------------------------------------------+-----------------------------------------------------------------------------------+
     |                  | Ben Blake (@BenjaminBlake-NOAA)                | Output visualization, Rocoto                                                      |
     |                  +------------------------------------------------+-----------------------------------------------------------------------------------+
diff --git a/modulefiles/srw_common b/modulefiles/srw_common
index 0dcc907d56..9c3ece42fc 100644
--- a/modulefiles/srw_common
+++ b/modulefiles/srw_common
@@ -17,7 +17,7 @@ module load g2/3.4.5
 module load g2tmpl/1.10.0
 module load ip/3.3.3
 module load sp/2.3.3
-module load w3nco/2.4.1
+module load w3emc/2.9.2
 
 module load-any gftl-shared/v1.5.0 gftl-shared/1.5.0
 module load-any yafyaml/v0.5.1 yafyaml/0.5.1
@@ -26,8 +26,8 @@ module load-any mapl/2.22.0-esmf-8.3.0b09 mapl/2.11.0-esmf-8.2.0
 module load nemsio/2.5.4
 module load sfcio/1.4.1
 module load sigio/2.3.2
-module load wgrib2/2.0.8
-
-module load w3emc/2.9.2
+module load w3nco/2.4.1
 module load wrf_io/1.2.0
+
 module load ncio/1.1.2
+module load wgrib2/2.0.8
diff --git a/sorc/CMakeLists.txt b/sorc/CMakeLists.txt
index 5cc8780116..1028fc87e9 100644
--- a/sorc/CMakeLists.txt
+++ b/sorc/CMakeLists.txt
@@ -1,10 +1,5 @@
 include(ExternalProject)
 
-# Hack to turn on EMC style bin_dir
-if(CMAKE_INSTALL_BINDIR STREQUAL "exec")
-  set(EMC_EXEC_DIR on)
-endif()
-
 # Options
 option(BUILD_UFS "Build UFS weather model" ON)
 option(BUILD_UFS_UTILS "Build UFS utilities" ON)
@@ -24,6 +19,7 @@ if(BUILD_UFS_UTILS)
 
   list(APPEND UFS_UTILS_ARGS
     "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}"
+    "-DCMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR}"
     "-DBUILD_TESTING=OFF"
   )
 
@@ -31,7 +27,7 @@ if(BUILD_UFS_UTILS)
     PREFIX ${CMAKE_CURRENT_BINARY_DIR}/UFS_UTILS
     SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/UFS_UTILS
     INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
-    CMAKE_ARGS ${UFS_UTILS_ARGS} -DEMC_EXEC_DIR=${EMC_EXEC_DIR}
+    CMAKE_ARGS ${UFS_UTILS_ARGS}
     BUILD_ALWAYS TRUE
     STEP_TARGETS build
     )