diff --git a/packages/muelu/test/scaling/CMakeLists.txt b/packages/muelu/test/scaling/CMakeLists.txt index 1e089dc43537..eb82d3baff79 100644 --- a/packages/muelu/test/scaling/CMakeLists.txt +++ b/packages/muelu/test/scaling/CMakeLists.txt @@ -63,7 +63,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 scaling-with-rerun.xml scaling_distance2_agg.xml smooVec.mm smooVecCoalesce.xml pairwise.xml sa_enforce_constraints.xml recurMG.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 scaling_distance2_agg.xml smooVec.mm smooVecCoalesce.xml pairwise.xml sa_enforce_constraints.xml recurMG.xml anisotropic.xml CATEGORIES BASIC PERFORMANCE ) @@ -114,6 +114,15 @@ TRIBITS_ADD_TEST( CATEGORIES PERFORMANCE ) + +TRIBITS_ADD_TEST( + Driver + NAME Driver_anisotropic + ARGS "--xml=anisotropic.xml --tol=1e-6" + NUM_MPI_PROCS 4 + COMM mpi # HAVE_MPI required + ) + # not very elegant. The best would probably to make Reuse.cpp work for both Epetra and Tpetra IF (${PACKAGE_NAME}_HAVE_TPETRA_SOLVER_STACK) TRIBITS_ADD_EXECUTABLE( @@ -188,6 +197,7 @@ IF (${PACKAGE_NAME}_HAVE_EPETRA_SOLVER_STACK AND (NOT Xpetra_INT_LONG_LONG)) NUM_MPI_PROCS 4 COMM mpi # HAVE_MPI required ) + TRIBITS_ADD_TEST( Driver diff --git a/packages/muelu/test/scaling/Driver.cpp b/packages/muelu/test/scaling/Driver.cpp index 678c414148c6..4bf53b7019fc 100644 --- a/packages/muelu/test/scaling/Driver.cpp +++ b/packages/muelu/test/scaling/Driver.cpp @@ -307,8 +307,19 @@ MueLu::MueLu_AMGX_initialize_plugins(); if (paramList.isParameter(name)) realParams.setEntry(name, paramList.getEntry(name)); } - } + // Galeri updates (only works with Run1) + if(paramList.sublist("Run1").isSublist("Galeri")) { + ParameterList& moreParams = paramList.sublist("Run1").sublist("Galeri"); + std::cout<<"*** moreParams ***"< > nodeComm; diff --git a/packages/muelu/test/scaling/anisotropic.xml b/packages/muelu/test/scaling/anisotropic.xml new file mode 100644 index 000000000000..780315391b9e --- /dev/null +++ b/packages/muelu/test/scaling/anisotropic.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +