Merge branch 'master' into issue-34

sandialabs · Feb 1, 2017 · c27bf85 · c27bf85
2 parents 52b6c77 + a539437
commit c27bf85
Show file tree

Hide file tree

Showing 35 changed files with 44 additions and 5,783 deletions.
diff --git a/doc/dashboards/cee-compute011.sandia.gov/ctest_nightly.cmake b/doc/dashboards/cee-compute011.sandia.gov/ctest_nightly.cmake
@@ -54,11 +54,11 @@ else ()
   # around with the settings in this block.
 
   # What to build and test
-  set (DOWNLOAD TRUE)
+  set (DOWNLOAD FALSE)
   # See if we can get away with this for speed, at least until we get onto a
   # machine that can support a lengthy nightly.
-  set (CLEAN_BUILD TRUE)
-  set (BUILD_SCOREC TRUE)
+  set (CLEAN_BUILD FALSE)
+  set (BUILD_SCOREC FALSE)
   set (BUILD_TRILINOS FALSE)
   set (BUILD_PERIDIGM FALSE)
   set (BUILD_ALB32 FALSE)
@@ -374,6 +374,9 @@ set (COMMON_CONFIGURE_OPTIONS
   "-DTrilinos_ENABLE_Amesos2:BOOL=ON"
   "-DTrilinos_ENABLE_Zoltan2:BOOL=ON"
   "-DTrilinos_ENABLE_MueLu:BOOL=ON"
+#
+  "-DTrilinos_ENABLE_STRONG_C_COMPILE_WARNINGS:BOOL=OFF"
+  "-DTrilinos_ENABLE_STRONG_CXX_COMPILE_WARNINGS:BOOL=OFF"
   #
   "-DZoltan_ENABLE_ULONG_IDS:BOOL=ON"
   "-DMDS_ID_TYPE:STRING='long int'"

diff --git a/doc/dashboards/cee-compute011.sandia.gov/intel_macro.cmake b/doc/dashboards/cee-compute011.sandia.gov/intel_macro.cmake
@@ -61,8 +61,8 @@ macro(do_intel COMMON_CONFIGURE_OPTIONS BTYPE)
     "-DCMAKE_INSTALL_PREFIX:PATH=${CTEST_BINARY_DIRECTORY}/TrilinosIntelInstall"
     "-DTPL_BLAS_LIBRARIES:STRING=${LABLAS_LIBRARIES}"
     "-DTPL_LAPACK_LIBRARIES:STRING=${LABLAS_LIBRARIES}"
-    "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON"
-    "-DCMAKE_INSTALL_RPATH:STRING=${INTEL_MPI_DIR}/lib64;${INTEL_PREFIX_DIR}/lib;${INTEL_DIR}/lib/intel64"
+#    "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON"
+#    "-DCMAKE_INSTALL_RPATH:STRING=${INTEL_MPI_DIR}/lib64;${INTEL_PREFIX_DIR}/lib;${INTEL_DIR}/lib/intel64"
     )
 
   if (BUILD_SCOREC)

diff --git a/doc/dashboards/cee-compute011.sandia.gov/nightly_cron_script.sh b/doc/dashboards/cee-compute011.sandia.gov/nightly_cron_script.sh
@@ -1,10 +1,23 @@
-#!/bin/sh
+#!/bin/bash
 
 SUBMIT_RESULTS=ON
 #SUBMIT_RESULTS=OFF
 THE_TEST_TYPE=Nightly
 #THE_TEST_TYPE=Experimental
 
+if [ "${MODULESHOME:-}" = "" ]; then
+  # Modules have not been set
+  . /usr/share/Modules/init/bash
+  module purge
+  module load sierra-git/2.6.1
+  module load sierra-compiler/gcc/5.2.0
+  module load sierra-mkl/17.0-2017.1.132
+else
+  module purge
+  module load sierra-git/2.6.1
+  module load sierra-compiler/gcc/5.2.0
+  module load sierra-mkl/17.0-2017.1.132
+fi
 
 BUILD_OPT="$1"
 

diff --git a/examples/ATO/2Matl_Homog/mitchell3D.xml b/examples/ATO/2Matl_Homog/mitchell3D.xml
@@ -425,6 +425,7 @@
     <Parameter name="Exodus Input File Name" type="string" value="padded.gen"/>
     <Parameter name="Exodus Output File Name" type="string" value="padded.exo"/>
     <Parameter name="Separate Evaluators by Element Block" type="bool" value="true"/>
+    <Parameter name="Workset Size" type="int" value="50"/>
   </ParameterList>
 
   <ParameterList name="Piro">

diff --git a/examples/ATO/2Matl_Homog/mitchell3DT.xml b/examples/ATO/2Matl_Homog/mitchell3DT.xml
@@ -425,6 +425,7 @@
     <Parameter name="Exodus Input File Name" type="string" value="padded.gen"/>
     <Parameter name="Exodus Output File Name" type="string" value="paddedT.exo"/>
     <Parameter name="Separate Evaluators by Element Block" type="bool" value="true"/>
+    <Parameter name="Workset Size" type="int" value="50"/>
   </ParameterList>
 
   <ParameterList name="Piro">

diff --git a/examples/ATO/CMakeLists.txt b/examples/ATO/CMakeLists.txt
@@ -4,7 +4,6 @@
 ##    in the file "license.txt" in the top-level Albany directory  //
 ##*****************************************************************//
 
-IF(NOT ALBANY_64BIT_INT)
 add_subdirectory(DistParam_2D)
 add_subdirectory(RegHeaviside_2D)
 add_subdirectory(RegHeaviside_3D)
@@ -30,4 +29,3 @@ add_subdirectory(Cogent_Tab)
 add_subdirectory(Cogent_Opt)
 add_subdirectory(Cogent_ThermoMech)
 ENDIF()
-ENDIF()
diff --git a/examples/ATO/RegHeaviside_3D/mitchell3D.xml b/examples/ATO/RegHeaviside_3D/mitchell3D.xml
@@ -165,6 +165,7 @@
     <Parameter name="Exodus Input File Name" type="string" value="mitchell3D.gen"/>
     <Parameter name="Exodus Output File Name" type="string" value="mitchell3D.exo"/>
     <Parameter name="Separate Evaluators by Element Block" type="bool" value="true"/>
+    <Parameter name="Workset Size" type="int" value="50"/>
   </ParameterList>
 
   <ParameterList name="Piro">

diff --git a/examples/ATO/RegHeaviside_3D/mitchell3DT.xml b/examples/ATO/RegHeaviside_3D/mitchell3DT.xml
@@ -165,6 +165,7 @@
     <Parameter name="Exodus Input File Name" type="string" value="mitchell3D.gen"/>
     <Parameter name="Exodus Output File Name" type="string" value="mitchell3DT.exo"/>
     <Parameter name="Separate Evaluators by Element Block" type="bool" value="true"/>
+    <Parameter name="Workset Size" type="int" value="50"/>
   </ParameterList>
 
   <ParameterList name="Piro">

diff --git a/examples/FELIX/Enthalpy/input_Enthalpy_test.xml b/examples/FELIX/Enthalpy/input_Enthalpy_test.xml
@@ -61,6 +61,7 @@
   </ParameterList>
   <ParameterList name="Discretization">
     <Parameter name="Method" type="string" value="Exodus"/>
+    <Parameter name="Workset Size" type="int" value="50"/>
     <Parameter name="Number Of Time Derivatives" type="int" value="0"/>
     <Parameter name="Cubature Degree" type="int" value="3"/>
     <Parameter name="Exodus Output File Name" type="string" value="gis_enthalpy.exo"/>