Made multiple multigrid levels for the special case of a single

Made multiple multigrid levels for the special case of a single
multigrid level "work".  That is, it runs wavetoy.

darcs-hash:20020109201510-07bb3-1459e6d1a6ceca29b86c91fbbac6139e30581931.gz

1 files changed, 14 insertions, 14 deletions

diff --git a/Carpet/Carpet/src/variables.cc b/Carpet/Carpet/src/variables.cc
index a8a2a7c75..23c637099 100644
--- a/Carpet/Carpet/src/variables.cc
+++ b/Carpet/Carpet/src/variables.cc
@@ -5,7 +5,7 @@
 
 #include "carpet.hh"
 
-static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/variables.cc,v 1.5 2002/01/09 17:45:40 schnetter Exp $";
+static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/variables.cc,v 1.6 2002/01/09 21:15:11 schnetter Exp $";
 
 
 
@@ -18,15 +18,6 @@ namespace Carpet {
   // Handle from CCTK_RegisterGHExtension
   int GHExtension;
   
-  // Multigrid levels
-  int mglevels;
-  
-  // Multigrid factor
-  int mgfact;
-  
-  // Multigrid factor on coarsest grid
-  int maxmglevelfact;
-  
   // Maximum number of refinement levels
   int maxreflevels;
   
@@ -36,20 +27,29 @@ namespace Carpet {
   // Refinement factor on finest grid
   int maxreflevelfact;
   
+  // Multigrid levels
+  int mglevels;
+  
+  // Multigrid factor
+  int mgfact;
+  
+  // Multigrid factor on coarsest grid
+  int maxmglevelfact;
+  
   // Current iteration per refinement level
   vector<int> iteration;
   
   // Current position on the grid hierarchy
-  int mglevel;
   int reflevel;
+  int mglevel;
   int component;
   
-  // multigrid factor of current level: ipow(multigrid_factor, mglevel)
-  int mglevelfact;
-  
   // refinement factor of current level: ipow(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;