Remove Epetra

CMakeLists.txt

@@ -148,8 +148,6 @@ include(CTest)
 ## Check for some required Trilinos package dependencies (Piro, Phalanx) ##
 MESSAGE("Checking Trilinos build for required and optional packages")
 
-OPTION(ENABLE_ALBANY_EPETRA "Flag to turn on building of code depending on Epetra" ON)
-
 OPTION(ENABLE_ALBANY_PYTHON "Flag to turn on building of code depending on Python" OFF)
 
 ###############################
@@ -287,15 +285,6 @@ ELSE()
   SET(ALBANY_STOKHOS FALSE)
 ENDIF()
 
-# set optional dependency on Belos's Epetra subpackage
-IF (EXISTS "${Trilinos_INCLUDE_DIRS}/BelosEpetraAdapter.hpp")
-  MESSAGE("-- Looking for BelosEpetra ...                   Found.")
-  SET(ALBANY_BELOS_EPETRA TRUE)
-ELSE ()
-  MESSAGE("-- Looking for BelosEpetra ...               NOT Found.")
-  SET(ALBANY_BELOS_EPETRA FALSE)
-ENDIF()
-
 # set optional dependency on Amesos2, for solving and preconditioning
 LIST(FIND Trilinos_PACKAGE_LIST Amesos2 Amesos2_List_ID)
 IF (Amesos2_List_ID GREATER -1)
@@ -459,28 +448,6 @@ IF (DEFINED CMAKE_BUILD_TYPE)
       SET(ALBANY_DEBUG_BUILD OFF)
    ENDIF()
 ENDIF()
-# Set optional build of code depending on Epetra.
-# Be default, it will be on, so both Tpetra and Epetra capabilities are built.
-# Ideally, one should not need Epetra though, since the Tpetra stack in
-# Trilinos *should* be a superset of the Epetra one (in terms of capabilities,
-# not structures, obviously).
-
-IF (ENABLE_ALBANY_EPETRA)
-  MESSAGE("-- ALBANY_EPETRA                           Enabled.")
-  SET(ALBANY_EPETRA TRUE)
-
-  # If Epetra build is requested, the ThyraEpetraAdapter package  in Trilinos is required
-  LIST(FIND Trilinos_PACKAGE_LIST ThyraEpetraAdapters ThyraEpetraAdapters_ID)
-  IF (ThyraEpetraAdapters_ID GREATER -1)
-    MESSAGE("  -- Looking for ThyraEpetraAdapters       Found.")
-  ELSE()
-    MESSAGE("  -- Looking for ThyraEpetraAdapters   NOT Found.")
-    MESSAGE (FATAL_ERROR "ENABLE_ALBANY_EPETRA=ON requires ThyraEpetraAdapters in Trilinos.\n")
-  ENDIF()
-ELSE()
-  MESSAGE("-- ALBANY_EPETRA                     NOT Enabled.")
-  SET(ALBANY_EPETRA FALSE)
-ENDIF()
 
 IF (ENABLE_ALBANY_PYTHON)
   MESSAGE("-- ALBANY_PYTHON                           Enabled.")
@@ -610,9 +577,6 @@ MESSAGE("\nMiscellaneous Albany Options:\n")
 
 # Optional CUDA settings
 IF(Kokkos_ENABLE_CUDA)
-  IF (ENABLE_ALBANY_EPETRA)
-    MESSAGE(FATAL_ERROR "\nError: Albany with Epetra is not supported with CUDA KokkosNode!  Please re-configure w/o Epetra (ENABLE_ALBANY_EPETRA=OFF).")
-  ENDIF()
   SET(KOKKOS_NDEVICES "--kokkos-map-device-id-by=mpi_rank")
   IF (ENABLE_CUDA_ERROR_CHECK)
     SET(ALBANY_CUDA_ERROR_CHECK ON)

pyAlbany/examples/extremeEvent/thermal_steady.yaml

@@ -1,7 +1,6 @@
 %YAML 1.1
 ---
 ANONYMOUS:
-  Build Type: Tpetra
   Problem:
     Phalanx Graph Visualization Detail: 1
     Name: Thermal 2D

pyAlbany/examples/extremeEvent/thermal_steady_2.yaml

@@ -1,7 +1,6 @@
 %YAML 1.1
 ---
 ANONYMOUS:
-  Build Type: Tpetra
   Problem:
     Name: Thermal 2D
     Solution Method: Steady

pyAlbany/examples/landIce/FO_GIS/input_fo_gis_analysis_beta_smbT.yaml

@@ -1,7 +1,6 @@
 %YAML 1.1
 ---
 ANONYMOUS:
-  Build Type: Tpetra
   Debug Output: {}
   Problem:
     Phalanx Graph Visualization Detail: 1

pyAlbany/examples/paper/input_distributed.yaml

@@ -1,7 +1,6 @@
 %YAML 1.1
 ---
 ANONYMOUS:
-  Build Type: Tpetra
   Problem: 
     Name: Heat 2D
     Compute Sensitivities: true

pyAlbany/examples/paper/input_scalar.yaml

@@ -1,7 +1,6 @@
 %YAML 1.1
 ---
 ANONYMOUS:
-  Build Type: Tpetra
   Problem: 
     Name: Heat 2D
     Compute Sensitivities: true

pyAlbany/examples/paper/input_scalar_to_update.yaml

@@ -1,7 +1,6 @@
 %YAML 1.1
 ---
 ANONYMOUS:
-  Build Type: Tpetra
   Problem: 
     Name: Heat 2D
     Compute Sensitivities: true

pyAlbany/examples/performanceAnalysis/input_conductivity_dist_paramT.yaml

@@ -1,7 +1,6 @@
 %YAML 1.1
 ---
 ANONYMOUS:
-  Build Type: Tpetra
   Problem: 
     Name: Heat 2D
     Compute Sensitivities: true

pyAlbany/examples/tutorial/input_conductivity_dist_paramT.yaml

@@ -1,7 +1,6 @@
 %YAML 1.1
 ---
 ANONYMOUS:
-  Build Type: Tpetra
   Problem: 
     Name: Heat 2D
     Compute Sensitivities: true

pyAlbany/examples/uncertaintyQuantification/input_dirichletT.yaml

@@ -1,7 +1,6 @@
 %YAML 1.1
 ---
 ANONYMOUS:
-  Build Type: Tpetra
   Problem: 
     Name: Heat 2D
     Compute Sensitivities: true

pyAlbany/src/Albany_Interface.cpp

@@ -93,20 +93,6 @@ PyProblem::PyProblem(std::string filename, Teuchos::RCP<PyParallelEnv> _pyParall
 
     slvrfctry = rcp(new Albany::SolverFactory(filename, comm));
 
-    auto const &bt = slvrfctry->getParameters()->get<std::string>("Build Type", "NONE");
-
-    if (bt == "Tpetra")
-    {
-        // Set the static variable that denotes this as a Tpetra run
-        static_cast<void>(Albany::build_type(Albany::BuildType::Tpetra));
-    }
-    else
-    {
-        TEUCHOS_TEST_FOR_EXCEPTION(true, Teuchos::Exceptions::InvalidArgument,
-                                   "Error! Invalid choice (" + bt + ") for 'BuildType'.\n"
-                                                                    "       The only valid choice for PyAlbany is 'Tpetra'.\n");
-    }
-
     // Make sure all the pb factories are registered *before* the Application
     // is created (since in the App ctor the pb factories are queried)
     Albany::register_pb_factories();
@@ -153,20 +139,6 @@ PyProblem::PyProblem(Teuchos::RCP<Teuchos::ParameterList> params, Teuchos::RCP<P
 
     slvrfctry = rcp(new Albany::SolverFactory(params, comm));
 
-    auto const &bt = slvrfctry->getParameters()->get<std::string>("Build Type", "NONE");
-
-    if (bt == "Tpetra")
-    {
-        // Set the static variable that denotes this as a Tpetra run
-        static_cast<void>(Albany::build_type(Albany::BuildType::Tpetra));
-    }
-    else
-    {
-        TEUCHOS_TEST_FOR_EXCEPTION(true, Teuchos::Exceptions::InvalidArgument,
-                                   "Error! Invalid choice (" + bt + ") for 'BuildType'.\n"
-                                                                    "       The only valid choice for PyAlbany is 'Tpetra'.\n");
-    }
-
     // Make sure all the pb factories are registered *before* the Application
     // is created (since in the App ctor the pb factories are queried)
     Albany::register_pb_factories();

pyAlbany/tests/extremeEvent/thermal_steady.yaml

@@ -1,7 +1,6 @@
 %YAML 1.1
 ---
 ANONYMOUS:
-  Build Type: Tpetra
   Problem:
     Name: Thermal 2D
     Solution Method: Steady

pyAlbany/tests/extremeEvent/thermal_steady_hessian.yaml

@@ -1,7 +1,6 @@
 %YAML 1.1
 ---
 ANONYMOUS:
-  Build Type: Tpetra
   Problem:
     Name: Thermal 2D
     Solution Method: Steady

pyAlbany/tests/inputOutput/input.yaml

@@ -1,7 +1,6 @@
 %YAML 1.1
 ---
 ANONYMOUS:
-  Build Type: Tpetra
   Problem: 
     Name: Heat 2D
     Compute Sensitivities: true

pyAlbany/tests/randCompress/inputT_MueLu.yaml

@@ -1,7 +1,6 @@
 %YAML 1.1
 ---
 ANONYMOUS:
-  Build Type: Tpetra
   Problem: 
     Name: Heat 2D
     Compute Sensitivities: true

pyAlbany/tests/randCompress/input_conductivity_dist_paramT.yaml

@@ -1,7 +1,6 @@
 %YAML 1.1
 ---
 ANONYMOUS:
-  Build Type: Tpetra
   Problem: 
     Name: Heat 2D
     Compute Sensitivities: true

pyAlbany/tests/steadyHeat/input_conductivity_dist_paramT.yaml

@@ -1,7 +1,6 @@
 %YAML 1.1
 ---
 ANONYMOUS:
-  Build Type: Tpetra
   Problem: 
     Name: Heat 2D
     Compute Sensitivities: true

pyAlbany/tests/steadyHeat/input_dirichlet_mixed_paramsT.yaml

@@ -1,7 +1,6 @@
 %YAML 1.1
 ---
 ANONYMOUS:
-  Build Type: Tpetra
   Problem: 
     Name: Heat 2D
     Compute Sensitivities: true

src/Albany_Application.cpp

@@ -134,10 +134,6 @@ Application::initialSetUp(const RCP<Teuchos::ParameterList>& params)
   comm->Barrier();
 #endif
 
-#if !defined(ALBANY_EPETRA)
-  removeEpetraRelatedPLs(params);
-#endif
-
   // Create problem object
   problemParams = Teuchos::sublist(params, "Problem", true);
 
@@ -418,7 +414,6 @@ Application::initialSetUp(const RCP<Teuchos::ParameterList>& params)
       Teuchos::sublist(params, "Debug Output", true);
   writeToMatrixMarketJac =
       debugParams->get("Write Jacobian to MatrixMarket", 0);
-  computeJacCondNum = debugParams->get("Compute Jacobian Condition Number", 0);
   writeToMatrixMarketRes =
       debugParams->get("Write Residual to MatrixMarket", 0);
   writeToMatrixMarketSoln =
@@ -476,14 +471,7 @@ Application::initialSetUp(const RCP<Teuchos::ParameterList>& params)
             << "Invalid Parameter Write Solution to Standard Output.  "
                "Acceptable values are -1, 0, 1, 2, ... \n");
   }
-  if (computeJacCondNum < -1) {
-    TEUCHOS_TEST_FOR_EXCEPTION(
-        true,
-        Teuchos::Exceptions::InvalidParameter,
-             "\nError in Albany::Application constructor:  "
-            << "Invalid Parameter Compute Jacobian Condition Number.  "
-               "Acceptable values are -1, 0, 1, 2, ...\n");
-  }
+
   countJac = 0;  // initiate counter that counts instances of Jacobian matrix to
                  // 0
   countRes = 0;  // initiate counter that counts instances of residual vector to
@@ -1593,9 +1581,8 @@ Application::computeGlobalJacobianImpl(
     if (!workset.f.is_null()) {
       workset.f_kokkos = getNonconstDeviceData(workset.f);
     }
-    if (build_type()!=BuildType::Epetra) {
-      workset.Jac_kokkos = getNonconstDeviceData(workset.Jac);
-    }
+
+    workset.Jac_kokkos = getNonconstDeviceData(workset.Jac);
 #endif
     for (int ws = 0; ws < numWorksets; ws++) {
       const std::string evalName = PHAL::evalName<EvalT>("FM", wsPhysIndex[ws]);
@@ -1760,38 +1747,8 @@ Application::computeGlobalJacobian(
       describe(jac.getConst(), *out, Teuchos::VERB_EXTREME);
     }
   }
-  if (computeJacCondNum !=
-      0) {  // If requesting computation of condition number
-#if defined(ALBANY_EPETRA)
-    if (computeJacCondNum == -1) {
-      // cout jacobian condition # every time it arises
-      double condNum = computeConditionNumber(jac);
-      *out << "Jacobian #" << countJac << " condition number = " << condNum
-           << "\n";
-    } else if (countJac == computeJacCondNum) {
-      // cout jacobian condition # only at requested count#
-      double condNum = computeConditionNumber(jac);
-      *out << "Jacobian #" << countJac << " condition number = " << condNum
-           << "\n";
-    }
-#else
-    TEUCHOS_TEST_FOR_EXCEPTION(
-        true,
-        std::logic_error,
-        "Error in Albany::Application: Compute Jacobian Condition Number debug "
-        "option "
-        "currently relies on an Epetra-based routine in AztecOO.\n To use this "
-        "option, please "
-        "rebuild Albany with ENABLE_ALBANY_EPETRA=ON.\nYou will then be able "
-        "to have Albany "
-        "output the Jacobian condition number when running either the Tpetra "
-        "or Epetra stack.\n"
-        "Notice that ENABLE_ALBANY_EPETRA is ON by default, so you must have "
-        "disabled it explicitly.\n");
-#endif
-  }
-  if (writeToMatrixMarketJac != 0 || writeToCoutJac != 0 ||
-      computeJacCondNum != 0) {
+
+  if (writeToMatrixMarketJac != 0 || writeToCoutJac != 0) {
     countJac++;  // increment Jacobian counter
   }
   // Debut output - residual
@@ -3583,38 +3540,4 @@ Application::setupTangentWorksetInfo(
   workset.param_offset = param_offset;
 }
 
-void
-Application::removeEpetraRelatedPLs(
-    const Teuchos::RCP<Teuchos::ParameterList>& params)
-{
-  if (params->isSublist("Piro")) {
-    Teuchos::ParameterList& piroPL = params->sublist("Piro", true);
-    if (piroPL.isSublist("NOX")) {
-      Teuchos::ParameterList& noxPL = piroPL.sublist("NOX", true);
-      if (noxPL.isSublist("Direction")) {
-        Teuchos::ParameterList& dirPL = noxPL.sublist("Direction", true);
-        if (dirPL.isSublist("Newton")) {
-          Teuchos::ParameterList& newPL = dirPL.sublist("Newton", true);
-          if (newPL.isSublist("Stratimikos Linear Solver")) {
-            Teuchos::ParameterList& stratPL =
-                newPL.sublist("Stratimikos Linear Solver", true);
-            if (stratPL.isSublist("Stratimikos")) {
-              Teuchos::ParameterList& strataPL =
-                  stratPL.sublist("Stratimikos", true);
-              if (strataPL.isSublist("AztecOO")) {
-                strataPL.remove("AztecOO", true);
-              }
-              if (strataPL.isSublist("Linear Solver Types")) {
-                Teuchos::ParameterList& lsPL =
-                    strataPL.sublist("Linear Solver Types", true);
-                if (lsPL.isSublist("AztecOO")) { lsPL.remove("AztecOO", true); }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
 }  // namespace Albany

src/Albany_Application.hpp

@@ -1031,9 +1031,6 @@ void
   void
   defineTimers();
 
-  void
-  removeEpetraRelatedPLs(const Teuchos::RCP<Teuchos::ParameterList>& params);
-
  public:
   //! Routine to get workset (bucket) size info needed by all Evaluation types
   void
@@ -1216,7 +1213,6 @@ void
   int writeToMatrixMarketJac;
   int writeToMatrixMarketRes;
   int writeToMatrixMarketSoln;
-  int computeJacCondNum;
   //! Integer specifying whether user wants to write Jacobian, residual and solution to
   //! Standard output (cout)
   int writeToCoutJac;