Move to a single UFS_UTILS repository; remove utility builds from reg…

…ional_workflow (#17)

* Changes necessary to run with a single UFS_UTILS repository and with the new chgres_cube

* Changes to Externals.cfg to point to the EMC_post release branch and remove the second UFS_UTILS repo

* Change UFS_UTILS source directory name (remove _develop)

* Changes to build regional_grid on Jet

* Remove builds for utilities previously in regional_workflow

* Add new UFS_UTILS utilities to install_all.sh

* Remove spaces.

* Changes to Externals.cfg to point to new UFS_UTILS and regional_workflow, plus develop branch of ufs_weather_model and release branch of EMC_post

* Revert back to NCAR fork of ufs_weather_model, since develop branch build of ufs-community/ufs_weather_model fails on Hera

* Point to Larissa's fork of UFS_UTILS for new bug fixes

* Point to my fork of UFS_UTILS

Externals.cfg

@@ -8,20 +8,11 @@ required = True
 
 [ufs_utils]
 protocol = git
-repo_url = https://github.com/NCAR/UFS_UTILS
+repo_url = https://github.com/JeffBeck-NOAA/UFS_UTILS
 # Specify either a branch name or a hash but not both.
-#branch = dtc/develop
-hash = 6c9db728
-local_path = src/UFS_UTILS_develop
-required = True
-
-[ufs_utils_chgres]
-protocol = git
-repo_url = https://github.com/NCAR/UFS_UTILS
-# Specify either a branch name or a hash but not both.
-#branch = feature/chgres_grib2
-hash = 53193694
-local_path = src/UFS_UTILS_chgres_grib2
+branch = feature/regional_release
+#hash = 6c9db728
+local_path = src/UFS_UTILS
 required = True
 
 [ufs_weather_model]
@@ -37,8 +28,8 @@ required = True
 protocol = git
 repo_url = https://github.com/NOAA-EMC/EMC_post
 # Specify either a branch name or a hash but not both.
-#branch = develop
-hash = dceca26
+branch = release/public-v2
+#hash =
 local_path = src/EMC_post
 required = True
 

src/build_UFS_UTILS.sh

@@ -0,0 +1,50 @@
+#!/bin/sh
+#==========================================================================
+#
+# Description: Builds chgres, chgres_cube, orog, fre-nctools, sfc_climo_gen,
+#              regional_grid, global_equiv_resol, and mosaic_file.
+#
+# Usage: ./build_UFS_UTILS.sh
+#
+#==========================================================================
+set -eux
+cwd=`pwd`
+
+build_dir="${cwd}"
+UFS_UTILS="${cwd}/UFS_UTILS"
+export USE_PREINST_LIBS="true"
+
+#------------------------------------
+# END USER DEFINED STUFF
+#------------------------------------
+
+logs_dir=${cwd}/logs
+if [ ! -d $logs_dir  ]; then
+  echo "Creating logs folder"
+  mkdir $logs_dir
+fi
+
+#------------------------------------
+# INCLUDE PARTIAL BUILD 
+#------------------------------------
+
+. ./partial_build.sh
+
+#------------------------------------
+# build UFS_UTILS
+#------------------------------------
+$Build_UFS_UTILS && {
+echo " .... Building UFS_UTILS .... "
+cd $UFS_UTILS
+./build_all.sh > $logs_dir/build_UFS_UTILS.log 2>&1
+if [ $? -eq 0 ] ; then
+  echo "UFS_UTILS build SUCCEEDED"
+else
+  echo "UFS_UTILS build FAILED see $logs_dir/build_UFS_UTILS.log"
+  exit 1
+fi
+}
+
+cd $build_dir
+
+echo 'Building UFS_UTILS done'

src/build_all.sh

@@ -78,15 +78,15 @@ fi
 }
 
 #------------------------------------
-# build utils
+# build UTILS
 #------------------------------------
-$Build_utils && {
-echo " .... Building utils .... "
-./build_utils.sh > $logs_dir/build_utils.log 2>&1
+$Build_UFS_UTILS && {
+echo " .... Building UFS_UTILS .... "
+./build_UFS_UTILS.sh > $logs_dir/build_UFS_UTILS.log 2>&1
 if [ $? -eq 0 ] ; then
-  echo "Utils build SUCCEEDED"
+  echo "UFS_UTILS build SUCCEEDED"
 else
-  echo "Utils build FAILED see $logs_dir/build_utils.log"
+  echo "UFS_UTILS build FAILED see $logs_dir/build_UFS_UTILS.log"
   exit 1
 fi
 }