Rename the parameter h5verbose to verbose.

darcs-hash:20040403134237-07bb3-8bb947389abf79bfad644fdf6ed22b8861a9e7f2.gz

4 files changed, 28 insertions, 28 deletions

diff --git a/Carpet/CarpetIOHDF5/par/CarpetWaveToyCheckpointTest.par b/Carpet/CarpetIOHDF5/par/CarpetWaveToyCheckpointTest.par
index 4f19621a7..2d1c670ac 100644
--- a/Carpet/CarpetIOHDF5/par/CarpetWaveToyCheckpointTest.par
+++ b/Carpet/CarpetIOHDF5/par/CarpetWaveToyCheckpointTest.par
@@ -40,7 +40,7 @@ IDScalarWave::radius		= 0.0
 
 iohdf5::checkpoint = "yes"
 io::checkpoint_every = 12
-iohdf5::h5verbose = "yes"
+iohdf5::verbose = "yes"
 io::checkpoint_keep = 2
 
 #io::recover = "auto"
diff --git a/Carpet/CarpetIOHDF5/param.ccl b/Carpet/CarpetIOHDF5/param.ccl
index 9d8aa2480..71404d0d6 100644
--- a/Carpet/CarpetIOHDF5/param.ccl
+++ b/Carpet/CarpetIOHDF5/param.ccl
@@ -1,5 +1,5 @@
 # Parameter definitions for thorn CarpetIOHDF5
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOHDF5/param.ccl,v 1.7 2004/04/03 12:40:21 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOHDF5/param.ccl,v 1.8 2004/04/03 15:42:37 schnetter Exp $
 
 
 
@@ -28,7 +28,7 @@ private:
 
 
 
-BOOLEAN h5verbose "Produce log output" STEERABLE = ALWAYS
+BOOLEAN verbose "Produce log output" STEERABLE = ALWAYS
 {
 } "no"
 
diff --git a/Carpet/CarpetIOHDF5/src/iohdf5.cc b/Carpet/CarpetIOHDF5/src/iohdf5.cc
index 0f851d9d8..f52e89858 100644
--- a/Carpet/CarpetIOHDF5/src/iohdf5.cc
+++ b/Carpet/CarpetIOHDF5/src/iohdf5.cc
@@ -17,7 +17,7 @@
 #include "cctk_Parameters.h"
 
 extern "C" {
-  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOHDF5/src/iohdf5.cc,v 1.24 2004/04/03 12:40:21 schnetter Exp $";
+  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOHDF5/src/iohdf5.cc,v 1.25 2004/04/03 15:42:37 schnetter Exp $";
   CCTK_FILEVERSION(Carpet_CarpetIOHDF5_iohdf5_cc);
 }
 
@@ -223,7 +223,7 @@ namespace CarpetIOHDF5 {
       
     }
 
-    if(h5verbose) {
+    if(verbose) {
       CCTK_VInfo (CCTK_THORNSTRING, 
 		  "Writing variable %s on refinement level %d",varname,reflevel);
     }
@@ -723,7 +723,7 @@ namespace CarpetIOHDF5 {
       return 0;
     }  
 
-    if (h5verbose) cout << "amr_level: " << amr_level << " reflevel: " << reflevel << endl;
+    if (verbose) cout << "amr_level: " << amr_level << " reflevel: " << reflevel << endl;
     
     if (amr_level == rl) {
 	  
@@ -763,7 +763,7 @@ namespace CarpetIOHDF5 {
 	   //cout << "lb_before: " << lb << endl;
 	   //cout << "ub_before: " << ub << endl;
 	   if (cgdata.disttype == CCTK_DISTRIB_CONSTANT) {
-	     if (h5verbose) cout << "CCTK_DISTRIB_CONSTANT: " << varname << endl;
+	     if (verbose) cout << "CCTK_DISTRIB_CONSTANT: " << varname << endl;
 	     assert(grouptype == CCTK_ARRAY || grouptype == CCTK_SCALAR);
 	     if (grouptype == CCTK_SCALAR) {
 	       lb[0] = arrdata.at(group).at(Carpet::map).hh->processors.at(rl).at(component);
@@ -782,12 +782,12 @@ namespace CarpetIOHDF5 {
 	       lb[gpdim-1] = newlb;
 	       ub[gpdim-1] = newub;
 	     }
-	      if (h5verbose)  cout << "lb: " << lb << endl;
-	      if (h5verbose)  cout << "ub: " << ub << endl;
+	      if (verbose)  cout << "lb: " << lb << endl;
+	      if (verbose)  cout << "ub: " << ub << endl;
 	   }
 	   const bbox<int,dim> ext(lb,ub,str);
 	   
-	   if (h5verbose) cout << "ext: " << ext << endl;
+	   if (verbose) cout << "ext: " << ext << endl;
 	     
 	   if (CCTK_MyProc(cctkGH)==0) {
 	     tmp->allocate (ext, 0, h5data);
@@ -800,7 +800,7 @@ namespace CarpetIOHDF5 {
 	   const bbox<int,dim> overlap = tmp->extent() & data->extent();
 	   regions_read.at(Carpet::map) |= overlap;
 
-	   if (h5verbose) {
+	   if (verbose) {
 	     cout << "working on component: " << component << endl;
 	     cout << "tmp->extent " << tmp->extent() << endl;
 	     cout << "data->extent " << data->extent() << endl;
@@ -894,7 +894,7 @@ namespace CarpetIOHDF5 {
     if (CCTK_MyProc(cctkGH)==0) {
       
       // Open the file 
-      if (h5verbose) CCTK_VInfo (CCTK_THORNSTRING, "Opening file \"%s\"", filename);
+      if (verbose) CCTK_VInfo (CCTK_THORNSTRING, "Opening file \"%s\"", filename);
       reader = H5Fopen (filename, H5F_ACC_RDONLY, H5P_DEFAULT);
       if (reader<0) {
         CCTK_VWarn (0, __LINE__, __FILE__, CCTK_THORNSTRING,
@@ -913,7 +913,7 @@ namespace CarpetIOHDF5 {
       
 
     for (int datasetid=0; datasetid<ndatasets; ++datasetid) {
-      if (h5verbose) CCTK_VInfo (CCTK_THORNSTRING, "Handling dataset #%d", datasetid);
+      if (verbose) CCTK_VInfo (CCTK_THORNSTRING, "Handling dataset #%d", datasetid);
 
         
       // Read data
@@ -936,7 +936,7 @@ namespace CarpetIOHDF5 {
        char * name;
        ReadAttribute (dataset, "name", name);
        //        cout << "dataset name is " << name << endl;
-       if (h5verbose) {
+       if (verbose) {
 	 if (name) {
 		CCTK_VInfo (CCTK_THORNSTRING, "Dataset name is \"%s\"", name);
 	 }
@@ -958,7 +958,7 @@ namespace CarpetIOHDF5 {
       
     // Close the file
     if (CCTK_MyProc(cctkGH)==0) {
-      if (h5verbose) CCTK_VInfo (CCTK_THORNSTRING, "Closing file");
+      if (verbose) CCTK_VInfo (CCTK_THORNSTRING, "Closing file");
       herr = H5Fclose(reader);
       //	  cout << "blah! " << reader << "\n";
       // cout << "closing file " << herr << "\n";
diff --git a/Carpet/CarpetIOHDF5/src/iohdf5chckpt_recover.cc b/Carpet/CarpetIOHDF5/src/iohdf5chckpt_recover.cc
index 8792fa949..d55984058 100644
--- a/Carpet/CarpetIOHDF5/src/iohdf5chckpt_recover.cc
+++ b/Carpet/CarpetIOHDF5/src/iohdf5chckpt_recover.cc
@@ -18,7 +18,7 @@
 #include "cctk_Version.h"
 
 extern "C" {
-  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOHDF5/src/iohdf5chckpt_recover.cc,v 1.20 2004/03/26 15:51:12 bzink Exp $";
+  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOHDF5/src/iohdf5chckpt_recover.cc,v 1.21 2004/04/03 15:42:37 schnetter Exp $";
   CCTK_FILEVERSION(Carpet_CarpetIOHDF5_iohdf5chckpt_recover_cc);
 }
 
@@ -135,7 +135,7 @@ namespace CarpetIOHDF5 {
 
       if (myproc == 0) {
 	// First, open the file
-	if (h5verbose) 
+	if (verbose) 
 	  CCTK_VInfo(CCTK_THORNSTRING, "Opening Checkpoint file %s for recovery",filename);
 	reader = H5Fopen (filename, H5F_ACC_RDONLY, H5P_DEFAULT);
 	if (reader<0) {
@@ -216,7 +216,7 @@ namespace CarpetIOHDF5 {
 	assert(!mpierr);
       }
 
-      if (h5verbose) {
+      if (verbose) {
 	cout << "leveltimes: " << leveltimes << endl;
       }
 
@@ -225,7 +225,7 @@ namespace CarpetIOHDF5 {
       result += RecoverGHextensions(cctkGH,reader);
 
 	  
-      if (h5verbose) {
+      if (verbose) {
 	cout << "reflevel: " << reflevel << endl;
       }
 
@@ -283,7 +283,7 @@ namespace CarpetIOHDF5 {
 
     assert ((ndatasets)>=0);
     
-    //if (h5verbose && reflevel==0) cout << "ndatasets: " << ndatasets << endl;
+    //if (verbose && reflevel==0) cout << "ndatasets: " << ndatasets << endl;
     if ( reflevel == 0) {
       cout << "ndatasets: " << ndatasets << endl;
     }
@@ -367,7 +367,7 @@ namespace CarpetIOHDF5 {
 
       name = CCTK_FullName(varindex);
 
-      if (h5verbose) {
+      if (verbose) {
 	cout << name << "  rl: " << reflevel << endl;
       }
       vector<ibset> regions_read(Carpet::maps);
@@ -491,7 +491,7 @@ namespace CarpetIOHDF5 {
       herr = H5Gclose(group);
       assert(!herr);
 
-      if(h5verbose) {
+      if(verbose) {
 	CCTK_VInfo (CCTK_THORNSTRING, "\n%s\n",parameters);
       }
 
@@ -575,7 +575,7 @@ namespace CarpetIOHDF5 {
 
     if (myproc == 0) {
 
-      if (h5verbose) {
+      if (verbose) {
 	CCTK_VInfo (CCTK_THORNSTRING, "Creating temporary checkpoint file '%s'", cp_tempname);
       }
       writer = H5Fcreate (cp_tempname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
@@ -601,7 +601,7 @@ namespace CarpetIOHDF5 {
 
       BEGIN_REFLEVEL_LOOP(cctkGH) {
 
-	if (h5verbose)
+	if (verbose)
 	  {
 	    CCTK_INFO ("Dumping Grid Variables ...");
 	  }
@@ -635,7 +635,7 @@ namespace CarpetIOHDF5 {
 		gtotalsize=tlsh[i];		  
 	      }
 	      if(gtotalsize == 0){
-		if (h5verbose) CCTK_VInfo(CCTK_THORNSTRING, 
+		if (verbose) CCTK_VInfo(CCTK_THORNSTRING, 
 		    "Group %s is zero-sized. No checkpoint info written",CCTK_GroupName(group));
 		continue;
 	      }
@@ -671,7 +671,7 @@ namespace CarpetIOHDF5 {
 		     request->timelevel < gdata.numtimelevels;
 		     request->timelevel++)
 		  {
-		    if (h5verbose)
+		    if (verbose)
 		      {
 			fullname = CCTK_FullName (request->vindex);
 			if (fullname != NULL) {
@@ -689,7 +689,7 @@ namespace CarpetIOHDF5 {
 		    if (grouptype == CCTK_ARRAY || grouptype == CCTK_GF || grouptype == CCTK_SCALAR)
 		      {
 			char* fullname = CCTK_FullName (request->vindex);
-			if (h5verbose)
+			if (verbose)
 			  CCTK_VInfo (CCTK_THORNSTRING,"%s: reflevel: %d map: %d component: %d grouptype: %d ",
 				      fullname,reflevel,Carpet::map,component,grouptype);
 			free(fullname);
@@ -760,7 +760,7 @@ namespace CarpetIOHDF5 {
     const char *version;
     ioGH *ioUtilGH;
   
-    if (h5verbose) {
+    if (verbose) {
       CCTK_INFO ("Dumping Parameters and GH Extentions...");
     }