From: kanschat <kanschat@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Wed, 28 Sep 2011 01:56:07 +0000 (+0000)
Subject: updated tests
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a0a9267c2b65106165ed43b3bc0c03ac0d8c5c7;p=dealii-svn.git

updated tests

git-svn-id: https://svn.dealii.org/trunk@24452 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/tests/lac/solver_relaxation_02.cc b/tests/lac/solver_relaxation_02.cc
index 268e686065..65de156ff5 100644
--- a/tests/lac/solver_relaxation_02.cc
+++ b/tests/lac/solver_relaxation_02.cc
@@ -79,19 +79,17 @@ int main()
 	{
 	  deallog << "Block size " << blocksize << std::endl;
 
-	  const unsigned int n_blocks = dim/blocksize;
-	  std::vector<unsigned int> indices(blocksize);
-	  
+	  const unsigned int n_blocks = dim/blocksize;	  
 	  RelaxationBlock<SparseMatrix<double>,double>::AdditionalData relax_data(0.8);
 	  PreconditionBlock<SparseMatrix<double>,double>::AdditionalData prec_data(blocksize, 0.8);
 	  
-	  relax_data.block_list.initialize(n_blocks);
+	  relax_data.block_list.reinit(n_blocks, dim, blocksize);
 	  for (unsigned int block=0;block<n_blocks;++block)
 	    {
 	      for (unsigned int i=0;i<blocksize;++i)
-		indices[i] = i+block*blocksize;
-	      relax_data.block_list.add(block, indices);
+		relax_data.block_list.add(block, i+block*blocksize);
 	    }
+	  relax_data.block_list.compress();
 	  
 	  PreconditionBlockJacobi<SparseMatrix<double>,double> prec_jacobi;
 	  prec_jacobi.initialize(A, prec_data);
diff --git a/tests/lac/solver_relaxation_03.cc b/tests/lac/solver_relaxation_03.cc
index 205244cef7..7050b697d4 100644
--- a/tests/lac/solver_relaxation_03.cc
+++ b/tests/lac/solver_relaxation_03.cc
@@ -84,9 +84,7 @@ int main()
 	{
 	  deallog << "Block size " << blocksize << std::endl;
 
-	  const unsigned int n_blocks = dim/blocksize;
-	  std::vector<unsigned int> indices(blocksize);
-
+	  const unsigned int n_blocks = dim/blocksize;	  
 	  RelaxationBlock<SparseMatrix<double>,double>::AdditionalData relax_data(0.8);
 	  PreconditionBlock<SparseMatrix<double>,double>::AdditionalData prec_data(blocksize, 0.8);
 	  
@@ -94,14 +92,14 @@ int main()
 	  std::vector<unsigned int> bperm(n_blocks);
 	  std::vector<unsigned int> ibperm(n_blocks);
 	  
-	  relax_data.block_list.initialize(n_blocks);
+	  relax_data.block_list.reinit(n_blocks, dim, blocksize);
 	  for (unsigned int block=0;block<n_blocks;++block)
 	    {
 	      bperm[block] = n_blocks-block-1;
 	      for (unsigned int i=0;i<blocksize;++i)
-		indices[i] = i+block*blocksize;
-	      relax_data.block_list.add(block, indices);
+		relax_data.block_list.add(block, i+block*blocksize);
 	    }
+	  relax_data.block_list.compress();
 					   // Currently, bperm is just
 					   // the inversion.
 					   // Now swap the last two