Merge Pull Request #4446 from trilinos/Trilinos/csiefer-1b1f315

Automatically Merged using Trilinos Pull Request AutoTester PR Title: MueLu: Refactor of Driver to allow for code reuse PR Author: csiefer2
trilinos · Feb 21, 2019 · dd4f8d6 · dd4f8d6
2 parents 1558b1f + 1ad41f8
commit dd4f8d6
Show file tree

Hide file tree

Showing 4 changed files with 537 additions and 251 deletions.
diff --git a/packages/muelu/test/scaling/CMakeLists.txt b/packages/muelu/test/scaling/CMakeLists.txt
@@ -39,7 +39,7 @@ IF (${PACKAGE_NAME}_HAVE_TPETRA_SOLVER_STACK OR ${PACKAGE_NAME}_HAVE_EPETRA_SOLV
     )
 
   TRIBITS_COPY_FILES_TO_BINARY_DIR(Driver_cp
-    SOURCE_FILES scaling.xml scaling.yaml scaling-complex.xml scaling-withglobalconstants.xml scaling-complex-withglobalconstants.xml circ_nsp_dependency.xml isorropia.xml iso_poisson.xml conchas_milestone_zoltan.xml conchas_milestone_zoltan2.xml conchas_milestone_zoltan2_complex.xml sa_with_ilu.xml sa_with_Ifpack2_line_detection.xml rap.xml smoother.xml smoother_complex.xml tripleMatrixProduct.xml scaling-ml.xml elasticity3D.xml amgx.json amgx.xml
+    SOURCE_FILES scaling.xml scaling.yaml scaling-complex.xml scaling-withglobalconstants.xml scaling-complex-withglobalconstants.xml circ_nsp_dependency.xml isorropia.xml iso_poisson.xml conchas_milestone_zoltan.xml conchas_milestone_zoltan2.xml conchas_milestone_zoltan2_complex.xml sa_with_ilu.xml sa_with_Ifpack2_line_detection.xml rap.xml smoother.xml smoother_complex.xml tripleMatrixProduct.xml scaling-ml.xml elasticity3D.xml amgx.json amgx.xml scaling-with-rerun.xml
    )
 
  TRIBITS_ADD_EXECUTABLE(
@@ -125,6 +125,14 @@ IF (${PACKAGE_NAME}_HAVE_EPETRA_SOLVER_STACK AND (NOT Xpetra_INT_LONG_LONG))
       COMM mpi # HAVE_MPI required
       )
 
+    TRIBITS_ADD_TEST(
+      Driver
+      NAME "DriverEpetra_Rerun"
+      ARGS "--linAlgebra=Epetra --xml=scaling-with-rerun.xml"
+      NUM_MPI_PROCS 4
+      COMM mpi # HAVE_MPI required
+      )    
+
     TRIBITS_ADD_TEST(
       Driver
       NAME "DriverEpetra_isotropic_poisson"
@@ -225,6 +233,14 @@ IF (${PACKAGE_NAME}_HAVE_TPETRA_SOLVER_STACK)
         COMM mpi # HAVE_MPI required
         )
 
+      TRIBITS_ADD_TEST(
+        Driver
+        NAME "DriverTpetra_Rerun"
+        ARGS "--linAlgebra=Tpetra --xml=scaling-with-rerun.xml"
+        NUM_MPI_PROCS 4
+        COMM mpi # HAVE_MPI required
+        )
+
       TRIBITS_ADD_TEST(
         Driver
         NAME "DriverTpetra_WithGlobalConstants"