Skip to content
Snippets Groups Projects
Commit 1d245684 authored by Elias Pipping's avatar Elias Pipping
Browse files

[Cleanup] 'missing field initializer' warnings

parent ed3541b5
No related branches found
No related tags found
No related merge requests found
...@@ -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);
}; };
......
...@@ -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_;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment