Merge branch 'atdv-237-atdm-promote-cee-rhel6-openmpi-4.0.1-builds' i…

…nto atdm-nightly-manual-updates (ATDV-237, #6533)
trilinos · Jan 7, 2020 · 9641130 · 9641130
2 parents 999b94f + 4bbac0b
commit 9641130
Show file tree

Hide file tree

Showing 11 changed files with 410 additions and 30 deletions.
diff --git a/.../cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_clang-5.0.1_openmpi-4.0.1_serial_static_opt.sh b/.../cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_clang-5.0.1_openmpi-4.0.1_serial_static_opt.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 if [ "${Trilinos_TRACK}" == "" ]; then
- export Trilinos_TRACK=Specialized
+ export Trilinos_TRACK=ATDM
 fi
 $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel6/local-driver.sh
diff --git a/...dm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_gnu-7.2.0_openmpi-4.0.1_serial_shared_opt.sh b/...dm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_gnu-7.2.0_openmpi-4.0.1_serial_shared_opt.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 if [ "${Trilinos_TRACK}" == "" ]; then
- export Trilinos_TRACK=Specialized
+ export Trilinos_TRACK=ATDM
 fi
 $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel6/local-driver.sh
diff --git a/.../drivers/geminga/ctest_linux_nightly_mpi_release_muelu_kokkos_refactor_cuda_geminga.cmake b/.../drivers/geminga/ctest_linux_nightly_mpi_release_muelu_kokkos_refactor_cuda_geminga.cmake
@@ -75,29 +75,27 @@ SET(Trilinos_PACKAGES MueLu Xpetra Amesos2)
 
 SET(EXTRA_CONFIGURE_OPTIONS
  ### ETI ###
- "-DTrilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON"
- "-DTpetra_INST_INT_LONG_LONG:BOOL=OFF"
- "-DTrilinos_ENABLE_COMPLEX:BOOL=ON"
- "-DTeuchos_ENABLE_COMPLEX:BOOL=OFF"
- "-DTpetra_INST_COMPLEX_DOUBLE:BOOL=OFF"
- "-DTpetra_INST_COMPLEX_FLOAT:BOOL=OFF"
- "-DTpetra_INST_SERIAL=ON"
+ "-D Trilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON"
+ "-D Trilinos_ENABLE_COMPLEX:BOOL=OFF"
+ "-D Tpetra_INST_INT_LONG_LONG:BOOL=OFF"
+ "-D Tpetra_INST_INT_INT:BOOL=ON"
+ "-D Tpetra_INST_SERIAL=ON"
 
  ### MISC ###
- "-DTrilinos_ENABLE_DEPENDENCY_UNIT_TESTS:BOOL=OFF"
- "-DTeuchos_GLOBALLY_REDUCE_UNITTEST_RESULTS:BOOL=ON"
+ "-D Trilinos_ENABLE_DEPENDENCY_UNIT_TESTS:BOOL=OFF"
+ "-D Teuchos_GLOBALLY_REDUCE_UNITTEST_RESULTS:BOOL=ON"
 
  ### TPLS ###
  "-DTPL_ENABLE_SuperLU:BOOL=ON"
- "-DSuperLU_INCLUDE_DIRS:PATH=$ENV{SEMS_SUPERLU_INCLUDE_PATH}"
- "-DSuperLU_LIBRARY_DIRS:PATH=$ENV{SEMS_SUPERLU_LIBRARY_PATH}"
+ "-D SuperLU_INCLUDE_DIRS:PATH=$ENV{SEMS_SUPERLU_INCLUDE_PATH}"
+ "-D SuperLU_LIBRARY_DIRS:PATH=$ENV{SEMS_SUPERLU_LIBRARY_PATH}"
 
  ### PACKAGES CONFIGURATION ###
- "-DMueLu_ENABLE_Experimental:BOOL=ON"
- "-DMueLu_ENABLE_Kokkos_Refactor:BOOL=ON"
- "-DMueLu_ENABLE_Kokkos_Refactor_Use_By_Default:BOOL=ON"
- "-DXpetra_ENABLE_Experimental:BOOL=ON"
- "-DXpetra_ENABLE_Kokkos_Refactor:BOOL=ON"
+ "-D MueLu_ENABLE_Experimental:BOOL=ON"
+ "-D MueLu_ENABLE_Kokkos_Refactor:BOOL=ON"
+ "-D MueLu_ENABLE_Kokkos_Refactor_Use_By_Default:BOOL=ON"
+ "-D Xpetra_ENABLE_Experimental:BOOL=ON"
+ "-D Xpetra_ENABLE_Kokkos_Refactor:BOOL=ON"
 )
 
 #

diff --git a/cmake/std/atdm/common/toss3/environment_new.sh b/cmake/std/atdm/common/toss3/environment_new.sh
@@ -21,9 +21,8 @@ module purge &> /dev/null
 module purge
 . /projects/sems/modulefiles/utils/sems-modules-init.sh
 module load sems-env
-module load atdm-env
-module load atdm-ninja_fortran/1.7.2
-module load sparc-git/2.19.1
+module load sems-ninja_fortran/1.8.2
+module load sems-git/2.10.1
 
 if [ "$ATDM_CONFIG_NODE_TYPE" == "OPENMP" ] ; then
  export ATDM_CONFIG_CTEST_PARALLEL_LEVEL=8

diff --git a/packages/tempus/test/Newmark/CMakeLists.txt b/packages/tempus/test/Newmark/CMakeLists.txt
@@ -19,6 +19,6 @@ TRIBITS_ADD_EXECUTABLE_AND_TEST(
 # )
 
 TRIBITS_COPY_FILES_TO_BINARY_DIR(Test_NewmarkImplicitAForm_CopyFiles
- DEST_FILES Tempus_NewmarkImplicitAForm_HarmonicOscillator_Damped_SecondOrder.xml Tempus_NewmarkImplicitAForm_HarmonicOscillator_Damped_FirstOrder.xml Tempus_NewmarkExplicitAForm_SinCos.xml Tempus_NewmarkExplicitAForm_BallParabolic.xml Tempus_NewmarkExplicitAForm_HarmonicOscillator_Damped.xml 
+ DEST_FILES Tempus_NewmarkImplicitAForm_HarmonicOscillator_Damped_SecondOrder.xml Tempus_NewmarkImplicitAForm_HarmonicOscillator_Damped_FirstOrder.xml Tempus_NewmarkExplicitAForm_SinCos.xml Tempus_NewmarkExplicitAForm_BallParabolic.xml Tempus_NewmarkExplicitAForm_HarmonicOscillator_Damped.xml Tempus_NewmarkImplicitDForm_HarmonicOscillator_Damped_SecondOrder.xml 
  EXEDEPS Newmark
  )
diff --git a/...tempus/test/Newmark/Tempus_NewmarkImplicitDForm_HarmonicOscillator_Damped_SecondOrder.xml b/...tempus/test/Newmark/Tempus_NewmarkImplicitDForm_HarmonicOscillator_Damped_SecondOrder.xml
@@ -0,0 +1,104 @@
+<ParameterList name="Newmark_HarmonicOscillator">
+ <ParameterList name="HarmonicOscillatorModel">
+ <Parameter name="Damping coeff c" type="double" value="1.0"/>
+ <Parameter name="Forcing coeff f" type="double" value="-1.0"/>
+ <Parameter name="x coeff k" type="double" value="0.0"/>
+ <Parameter name="Mass coeff m" type="double" value="1.0"/>
+ </ParameterList>
+ <ParameterList name="Tempus">
+ <Parameter name="Integrator Name" type="string" value="Default Integrator"/>
+
+ <ParameterList name="Default Integrator">
+ <Parameter name="Integrator Type" type="string" value="Integrator Basic"/>
+ <Parameter name="Screen Output Index List" type="string" value="1"/>
+ <Parameter name="Screen Output Index Interval" type="int" value="100"/>
+ <Parameter name="Stepper Name" type="string" value="Default Stepper"/>
+ <ParameterList name="Solution History">
+ <Parameter name="Storage Type" type="string" value="Unlimited"/>
+ <Parameter name="Storage Limit" type="int" value="20"/>
+ </ParameterList>
+ <ParameterList name="Time Step Control">
+ <Parameter name="Initial Time" type="double" value="0.0"/>
+ <Parameter name="Final Time" type="double" value="2.0"/>
+ <Parameter name="Initial Time Index" type="int" value="0"/>
+ <Parameter name="Final Time Index" type="int" value="10000"/>
+ <Parameter name="Initial Time Step" type="double" value="1.0"/>
+ <Parameter name="Maximum Absolute Error" type="double" value="1.0e-8"/>
+ <Parameter name="Maximum Relative Error" type="double" value="1.0e-8"/>
+ <Parameter name="Integrator Step Type" type="string" value="Constant"/>
+ <Parameter name="Output Time List" type="string" value=""/>
+ <Parameter name="Output Index List" type="string" value=""/>
+ <Parameter name="Output Time Interval" type="double" value="1.0"/>
+ <Parameter name="Output Index Interval" type="int" value="1000"/>
+ <Parameter name="Maximum Number of Stepper Failures" type="int" value="10"/>
+ <Parameter name="Maximum Number of Consecutive Stepper Failures" type="int" value="5"/>
+ </ParameterList>
+ </ParameterList>
+
+ <ParameterList name="Default Stepper">
+
+ <Parameter name="Stepper Type" type="string" value="Newmark Implicit d-Form"/>
+ <Parameter name="Use FSAL" type="bool" value="true"/>
+ <Parameter name="Initial Condition Consistency" type="string" value="Consistent"/>
+ <Parameter name="Initial Condition Consistency Check" type="bool" value="false"/>
+ <Parameter name="Zero Initial Guess" type="bool" value="0"/>
+ <ParameterList name="Newmark Parameters">
+ <Parameter name="Scheme Name" type="string" value="Average Acceleration"/>
+ </ParameterList>
+ <Parameter name="Solver Name" type="string" value="Default Solver"/>
+
+ <ParameterList name="Default Solver">
+ <ParameterList name="NOX">
+ <ParameterList name="Direction">
+ <Parameter name="Method" type="string" value="Newton"/>
+ <ParameterList name="Newton">
+ <Parameter name="Forcing Term Method" type="string" value="Constant"/>
+ <Parameter name="Rescue Bad Newton Solve" type="bool" value="1"/>
+ </ParameterList>
+ </ParameterList>
+ <ParameterList name="Line Search">
+ <Parameter name="Method" type="string" value="Full Step"/>
+ <ParameterList name="Full Step">
+ <Parameter name="Full Step" type="double" value="1"/>
+ </ParameterList>
+ </ParameterList>
+ <Parameter name="Nonlinear Solver" type="string" value="Line Search Based"/>
+ <ParameterList name="Printing">
+ <Parameter name="Output Precision" type="int" value="3"/>
+ <Parameter name="Output Processor" type="int" value="0"/>
+ <ParameterList name="Output Information">
+ <Parameter name="Error" type="bool" value="1"/>
+ <Parameter name="Warning" type="bool" value="1"/>
+ <Parameter name="Outer Iteration" type="bool" value="0"/>
+ <Parameter name="Parameters" type="bool" value="0"/>
+ <Parameter name="Details" type="bool" value="0"/>
+ <Parameter name="Linear Solver Details" type="bool" value="1"/>
+ <Parameter name="Stepper Iteration" type="bool" value="1"/>
+ <Parameter name="Stepper Details" type="bool" value="1"/>
+ <Parameter name="Stepper Parameters" type="bool" value="1"/>
+ </ParameterList>
+ </ParameterList>
+ <ParameterList name="Solver Options">
+ <Parameter name="Status Test Check Type" type="string" value="Minimal"/>
+ </ParameterList>
+ <ParameterList name="Status Tests">
+ <Parameter name="Test Type" type="string" value="Combo"/>
+ <Parameter name="Combo Type" type="string" value="OR"/>
+ <Parameter name="Number of Tests" type="int" value="2"/>
+ <ParameterList name="Test 0">
+ <Parameter name="Test Type" type="string" value="NormF"/>
+ <Parameter name="Tolerance" type="double" value="1.0e-8"/>
+ </ParameterList>
+ <ParameterList name="Test 1">
+ <Parameter name="Test Type" type="string" value="MaxIters"/>
+ <Parameter name="Maximum Iterations" type="int" value="10"/>
+ </ParameterList>
+ </ParameterList>
+ </ParameterList>
+ </ParameterList>
+
+ </ParameterList>
+
+ </ParameterList>
+
+</ParameterList>