Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dumux-course
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-course
Commits
6b0f7143
Commit
6b0f7143
authored
3 years ago
by
Timo Koch
Browse files
Options
Downloads
Plain Diff
Merge branch 'fix/spatialparams' into 'master'
spatial params fixed See merge request
!116
parents
27b03ad9
2f193857
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!116
spatial params fixed
Pipeline
#13199
passed
3 years ago
Stage: deploy
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
exercises/exercise-fluidsystem/spatialparams.hh
+6
-6
6 additions, 6 deletions
exercises/exercise-fluidsystem/spatialparams.hh
with
6 additions
and
6 deletions
exercises/exercise-fluidsystem/spatialparams.hh
+
6
−
6
View file @
6b0f7143
...
...
@@ -51,7 +51,7 @@ class ExerciseFluidsystemSpatialParams
static
constexpr
int
dim
=
GridView
::
dimension
;
static
constexpr
int
dimWorld
=
GridView
::
dimensionworld
;
using
Element
=
typename
GridView
::
template
Codim
<
0
>
::
Entity
;
using
GlobalPosition
=
typename
Element
::
Geometry
::
GlobalCoordinate
;
using
GlobalPosition
=
typename
Element
::
Geometry
::
GlobalCoordinate
;
using
PcKrSwCurve
=
FluidMatrix
::
BrooksCoreyDefault
<
Scalar
>
;
...
...
@@ -69,7 +69,7 @@ public:
,
K_
(
0
)
,
KLens_
(
0
)
,
pcKrSwCurve_
(
"SpatialParams"
)
,
lensPcKrSwCurve_
(
"
Lens.
SpatialParams"
)
,
lensPcKrSwCurve_
(
"SpatialParams
.Lens
"
)
{
//set main diagonal entries of the permeability tensor to a value
//setting to one value means: isotropic, homogeneous
...
...
@@ -111,10 +111,10 @@ public:
* \param globalPos The global coordinates for the given location
*/
auto
fluidMatrixInteractionAtPos
(
const
GlobalPosition
&
globalPos
)
const
{
{
if
(
isInLens
(
globalPos
))
return
makeFluidMatrixInteraction
(
pcKrSwCurve_
);
return
makeFluidMatrixInteraction
(
lensPcKrSwCurve_
);
return
makeFluidMatrixInteraction
(
pcKrSwCurve_
);
return
makeFluidMatrixInteraction
(
lensPcKrSwCurve_
);
}
/*!
...
...
@@ -150,7 +150,7 @@ private:
Dune
::
FieldMatrix
<
Scalar
,
dim
,
dim
>
K_
;
Dune
::
FieldMatrix
<
Scalar
,
dim
,
dim
>
KLens_
;
const
PcKrSwCurve
pcKrSwCurve_
;
const
PcKrSwCurve
lensPcKrSwCurve_
;
};
...
...
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