OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Made use of range based for for graph traversal.

Browse Source
This commit is contained in:
Markus Blatt
2018-02-06 15:30:24 +01:00
parent a8dde44afc
commit 14cde5bafc
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
opm/autodiff/BlackoilAmg.hpp
View File

@@ -534,8 +534,8 @@ buildOverlapVertices(const G& graph, const C& pinfo,
const auto& lookup=pinfo.globalLookup(); const auto& lookup=pinfo.globalLookup();
for(auto vertex=graph.begin(); vertex != end; ++vertex) { for ( const auto& vertex: graph ) {
const auto* pair = lookup.pair(*vertex); const auto* pair = lookup.pair(vertex);
if(pair!=0 && overlap.contains(pair->local().attribute())) if(pair!=0 && overlap.contains(pair->local().attribute()))
++overlapCount; ++overlapCount;
@@ -544,14 +544,14 @@ buildOverlapVertices(const G& graph, const C& pinfo,
using Vertex = typename G::VertexDescriptor; using Vertex = typename G::VertexDescriptor;
using OverlapVertex = Dune::Amg::OverlapVertex<Vertex>; using OverlapVertex = Dune::Amg::OverlapVertex<Vertex>;
auto* overlapVertices = new OverlapVertex[overlapCount=0 ? 1 : overlapCount]; auto* overlapVertices = new OverlapVertex[overlapCount==0 ? 1 : overlapCount];
if(overlapCount==0) if(overlapCount==0)
return overlapVertices; return overlapVertices;
// Initialize them // Initialize them
overlapCount=0; overlapCount=0;
for(auto vertex=graph.begin(); vertex != end; ++vertex) { for ( const auto& vertex: graph ) {
const auto* pair = lookup.pair(*vertex); const auto* pair = lookup.pair(vertex);
if(pair!=0 && overlap.contains(pair->local().attribute())) { if(pair!=0 && overlap.contains(pair->local().attribute())) {
overlapVertices[overlapCount].aggregate = &aggregates[pair->local()]; overlapVertices[overlapCount].aggregate = &aggregates[pair->local()];
@@ -591,11 +591,10 @@ void buildCoarseSparseMatrix(M& coarseMatrix, G& fineGraph,
const auto UNAGGREGATED = Dune::Amg::AggregatesMap<typename G::VertexDescriptor>::UNAGGREGATED; const auto UNAGGREGATED = Dune::Amg::AggregatesMap<typename G::VertexDescriptor>::UNAGGREGATED;
#endif #endif
const auto ISOLATED = Dune::Amg::AggregatesMap<typename G::VertexDescriptor>::ISOLATED; const auto ISOLATED = Dune::Amg::AggregatesMap<typename G::VertexDescriptor>::ISOLATED;
auto vend = fineGraph.end();
for(auto vertex = fineGraph.begin(); vertex != vend; ++vertex) { for ( const auto& vertex: fineGraph ) {
assert(aggregates[*vertex] != UNAGGREGATED); assert(aggregates[vertex] != UNAGGREGATED);
put(visitedMap, *vertex, aggregates[*vertex]==ISOLATED); put(visitedMap, vertex, aggregates[vertex]==ISOLATED);
} }
Dune::Amg::SparsityBuilder<M> sparsityBuilder(coarseMatrix); Dune::Amg::SparsityBuilder<M> sparsityBuilder(coarseMatrix);
@@ -620,11 +619,10 @@ void buildCoarseSparseMatrix(M& coarseMatrix, G& fineGraph, const V& visitedMap,
const auto UNAGGREGATED = Dune::Amg::AggregatesMap<typename G::VertexDescriptor>::UNAGGREGATED; const auto UNAGGREGATED = Dune::Amg::AggregatesMap<typename G::VertexDescriptor>::UNAGGREGATED;
#endif #endif
const auto ISOLATED = Dune::Amg::AggregatesMap<typename G::VertexDescriptor>::ISOLATED; const auto ISOLATED = Dune::Amg::AggregatesMap<typename G::VertexDescriptor>::ISOLATED;
using Vertex = typename G::VertexIterator;
Vertex vend = fineGraph.end(); for(const auto& vertex: fineGraph ) {
for(Vertex vertex = fineGraph.begin(); vertex != vend; ++vertex) { assert(aggregates[vertex] != UNAGGREGATED);
assert(aggregates[*vertex] != UNAGGREGATED); put(visitedMap, vertex, aggregates[vertex]==ISOLATED);
put(visitedMap, *vertex, aggregates[*vertex]==ISOLATED);
} }
Dune::Amg::SparsityBuilder<M> sparsityBuilder(coarseMatrix); Dune::Amg::SparsityBuilder<M> sparsityBuilder(coarseMatrix);