[production/AQM.v7] EE2 fixes for Debug build. (ufs-community#976)

* get -ftrapuv and -check all into DEBUG builds using CMAKE_BUILD_TYPE

* Update externals with my personal update branches

* Update externals with updated ufs-weather-model hash/branch

* Sending build type to externals needs to use the right punctuation

* Bring externals up to date with new hash's for new DEBUG build flags

sorc/CMakeLists.txt

@@ -231,6 +231,7 @@ if(BUILD_UFS_UTILS)
   list(APPEND UFS_UTILS_ARGS
     "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}"
     "-DCMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR}"
+    "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"
     "-DBUILD_TESTING=OFF"
     "-DFRENCTOOLS=OFF"
     "-DICEBLEND=OFF"
@@ -265,6 +266,7 @@ if (BUILD_UPP)
     "-DBUILD_WITH_IFI=OFF"
     "-DBUILD_WITH_GTG=OFF"
     "-DBUILD_WITH_WRFIO=ON"
+    "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"
   )
 
   ExternalProject_Add(UPP
@@ -286,7 +288,7 @@ if (BUILD_GSI)
     PREFIX ${CMAKE_CURRENT_BINARY_DIR}/GSI
     SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/gsi
     INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR} -DGSI_MODE=Regional -DENKF_MODE=FV3REG
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DGSI_MODE=Regional -DENKF_MODE=FV3REG
     BUILD_ALWAYS TRUE
     STEP_TARGETS build
     )
@@ -300,7 +302,7 @@ if (BUILD_RRFS_UTILS)
     PREFIX ${CMAKE_CURRENT_BINARY_DIR}/rrfs_utl
     SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/rrfs_utl
     INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR}
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
     BUILD_ALWAYS TRUE
     STEP_TARGETS build
     DEPENDS GSI
@@ -316,7 +318,7 @@ if (CPL_AQM)
       PREFIX ${CMAKE_CURRENT_BINARY_DIR}/arl_nexus
       SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/arl_nexus
       INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
-      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR}
+      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
       BUILD_ALWAYS TRUE
     )
   endif()
@@ -329,7 +331,7 @@ if (CPL_AQM)
       PREFIX ${CMAKE_CURRENT_BINARY_DIR}/AQM-utils
       SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/AQM-utils
       INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
-      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR} -DBUILD_POST_STAT=${BUILD_POST_STAT}
+      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR} -DBUILD_POST_STAT=${BUILD_POST_STAT} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
       BUILD_ALWAYS TRUE
     )
   endif()

sorc/Externals.cfg

@@ -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 = production/AQM.v7
-hash = 4cf17f7
+hash = 80d0fe8
 local_path = ufs-weather-model
 required = True
 
@@ -21,16 +21,16 @@ protocol = git
 repo_url = https://github.com/NOAA-EMC/UPP
 # Specify either a branch name or a hash but not both.
 #branch = develop
-hash = 54cbb57
+hash = 59a0175
 local_path = UPP
 required = True
 
 [arl_nexus]
 protocol = git
 repo_url = https://github.com/noaa-oar-arl/NEXUS
-# Specify either a branch name or a hash but not both.
 #branch = develop
-hash =  9bfc6f4
+# Specify either a branch name or a hash but not both.
+hash =  12f932f
 local_path = arl_nexus
 required = True
 
@@ -39,7 +39,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 = 286fc69
+hash = b4d37a8
 local_path = AQM-utils
 required = True
 

sorc/app_build.sh

@@ -44,8 +44,8 @@ OPTIONS
   --bin-dir=BIN_DIR
       installation binary directory name ("exec" by default; any name is available)
   --build-type=BUILD_TYPE
-      build type; defaults to RELEASE
-      (e.g. DEBUG | RELEASE | RELWITHDEBINFO)
+      build type; defaults to Release
+      (e.g. Debug | Release | RelWithDebInfo)
   --build-jobs=BUILD_JOBS
       number of build jobs; defaults to 4
   --use-sub-modules
@@ -114,7 +114,7 @@ APPLICATION=""
 CCPP_SUITES=""
 ENABLE_OPTIONS=""
 DISABLE_OPTIONS=""
-BUILD_TYPE="RELEASE"
+BUILD_TYPE="Release"
 BUILD_JOBS=4
 EXTRN=false
 REMOVE=false
@@ -407,7 +407,7 @@ if [ $USE_SUB_MODULES = true ]; then
         set +e
         #try most specialized modulefile first
         MODF="$1${PLATFORM}.${COMPILER}"
-        if [ $BUILD_TYPE != "RELEASE" ]; then
+        if [ $BUILD_TYPE != "Release" ]; then
             MODF="${MODF}.debug"
         else
             MODF="${MODF}.release"