]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Make the function time usable again: remove the #time# variable from the Function...
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 22 Feb 1999 14:51:38 +0000 (14:51 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 22 Feb 1999 14:51:38 +0000 (14:51 +0000)
git-svn-id: https://svn.dealii.org/trunk@874 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/base/include/base/function.h
deal.II/base/include/base/function_time.h

index e3a6acde4baddfb69f3d7e2f19bfb97eef487a2b..48ddc05c260994d46a0dcfad99c3b42be27c3dc3 100644 (file)
@@ -40,8 +40,7 @@
  *  @author Wolfgang Bangerth, 1998, 1999
  */
 template <int dim>
-class Function :
-  public FunctionTime
+class Function : public FunctionTime
 {
   public:
                                     /**
@@ -101,12 +100,6 @@ class Function :
                    int, int,
                    << "The vector has size " << arg1 << " but should have "
                    << arg2 << " elements.");
-    
-  protected:
-                                    /**
-                                     * Store the present time.
-                                     */
-    double time;
 };
 
 
index d29dc463a2145f8877d6fd72c7d7426ac26e1115..21cb151f147dd03e669ec1e3a4817d72fb102855 100644 (file)
@@ -59,10 +59,10 @@ class FunctionTime {
                                      */
     FunctionTime (const double initial_time = 0.0);
 
-                                  /**
-                                   * Virtual destructor.
-                                   */
-  virtual ~FunctionTime();
+                                    /**
+                                     * Virtual destructor.
+                                     */
+    virtual ~FunctionTime();
   
                                     /**
                                      * Return the value of the time variable/
@@ -81,13 +81,15 @@ class FunctionTime {
                                      */
     virtual void advance_time (const double delta_t);
 
-private:
+  private:
                                     /**
                                      * Store the present time.
                                      */
     double time;
 };
 
+
+
 inline double
 FunctionTime::get_time () const
 {

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.