diff --git a/packages/muelu/test/unit_tests/CMakeLists.txt b/packages/muelu/test/unit_tests/CMakeLists.txt index 7347b498987f..cbc8ed6d459d 100644 --- a/packages/muelu/test/unit_tests/CMakeLists.txt +++ b/packages/muelu/test/unit_tests/CMakeLists.txt @@ -120,12 +120,6 @@ TRIBITS_COPY_FILES_TO_BINARY_DIR(UnitTestsTestMatrices_cp IF (${PACKAGE_NAME}_ENABLE_Epetra) -IF( HAVE_${PACKAGE_NAME_UC}_DEPRECATED_CODE) -APPEND_SET(SOURCES - ParameterList/MLParameterListInterpreter.cpp -) -ENDIF() - APPEND_SET(SOURCES ParameterList/CreateSublists.cpp ) @@ -451,6 +445,5 @@ ADD_SUBDIRECTORY(ParameterList/FactoryFactory/) ADD_SUBDIRECTORY(ParameterList/ParameterListInterpreter/) IF (${PACKAGE_NAME}_ENABLE_Epetra) - ADD_SUBDIRECTORY(ParameterList/MLParameterListInterpreter/) ADD_SUBDIRECTORY(ParameterList/CreateSublists/) ENDIF() diff --git a/packages/muelu/test/unit_tests/ParameterList/MLParameterListInterpreter.cpp b/packages/muelu/test/unit_tests/ParameterList/MLParameterListInterpreter.cpp deleted file mode 100644 index 690e37d1791d..000000000000 --- a/packages/muelu/test/unit_tests/ParameterList/MLParameterListInterpreter.cpp +++ /dev/null @@ -1,75 +0,0 @@ -// @HEADER -// ***************************************************************************** -// MueLu: A package for multigrid based preconditioning -// -// Copyright 2012 NTESS and the MueLu contributors. -// SPDX-License-Identifier: BSD-3-Clause -// ***************************************************************************** -// @HEADER - -#include -#include -#include - -#include "MueLu_TestHelpers.hpp" -#include "MueLu_Version.hpp" - -#include "MueLu_MLParameterListInterpreter.hpp" -#include "MueLu_Exceptions.hpp" - -namespace MueLuTests { - -TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(MLParameterListInterpreter, SetParameterList, Scalar, LocalOrdinal, GlobalOrdinal, Node) { -#include "MueLu_UseShortNames.hpp" - MUELU_TESTING_SET_OSTREAM; - MUELU_TESTING_LIMIT_SCOPE(Scalar, GlobalOrdinal, NO); - if (!TYPE_EQUAL(SC, double)) { - out << "Skipping for SC != double" << std::endl; - return; - } - out << "version: " << MueLu::Version() << std::endl; - - // TODO: this test can be done at compilation time -#if !defined(HAVE_MUELU_EPETRA) or !defined(HAVE_MUELU_IFPACK) or !defined(HAVE_MUELU_AMESOS) - MUELU_TESTING_DO_NOT_TEST(Xpetra::UseEpetra, "Epetra, Ifpack, Amesos"); -#endif - -#if !defined(HAVE_MUELU_IFPACK2) or !defined(HAVE_MUELU_AMESOS2) - MUELU_TESTING_DO_NOT_TEST(Xpetra::UseTpetra, "Tpetra, Ifpack2, Amesos2"); -#endif - - RCP A = TestHelpers::TestFactory::Build1DPoisson(99); - Teuchos::ParameterList galeriParameters; - galeriParameters.set("nx", 99); - RCP coordinates = Galeri::Xpetra::Utils::CreateCartesianCoordinates("1D", A->getRowMap(), galeriParameters); - - ArrayRCP fileList = TestHelpers::GetFileList(std::string("ParameterList/MLParameterListInterpreter/"), std::string(".xml")); - - for (int i = 0; i < fileList.size(); i++) { - out << "Processing file: " << fileList[i] << std::endl; - Teuchos::ParameterList myList; - myList.set("xml parameter file", "ParameterList/MLParameterListInterpreter/" + fileList[i]); - - Teuchos::ArrayRCP xcoord = coordinates->getDataNonConst(0); - myList.set("x-coordinates", xcoord.get()); - - MLParameterListInterpreter mueluFactory(myList, A->getRowMap()->getComm()); - - RCP H = mueluFactory.CreateHierarchy(); - H->GetLevel(0)->template Set >("A", A); - - mueluFactory.SetupHierarchy(*H); - - // TODO: check no unused parameters - // TODO: check results of Iterate() - } -} - -#define MUELU_ETI_GROUP(SC, LO, GO, Node) \ - TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT(MLParameterListInterpreter, SetParameterList, SC, LO, GO, Node) - -#include - -} // namespace MueLuTests - -// TODO: some tests of the parameter list parser can be done without building the Hierarchy. diff --git a/packages/muelu/test/unit_tests/ParameterList/MLParameterListInterpreter/CMakeLists.txt b/packages/muelu/test/unit_tests/ParameterList/MLParameterListInterpreter/CMakeLists.txt deleted file mode 100644 index ca8348a3c1ba..000000000000 --- a/packages/muelu/test/unit_tests/ParameterList/MLParameterListInterpreter/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -# Note about the use of wildcard in CMakeLists.txt: CMake dont't know -# when new files is added. You need to re-run CMake manually to -# regenerate a build system incorporating the new file. -# YOU MUST ALSO TOUCH A CMAKE CONFIGURATION FILE WHEN YOU PUSH THE NEW -# FILE TO FORCE THE RECONFIGURE ON OTHER PEOPLE'S BUILDS. -FILE(GLOB xmlFiles RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.xml) - -TRIBITS_COPY_FILES_TO_BINARY_DIR(ParameterList_MLParameterListInterpreter_cp - SOURCE_FILES ${xmlFiles} - ) diff --git a/packages/muelu/test/unit_tests/ParameterList/MLParameterListInterpreter/ml_SmootherParamAtTopLevel.xml b/packages/muelu/test/unit_tests/ParameterList/MLParameterListInterpreter/ml_SmootherParamAtTopLevel.xml deleted file mode 100644 index 8e53790faf4d..000000000000 --- a/packages/muelu/test/unit_tests/ParameterList/MLParameterListInterpreter/ml_SmootherParamAtTopLevel.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/packages/muelu/test/unit_tests/ParameterList/MLParameterListInterpreter/ml_SmootherParamMixed.xml b/packages/muelu/test/unit_tests/ParameterList/MLParameterListInterpreter/ml_SmootherParamMixed.xml deleted file mode 100644 index 05388abb6a8d..000000000000 --- a/packages/muelu/test/unit_tests/ParameterList/MLParameterListInterpreter/ml_SmootherParamMixed.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/packages/muelu/test/unit_tests/ParameterList/MLParameterListInterpreter/ml_SmootherParamPerLevel.xml b/packages/muelu/test/unit_tests/ParameterList/MLParameterListInterpreter/ml_SmootherParamPerLevel.xml deleted file mode 100644 index c2af11b7177b..000000000000 --- a/packages/muelu/test/unit_tests/ParameterList/MLParameterListInterpreter/ml_SmootherParamPerLevel.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/packages/muelu/test/unit_tests/ParameterList/MLParameterListInterpreter/ml_SmootherParamSubLists.xml b/packages/muelu/test/unit_tests/ParameterList/MLParameterListInterpreter/ml_SmootherParamSubLists.xml deleted file mode 100644 index dd4a963c5b76..000000000000 --- a/packages/muelu/test/unit_tests/ParameterList/MLParameterListInterpreter/ml_SmootherParamSubLists.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file