From ca4ceca0f666bc760cfdff20f6ac1974b99db535 Mon Sep 17 00:00:00 2001
From: RussTreadon-NOAA <russ.treadon@noaa.gov>
Date: Thu, 10 Oct 2024 16:47:45 +0000
Subject: [PATCH 1/2] add date to build.sh; remove missing yamls from test
 CMakeLists.txt (#1302)

---
 build.sh            | 18 +++++++++++-------
 test/CMakeLists.txt | 14 --------------
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/build.sh b/build.sh
index 48931b553..a16036366 100755
--- a/build.sh
+++ b/build.sh
@@ -7,6 +7,7 @@
 
 set -eu
 
+echo "Start ... `date`"
 dir_root="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
 source $dir_root/ush/detect_machine.sh
@@ -113,7 +114,7 @@ if [[ $BUILD_TARGET == 'hera' ]]; then
 fi
 
 # Configure
-echo "Configuring ..."
+echo "Configuring ... `date`"
 set -x
 cmake \
   ${CMAKE_OPTS:-} \
@@ -121,15 +122,18 @@ cmake \
 set +x
 
 # Build
-echo "Building ..."
+echo "Building ... `date`"
 set -x
 if [[ $BUILD_JCSDA == 'YES' ]]; then
-  make -j ${BUILD_JOBS:-6} VERBOSE=$BUILD_VERBOSE
+  make -j ${BUILD_JOBS:-8} VERBOSE=$BUILD_VERBOSE
 else
   builddirs="gdas iodaconv land-imsproc land-jediincr gdas-utils bufr-query da-utils"
   for b in $builddirs; do
     cd $b
-    make -j ${BUILD_JOBS:-6} VERBOSE=$BUILD_VERBOSE
+    set +x      
+    echo "Building $b ... `date`"
+    set -x
+    make -j ${BUILD_JOBS:-8} VERBOSE=$BUILD_VERBOSE
     cd ../
   done
 fi
@@ -137,10 +141,10 @@ set +x
 
 # Install
 if [[ -n ${INSTALL_PREFIX:-} ]]; then
-  echo "Installing ..."
+  echo "Installing ... `date`"
   set -x
-  make install
+  make install -j ${BUILD_JOBS:-8}
   set +x
 fi
-
+echo "Finish ... `date`"
 exit 0
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index cae0d55ec..aaa1aba35 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -54,15 +54,6 @@ list(APPEND test_input
   ${PROJECT_SOURCE_DIR}/test/testinput/check_yaml_keys_test.yaml
   ${PROJECT_SOURCE_DIR}/test/testinput/bufr_adpsfc.yaml
   ${PROJECT_SOURCE_DIR}/test/testinput/bufr_adpsfc_snow.yaml
-  ${PROJECT_SOURCE_DIR}/test/testinput/amsua_n19_ewok.yaml
-  ${PROJECT_SOURCE_DIR}/test/testinput/temp_bufr_dbuoyprof.yaml
-  ${PROJECT_SOURCE_DIR}/test/testinput/salt_bufr_dbuoyprof.yaml
-  ${PROJECT_SOURCE_DIR}/test/testinput/temp_bufr_mbuoybprof.yaml
-  ${PROJECT_SOURCE_DIR}/test/testinput/salt_bufr_mbuoybprof.yaml
-  ${PROJECT_SOURCE_DIR}/test/testinput/bufr_tesacprof.yaml
-  ${PROJECT_SOURCE_DIR}/test/testinput/bufr_trkobprof.yaml
-  ${PROJECT_SOURCE_DIR}/test/testinput/bufr_sfcships.yaml
-  ${PROJECT_SOURCE_DIR}/test/testinput/bufr_sfcshipsu.yaml
 )
 
 # create testinput dir
@@ -87,11 +78,6 @@ file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/test/testoutput)
 # create testreference dir
 file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/test/testreference)
 
-# list of test reference files to install
-list(APPEND test_reference
-  ${PROJECT_SOURCE_DIR}/test/testreference/amsua_n19_gdas.yaml
-)
-
 # symlink
 foreach(FILENAME ${test_reference})
   file(RELATIVE_PATH FILENAME_REL ${PROJECT_SOURCE_DIR}/test/testreference/ ${FILENAME})

From d2a24e7f2d85edbf1f5338396b4f32f23a8150d3 Mon Sep 17 00:00:00 2001
From: Russ-Treadon-NOAA <Russ.Treadon@noaa.gov>
Date: Thu, 27 Feb 2025 15:47:05 +0000
Subject: [PATCH 2/2] remove git-lfs hack from wcoss2.intel.lua, unset wcoss2
 compiler flags (#1303)

---
 modulefiles/GDAS/wcoss2.intel.lua | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/modulefiles/GDAS/wcoss2.intel.lua b/modulefiles/GDAS/wcoss2.intel.lua
index b7d042233..23f7d11b9 100644
--- a/modulefiles/GDAS/wcoss2.intel.lua
+++ b/modulefiles/GDAS/wcoss2.intel.lua
@@ -20,6 +20,7 @@ load("pcre2/10.42")
 load("curl/8.4.0")
 load("zlib/1.2.13")
 load("git/2.35.3")
+load("git-lfs/2.11.0")
 load("pkg-config/0.29.2")
 load("hdf5/1.14.0")
 load("parallel-netcdf/1.12.2")
@@ -75,13 +76,17 @@ load("py-markupsafe/2.1.3")
 load("py-cftime/1.0.3.4")
 load("py-packaging/23.1")
 
--- hack for git-lfs
-prepend_path("PATH", "/apps/spack/git-lfs/2.11.0/gcc/11.2.0/m6b6nl5kfqngfteqbggydc7kflxere3s/bin")
-
 setenv("CC","cc")
 setenv("CXX","CC")
 setenv("FC","ftn")
 
+-- stack-intel/19.1.3.304 sets compiler flags "-static-libgcc -static-libstdc++ -Bstatic -lstdc++ -Bdynamic -lm -lpthread"
+-- flags trigger "warning #10315: specifying -lm before files may supersede the Intel(R) math library and affect performance"
+-- TODO: remove unsetenv lines when complier flags are removed from the wcoss2 spack-stack build
+unsetenv("CFLAGS")
+unsetenv("CXXFLAGS")
+unsetenv("FFLAGS")
+
 local mpiexec = '/opt/cray/pals/1.3.2/bin/mpirun'
 local mpinproc = '-n'
 setenv('MPIEXEC_EXEC', mpiexec)