From ddcf589c9fcd6283a99886d8e5b999af95c0e3d6 Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Fri, 12 Aug 2011 15:08:10 +0000
Subject: [PATCH] Use FieldVector::dimension instead of FieldVector::size

[[Imported from SVN: r4356]]
---
 dune/solvers/iterationsteps/mmgstep.cc                      | 2 +-
 dune/solvers/solvers/cgsolver.hh                            | 2 +-
 dune/solvers/solvers/quadraticipopt.hh                      | 6 +++---
 dune/solvers/solvers/tcgsolver.hh                           | 2 +-
 .../transferoperators/compressedmultigridtransfer.hh        | 4 ++--
 dune/solvers/transferoperators/densemultigridtransfer.hh    | 4 ++--
 dune/solvers/transferoperators/multigridtransfer.hh         | 2 +-
 .../transferoperators/truncatedcompressedmgtransfer.hh      | 4 ++--
 dune/solvers/transferoperators/truncateddensemgtransfer.hh  | 4 ++--
 dune/solvers/transferoperators/truncatedmgtransfer.hh       | 4 ++--
 10 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/dune/solvers/iterationsteps/mmgstep.cc b/dune/solvers/iterationsteps/mmgstep.cc
index 0d53f2cb..a57e7008 100644
--- a/dune/solvers/iterationsteps/mmgstep.cc
+++ b/dune/solvers/iterationsteps/mmgstep.cc
@@ -212,7 +212,7 @@ void MonotoneMGStep<OperatorType, DiscFuncType>::iterate()
 #ifndef NDEBUG
         // Debug: is the current iterate really admissible?
         for (int i=0; i<obstacles[level].size(); i++)
-            for (int j=0; j<DiscFuncType::block_type::size; j++)
+            for (int j=0; j<DiscFuncType::block_type::dimension; j++)
                 if (x[level][i][j] < obstacles[level][i].lower(j)
                     || x[level][i][j] > obstacles[level][i].upper(j)) {
                     
diff --git a/dune/solvers/solvers/cgsolver.hh b/dune/solvers/solvers/cgsolver.hh
index 3360d91e..3ff937d5 100644
--- a/dune/solvers/solvers/cgsolver.hh
+++ b/dune/solvers/solvers/cgsolver.hh
@@ -11,7 +11,7 @@
 template <class MatrixType, class VectorType>
 class CGSolver : public IterativeSolver<VectorType>
 {
-    static const int blocksize = VectorType::block_type::size;
+    static const int blocksize = VectorType::block_type::dimension;
 
 public:     
 
diff --git a/dune/solvers/solvers/quadraticipopt.hh b/dune/solvers/solvers/quadraticipopt.hh
index b4a0bfb5..0d558519 100644
--- a/dune/solvers/solvers/quadraticipopt.hh
+++ b/dune/solvers/solvers/quadraticipopt.hh
@@ -38,7 +38,7 @@
 template <class MatrixType, class VectorType>
 class QuadraticIPOptProblem : public Ipopt::TNLP
 {
-    enum {blocksize = VectorType::block_type::size};
+    enum {blocksize = VectorType::block_type::dimension};
 
     typedef typename VectorType::field_type field_type;
 
@@ -513,10 +513,10 @@ finalize_solution(Ipopt::SolverReturn status,
 */
 template <class MatrixType, class VectorType>
 class QuadraticIPOptSolver 
-    : public IterativeSolver<VectorType>, public CanIgnore<Dune::BitSetVector<VectorType::block_type::size> >
+    : public IterativeSolver<VectorType>, public CanIgnore<Dune::BitSetVector<VectorType::block_type::dimension> >
 {
 
-    enum {blocksize = VectorType::block_type::size};
+    enum {blocksize = VectorType::block_type::dimension};
 
     typedef typename VectorType::field_type field_type;
 
diff --git a/dune/solvers/solvers/tcgsolver.hh b/dune/solvers/solvers/tcgsolver.hh
index 0bd03648..07d2779c 100644
--- a/dune/solvers/solvers/tcgsolver.hh
+++ b/dune/solvers/solvers/tcgsolver.hh
@@ -11,7 +11,7 @@
 template <class MatrixType, class VectorType>
 class TruncatedCGSolver : public IterativeSolver<VectorType>
 {
-    static const int blocksize = VectorType::block_type::size;
+    static const int blocksize = VectorType::block_type::dimension;
 
     typedef typename VectorType::field_type field_type;
 
diff --git a/dune/solvers/transferoperators/compressedmultigridtransfer.hh b/dune/solvers/transferoperators/compressedmultigridtransfer.hh
index 29d665ae..37b3ea74 100644
--- a/dune/solvers/transferoperators/compressedmultigridtransfer.hh
+++ b/dune/solvers/transferoperators/compressedmultigridtransfer.hh
@@ -23,12 +23,12 @@ template<
     class VectorType,
     class BitVectorType = Dune::BitSetVector<VectorType::block_type::dimension>,
     class MatrixType = Dune::BCRSMatrix< typename Dune::FieldMatrix<
-        typename VectorType::field_type, VectorType::block_type::size, VectorType::block_type::size> > >
+        typename VectorType::field_type, VectorType::block_type::dimension, VectorType::block_type::dimension> > >
 class CompressedMultigridTransfer :
     public MultigridTransfer<VectorType,BitVectorType,MatrixType>
 {
 
-    enum {blocksize = VectorType::block_type::size};
+    enum {blocksize = VectorType::block_type::dimension};
 
     typedef typename VectorType::field_type field_type;
 
diff --git a/dune/solvers/transferoperators/densemultigridtransfer.hh b/dune/solvers/transferoperators/densemultigridtransfer.hh
index 3a785e3c..ae1258ce 100644
--- a/dune/solvers/transferoperators/densemultigridtransfer.hh
+++ b/dune/solvers/transferoperators/densemultigridtransfer.hh
@@ -23,12 +23,12 @@ template<
     class VectorType,
     class BitVectorType = Dune::BitSetVector<VectorType::block_type::dimension>,
     class MatrixType = Dune::BCRSMatrix< typename Dune::FieldMatrix<
-        typename VectorType::field_type, VectorType::block_type::size, VectorType::block_type::size> > >
+        typename VectorType::field_type, VectorType::block_type::dimension, VectorType::block_type::dimension> > >
 class DenseMultigridTransfer :
     public MultigridTransfer<VectorType,BitVectorType,MatrixType>
 {
 
-    enum {blocksize = VectorType::block_type::size};
+    enum {blocksize = VectorType::block_type::dimension};
 
     typedef typename VectorType::field_type field_type;
 
diff --git a/dune/solvers/transferoperators/multigridtransfer.hh b/dune/solvers/transferoperators/multigridtransfer.hh
index 455727a8..f7fbdf63 100644
--- a/dune/solvers/transferoperators/multigridtransfer.hh
+++ b/dune/solvers/transferoperators/multigridtransfer.hh
@@ -18,7 +18,7 @@ template<
     class VectorType,
     class BitVectorType = Dune::BitSetVector<VectorType::block_type::dimension>,
     class MatrixType = Dune::BCRSMatrix< typename Dune::FieldMatrix<
-        typename VectorType::field_type, VectorType::block_type::size, VectorType::block_type::size> > >
+        typename VectorType::field_type, VectorType::block_type::dimension, VectorType::block_type::dimension> > >
 class MultigridTransfer {
 
 public:
diff --git a/dune/solvers/transferoperators/truncatedcompressedmgtransfer.hh b/dune/solvers/transferoperators/truncatedcompressedmgtransfer.hh
index f7b4bd82..8fc17d55 100644
--- a/dune/solvers/transferoperators/truncatedcompressedmgtransfer.hh
+++ b/dune/solvers/transferoperators/truncatedcompressedmgtransfer.hh
@@ -25,13 +25,13 @@ template<
     class VectorType,
     class BitVectorType = Dune::BitSetVector<VectorType::block_type::dimension>,
     class MatrixType = Dune::BCRSMatrix< typename Dune::FieldMatrix<
-        typename VectorType::field_type, VectorType::block_type::size, VectorType::block_type::size> > >
+        typename VectorType::field_type, VectorType::block_type::dimension, VectorType::block_type::dimension> > >
 class TruncatedCompressedMGTransfer :
     public CompressedMultigridTransfer<VectorType, BitVectorType, MatrixType>,
     public TruncatedMGTransfer<VectorType, BitVectorType, MatrixType>
 {
 
-    enum {blocksize = VectorType::block_type::size};
+    enum {blocksize = VectorType::block_type::dimension};
 
     typedef typename VectorType::field_type field_type;
 
diff --git a/dune/solvers/transferoperators/truncateddensemgtransfer.hh b/dune/solvers/transferoperators/truncateddensemgtransfer.hh
index 46ae1c80..2159caa3 100644
--- a/dune/solvers/transferoperators/truncateddensemgtransfer.hh
+++ b/dune/solvers/transferoperators/truncateddensemgtransfer.hh
@@ -24,13 +24,13 @@ template<
     class VectorType,
     class BitVectorType = Dune::BitSetVector<VectorType::block_type::dimension>,
     class MatrixType = Dune::BCRSMatrix< typename Dune::FieldMatrix<
-        typename VectorType::field_type, VectorType::block_type::size, VectorType::block_type::size> > >
+        typename VectorType::field_type, VectorType::block_type::dimension, VectorType::block_type::dimension> > >
 class TruncatedDenseMGTransfer :
     public DenseMultigridTransfer<VectorType, BitVectorType, MatrixType>,
     public TruncatedMGTransfer<VectorType, BitVectorType, MatrixType>
 {
 
-    enum {blocksize = VectorType::block_type::size};
+    enum {blocksize = VectorType::block_type::dimension};
 
     typedef typename VectorType::field_type field_type;
 
diff --git a/dune/solvers/transferoperators/truncatedmgtransfer.hh b/dune/solvers/transferoperators/truncatedmgtransfer.hh
index d6a21635..f6b6653a 100644
--- a/dune/solvers/transferoperators/truncatedmgtransfer.hh
+++ b/dune/solvers/transferoperators/truncatedmgtransfer.hh
@@ -21,11 +21,11 @@ template<
     class VectorType,
     class BitVectorType = Dune::BitSetVector<VectorType::block_type::dimension>,
     class MatrixType = Dune::BCRSMatrix< typename Dune::FieldMatrix<
-        typename VectorType::field_type, VectorType::block_type::size, VectorType::block_type::size> > >
+        typename VectorType::field_type, VectorType::block_type::dimension, VectorType::block_type::dimension> > >
 class TruncatedMGTransfer
 {
 
-    enum {blocksize = VectorType::block_type::size};
+    enum {blocksize = VectorType::block_type::dimension};
 
     typedef typename VectorType::field_type field_type;
 
-- 
GitLab