From 9855daf6dfcacc937783cc8522320631ffee5bd1 Mon Sep 17 00:00:00 2001
From: "Michael Kavulich, Jr" <kavulich@ucar.edu>
Date: Mon, 10 May 2021 15:33:48 +0000
Subject: [PATCH 01/13] Save log files in devbuild script

---
 devbuild.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/devbuild.sh b/devbuild.sh
index 6edcc5495b..0a35409246 100755
--- a/devbuild.sh
+++ b/devbuild.sh
@@ -70,7 +70,7 @@ fi
 
 mkdir -p ${BUILD_DIR}
 cd ${BUILD_DIR}
-cmake .. -DCMAKE_INSTALL_PREFIX=..
-make -j ${BUILD_JOBS:-4}
+cmake .. -DCMAKE_INSTALL_PREFIX=.. 2>&1 | tee log.cmake
+make -j ${BUILD_JOBS:-4} 2>&1 | tee log.make
 
 exit 0

From 1b6a7450ae206f21fe49f32e4cead5857bfa5175 Mon Sep 17 00:00:00 2001
From: "Michael Kavulich, Jr" <kavulich@ucar.edu>
Date: Mon, 10 May 2021 16:07:45 +0000
Subject: [PATCH 02/13] Updates for wm hash 13053c1; renamed GFS v16 suite

---
 Externals.cfg      | 8 ++++----
 src/CMakeLists.txt | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Externals.cfg b/Externals.cfg
index 93345db23d..ab9cc9dc23 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -1,9 +1,9 @@
 [regional_workflow]
 protocol = git
-repo_url = https://github.com/NOAA-EMC/regional_workflow
+repo_url = https://github.com/mkavulich/regional_workflow
 # Specify either a branch name or a hash but not both.
-#branch = develop
-hash = 3586e11
+branch = update_GFS_v16_suite
+#hash = 3586e11
 local_path = regional_workflow
 required = True
 
@@ -21,7 +21,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 = ea8a7aa
+hash = 13053c1
 local_path = src/ufs_weather_model
 required = True
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dcb74f72f9..e788e6632f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,7 +8,7 @@ ExternalProject_Add(UFS_UTILS
   )
 
 if(NOT CCPP_SUITES)
-  set(CCPP_SUITES "FV3_CPT_v0,FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_regional,FV3_GSD_SAR,FV3_GSD_v0,FV3_GFS_v15p2,FV3_GFS_v16beta,FV3_RRFS_v1beta,FV3_HRRR")
+  set(CCPP_SUITES "FV3_CPT_v0,FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_regional,FV3_GSD_SAR,FV3_GSD_v0,FV3_GFS_v15p2,FV3_GFS_v16,FV3_RRFS_v1beta,FV3_HRRR")
 endif()
 
 ExternalProject_Add(ufs_weather_model

From 1ac936fafefde0e42ea6094da20e4003cc5d9c19 Mon Sep 17 00:00:00 2001
From: "Michael Kavulich, Jr" <kavulich@ucar.edu>
Date: Mon, 10 May 2021 18:12:30 +0000
Subject: [PATCH 03/13] Build model 32-bit rather than 64

---
 src/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e788e6632f..d64151fa9d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,6 +21,7 @@ ExternalProject_Add(ufs_weather_model
                "-DCMAKE_CXX_COMPILER=${MPI_CXX_COMPILER}"
                "-DCMAKE_Fortran_COMPILER=${MPI_Fortran_COMPILER}"
                "-DNETCDF_DIR=$ENV{NETCDF}"
+               "-32BIT=ON"
   INSTALL_COMMAND mkdir -p ${CMAKE_INSTALL_PREFIX}/bin && cp ${CMAKE_CURRENT_BINARY_DIR}/ufs_weather_model/src/ufs_weather_model-build/ufs_model ${CMAKE_INSTALL_PREFIX}/bin/
   )
 

From d319459d8a82c689916198e98b1eff669d246548 Mon Sep 17 00:00:00 2001
From: "Michael Kavulich, Jr" <kavulich@ucar.edu>
Date: Tue, 11 May 2021 01:19:29 +0000
Subject: [PATCH 04/13] Updates for hash 37f0da7; add "-DAPP=ATM" cmake flag
 for weather model, update 32bit build to actually work

---
 Externals.cfg      | 2 +-
 src/CMakeLists.txt | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Externals.cfg b/Externals.cfg
index ab9cc9dc23..c5e0dff37c 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -21,7 +21,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 = 13053c1
+hash = 37f0da7
 local_path = src/ufs_weather_model
 required = True
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d64151fa9d..33b5166aa2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,7 +21,8 @@ ExternalProject_Add(ufs_weather_model
                "-DCMAKE_CXX_COMPILER=${MPI_CXX_COMPILER}"
                "-DCMAKE_Fortran_COMPILER=${MPI_Fortran_COMPILER}"
                "-DNETCDF_DIR=$ENV{NETCDF}"
-               "-32BIT=ON"
+               "-D32BIT=ON"
+               "-DAPP=ATM"
   INSTALL_COMMAND mkdir -p ${CMAKE_INSTALL_PREFIX}/bin && cp ${CMAKE_CURRENT_BINARY_DIR}/ufs_weather_model/src/ufs_weather_model-build/ufs_model ${CMAKE_INSTALL_PREFIX}/bin/
   )
 

From 0602b8f37a25791fbe781b723f01a04104217687 Mon Sep 17 00:00:00 2001
From: "Michael Kavulich, Jr" <kavulich@ucar.edu>
Date: Tue, 11 May 2021 15:56:04 +0000
Subject: [PATCH 05/13] Fix for weather model hash b8ed338: update hpc stack to
 latest version, including esmf/8_1_0_beta_snapshot_47

---
 Externals.cfg            | 2 +-
 env/build_hera_intel.env | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Externals.cfg b/Externals.cfg
index c5e0dff37c..7293ae00b9 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -21,7 +21,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 = 37f0da7
+hash = b8ed338
 local_path = src/ufs_weather_model
 required = True
 
diff --git a/env/build_hera_intel.env b/env/build_hera_intel.env
index 60353b1e49..49cdcbb76a 100644
--- a/env/build_hera_intel.env
+++ b/env/build_hera_intel.env
@@ -6,9 +6,9 @@ module use /contrib/sutils/modulefiles
 module load sutils
 module load cmake/3.16.1
 
-module use /scratch2/NCEPDEV/nwprod/hpc-stack/test/modulefiles/stack
+module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack
 
-module load hpc/1.0.0-beta1
+module load hpc/1.1.0
 module load hpc-intel/18.0.5.274
 module load hpc-impi/2018.0.4
 module load jasper/2.0.22
@@ -17,7 +17,7 @@ module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
 module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
+module load esmf/8_1_0_beta_snapshot_47
 module load bacio/2.4.1
 module load crtm/2.3.0
 module load g2/3.4.1
@@ -27,7 +27,7 @@ module load nemsio/2.5.2
 module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load upp/10.0.0
+module load upp/10.0.4
 
 module load gfsio/1.4.1
 module load sfcio/1.4.1

From 9d577676b0e73eb6dff6c3fd9589f5b44d599f72 Mon Sep 17 00:00:00 2001
From: "Michael Kavulich, Jr" <kavulich@ucar.edu>
Date: Tue, 11 May 2021 17:25:12 +0000
Subject: [PATCH 06/13] Add FV3_RRFS_v1alpha suite

---
 Externals.cfg      | 2 +-
 src/CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Externals.cfg b/Externals.cfg
index 7293ae00b9..c515d822fe 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -21,7 +21,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 = b8ed338
+hash = dfabe21
 local_path = src/ufs_weather_model
 required = True
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 33b5166aa2..f906360436 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,7 +8,7 @@ ExternalProject_Add(UFS_UTILS
   )
 
 if(NOT CCPP_SUITES)
-  set(CCPP_SUITES "FV3_CPT_v0,FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_regional,FV3_GSD_SAR,FV3_GSD_v0,FV3_GFS_v15p2,FV3_GFS_v16,FV3_RRFS_v1beta,FV3_HRRR")
+  set(CCPP_SUITES "FV3_CPT_v0,FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_regional,FV3_GSD_SAR,FV3_GSD_v0,FV3_GFS_v15p2,FV3_GFS_v16,FV3_RRFS_v1beta,FV3_HRRR,FV3_RRFS_v1alpha")
 endif()
 
 ExternalProject_Add(ufs_weather_model

From 2505163ec5ecf9f465fd42568d0c33f9e5a7b0c8 Mon Sep 17 00:00:00 2001
From: "Michael Kavulich, Jr" <kavulich@ucar.edu>
Date: Wed, 12 May 2021 19:49:23 +0000
Subject: [PATCH 07/13] Update to latest weather model hash

---
 Externals.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Externals.cfg b/Externals.cfg
index c515d822fe..772b0ed31f 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -21,7 +21,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 = dfabe21
+hash = 2f1c8e1
 local_path = src/ufs_weather_model
 required = True
 

From 529deb6cdc96361adda712ec7654b8197154dd77 Mon Sep 17 00:00:00 2001
From: "Michael Kavulich, Jr" <kavulich@ucar.edu>
Date: Thu, 13 May 2021 14:05:40 -0600
Subject: [PATCH 08/13] Update cheyenne build environment file

---
 env/build_cheyenne_intel.env | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/env/build_cheyenne_intel.env b/env/build_cheyenne_intel.env
index 9389b7f4a8..e35687ceb0 100644
--- a/env/build_cheyenne_intel.env
+++ b/env/build_cheyenne_intel.env
@@ -7,17 +7,19 @@ module load mpt/2.22
 module load ncarcompilers/0.5.0
 module load cmake/3.16.4
 
-module use /glade/p/ral/jntp/GMTB/tools/hpc-stack-nco-20201113/modulefiles/stack
-module load hpc/1.0.0-beta1
+module use /glade/p/ral/jntp/GMTB/tools/hpc-stack-v1.1.0/modulefiles/stack
+module load hpc/1.1.0
 module load hpc-intel/19.1.1
 module load hpc-mpt/2.22
+
 module load jasper/2.0.22
 module load zlib/1.2.11
 module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
+module load pio/2.5.2
+module load esmf/8_1_1
+
 module load bacio/2.4.1
 module load crtm/2.3.0
 module load g2/3.4.1
@@ -27,7 +29,7 @@ module load nemsio/2.5.2
 module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load upp/10.0.0
+module load upp/10.0.6
 
 module load gfsio/1.4.1
 module load sfcio/1.4.1

From 171eb3e7d68325a008eb84ddf411e716b317cc00 Mon Sep 17 00:00:00 2001
From: "Michael J. Kavulich, Jr" <kavulich@ucar.edu>
Date: Fri, 14 May 2021 17:14:39 +0000
Subject: [PATCH 09/13] Update Jet build environment file

---
 env/build_jet_intel.env | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/env/build_jet_intel.env b/env/build_jet_intel.env
index 3b69220b8c..1f2d789992 100644
--- a/env/build_jet_intel.env
+++ b/env/build_jet_intel.env
@@ -6,17 +6,17 @@ module load sutils
 module load cmake/3.16.1
 
 module use /lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/modulefiles/stack
+
 module load hpc/1.1.0
 module load hpc-intel/18.0.5.274
 module load hpc-impi/2018.4.274
-
 module load jasper/2.0.22
 module load zlib/1.2.11
 module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
+module load pio/2.5.2
+module load esmf/8_1_1
 module load bacio/2.4.1
 module load crtm/2.3.0
 module load g2/3.4.1
@@ -26,7 +26,7 @@ module load nemsio/2.5.2
 module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load upp/10.0.0
+module load upp/10.0.6
 
 module load gfsio/1.4.1
 module load sfcio/1.4.1

From 758d313a27f0e5804b25b212ca7e8c9bbe66d5ad Mon Sep 17 00:00:00 2001
From: "Michael Kavulich, Jr" <kavulich@ucar.edu>
Date: Wed, 26 May 2021 21:16:53 +0000
Subject: [PATCH 10/13] regional_workflow PR has been merged, updating hash

---
 Externals.cfg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Externals.cfg b/Externals.cfg
index 772b0ed31f..eca858dbfa 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -1,9 +1,9 @@
 [regional_workflow]
 protocol = git
-repo_url = https://github.com/mkavulich/regional_workflow
+repo_url = https://github.com/NOAA-EMC/regional_workflow
 # Specify either a branch name or a hash but not both.
-branch = update_GFS_v16_suite
-#hash = 3586e11
+#branch = develop
+hash = 40cfeff
 local_path = regional_workflow
 required = True
 

From 77ee3452ade035dce3912a8526c2f464f0afa375 Mon Sep 17 00:00:00 2001
From: "Michael J. Kavulich, Jr" <kavulich@ucar.edu>
Date: Fri, 28 May 2021 10:34:57 -0500
Subject: [PATCH 11/13] Update orion env files

---
 env/build_orion_intel.env | 11 ++++++-----
 env/wflow_orion.env       |  2 ++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/env/build_orion_intel.env b/env/build_orion_intel.env
index d1f07a496e..8daad29d46 100644
--- a/env/build_orion_intel.env
+++ b/env/build_orion_intel.env
@@ -3,10 +3,11 @@
 module load contrib noaatools
 
 module load cmake/3.17.3
+module load python/3.7.5
 
-module use /apps/contrib/NCEP/test/hpc-stack-nco/modulefiles/stack
+module use /apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack
 
-module load hpc/1.0.0-beta1
+module load hpc/1.1.0
 module load hpc-intel/2018.4
 module load hpc-impi/2018.4
 
@@ -15,8 +16,8 @@ module load zlib/1.2.11
 module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
+module load pio/2.5.2
+module load esmf/8_1_1
 module load bacio/2.4.1
 module load crtm/2.3.0
 module load g2/3.4.1
@@ -26,7 +27,7 @@ module load nemsio/2.5.2
 module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load upp/10.0.0
+module load upp/10.0.6
 
 module load gfsio/1.4.1
 module load sfcio/1.4.1
diff --git a/env/wflow_orion.env b/env/wflow_orion.env
index 5a05277744..dca666ef12 100644
--- a/env/wflow_orion.env
+++ b/env/wflow_orion.env
@@ -1,5 +1,7 @@
 # Python environment for workflow on Orion
 
+module load rocoto
+
 module use -a /apps/contrib/miniconda3-noaa-gsl/modulefiles
 module load miniconda3
 conda activate regional_workflow

From cb85e44e4c26d1c47aa1bb117d3b6997b6ee537e Mon Sep 17 00:00:00 2001
From: "Michael Kavulich, Jr" <kavulich@ucar.edu>
Date: Fri, 28 May 2021 15:46:08 +0000
Subject: [PATCH 12/13] Update hera env file to use ESMF 8.1.1; the older
 version has a major bug that causes significant slowdown

---
 env/build_hera_intel.env | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/env/build_hera_intel.env b/env/build_hera_intel.env
index 49cdcbb76a..5f4fcc3d58 100644
--- a/env/build_hera_intel.env
+++ b/env/build_hera_intel.env
@@ -16,8 +16,8 @@ module load zlib/1.2.11
 module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_47
+module load pio/2.5.2
+module load esmf/8_1_1
 module load bacio/2.4.1
 module load crtm/2.3.0
 module load g2/3.4.1
@@ -27,7 +27,7 @@ module load nemsio/2.5.2
 module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load upp/10.0.4
+module load upp/10.0.6
 
 module load gfsio/1.4.1
 module load sfcio/1.4.1

From aceed26287f35dccfda5de38d8d3a1d6085a21b3 Mon Sep 17 00:00:00 2001
From: "Michael Kavulich, Jr" <kavulich@ucar.edu>
Date: Fri, 28 May 2021 15:56:45 +0000
Subject: [PATCH 13/13] Update cheyenne gnu env file

---
 env/build_cheyenne_gnu.env | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/env/build_cheyenne_gnu.env b/env/build_cheyenne_gnu.env
index a5dbe55bf8..2888c3545d 100644
--- a/env/build_cheyenne_gnu.env
+++ b/env/build_cheyenne_gnu.env
@@ -18,7 +18,7 @@ module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
 module load pio/2.5.2
-module load esmf/8_1_0_beta_snapshot_27
+module load esmf/8_1_1
 module load bacio/2.4.1
 module load crtm/2.3.0
 module load g2/3.4.1
@@ -28,7 +28,7 @@ module load nemsio/2.5.2
 module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load upp/10.0.0
+module load upp/10.0.6
 
 module load gfsio/1.4.1
 module load sfcio/1.4.1