controller: Change step/iteration state management.

Rework tracking of current time, step, and iteration.

Signed-off-by: Matthew Emmett <[email protected]>

Author: memmett

examples/advection_diffusion/serial_mlsdc.cpp

@@ -70,7 +70,7 @@ error_map run_serial_mlsdc()
   /*
    * run mlsdc!
    */
-  mlsdc.set_duration(dt, nsteps, niters);
+  mlsdc.set_duration(0.0, nsteps*dt, dt, niters);
   mlsdc.run();
 
   fftw_cleanup();

examples/advection_diffusion/serial_mlsdc_autobuild.cpp

@@ -65,7 +65,7 @@ int main(int /*argc*/, char** /*argv*/)
 
   auto_build(mlsdc, nodes, build_level);
   auto_setup(mlsdc, initial);
-  mlsdc.set_duration(dt, nsteps, niters);
+  mlsdc.set_duration(0.0, nsteps*dt, dt, niters);
   mlsdc.run();
 
   fftw_cleanup();

examples/advection_diffusion/vanilla_sdc.cpp

@@ -32,7 +32,7 @@ error_map run_vanilla_sdc()
   sweeper->set_factory(factory);
 
   sdc.add_level(sweeper);
-  sdc.set_duration(dt, nsteps, niters);
+  sdc.set_duration(0.0, nsteps*dt, dt, niters);
   sdc.setup();
 
   auto q0 = sweeper->get_state(0);
@@ -47,7 +47,7 @@ error_map run_vanilla_sdc()
 
 
 #ifndef PFASST_UNIT_TESTING
-int main(int argc, char** argv)
+int main(int /*argc*/, char** /*argv*/)
 {
   run_vanilla_sdc();
 }

include/pfasst/controller.hpp

@@ -26,7 +26,8 @@ namespace pfasst
       deque<shared_ptr<ISweeper<time>>>  levels;
       deque<shared_ptr<ITransfer<time>>> transfer;
 
-      time dt;
+      int step, iteration, max_iterations;
+      time t, dt, tend;
 
     public:
       //! @{
@@ -38,11 +39,15 @@ namespace pfasst
         }
       }
 
-      void set_duration(time dt, size_t nsteps, size_t niters)
+    // XXX
+      void set_duration(time t0, time tend, time dt, int niters)
       {
+        this->t = t0;
+        this->tend = tend;
         this->dt = dt;
-        steps.set_size(nsteps);
-	iterations.set_size(niters);
+        this->step = 0;
+        this->iteration = 0;
+        this->max_iterations = niters;
       }
 
       void add_level(shared_ptr<ISweeper<time>> swpr,
@@ -176,36 +181,52 @@ namespace pfasst
 
 
       /**
-       * Simple range iterator.
+       * Get current time step number.
        */
-      class RangeIter {
-          friend Controller;
-          size_t i, n;
-        public:
-          void set_size(size_t n) { this->n = n; }
-          void reset(size_t i = 0) { this->i = i; }
-          bool valid() { return i < n; }
-          void next() { i++; }
-      } steps, iterations;
-
-      size_t get_step()
+      int get_step()
       {
-        return steps.i;
+        return step;
       }
 
-      size_t get_iteration()
+      time get_time_step()
       {
-        return iterations.i;
+        return dt;
       }
 
       time get_time()
       {
-        return get_step() * get_time_step();
+        return t;
       }
 
-      time get_time_step()
+      void advance_time(int nsteps=1)
       {
-        return dt;
+        step += nsteps;
+        t += nsteps*dt;
+      }
+
+      time get_end_time()
+      {
+        return tend;
+      }
+
+      int get_iteration()
+      {
+        return iteration;
+      }
+
+      void set_iteration(int iter)
+      {
+        this->iteration = iter;
+      }
+
+      void advance_iteration()
+      {
+        iteration++;
+      }
+
+      int get_max_iteration()
+      {
+        return max_iterations;
       }
 
   };

include/pfasst/mlsdc.hpp

@@ -58,15 +58,12 @@ namespace pfasst
        */
       void run()
       {
-	auto& steps = this->steps;
-	auto& iters = this->iterations;
-
-        for (steps.reset(); steps.valid(); steps.next()) {
+        for (; this->get_time() < this->get_end_time(); this->advance_time()) {
           predict = true;   // use predictor for first fine sweep of each step
           initial = this->get_step() == 0; // only evaluate node 0 functions on first step
 
           // iterate by performing v-cycles
-	  for (iters.reset(); iters.valid(); iters.next()) {
+	  for (this->set_iteration(0); this->get_iteration() < this->get_max_iteration(); this->advance_iteration()) {
             cycle_v(this->finest());
           }
 

include/pfasst/sdc.hpp

@@ -22,12 +22,10 @@ namespace pfasst
       void run()
       {
         auto sweeper = this->get_level(0);
-	auto& steps = this->steps;
-	auto& iters = this->iterations;
 
-        for (steps.reset(); steps.valid(); steps.next()) {
+        for (; this->get_time() < this->get_end_time(); this->advance_time()) {
           bool initial = this->get_step() == 0;
-	  for (iters.reset(); iters.valid(); iters.next()) {
+	  for (this->set_iteration(0); this->get_iteration() < this->get_max_iteration(); this->advance_iteration()) {
 	    bool predict = this->get_iteration() == 0;
 	    if (predict) {
 	      sweeper->predict(initial);

tests/test-advection-diffusion.cpp

@@ -34,7 +34,6 @@ TEST(ErrorTest, VanillaSDC)
 
   auto errors = run_vanilla_sdc();
   auto get_iter  = [](const vtype x) { return get<1>(get<0>(x)); };
-  auto get_step  = [](const vtype x) { return get<0>(get<0>(x)); };
   auto get_error = [](const vtype x) { return get<1>(x); };
 
   auto max_iter = get_iter(*std::max_element(errors.begin(), errors.end(),
@@ -57,7 +56,6 @@ TEST(ErrorTest, SerialMLSDC)
 
   auto errors = run_serial_mlsdc();
   auto get_iter  = [](const vtype x) { return get<1>(get<0>(x)); };
-  auto get_step  = [](const vtype x) { return get<0>(get<0>(x)); };
   auto get_error = [](const vtype x) { return get<1>(x); };
 
   auto max_iter = get_iter(*std::max_element(errors.begin(), errors.end(),