Use FieldVector::dimension instead of FieldVector::size

[[Imported from SVN: r4356]]

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)) {
                     

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:     
 

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;
 

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;
 

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;
 

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;
 

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:

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;
 

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;
 

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;