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
4c6d30d0
Commit
4c6d30d0
authored
6 years ago
by
Dennis Gläser
Committed by
Timo Koch
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[2pincomp] use getParamFromGroup
parent
c79d2e90
No related branches found
No related tags found
1 merge request
!892
[pm][ff] Improve indices, move into model traits, [pm] free volume variables from type tag
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dumux/porousmediumflow/2p/incompressiblelocalresidual.hh
+3
-3
3 additions, 3 deletions
dumux/porousmediumflow/2p/incompressiblelocalresidual.hh
with
3 additions
and
3 deletions
dumux/porousmediumflow/2p/incompressiblelocalresidual.hh
+
3
−
3
View file @
4c6d30d0
...
...
@@ -174,7 +174,7 @@ public:
using
AdvectionType
=
typename
GET_PROP_TYPE
(
TypeTag
,
AdvectionType
);
// evaluate the current wetting phase Darcy flux and resulting upwind weights
static
const
Scalar
upwindWeight
=
getParam
<
Scalar
>
(
GET_PROP_VALUE
(
TypeTag
,
ModelParameterGroup
),
"Implicit.UpwindWeight"
);
static
const
Scalar
upwindWeight
=
getParam
FromGroup
<
Scalar
>
(
GET_PROP_VALUE
(
TypeTag
,
ModelParameterGroup
),
"Implicit.UpwindWeight"
);
const
auto
flux_w
=
AdvectionType
::
flux
(
problem
,
element
,
fvGeometry
,
curElemVolVars
,
scvf
,
0
,
elemFluxVarsCache
);
const
auto
flux_n
=
AdvectionType
::
flux
(
problem
,
element
,
fvGeometry
,
curElemVolVars
,
scvf
,
1
,
elemFluxVarsCache
);
const
auto
insideWeight_w
=
std
::
signbit
(
flux_w
)
?
(
1.0
-
upwindWeight
)
:
upwindWeight
;
...
...
@@ -292,7 +292,7 @@ public:
using
AdvectionType
=
typename
GET_PROP_TYPE
(
TypeTag
,
AdvectionType
);
// evaluate the current wetting phase Darcy flux and resulting upwind weights
static
const
Scalar
upwindWeight
=
getParam
<
Scalar
>
(
GET_PROP_VALUE
(
TypeTag
,
ModelParameterGroup
),
"Implicit.UpwindWeight"
);
static
const
Scalar
upwindWeight
=
getParam
FromGroup
<
Scalar
>
(
GET_PROP_VALUE
(
TypeTag
,
ModelParameterGroup
),
"Implicit.UpwindWeight"
);
const
auto
flux_w
=
AdvectionType
::
flux
(
problem
,
element
,
fvGeometry
,
curElemVolVars
,
scvf
,
0
,
elemFluxVarsCache
);
const
auto
flux_n
=
AdvectionType
::
flux
(
problem
,
element
,
fvGeometry
,
curElemVolVars
,
scvf
,
1
,
elemFluxVarsCache
);
const
auto
insideWeight_w
=
std
::
signbit
(
flux_w
)
?
(
1.0
-
upwindWeight
)
:
upwindWeight
;
...
...
@@ -437,7 +437,7 @@ public:
using
AdvectionType
=
typename
GET_PROP_TYPE
(
TypeTag
,
AdvectionType
);
// evaluate the current wetting phase Darcy flux and resulting upwind weights
static
const
Scalar
upwindWeight
=
getParam
<
Scalar
>
(
GET_PROP_VALUE
(
TypeTag
,
ModelParameterGroup
),
"Implicit.UpwindWeight"
);
static
const
Scalar
upwindWeight
=
getParam
FromGroup
<
Scalar
>
(
GET_PROP_VALUE
(
TypeTag
,
ModelParameterGroup
),
"Implicit.UpwindWeight"
);
const
auto
flux_w
=
AdvectionType
::
flux
(
problem
,
element
,
fvGeometry
,
curElemVolVars
,
scvf
,
0
,
elemFluxVarsCache
);
const
auto
flux_n
=
AdvectionType
::
flux
(
problem
,
element
,
fvGeometry
,
curElemVolVars
,
scvf
,
1
,
elemFluxVarsCache
);
const
auto
insideWeight_w
=
std
::
signbit
(
flux_w
)
?
(
1.0
-
upwindWeight
)
:
upwindWeight
;
...
...
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