add missing functions and fix wrong timestep

git-svn-id: https://svn.dealii.org/trunk@32971 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/include/deal.II/algorithms/theta_timestepping.h b/deal.II/include/deal.II/algorithms/theta_timestepping.h
index 0d86380de1f6b2a431bfa9bf4d546b151b7160fd..c7908f8cf0300ccea0b406e54597f3fbf6830fe4 100644 (file)
--- a/deal.II/include/deal.II/algorithms/theta_timestepping.h
+++ b/deal.II/include/deal.II/algorithms/theta_timestepping.h
@@ -254,7 +254,12 @@ namespace Algorithms
     /**
      * The weight between implicit and explicit part.
      */
-    const double &theta() const;
+    const double theta() const;
+
+      /**
+       * Set a new weight and return the old
+       */
+    const double theta(double new_theta);
 
     /**
      * The data handed to the #op_explicit time stepping operator.
@@ -371,6 +376,24 @@ namespace Algorithms
   {
     output = &out;
   }
+
+
+  template <class VECTOR>
+  inline
+  const double ThetaTimestepping<VECTOR>::theta () const
+  {
+    return vtheta;
+  }
+
+
+  template <class VECTOR>
+  inline
+  const double ThetaTimestepping<VECTOR>::theta (double new_theta)
+  {
+    const double tmp = vtheta;
+    vtheta = new_theta;
+    return tmp;
+  }
 }
 
 DEAL_II_NAMESPACE_CLOSE

diff --git a/deal.II/include/deal.II/algorithms/theta_timestepping.templates.h b/deal.II/include/deal.II/algorithms/theta_timestepping.templates.h
index 3e3e19c765ca38004706d7b5a8a1ddb3f0a6055d..9d007be8a93165a3c2813e2acbd9d630e23107fd 100644 (file)
--- a/deal.II/include/deal.II/algorithms/theta_timestepping.templates.h
+++ b/deal.II/include/deal.II/algorithms/theta_timestepping.templates.h
@@ -103,7 +103,7 @@ namespace Algorithms
     // The data provided to the inner solver
     src2.add<const VECTOR *>(aux, "Previous time");
     src2.add<const double *>(&d_implicit.time, "Time");
-    src2.add<const double *>(&d_explicit.step, "Timestep");
+    src2.add<const double *>(&d_implicit.step, "Timestep");
     src2.merge(in);
 
     if (output != 0)