update build.sh and compile.sh

add RegressionTests_wcoss_dell_p3.log update 4 datm tests
ufs-community · Jul 7, 2021 · b58d781 · b58d781
1 parent b91a740
commit b58d781
Show file tree

Hide file tree

Showing 7 changed files with 694 additions and 304 deletions.
diff --git a/build.sh b/build.sh
@@ -16,7 +16,6 @@ export ESMFMKFILE=${ESMFMKFILE:?"Please set ESMFMKFILE environment variable"}
 BUILD_DIR=${BUILD_DIR:-${UFS_MODEL_DIR}/build}
 mkdir -p ${BUILD_DIR}
 
-[[ -n "${CCPP_SUITES:-""}" ]] && CMAKE_FLAGS+=" -DCCPP_SUITES=${CCPP_SUITES}"
 [[ -n "${MAPL_ROOT:-""}" ]] && CMAKE_FLAGS+=" -DCMAKE_MODULE_PATH=${MAPL_ROOT}/share/MAPL/cmake"
 
 cd ${BUILD_DIR}

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
@@ -114,11 +114,11 @@ set -ex
 # Valid applications
 
 if [[ "${MAKE_OPT}" == *"-DAPP=S2S"* ]]; then
-    CMAKE_FLAGS="${CMAKE_FLAGS} -DMOM6SOLO=ON"
+    CMAKE_FLAGS+=" -DMOM6SOLO=ON"
 fi
 
 if [[ "${MAKE_OPT}" == *"-DAPP=NG-GODAS"* ]]; then
-    CMAKE_FLAGS="${CMAKE_FLAGS} -DMOM6SOLO=ON"
+    CMAKE_FLAGS+=" -DMOM6SOLO=ON"
 fi
 
 CMAKE_FLAGS=$(trim "${CMAKE_FLAGS}")

diff --git a/tests/tests/datm_cdeps_mx025_cfsr b/tests/tests/datm_cdeps_mx025_cfsr
@@ -23,7 +23,6 @@ export FHMAX=12
 export RESTART_N=${FHMAX}
 export DT_DYNAM_MOM6='900'
 export DT_THERM_MOM6='1800'
-export CPL_SLOW=${DT_THERM_MOM6}
 
 export TASKS=$TASKS_cdeps_025
 export TPN=$TPN_cdeps_025

diff --git a/tests/tests/datm_cdeps_mx025_gefs b/tests/tests/datm_cdeps_mx025_gefs
@@ -20,7 +20,6 @@ export FHMAX=12
 export RESTART_N=${FHMAX}
 export DT_DYNAM_MOM6='900'
 export DT_THERM_MOM6='1800'
-export CPL_SLOW=${DT_THERM_MOM6}
 
 export IATM=1536
 export JATM=768

diff --git a/tests/tests/datm_mx025_cfsr b/tests/tests/datm_mx025_cfsr
@@ -23,7 +23,6 @@ export FHMAX=12
 export RESTART_N=${FHMAX}
 export DT_DYNAM_MOM6='900'
 export DT_THERM_MOM6='1800'
-export CPL_SLOW=${DT_THERM_MOM6}
 
 export TASKS=$TASKS_datm_025
 export TPN=$TPN_datm_025

diff --git a/tests/tests/datm_mx025_gefs b/tests/tests/datm_mx025_gefs
@@ -19,7 +19,6 @@ export FHMAX=12
 export RESTART_N=${FHMAX}
 export DT_DYNAM_MOM6='900'
 export DT_THERM_MOM6='1800'
-export CPL_SLOW=${DT_THERM_MOM6}
 
 export TASKS=$TASKS_datm_025
 export TPN=$TPN_datm_025