From 75ed6fe1dc785113477636a816ffd69c86374c30 Mon Sep 17 00:00:00 2001
From: Cory Martin <cory.r.martin@noaa.gov>
Date: Wed, 2 Aug 2023 14:48:58 -0400
Subject: [PATCH] Switch to develop ufo, crtm 2.4, and some build changes
 (#546)

* switch to develop ufo, crtm 2.4, and some build changes

* pycodestyle (why did this break?)
---
 CMakeLists.txt       | 4 ++--
 build.sh             | 5 +++--
 ush/ufsda/genYAML.py | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f432d428..be737529c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,7 +62,7 @@ if(BUILD_GDASBUNDLE)
 
 # External (required) observation operators
   option("BUNDLE_SKIP_CRTM" "Don't build CRTM" "OFF") # Don't build crtm unless user passes -DBUNDLE_SKIP_CRTM=OFF
-  ecbuild_bundle( PROJECT crtm GIT "https://github.com/ADCollard/crtm.git"   TAG v2.3-jedi.3_fix )
+  ecbuild_bundle( PROJECT crtm GIT "https://github.com/JCSDA/crtm.git"   TAG v2.4.1-jedi.1 )
 
 # Build GSI-B
   option(BUILD_GSIBEC "Build GSI-B" OFF)
@@ -75,7 +75,7 @@ if(BUILD_GDASBUNDLE)
   ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" BRANCH develop )
   ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" BRANCH develop )
   ecbuild_bundle( PROJECT ioda  GIT "https://github.com/jcsda/ioda.git" BRANCH develop  )
-  ecbuild_bundle( PROJECT ufo   GIT "https://github.com/jcsda/ufo.git" BRANCH feature/gdasapp_ufo )
+  ecbuild_bundle( PROJECT ufo   GIT "https://github.com/jcsda/ufo.git" BRANCH develop )
 
 # FMS and FV3 dynamical core
   ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" BRANCH release-stable )
diff --git a/build.sh b/build.sh
index a6040b0f0..06410d6d6 100755
--- a/build.sh
+++ b/build.sh
@@ -34,7 +34,7 @@ usage() {
 # Defaults:
 INSTALL_PREFIX=""
 CMAKE_OPTS=""
-BUILD_TARGET="${MACHINE_ID}"
+BUILD_TARGET="${MACHINE_ID:-'localhost'}"
 BUILD_VERBOSE="NO"
 CLONE_JCSDADATA="NO"
 CLEAN_BUILD="NO"
@@ -76,7 +76,6 @@ case ${BUILD_TARGET} in
     module use $dir_root/modulefiles
     module load GDAS/$BUILD_TARGET
     CMAKE_OPTS+=" -DMPIEXEC_EXECUTABLE=$MPIEXEC_EXEC -DMPIEXEC_NUMPROC_FLAG=$MPIEXEC_NPROC -DBUILD_GSIBEC=ON"
-    CMAKE_OPTS+=" -DCLONE_JCSDADATA=$CLONE_JCSDADATA"
     module list
     ;;
   $(hostname))
@@ -87,6 +86,8 @@ case ${BUILD_TARGET} in
     ;;
 esac
 
+CMAKE_OPTS+=" -DCLONE_JCSDADATA=$CLONE_JCSDADATA"
+
 BUILD_DIR=${BUILD_DIR:-$dir_root/build}
 if [[ $CLEAN_BUILD == 'YES' ]]; then
   [[ -d ${BUILD_DIR} ]] && rm -rf ${BUILD_DIR}
diff --git a/ush/ufsda/genYAML.py b/ush/ufsda/genYAML.py
index accc8d5c5..f6ffbda6b 100644
--- a/ush/ufsda/genYAML.py
+++ b/ush/ufsda/genYAML.py
@@ -31,7 +31,7 @@ def genYAML(yamlconfig, output=None):
     # what if the config_dict has environment variables that need substituted?
     pattern = re.compile(r'.*?\${(\w+)}.*?')
     for key, value in config_dict.items():
-        if type(value) == str:
+        if type(value) is str:
             match = pattern.findall(value)
             if match:
                 fullvalue = value