yet another not working cvs commit to save the current state

darcs-hash:20030924063530-62b91-f476be710cbcc753a402f858f1780341384ef3c0.gz

2 files changed, 17 insertions, 17 deletions

diff --git a/CarpetAttic/CarpetIOFlexIOCheckpoint/src/checkpointrestart.cc b/CarpetAttic/CarpetIOFlexIOCheckpoint/src/checkpointrestart.cc
index c3c275477..69d332648 100644
--- a/CarpetAttic/CarpetIOFlexIOCheckpoint/src/checkpointrestart.cc
+++ b/CarpetAttic/CarpetIOFlexIOCheckpoint/src/checkpointrestart.cc
@@ -48,7 +48,7 @@
 #include "ioflexio.hh"
 
 extern "C" {
-  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIOCheckpoint/src/checkpointrestart.cc,v 1.7 2003/09/23 12:34:43 cvs_anon Exp $";
+  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIOCheckpoint/src/checkpointrestart.cc,v 1.8 2003/09/24 08:35:30 cvs_anon Exp $";
   CCTK_FILEVERSION(Carpet_CarpetIOFlexIO_checkpointrestart_cc);
 }
 
@@ -224,17 +224,9 @@ namespace CarpetCheckpointRestart {
 
     
     // now dump the grid varibles for all reflevels and components, sorted by groups
-    //   CCTK_VInfo (CCTK_THORNSTRING, "maxreflevelfact,reflevelfact,it %d,%d,%d",maxreflevelfact,reflevelfact,cgh->cctk_iteration);
     BEGIN_REFLEVEL_LOOP(cgh) {
 
-     const int do_every = maxreflevelfact/reflevelfact;
-      if (cgh->cctk_iteration % do_every == 0) {
-	
-	BEGIN_MGLEVEL_LOOP(cgh) {
-	  const int do_every = mglevelfact * maxreflevelfact/reflevelfact;
-          CCTK_VInfo (CCTK_THORNSTRING, "do_every %d",do_every);	 	  
-
-	  if (cgh->cctk_iteration % do_every == 0) {
+  	BEGIN_MGLEVEL_LOOP(cgh) {
 	      
 	    if (CCTK_Equals ("verbose", "full"))
 	    {
@@ -301,9 +293,12 @@ namespace CarpetCheckpointRestart {
 		  {
 		    retval += WriteGS(cgh,writer,request);
 		  }
-		  //		  else if (grouptype == CCTK_ARRAY || grouptype == CCTK_GF)
-		  else if (grouptype == CCTK_GF)
+		  else if (grouptype == CCTK_ARRAY || grouptype == CCTK_GF)
+		    //else if (grouptype == CCTK_GF)
 		  {
+		    char* fullname = CCTK_FullName (request->vindex);
+		    CCTK_VInfo (CCTK_THORNSTRING,"%s:: reflevel: %d component: %d grouptype: %d ",fullname,reflevel,component,grouptype);
+		    free(fullname);
 		    retval += WriteGF(cgh,writer,amrwriter,request);
 		  }
 		  else
@@ -317,9 +312,9 @@ namespace CarpetCheckpointRestart {
 	      } /* end of loop over all variables */
 	
 	    } /* end of loop over all groups */
-	  }
+	
 	} END_MGLEVEL_LOOP;
-      }
+    
     } END_REFLEVEL_LOOP;
 
 
diff --git a/CarpetAttic/CarpetIOFlexIOCheckpoint/src/ioflexio.cc b/CarpetAttic/CarpetIOFlexIOCheckpoint/src/ioflexio.cc
index 518b75349..ea9a63960 100644
--- a/CarpetAttic/CarpetIOFlexIOCheckpoint/src/ioflexio.cc
+++ b/CarpetAttic/CarpetIOFlexIOCheckpoint/src/ioflexio.cc
@@ -44,7 +44,7 @@
 #include "ioflexio.hh"
 
 extern "C" {
-  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIOCheckpoint/src/ioflexio.cc,v 1.6 2003/09/23 12:34:43 cvs_anon Exp $";
+  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIOCheckpoint/src/ioflexio.cc,v 1.7 2003/09/24 08:35:30 cvs_anon Exp $";
   CCTK_FILEVERSION(Carpet_CarpetIOFlexIO_ioflexio_cc);
 }
 
@@ -209,8 +209,13 @@ namespace CarpetIOFlexIO {
       const ggf<dim>* ff = 0;
 
 
-    if (grouptype == CCTK_ARRAY)
+    if (grouptype == CCTK_ARRAY){
+      // this is a DIRTY hack to fix problems caused by the fact that I am to lazy to write a more
+      //   general output routine...
       CCTK_VInfo (CCTK_THORNSTRING, "ARRAY reflevel: %d component: %d grouptype: %d ",reflevel,component,grouptype);
+      component = 0;
+      reflevel = 0;
+    }
     else
       CCTK_VInfo (CCTK_THORNSTRING, "GF reflevel: %d component: %d grouptype: %d",reflevel,component,grouptype);
 
@@ -351,7 +356,7 @@ namespace CarpetIOFlexIO {
        // executed for scalars; see macro definition.
 
 
-       //      CCTK_VInfo (CCTK_THORNSTRING, "SCALAR reflevel,component,mglevel %d,%d,%d",reflevel,component,mglevel);
+      CCTK_VInfo (CCTK_THORNSTRING, "SCALAR reflevel,component,mglevel %d,%d,%d",reflevel,component,mglevel);
       writer->write(FlexIODataType(CCTK_VarTypeI(varindex)),1,&dim,buffer);
       /* scalars have size 0 */
       request->hsize[0] = 0;