From: kanschat Date: Fri, 17 Jun 2011 21:45:56 +0000 (+0000) Subject: stop copying BlockList X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e37d6737749523c03e76d2a340f671d5db53c847;p=dealii-svn.git stop copying BlockList git-svn-id: https://svn.dealii.org/trunk@23839 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/lac/solver_relaxation_02.cc b/tests/lac/solver_relaxation_02.cc index 7777f5b86e..268e686065 100644 --- a/tests/lac/solver_relaxation_02.cc +++ b/tests/lac/solver_relaxation_02.cc @@ -80,20 +80,19 @@ int main() deallog << "Block size " << blocksize << std::endl; const unsigned int n_blocks = dim/blocksize; - BlockList blist; - blist.initialize(n_blocks); std::vector indices(blocksize); + RelaxationBlock,double>::AdditionalData relax_data(0.8); + PreconditionBlock,double>::AdditionalData prec_data(blocksize, 0.8); + + relax_data.block_list.initialize(n_blocks); for (unsigned int block=0;block,double>::AdditionalData relax_data(blist, 0.8); - PreconditionBlock,double>::AdditionalData prec_data(blocksize, 0.8); - PreconditionBlockJacobi,double> prec_jacobi; prec_jacobi.initialize(A, prec_data); PreconditionBlockSOR,double> prec_sor; diff --git a/tests/lac/solver_relaxation_03.cc b/tests/lac/solver_relaxation_03.cc index fb94938d26..58f6a4d51e 100644 --- a/tests/lac/solver_relaxation_03.cc +++ b/tests/lac/solver_relaxation_03.cc @@ -85,20 +85,22 @@ int main() deallog << "Block size " << blocksize << std::endl; const unsigned int n_blocks = dim/blocksize; - BlockList blist; - blist.initialize(n_blocks); std::vector indices(blocksize); + RelaxationBlock,double>::AdditionalData relax_data(0.8); + PreconditionBlock,double>::AdditionalData prec_data(blocksize, 0.8); + // The permutation vectors; std::vector bperm(n_blocks); std::vector ibperm(n_blocks); + relax_data.block_list.initialize(n_blocks); for (unsigned int block=0;block,double>::AdditionalData relax_data(blist, 0.8); - PreconditionBlock,double>::AdditionalData prec_data(blocksize, 0.8); - PreconditionBlockJacobi,double> prec_jacobi; prec_jacobi.initialize(A, perm, iperm, prec_data); PreconditionBlockSOR,double> prec_sor;