Skip to content
Snippets Groups Projects
Commit 4c30ab63 authored by Yue Wang's avatar Yue Wang
Browse files

Merge branch 'cherry-pick-c3d34b76' into 'releases/3.5'

Merge branch 'fix/tpfa-grid-geom-update' into 'master'

See merge request !3079
parents dbf7300a 871aee86
No related branches found
No related tags found
2 merge requests!3298Draft: Merge branch 'fix/deprecated-attribute' into 'master',!3079Merge branch 'fix/tpfa-grid-geom-update' into 'master'
Pipeline #15769 failed
Pipeline: dumux-lecture

#15782

    Pipeline: dumux

    #15773

      Pipeline: dumux

      #15772

        +2
        ...@@ -238,7 +238,7 @@ private: ...@@ -238,7 +238,7 @@ private:
        scvs_.resize(numScvs); scvs_.resize(numScvs);
        scvfs_.reserve(numScvf); scvfs_.reserve(numScvf);
        scvfIndicesOfScv_.resize(numScvs); scvfIndicesOfScv_.resize(numScvs);
        hasBoundaryScvf_.resize(numScvs, false); hasBoundaryScvf_.assign(numScvs, false);
        // Build the scvs and scv faces // Build the scvs and scv faces
        GridIndexType scvfIdx = 0; GridIndexType scvfIdx = 0;
        ...@@ -347,7 +347,7 @@ private: ...@@ -347,7 +347,7 @@ private:
        } }
        } }
        // build the connectivity map for an effecient assembly // build the connectivity map for an efficient assembly
        connectivityMap_.update(*this); connectivityMap_.update(*this);
        } }
        ...@@ -531,7 +531,7 @@ private: ...@@ -531,7 +531,7 @@ private:
        neighborVolVarIndexSet.reserve(numLocalFaces); neighborVolVarIndexSet.reserve(numLocalFaces);
        // for network grids there might be multiple intersection with the same geometryInInside // for network grids there might be multiple intersection with the same geometryInInside
        // we indentify those by the indexInInside for now (assumes conforming grids at branching facets) // we identify those by the indexInInside for now (assumes conforming grids at branching facets)
        std::vector<NeighborVolVarIndices> outsideIndices; std::vector<NeighborVolVarIndices> outsideIndices;
        if (dim < dimWorld) if (dim < dimWorld)
        { {
        ...@@ -590,7 +590,7 @@ private: ...@@ -590,7 +590,7 @@ private:
        neighborVolVarIndices_[eIdx] = neighborVolVarIndexSet; neighborVolVarIndices_[eIdx] = neighborVolVarIndexSet;
        } }
        // build the connectivity map for an effecient assembly // build the connectivity map for an efficient assembly
        connectivityMap_.update(*this); connectivityMap_.update(*this);
        } }
        ......
        0% Loading or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment