Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-tectonic
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
podlesny
dune-tectonic
Commits
1d245684
Commit
1d245684
authored
9 years ago
by
Elias Pipping
Browse files
Options
Downloads
Patches
Plain Diff
[Cleanup] 'missing field initializer' warnings
parent
ed3541b5
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/spatial-solving/fixedpointiterator.hh
+2
-2
2 additions, 2 deletions
src/spatial-solving/fixedpointiterator.hh
src/time-stepping/adaptivetimestepper.cc
+5
-5
5 additions, 5 deletions
src/time-stepping/adaptivetimestepper.cc
with
7 additions
and
7 deletions
src/spatial-solving/fixedpointiterator.hh
+
2
−
2
View file @
1d245684
...
@@ -9,8 +9,8 @@
...
@@ -9,8 +9,8 @@
#include
<dune/solvers/solvers/solver.hh>
#include
<dune/solvers/solvers/solver.hh>
struct
FixedPointIterationCounter
{
struct
FixedPointIterationCounter
{
size_t
iterations
;
size_t
iterations
=
0
;
size_t
multigridIterations
;
size_t
multigridIterations
=
0
;
void
operator
+=
(
FixedPointIterationCounter
const
&
other
);
void
operator
+=
(
FixedPointIterationCounter
const
&
other
);
};
};
...
...
This diff is collapsed.
Click to expand it.
src/time-stepping/adaptivetimestepper.cc
+
5
−
5
View file @
1d245684
...
@@ -45,10 +45,10 @@ template <class Factory, class Updaters, class ErrorNorm>
...
@@ -45,10 +45,10 @@ template <class Factory, class Updaters, class ErrorNorm>
bool
AdaptiveTimeStepper
<
Factory
,
Updaters
,
ErrorNorm
>::
coarsen
()
{
bool
AdaptiveTimeStepper
<
Factory
,
Updaters
,
ErrorNorm
>::
coarsen
()
{
bool
didCoarsen
=
false
;
bool
didCoarsen
=
false
;
while
(
relativeTime_
+
relativeTau_
<
1.0
)
{
while
(
relativeTime_
+
relativeTau_
<
1.0
)
{
R2_
=
{
R1_
.
updaters
.
clone
()
};
R2_
=
{
R1_
.
updaters
.
clone
()
,
FixedPointIterationCounter
()
};
step
(
R2_
,
relativeTime_
+
relativeTau_
,
relativeTau_
);
step
(
R2_
,
relativeTime_
+
relativeTau_
,
relativeTau_
);
UpdatersWithCount
C
{
current_
.
clone
()
};
UpdatersWithCount
C
{
current_
.
clone
()
,
FixedPointIterationCounter
()
};
step
(
C
,
relativeTime_
,
2.0
*
relativeTau_
);
step
(
C
,
relativeTime_
,
2.0
*
relativeTau_
);
if
(
!
mustRefine_
(
C
.
updaters
,
R2_
.
updaters
))
{
if
(
!
mustRefine_
(
C
.
updaters
,
R2_
.
updaters
))
{
...
@@ -66,9 +66,9 @@ bool AdaptiveTimeStepper<Factory, Updaters, ErrorNorm>::coarsen() {
...
@@ -66,9 +66,9 @@ bool AdaptiveTimeStepper<Factory, Updaters, ErrorNorm>::coarsen() {
template
<
class
Factory
,
class
Updaters
,
class
ErrorNorm
>
template
<
class
Factory
,
class
Updaters
,
class
ErrorNorm
>
void
AdaptiveTimeStepper
<
Factory
,
Updaters
,
ErrorNorm
>::
refine
()
{
void
AdaptiveTimeStepper
<
Factory
,
Updaters
,
ErrorNorm
>::
refine
()
{
while
(
true
)
{
while
(
true
)
{
UpdatersWithCount
F1
{
current_
.
clone
()
};
UpdatersWithCount
F1
{
current_
.
clone
()
,
FixedPointIterationCounter
()
};
step
(
F1
,
relativeTime_
,
relativeTau_
/
2.0
);
step
(
F1
,
relativeTime_
,
relativeTau_
/
2.0
);
UpdatersWithCount
F2
{
F1
.
updaters
.
clone
()
};
UpdatersWithCount
F2
{
F1
.
updaters
.
clone
()
,
FixedPointIterationCounter
()
};
step
(
F2
,
relativeTime_
+
relativeTau_
/
2.0
,
relativeTau_
/
2.0
);
step
(
F2
,
relativeTime_
+
relativeTau_
/
2.0
,
relativeTau_
/
2.0
);
if
(
!
mustRefine_
(
R1_
.
updaters
,
F2
.
updaters
))
{
if
(
!
mustRefine_
(
R1_
.
updaters
,
F2
.
updaters
))
{
...
@@ -84,7 +84,7 @@ void AdaptiveTimeStepper<Factory, Updaters, ErrorNorm>::refine() {
...
@@ -84,7 +84,7 @@ void AdaptiveTimeStepper<Factory, Updaters, ErrorNorm>::refine() {
template
<
class
Factory
,
class
Updaters
,
class
ErrorNorm
>
template
<
class
Factory
,
class
Updaters
,
class
ErrorNorm
>
IterationRegister
AdaptiveTimeStepper
<
Factory
,
Updaters
,
ErrorNorm
>::
advance
()
{
IterationRegister
AdaptiveTimeStepper
<
Factory
,
Updaters
,
ErrorNorm
>::
advance
()
{
if
(
R2_
.
updaters
==
Updaters
())
{
if
(
R2_
.
updaters
==
Updaters
())
{
R1_
=
{
current_
.
clone
()
};
R1_
=
{
current_
.
clone
()
,
FixedPointIterationCounter
()
};
step
(
R1_
,
relativeTime_
,
relativeTau_
);
// counting again upon restart
step
(
R1_
,
relativeTime_
,
relativeTau_
);
// counting again upon restart
}
else
{
}
else
{
R1_
=
R2_
;
R1_
=
R2_
;
...
...
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