Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dorie
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
31
Issues
31
List
Boards
Labels
Service Desk
Milestones
Merge Requests
9
Merge Requests
9
Operations
Operations
Incidents
Environments
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
dorie
dorie
Commits
99db5435
Commit
99db5435
authored
Feb 09, 2018
by
Lukas Riedel
2
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bugix/conductivity-in-dirichlet-bc' into feature/local-operator-schemes
parents
6cdbdb13
237faaa9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
2 deletions
+14
-2
dune/dorie/solver/operator_DG.hh
dune/dorie/solver/operator_DG.hh
+14
-2
No files found.
dune/dorie/solver/operator_DG.hh
View file @
99db5435
...
...
@@ -543,10 +543,22 @@ public:
// compute numerical flux estimation
const
RF
numFlux
=
satCond_s
*
(
-
(
gradu_s
*
normal
)
+
penalty
*
jump
);
RF
head_upwind
;
if
(
numFlux
>
0
)
head_upwind
=
param
.
headMillerToRef
(
u_s
,
p_global_s
);
else
head_upwind
=
g
;
// Miller here?!
// compute saturation from matrix head
const
RF
saturation_upwind
=
param
.
saturation
(
head_upwind
,
p_global_s
);
// compute relative conductivity
const
RF
relCond_upwind
=
param
.
condFactor
(
saturation_upwind
,
p_global_s
);
// switches between Neumann and Dirichlet bc
// this choice is kept constant for one time step
normal_flux
=
boundary
.
j
(
ig
.
intersection
(),
it
.
position
(),
time
);
if
(
numFlux
<
normal_flux
)
{
if
(
relCond_upwind
*
numFlux
<
normal_flux
)
{
bcType
=
BCType
::
dirichlet
;
bc_type_cache
.
emplace
(
it_id
,
BoundaryCondition
::
Dirichlet
);
}
...
...
@@ -626,7 +638,7 @@ public:
// consistency term
// + penalty term
for
(
unsigned
int
i
=
0
;
i
<
lfsv_s
.
size
();
i
++
)
r_s
.
accumulate
(
lfsv_s
,
i
,
numFlux
*
phi_s
[
i
]
*
factor
);
r_s
.
accumulate
(
lfsv_s
,
i
,
relCond_upwind
*
numFlux
*
phi_s
[
i
]
*
factor
);
// update residual (symmetry term)
// (non-)symmetric IP term
...
...
Lukas Riedel
@lriedel
mentioned in commit
118d9bce
·
Mar 15, 2018
mentioned in commit
118d9bce
mentioned in commit 118d9bce8bbeaac642a13ce14b51abf5fe8b660c
Toggle commit list
Lukas Riedel
@lriedel
mentioned in merge request
!34 (merged)
·
Mar 15, 2018
mentioned in merge request
!34 (merged)
mentioned in merge request !34
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment