Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dumux
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dumux-repositories
dumux
Commits
4c30ab63
Commit
4c30ab63
authored
2 years ago
by
Yue Wang
Browse files
Options
Downloads
Plain Diff
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
!3298
Draft: Merge branch 'fix/deprecated-attribute' into 'master'
,
!3079
Merge branch 'fix/tpfa-grid-geom-update' into 'master'
Pipeline
#15769
failed
2 years ago
Stage: trigger
Stage: downstream modules
Pipeline: dumux-lecture
#15782
Pipeline: dumux
#15773
Pipeline: dumux
#15772
+2
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh
+4
-4
4 additions, 4 deletions
dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh
with
4 additions
and
4 deletions
dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh
+
4
−
4
View file @
4c30ab63
...
@@ -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 eff
e
cient assembly
// build the connectivity map for an eff
i
cient 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 i
n
dentify 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 eff
e
cient assembly
// build the connectivity map for an eff
i
cient assembly
connectivityMap_
.
update
(
*
this
);
connectivityMap_
.
update
(
*
this
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment