removed first version of run_scalar_sdc function from scalar_sdc.cpp; instead, the main routine sets default values and calls the run function with these as parameter

Author: Daniel

examples/scalar/scalar_sdc.cpp

@@ -16,40 +16,7 @@
 /*
  * A simple run routine with preset parameters
  */
-double run_scalar_sdc()
-{
-  pfasst::SDC<> sdc;
-
-  const size_t nsteps = 2;
-  const double dt     = 1.0;
-  const size_t nnodes = 4;
-  const size_t niters = 6;
-  const complex<double> lambda = complex<double>(-1.0, 1.0);
-  const complex<double> y0     = complex<double>(1.0, 0.0);
-
-  // so far, only lobatto nodes appear to be working
-  auto nodes   = pfasst::compute_nodes(nnodes, "gauss-lobatto");
-  auto factory = make_shared<pfasst::encap::VectorFactory<complex<double>>>(1);
-  auto sweeper = make_shared<ScalarSweeper<>>(lambda, y0);
-
-  sweeper->set_nodes(nodes);
-  sweeper->set_factory(factory);
-
-  sdc.add_level(sweeper);
-  sdc.set_duration(0.0, dt * nsteps, dt, niters);
-  sdc.setup();
 
-  auto q0 = sweeper->get_state(0);
-  sweeper->exact(q0, 0.0);
-
-  sdc.run();
-
-  return sweeper->get_errors();
-}
-
-/*
- * Overloaded run routine, which requires necessary parameters to be passed as arguments
- */
 double run_scalar_sdc(const size_t nsteps, const double dt, const size_t nnodes,
   const size_t niters, const complex<double> lambda)
 {
@@ -79,6 +46,12 @@ double run_scalar_sdc(const size_t nsteps, const double dt, const size_t nnodes,
 #ifndef PFASST_UNIT_TESTING
 int main(int /*argc*/, char** /*argv*/)
 {
-  run_scalar_sdc();
+  const size_t nsteps = 2;
+  const double dt     = 1.0;
+  const size_t nnodes = 4;
+  const size_t niters = 6;
+  const complex<double> lambda = complex<double>(-1.0, 1.0);
+  
+  run_scalar_sdc(nsteps, dt, nnodes, niters, lambda);
 }
 #endif