]> https://gitweb.dealii.org/ - dealii.git/commitdiff
some fixes
authorGuido Kanschat <dr.guido.kanschat@gmail.com>
Fri, 15 Jan 2010 12:34:47 +0000 (12:34 +0000)
committerGuido Kanschat <dr.guido.kanschat@gmail.com>
Fri, 15 Jan 2010 12:34:47 +0000 (12:34 +0000)
git-svn-id: https://svn.dealii.org/trunk@20367 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/include/numerics/newton.h
deal.II/deal.II/include/numerics/operator.h
deal.II/deal.II/include/numerics/theta_timestepping.h

index 97ba03865219f807c4fc4eee114ee5fbfd6be15c..3074f2efe0683bb865994d73b47e8b6f3857a052 100644 (file)
@@ -37,7 +37,7 @@ namespace Algorithms
  * Since assembling matrices, depending on the implementation, tends
  * to be costly, this method applies an adaptive reassembling
  * strategy. Only if the reduction factor for the residual is more
- * than #threshold, the event #bad_derivative is submitted to
+ * than #threshold, the event Algorithms::bad_derivative is submitted to
  * #inverse_derivative. It is up to this object to implement
  * reassembling accordingly.
  *
index a43b6acdbc2ad3805eabbc41d6925eff8f7b3e02..325e445e03e4723e4276f3e41996db5140afd790 100644 (file)
@@ -23,7 +23,7 @@ namespace Algorithms
 {
 /**
  * The abstract base class of all algorithms in this library. An
- * operator is an object with an #operator(), which transforms a set
+ * operator is an object with an operator(), which transforms a set
  * of named vectors into another set of named vectors.
  *
  * Furthermore, an operator can be notified of parameter changes by
index 1670a389fb57feb2bb43ae658493e2ec2a3a2cdb..33ce3b3b05cb10df089284bd798f79ef5a8a0b8d 100644 (file)
@@ -33,7 +33,7 @@ namespace Algorithms
  * of the step. For an implicit scheme, it is usually the time at the
  * end.
  */
-  struct TimeStepData
+  struct TimestepData
   {
 /// The current time
       double time;
@@ -73,7 +73,7 @@ namespace Algorithms
  * implicit Euler step with modified step size (right hand side
  * given). Thus, the implementation of the theta scheme will use two
  * Operator objects, one for the explicit, one for the implicit
- * part. Each of these will use its own TimeStepData to account for
+ * part. Each of these will use its own TimestepData to account for
  * the modified step sizes (and different times if the problem is not
  * autonomous).
  *
@@ -134,7 +134,7 @@ namespace Algorithms
 
                                       /**
                                        * The data handed to the
-                                       * #explicit time stepping
+                                       * #op_explicit time stepping
                                        * operator.
                                        *
                                        * The time in here is the time
@@ -143,11 +143,11 @@ namespace Algorithms
                                        * is (1-#theta) times the
                                        * actual time step.
                                        */
-      const TimeStepData& explicit_data() const;
+      const TimestepData& explicit_data() const;
       
                                       /**
                                        * The data handed to the
-                                       * #implicit time stepping
+                                       * #op_implicit time stepping
                                        * operator.
                                        *
                                        * The time in here is the time
@@ -156,7 +156,7 @@ namespace Algorithms
                                        * is #theta times the
                                        * actual time step.
                                        */
-      const TimeStepData& implicit_data() const;
+      const TimestepData& implicit_data() const;
 
                                       /**
                                        * Allow access to the control object.
@@ -186,13 +186,13 @@ namespace Algorithms
                                        * The data for the explicit
                                        * part of the scheme.
                                        */
-      TimeStepData d_explicit;
+      TimestepData d_explicit;
       
                                       /**
                                        * The data for the implicit
                                        * part of the scheme.
                                        */
-      TimeStepData d_implicit;
+      TimestepData d_implicit;
       
       
                                       /**
@@ -247,6 +247,25 @@ namespace Algorithms
                                        */
       SmartPointer<OutputOperator<VECTOR> > output;
   };
+
+
+  template <class VECTOR>
+  inline
+  const TimestepData&
+  ThetaTimestepping<VECTOR>::explicit_data () const
+  {
+    return d_explicit;
+  }
+  
+
+  template <class VECTOR>
+  inline
+  const TimestepData&
+  ThetaTimestepping<VECTOR>::implicit_data () const
+  {
+    return d_implicit;
+  }
+  
 }
 
 DEAL_II_NAMESPACE_CLOSE

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.