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
4fa85a3e
Commit
4fa85a3e
authored
6 years ago
by
Dennis Gläser
Committed by
Timo Koch
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[facet][mpfa] ensure support for gcc 5&6
parent
0764b44d
No related branches found
No related tags found
1 merge request
!1431
Feature/facetcoupling with mpfa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dumux/multidomain/facet/cellcentered/mpfa/couplingmanager.hh
+3
-3
3 additions, 3 deletions
dumux/multidomain/facet/cellcentered/mpfa/couplingmanager.hh
dumux/multidomain/facet/cellcentered/mpfa/couplingmapper.hh
+1
-1
1 addition, 1 deletion
dumux/multidomain/facet/cellcentered/mpfa/couplingmapper.hh
with
4 additions
and
4 deletions
dumux/multidomain/facet/cellcentered/mpfa/couplingmanager.hh
+
3
−
3
View file @
4fa85a3e
...
...
@@ -166,7 +166,7 @@ public:
* \note The coupling residual is independent of w.r.t. which bulk dof it is computed
*/
template
<
class
LowDimLocalAssembler
>
typename
LowDimLocalAssembler
::
LocalResidual
::
ElementResidualVector
typename
LocalResidual
<
lowDimId
>
::
ElementResidualVector
evalCouplingResidual
(
LowDimIdType
,
const
LowDimLocalAssembler
&
lowDimLocalAssembler
,
BulkIdType
,
...
...
@@ -179,7 +179,7 @@ public:
* the fluxes across the facets of the neighboring bulk elements.
*/
template
<
class
LowDimLocalAssembler
>
typename
LowDimLocalAssembler
::
LocalResidual
::
ElementResidualVector
typename
LocalResidual
<
lowDimId
>
::
ElementResidualVector
evalCouplingResidual
(
LowDimIdType
,
const
LowDimLocalAssembler
&
lowDimLocalAssembler
,
BulkIdType
)
{
// make sure this is called for the element for which the context was set
...
...
@@ -420,7 +420,7 @@ private:
// Update context to deflected solution and reevaluate residual
updateContext
(
couplingElemIdx
,
dofIndex
,
priVars
,
pvIdx
);
return
evalCouplingResidual
(
lowDimId
,
lowDimLocalAssembler
,
bulkId
);
return
this
->
evalCouplingResidual
(
lowDimId
,
lowDimLocalAssembler
,
bulkId
);
};
static
const
int
numDiffMethod
=
getParamFromGroup
<
int
>
(
this
->
problem
(
lowDimId
).
paramGroup
(),
"Assembly.NumericDifferenceMethod"
);
...
...
This diff is collapsed.
Click to expand it.
dumux/multidomain/facet/cellcentered/mpfa/couplingmapper.hh
+
1
−
1
View file @
4fa85a3e
...
...
@@ -158,7 +158,7 @@ public:
// add coupling info to all elements/scvfs in interaction volumes
for
(
auto
dofIdx
:
lowDimElementDofs
)
for
(
auto
scvfIdx
:
embeddedScvfIndices
)
addCouplingsFromIV_
(
bulkFvGridGeometry
,
fvGeometry
.
scvf
(
scvfIdx
),
fvGeometry
,
lowDimElemIdx
,
dofIdx
);
this
->
addCouplingsFromIV_
(
bulkFvGridGeometry
,
fvGeometry
.
scvf
(
scvfIdx
),
fvGeometry
,
lowDimElemIdx
,
dofIdx
);
// sort the scvfs according to the corners of the low dim element if box is used
// that allows identifying which scvf flux enters which low dim scv later
...
...
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