Merge pull request #175 from memmett/feature/fix174

Make sure number of processors and time steps are consistent.

Author: torbjoernk

examples/advection_diffusion/mpi_pfasst.cpp

@@ -76,6 +76,7 @@ namespace pfasst
         pf.set_duration(0.0, nsteps * dt, dt, niters);
         pf.set_nsweeps({2, 1});
         pf.get_finest<AdvectionDiffusionSweeper<>>()->set_residual_tolerances(abs_residual_tol, 0.0);
+        pf.set_options();
         pf.run();
 
         auto fine = pf.get_finest<AdvectionDiffusionSweeper<>>();
@@ -90,6 +91,9 @@ namespace pfasst
 int main(int argc, char** argv)
 {
   MPI_Init(&argc, &argv);
+  pfasst::init(argc, argv,
+               pfasst::examples::advection_diffusion::AdvectionDiffusionSweeper<>::init_opts,
+               pfasst::examples::advection_diffusion::AdvectionDiffusionSweeper<>::init_logs);
   pfasst::examples::advection_diffusion::run_mpi_pfasst(0.0);
   fftw_cleanup();
   MPI_Finalize();

examples/advection_diffusion/serial_mlsdc.cpp

@@ -91,6 +91,7 @@ namespace pfasst
          * run mlsdc!
          */
         mlsdc.set_duration(0.0, nsteps*dt, dt, niters);
+        mlsdc.set_options();
         mlsdc.run();
 
         fftw_cleanup();

examples/advection_diffusion/serial_mlsdc_autobuild.cpp

@@ -86,6 +86,7 @@ namespace pfasst
         auto_build(mlsdc, nodes, build_level);
         auto_setup(mlsdc, initial);
         mlsdc.set_duration(0.0, nsteps*dt, dt, niters);
+        mlsdc.set_options();
         mlsdc.run();
 
         fftw_cleanup();

src/pfasst/controller/pfasst_impl.hpp

@@ -47,9 +47,15 @@ namespace pfasst
     int nblocks = int(this->get_end_time() / this->get_time_step()) / comm->size();
 
     if (nblocks == 0) {
+      CLOG(INFO, "Controller") << "invalid duration: there are more time processors than time steps";
       throw ValueError("invalid duration: there are more time processors than time steps");
     }
 
+    if (nblocks * comm->size() * this->get_time_step() < this->get_end_time()) {
+      CLOG(INFO, "Controller") << "invalid duration: mismatch between number of time processors and time steps";
+      throw ValueError("invalid duration: mismatch between number of time processors and time steps");
+    }
+
     for (int nblock = 0; nblock < nblocks; nblock++) {
       this->set_step(nblock * comm->size() + comm->rank());