Broke the file "carpet.cc" into several files.

Broke the file "carpet.cc" into several files.
Simplified support for arrays with a dimension different from 3.
Added a testing thorn.

darcs-hash:20010704102946-07bb3-82132f0c643e91f0de33bbaef93f9c693ce7227f.gz

1 files changed, 27 insertions, 63 deletions

diff --git a/Carpet/Carpet/src/variables.cc b/Carpet/Carpet/src/variables.cc
index f23c8d3f6..f884950f1 100644
--- a/Carpet/Carpet/src/variables.cc
+++ b/Carpet/Carpet/src/variables.cc
@@ -1,10 +1,13 @@
+#include <vector>
+#include "Carpet/CarpetLib/src/dh.hh"
+#include "Carpet/CarpetLib/src/gh.hh"
+#include "Carpet/CarpetLib/src/th.hh"
+
+#include "carpet.hh"
+
+static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/variables.cc,v 1.1 2001/07/04 12:29:48 schnetter Exp $";
 
-#include "variables.hh"
 
-extern "C" {
-  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/variables.cc,v 1.22 2004/05/21 18:16:23 schnetter Exp $";
-  CCTK_FILEVERSION(Carpet_Carpet_variables_cc);
-}
 
 namespace Carpet {
   
@@ -18,81 +21,42 @@ namespace Carpet {
   // Maximum number of refinement levels
   int maxreflevels;
   
-  // Refinement levels
-  int reflevels;
-  
-  // Refinement factor
-  int reffact;
-  
   // Refinement factor on finest grid
   int maxreflevelfact;
   
-  // Base multigrid level
-  int basemglevel;
-  
-  // Multigrid levels
-  int mglevels;
-  
-  // Multigrid factor
-  int mgfact;
-  
-  // Multigrid factor on coarsest grid
-  int maxmglevelfact;
-  
-  // Maps
-  int maps;
-  
-  
+  // Current iteration per refinement level
+  vector<int> iteration;
   
   // Current position on the grid hierarchy
-  int reflevel;
   int mglevel;
-  int map;
+  int reflevel;
   int component;
   
-  // refinement factor of current level: ipow(refinement_factor, reflevel)
+  // refinement factor of current level: pow(refinement_factor, reflevel)
   int reflevelfact;
   
-  // multigrid factor of current level: ipow(multigrid_factor, mglevel)
-  int mglevelfact;
+  // Time step on base grid
+  CCTK_REAL base_delta_time;
   
   
   
-  // Carpet's GH
-  CarpetGH carpetGH;
-  
-  
-  
-  // Times and spaces on the refinement levels
-  CCTK_REAL global_time;
-  vector<vector<CCTK_REAL> > leveltimes; // [mglevel][reflevel]
-  CCTK_REAL delta_time;
-  
-  vector<vect<CCTK_REAL,dim> > origin_space; // [mglevel]
-  vect<CCTK_REAL,dim> delta_space;
-  
-  
-  
-  // Is this the time for a global mode call?
-  bool do_meta_mode;
-  bool do_global_mode;
-  
-  // Is prolongation enabled?
-  bool do_prolongate;
+  // Data for scalars
+  vector<scdesc> scdata;	// [group]
   
+  // Data for arrays
+  // TODO: have replicated arrays
+  vector<arrdesc> arrdata;	// [group]
   
+  // The grid hierarchy
+  gh<dim>* hh;
+  th* tt;
+  dh<dim>* dd;
+  int gfsize[dim];
   
   // Data for grid functions
+  vector<gfdesc> gfdata;	// [group]
   
-  // The grid hierarchy
-  vector<gh<dim>*> vhh;         // [map]
-  vector<dh<dim>*> vdd;         // [map]
-  vector<th<dim>*> vtt;         // [map]
-
-  // Data for the groups
-  vector<groupdesc> groupdata;  // [group]
-  
-  // Data for everything
-  vector<vector<arrdesc> > arrdata; // [group][map]
+  // Checksums
+  vector<vector<vector<vector<ckdesc> > > > checksums; // [n][rl][tl][c]
   
 } // namespace Carpet