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
6606dcc8
Commit
6606dcc8
authored
Oct 19, 2018
by
Lukas Riedel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix time variables applied to solver in Richards simulation
parent
cf5388f2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
7 deletions
+13
-7
CHANGELOG.md
CHANGELOG.md
+5
-1
dune/dorie/model/richards/richards.cc
dune/dorie/model/richards/richards.cc
+8
-6
No files found.
CHANGELOG.md
View file @
6606dcc8
...
...
@@ -111,6 +111,10 @@
It dumps its data into a YAML file which is then loaded for writing
the default configuration files and the cheat sheet.
### Fixed
*
Solver in
`RichardsSimulation`
was using the wrong time variable.
[
!116
](
https://ts-gitlab.iup.uni-heidelberg.de/dorie/dorie/merge_requests/116
)
### Deprecated
*
The configuration file key
`[parameters.interpolation]`
is deprecated due to
the new scheme for storing parameterization data. DORiE now only supports
...
...
@@ -198,4 +202,4 @@
## 1.0.0 (2018-03-28)
First stable version.
\ No newline at end of file
First stable version.
dune/dorie/model/richards/richards.cc
View file @
6606dcc8
...
...
@@ -18,7 +18,9 @@ RichardsSimulation<Traits>::RichardsSimulation (
gv
(
grid
->
leafGridView
()),
mbe_slop
(
estimate_mbe_entries
<
typename
MBE
::
size_type
>
(
Traits
::
dim
,
Traits
::
GridGeometryType
)),
mbe_tlop
(
1
)
mbe_tlop
(
1
),
time_before
(
0.0
),
dt_before
(
0.0
)
{
Dune
::
Timer
timer
;
...
...
@@ -140,7 +142,7 @@ void RichardsSimulation<Traits>::step()
bool
step_succeed
=
false
;
while
(
not
step_succeed
)
{
const
RF
t
=
controller
->
getTime
();
const
RF
t
ime
=
controller
->
getTime
();
const
RF
dt
=
controller
->
getDT
();
bool
exception
=
false
;
const
bool
solver_warnings
=
verbose
>
0
&&
helper
.
rank
()
==
0
?
...
...
@@ -153,7 +155,7 @@ void RichardsSimulation<Traits>::step()
if
(
not
solver_warnings
)
dwarn
.
push
(
false
);
osm
->
apply
(
time
_before
,
dt
,
*
u
,
*
unext
);
osm
->
apply
(
time
,
dt
,
*
u
,
*
unext
);
if
(
not
solver_warnings
)
dwarn
.
pop
();
...
...
@@ -173,9 +175,9 @@ void RichardsSimulation<Traits>::step()
}
// saving last times for adaptivity
time_before
=
t
;
time_before
=
t
ime
;
dt_before
=
dt
;
// controller reacts to outcome of solution
step_succeed
=
controller
->
validate
(
exception
);
}
...
...
@@ -248,4 +250,4 @@ void RichardsSimulation<Traits>::write_data () const
}
}
// namespace Dorie
}
// namespace Dune
\ No newline at end of file
}
// namespace Dune
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