Remove Epetra_Operator from FSIMatrixFree

Author: maxfirmbach

src/fsi/src/partitioned/nonlinear_solver/4C_fsi_nox_jacobian.cpp

@@ -52,7 +52,7 @@ NOX::FSI::FSIMatrixFree::FSIMatrixFree(Teuchos::ParameterList& printParams,
   }
 }
 
-Epetra_Operator& NOX::FSI::FSIMatrixFree::epetra_operator() { return *this; }
+Epetra_Operator& NOX::FSI::FSIMatrixFree::epetra_operator() { FOUR_C_THROW("Not implemented"); }
 
 void NOX::FSI::FSIMatrixFree::zero() { FOUR_C_THROW("Not implemented"); }
 
@@ -133,7 +133,6 @@ void NOX::FSI::FSIMatrixFree::multiply(bool TransA, const Core::LinAlg::MultiVec
         << "ERROR: FSIMatrixFree::multiply() - Transpose is unavailable in Matrix-Free mode!"
         << std::endl;
     throw "NOX Error";
-    return;
   }
 
   // Calculate the matrix-vector product:
@@ -193,77 +192,6 @@ void NOX::FSI::FSIMatrixFree::multiply(bool TransA, const Core::LinAlg::MultiVec
   // scale back
   // nevY.update(xscale, perturbY, 0.0);
   nevY.update(1., perturbY, 0.0);
-
-  return;
-}
-
-int NOX::FSI::FSIMatrixFree::SetUseTranspose(bool UseTranspose)
-{
-  FOUR_C_THROW("Not implemented");
-  return -1;
-}
-
-
-int NOX::FSI::FSIMatrixFree::Apply(const Epetra_MultiVector& X, Epetra_MultiVector& Y) const
-{
-  FOUR_C_THROW("Not implemented");
-  return -1;
-}
-
-
-int NOX::FSI::FSIMatrixFree::ApplyInverse(const Epetra_MultiVector& X, Epetra_MultiVector& Y) const
-{
-  FOUR_C_THROW("Not implemented");
-  return -1;
-}
-
-
-double NOX::FSI::FSIMatrixFree::NormInf() const
-{
-  FOUR_C_THROW("Not implemented");
-  return 1.0;
-}
-
-
-const char* NOX::FSI::FSIMatrixFree::Label() const
-{
-  FOUR_C_THROW("Not implemented");
-  return label.c_str();
-}
-
-
-bool NOX::FSI::FSIMatrixFree::UseTranspose() const
-{
-  FOUR_C_THROW("Not implemented");
-  return false;
-}
-
-
-bool NOX::FSI::FSIMatrixFree::HasNormInf() const
-{
-  FOUR_C_THROW("Not implemented");
-  return false;
-}
-
-
-const Epetra_Comm& NOX::FSI::FSIMatrixFree::Comm() const
-{
-  FOUR_C_THROW("Not implemented");
-  return Core::Communication::as_epetra_comm(currentX.get_linalg_vector().get_map().get_comm());
-}
-
-
-const Epetra_Map& NOX::FSI::FSIMatrixFree::OperatorDomainMap() const
-{
-  FOUR_C_THROW("Not implemented");
-  return *epetraMap;
-}
-
-
-const Epetra_Map& NOX::FSI::FSIMatrixFree::OperatorRangeMap() const
-{
-  FOUR_C_THROW("Not implemented");
-  return *epetraMap;
 }
 
 

src/fsi/src/partitioned/nonlinear_solver/4C_fsi_nox_jacobian.hpp

@@ -21,9 +21,6 @@
 
 #include <memory>
 
-// Forward Declarations
-class Map;
-
 FOUR_C_NAMESPACE_OPEN
 
 namespace NOX
@@ -37,8 +34,7 @@ namespace NOX
   {
     /// Matrix Free Newton Krylov based on an approximation of the residuum derivatives
     class FSIMatrixFree : public Core::LinAlg::SparseOperator,
-                          public virtual NOX::Nln::Interface::JacobianBase,
-                          public Epetra_Operator
+                          public virtual NOX::Nln::Interface::JacobianBase
     {
      public:
       /*! \brief Constructor
@@ -93,65 +89,6 @@ namespace NOX
       void multiply(bool TransA, const Core::LinAlg::MultiVector<double>& X,
           Core::LinAlg::MultiVector<double>& Y) const override;
 
-
-      // Methods of Epetra_Operator interface
-      //! If set true, transpose of this operator will be applied.
-      /*! This flag allows the transpose of the given operator to be used implicitly.  Setting this
-        flag affects only the Apply() and ApplyInverse() methods.  If the implementation of this
-        interface does not support transpose use, this method should return a value of -1. \param
-        UseTranspose -If true, multiply by the transpose of operator, otherwise just use operator.
-
-        \return Integer error code, set to 0 if successful.  Set to -1 if this implementation does
-        not support transpose.
-      */
-      int SetUseTranspose(bool UseTranspose) override;
-
-      //! Returns the result of a Epetra_Operator applied to a Epetra_MultiVector X in Y.
-      /*!
-        \param     X - A Epetra_MultiVector of dimension NumVectors to multiply with matrix.
-        \param     Y - A Epetra_MultiVector of dimension NumVectors containing result.
-
-        \return Integer error code, set to 0 if successful.
-      */
-      int Apply(const Epetra_MultiVector& X, Epetra_MultiVector& Y) const override;
-
-      //! Returns the result of a Epetra_Operator inverse applied to an Epetra_MultiVector X in Y.
-      /*!
-        \param     X - A Epetra_MultiVector of dimension NumVectors to solve for.
-        \param     Y -A Epetra_MultiVector of dimension NumVectors containing result.
-
-        \return Integer error code, set to 0 if successful.
-
-        \warning In order to work with an iterative solver, any implementation of this method must
-        support the case where X and Y are the same object.
-      */
-      int ApplyInverse(const Epetra_MultiVector& X, Epetra_MultiVector& Y) const override;
-
-      //! Returns the infinity norm of the global matrix.
-      /* Returns the quantity \f$ \| A \|_\infty\f$ such that
-         \f[\| A \|_\infty = \max_{1\lei\lem} \sum_{j=1}^n |a_{ij}| \f].
-
-         \warning This method must not be called unless HasNormInf() returns true.    */
-      double NormInf() const override;
-
-      //! Returns a character string describing the operator
-      const char* Label() const override;
-
-      //! Returns the current UseTranspose setting.
-      bool UseTranspose() const override;
-
-      //! Returns true if the \e this object can provide an approximate Inf-norm, false otherwise.
-      bool HasNormInf() const override;
-
-      //! Returns a reference to the Epetra_Comm communicator associated with this operator.
-      const Epetra_Comm& Comm() const override;
-
-      //! Returns the Core::LinAlg::Map object associated with the domain of this matrix operator.
-      const Epetra_Map& OperatorDomainMap() const override;
-
-      //! Returns the Core::LinAlg::Map object associated with the range of this matrix operator.
-      const Epetra_Map& OperatorRangeMap() const override;
-
       //! Compute Jacobian given the specified input vector, x.  Returns true if computation was
       //! successful.
       bool compute_jacobian(