From 6b4af76fb3967b274c1ac5b21f23a90811a04170 Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Mon, 14 Dec 2015 09:50:41 +0100
Subject: [PATCH] Remove the methods rowdim and coldim from the Matrix class
The information has been provided by the MatrixDimensions struct since roughly the end of 2010.
Correspondingly, the methods rowdim and coldim have been removed from the istl matrix implementations.
Apparently, we forgot to remove them from the Matrix class.
---
doc/istl.tex | 4 ----
dune/istl/matrix.hh | 48 ---------------------------------------------
2 files changed, 52 deletions(-)
diff --git a/doc/istl.tex b/doc/istl.tex
index 93bf8fdab..901292d54 100644
--- a/doc/istl.tex
+++ b/doc/istl.tex
@@ -493,10 +493,6 @@ complete list of names.
\hline
\texttt{M::N()} & \texttt{int} & row blocks\\
\texttt{M::M()} & \texttt{int} & col blocks\\
-\texttt{M::rowdim(int)} & \texttt{int} & dim.~of row block\\
-\texttt{M::rowdim()} & \texttt{int} & dim.~of row space\\
-\texttt{M::coldim(int)} & \texttt{int} & dim.~of col block\\
-\texttt{M::coldim()} & \texttt{int} & dim.~of col space\\
\texttt{M::exists(int i, int j)} & \texttt{bool} &\\
\hline
\end{tabular}
diff --git a/dune/istl/matrix.hh b/dune/istl/matrix.hh
index ac6b18997..7daa1c93c 100644
--- a/dune/istl/matrix.hh
+++ b/dune/istl/matrix.hh
@@ -166,54 +166,6 @@ namespace Dune {
return cols_;
}
- /** \brief The number of scalar rows */
- size_type rowdim() const {
-#ifdef DUNE_ISTL_WITH_CHECKING
- if (M()==0)
- DUNE_THROW(ISTLError, "Can't compute rowdim() when there are no columns!");
-#endif
- size_type dim = 0;
- for (size_type i=0; i<data_.N(); i++)
- dim += data_[i][0].rowdim();
-
- return dim;
- }
-
- /** \brief The number of scalar columns */
- size_type coldim() const {
-#ifdef DUNE_ISTL_WITH_CHECKING
- if (N()==0)
- DUNE_THROW(ISTLError, "Can't compute coldim() when there are no rows!");
-#endif
- size_type dim = 0;
- for (size_type i=0; i<data_[0].size(); i++)
- dim += data_[0][i].coldim();
-
- return dim;
- }
-
- /** \brief The number of scalar rows */
- size_type rowdim(size_type r) const {
-#ifdef DUNE_ISTL_WITH_CHECKING
- if (r<0 || r>=N())
- DUNE_THROW(ISTLError, "Rowdim for nonexisting row " << r << " requested!");
- if (M()==0)
- DUNE_THROW(ISTLError, "Can't compute rowdim() when there are no columns!");
-#endif
- return data_[r][0].rowdim();
- }
-
- /** \brief The number of scalar columns */
- size_type coldim(size_type c) const {
-#ifdef DUNE_ISTL_WITH_CHECKING
- if (c<0 || c>=M())
- DUNE_THROW(ISTLError, "Coldim for nonexisting column " << c << " requested!");
- if (N()==0)
- DUNE_THROW(ISTLError, "Can't compute coldim() when there are no rows!");
-#endif
- return data_[0][c].coldim();
- }
-
/** \brief Multiplication with a scalar */
Matrix<T>& operator*=(const field_type& scalar) {
data_ *= scalar;
--
GitLab