Merge branch 'develop' into feature/testrtchanges

DeniseWorthen · May 10, 2022 · d74b9b6 · d74b9b6
2 parents 4687e90 + 7a9a5f1
commit d74b9b6
Show file tree

Hide file tree

Showing 65 changed files with 2,801 additions and 2,471 deletions.
diff --git a/CICE-interface/CICE b/CICE-interface/CICE
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
@@ -47,7 +47,7 @@ BUILD_DIR=$(pwd)/build_${BUILD_NAME}
 if [[ $MACHINE_ID == cheyenne.* ]] ; then
     BUILD_JOBS=${BUILD_JOBS:-3}
 elif [[ $MACHINE_ID == wcoss_dell_p3 ]] ; then
-    BUILD_JOBS=${BUILD_JOBS:-4}
+    BUILD_JOBS=${BUILD_JOBS:-2}
     source $PATHTR/tests/module-setup.sh
 fi