Fixed bugs in time and time step handling. Things are more

Fixed bugs in time and time step handling.  Things are more
complicated than naively imagined, because cctk_iteration increases
monotonically, whereas cctk_time does not.

darcs-hash:20020925175504-07bb3-54936bc797f4a5db4d4bca5ec9cfc6fbe644ad7d.gz

1 files changed, 7 insertions, 12 deletions

diff --git a/Carpet/Carpet/src/carpet_public.hh b/Carpet/Carpet/src/carpet_public.hh
index 6b350ad9e..8ed6f5b9c 100644
--- a/Carpet/Carpet/src/carpet_public.hh
+++ b/Carpet/Carpet/src/carpet_public.hh
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/carpet_public.hh,v 1.20 2002/09/25 15:50:32 schnetter Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/carpet_public.hh,v 1.21 2002/09/25 19:55:06 schnetter Exp $
 
 // It is assumed that the number of components of all arrays is equal
 // to the number of components of the grid functions, and that their
@@ -20,6 +20,11 @@
 #include "Carpet/CarpetLib/src/th.hh"
   
 #include "carpet_public.h"
+  
+  
+  
+// Stuff with C linkage
+#include "carpet_public.h"
 
   
   
@@ -69,9 +74,6 @@ namespace Carpet {
   // Time step on base grid
   extern CCTK_REAL base_delta_time;
   
-  // Current time
-  extern CCTK_REAL current_time;
-  
   
   
   // Data for grid functions
@@ -88,7 +90,7 @@ namespace Carpet {
     gh<dim>* hh;
     th* tt;
     dh<dim>* dd;
-    vector<generic_gf<dim>* > data; // [var]
+    vector<generic_gf<dim>*> data; // [var]
   };
   extern vector<arrdesc> arrdata; // [group]
   
@@ -103,13 +105,6 @@ namespace Carpet {
   
   
   
-  // Stuff with C linkage
-  extern "C" {
-#include "carpet_public.h"
-  }
-  
-  
-  
   // Registered functions
   void* SetupGH (tFleshConfig* fc, int convLevel, cGH* cgh);