Merging develop into master

SCOREC · Nov 2, 2022 · 8311337 · 8311337
2 parents 3d5c28e + b0a7ecf
commit 8311337
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/cdash/nightly.cmake b/cdash/nightly.cmake
@@ -1,10 +1,11 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.17)
 
 SET(CTEST_DO_SUBMIT ON)
 SET(CTEST_TEST_TYPE Nightly)
+set(CTEST_BUILD_CONFIGURATION RelWithDebInfo)
 
 set(CTEST_NIGHTLY_START_TIME "17:00:00 EST")
-set(CTEST_SITE "pachisi.scorec.rpi.edu" )
+set(CTEST_SITE "cranium.scorec.rpi.edu" )
 set(CTEST_DROP_METHOD "http")
 set(CTEST_DROP_SITE "my.cdash.org")
 set(CTEST_DROP_LOCATION "/submit.php?project=SCOREC")
@@ -13,7 +14,6 @@ set(CTEST_BUILD_NAME  "linux-gcc-${CTEST_BUILD_CONFIGURATION}")
 
 set(CTEST_DASHBOARD_ROOT "/lore/cwsmith/nightlyBuilds/" )
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
-set(CTEST_BUILD_CONFIGURATION RelWithDebInfo)
 set(CTEST_BUILD_FLAGS -j4)
 
 set(CTEST_PROJECT_NAME "SCOREC")
@@ -313,7 +313,7 @@ SET(CONFIGURE_OPTIONS-sim
   "${CONFIGURE_OPTIONS}"
   "-DENABLE_SIMMETRIX:BOOL=ON"
   "-DSIM_PARASOLID:BOOL=ON"
-  "-DSIM_MPI:STRING=mpich3.3"
+  "-DSIM_MPI:STRING=mpich3.3.2"
 )
 
 setup_repo()

diff --git a/cdash/nightly.sh b/cdash/nightly.sh
@@ -9,6 +9,7 @@ export PATH=/usr/share/lmod/lmod/libexec:$PATH
 unset MODULEPATH
 
 module unuse /opt/scorec/spack/lmod/linux-rhel7-x86_64/Core
+module use /opt/scorec/modules
 module use /opt/scorec/spack/v0154_2/lmod/linux-rhel7-x86_64/Core
 module load gcc/10.1.0
 module load mpich/3.3.2
@@ -24,10 +25,10 @@ cd $d
 
 touch $d/startedCoreNightly
 #run nightly.cmake script
-ctest -V --script $d/repos/core/cdash/nightly.cmake
+ctest -V --script $d/nightly.cmake
 touch $d/doneCoreNightly
 
 #create doxygen docs
 cd build/master
 make doc
-cp -r doc/html/* /net/web/scorec/scorec-web/htdocs/pumi/doxygen/.
+cp -r doc/html /net/web/scorec/scorec-web/htdocs/pumi/doxygen