Thompson subcycling for develop, add missing hera.gnu debug modulefile (

#632) * Add missing modulefile ufs_hera.gnu_debug; bug fix in tests/compile.sh when checking for DEBUG=Y * Thompson subcycling for develop
ufs-community · Jun 10, 2021 · ab3f8f8 · ab3f8f8
1 parent 9aebf1a
commit ab3f8f8
Show file tree

Hide file tree

Showing 13 changed files with 2,337 additions and 2,360 deletions.
diff --git a/FV3 b/FV3
diff --git a/modulefiles/ufs_hera.gnu_debug b/modulefiles/ufs_hera.gnu_debug
@@ -0,0 +1,26 @@
+#%Module
+
+proc ModulesHelp {} {
+  puts stderr "\tcit - loads modules required for building and running UFS Model on Hera/GNU"
+}
+
+module-whatis "loads UFS Model prerequisites for Hera/GNU"
+
+module use /contrib/sutils/modulefiles
+module load sutils
+
+module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack
+
+module load hpc/1.1.0
+
+module load cmake/3.20.0
+
+module load hpc-gnu/9.2.0
+module load hpc-mpich/3.3.2
+
+module load ufs_common_debug
+
+setenv CC mpicc
+setenv CXX mpicxx
+setenv FC mpif90
+setenv CMAKE_Platform hera.gnu
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/compile.sh b/tests/compile.sh
@@ -172,7 +172,7 @@ export CMAKE_FLAGS
 bash -x ${PATHTR}/build.sh
 
 mv ${BUILD_DIR}/ufs_model ${PATHTR}/tests/${BUILD_NAME}.exe
-if [[ "${MAKE_OPT}" == "DEBUG=Y" ]]; then
+if [[ "${MAKE_OPT}" == *"DEBUG=Y"* ]]; then
   cp ${PATHTR}/modulefiles/ufs_${MACHINE_ID}_debug ${PATHTR}/tests/modules.${BUILD_NAME}
 else
   cp ${PATHTR}/modulefiles/ufs_${MACHINE_ID}       ${PATHTR}/tests/modules.${BUILD_NAME}

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -413,7 +413,7 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20210607
+BL_DATE=20210609
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 else