From 3d190f436a37868b0c5e72c6f35558a2d99b1a56 Mon Sep 17 00:00:00 2001 From: Markus Blatt <mblatt@dune-project.org> Date: Wed, 12 Oct 2011 10:08:54 +0000 Subject: [PATCH] Make tests comile again by adhering to new aggregation interface. [[Imported from SVN: r1503]] --- dune/istl/paamg/test/galerkintest.cc | 2 +- dune/istl/paamg/test/graphtest.cc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dune/istl/paamg/test/galerkintest.cc b/dune/istl/paamg/test/galerkintest.cc index 83cfc042f..8a46ff2af 100644 --- a/dune/istl/paamg/test/galerkintest.cc +++ b/dune/istl/paamg/test/galerkintest.cc @@ -74,7 +74,7 @@ void testCoarsenIndices(int N) int noAggregates, isoAggregates, oneAggregates, skipped; - Dune::tie(noAggregates, isoAggregates, oneAggregates,skipped) = aggregatesMap.buildAggregates(mat, pg, Criterion()); + Dune::tie(noAggregates, isoAggregates, oneAggregates,skipped) = aggregatesMap.buildAggregates(mat, pg, Criterion(), false); Dune::Amg::printAggregates2d(aggregatesMap, n, N, std::cout); diff --git a/dune/istl/paamg/test/graphtest.cc b/dune/istl/paamg/test/graphtest.cc index 8bfa82882..553ab1501 100644 --- a/dune/istl/paamg/test/graphtest.cc +++ b/dune/istl/paamg/test/graphtest.cc @@ -492,7 +492,7 @@ void testGraph () SymmetricCriterion<BCRSMat,FirstDiagonal> crit; Dune::Amg::AggregatesMap<PropertiesGraph::VertexDescriptor> aggregatesMap(pgraph.maxVertex()+1); - aggregatesMap.buildAggregates(laplacian2d, pgraph, crit); + aggregatesMap.buildAggregates(laplacian2d, pgraph, crit, false); Dune::Amg::printAggregates2d(aggregatesMap, N, N, std::cout); } @@ -539,14 +539,14 @@ void testAggregate(double eps) Dune::Amg::AggregatesMap<PropertiesGraph::VertexDescriptor> aggregatesMap(pgraph.maxVertex()+1); - aggregatesMap.buildAggregates(mat, pgraph, crit); + aggregatesMap.buildAggregates(mat, pgraph, crit, false); Dune::Amg::printAggregates2d(aggregatesMap, N, N, std::cout); std::cout<<"Excluded!"<<std::endl; Dune::Amg::AggregatesMap<SPropertiesGraph::VertexDescriptor> saggregatesMap(pgraph.maxVertex()+1); - saggregatesMap.buildAggregates(mat, spgraph, crit); + saggregatesMap.buildAggregates(mat, spgraph, crit, false); Dune::Amg::printAggregates2d(saggregatesMap, N, N, std::cout); -- GitLab