Write file information to output files only if IO::out_fileinfo is set.

For testsuite parameter files such information should not be output.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/IOASCII/trunk@52 94b1c47f-dcfd-45ef-a468-0854c0e9e350

2 files changed, 50 insertions, 22 deletions

diff --git a/src/Write1D.c b/src/Write1D.c
index 05a9c13..cd3b122 100644
--- a/src/Write1D.c
+++ b/src/Write1D.c
@@ -348,22 +348,36 @@ void IOASCII_Write1D (cGH *GH, int vindex, const char *alias)
 
           IOUtil_AdvertiseFile (GH, filename, &advertised_file);
 
-          CCTK_ParameterFilename (sizeof (buffer), buffer);
-          fprintf (file[i], "%cParameter file %s\n", comment_char, buffer);
-          Util_CurrentDate (sizeof (buffer), buffer);
-          fprintf (file[i], "%cCreated %s ", comment_char, buffer);
-          Util_CurrentTime (sizeof (buffer), buffer);
-          fprintf (file[i], "%s\n", buffer);
-          if (i % 4 < 3)
-          {
-            fprintf (file[i], "%cx-label %c\n", comment_char, 'x' + i % 4);
+          if (CCTK_Equals (out_fileinfo, "parameter filename") ||
+              CCTK_Equals (out_fileinfo, "all"))    
+          {     
+            buffer[0] = 0;    
+            CCTK_ParameterFilename (sizeof (buffer), buffer);
+            fprintf (file[i], "%cParameter file %s\n", comment_char, buffer);
           }
-          else
+          if (CCTK_Equals (out_fileinfo, "creation date") ||
+              CCTK_Equals (out_fileinfo, "all"))    
+          {     
+            buffer[0] = 0;
+            Util_CurrentDate (sizeof (buffer), buffer);
+            fprintf (file[i], "%cCreated %s ", comment_char, buffer);
+            Util_CurrentTime (sizeof (buffer), buffer);
+            fprintf (file[i], "%s\n", buffer);
+          }
+          if (CCTK_Equals (out_fileinfo, "axis labels") ||
+              CCTK_Equals (out_fileinfo, "all"))
           {
-            fprintf (file[i], "%cx-label diagonal\n", comment_char);
+            if (i % 4 < 3)
+            {
+              fprintf (file[i], "%cx-label %c\n", comment_char, 'x' + i % 4);
+            }
+            else
+            {
+              fprintf (file[i], "%cx-label diagonal\n", comment_char);
+            }
+            fprintf (file[i], "%cy-label %s\n",
+                     comment_char, advertised_file.varname);
           }
-          fprintf (file[i], "%cy-label %s\n",
-                   comment_char, advertised_file.varname);
 
           free (advertised_file.varname);
         }
diff --git a/src/Write2D.c b/src/Write2D.c
index 7e8149c..006a87e 100644
--- a/src/Write2D.c
+++ b/src/Write2D.c
@@ -244,15 +244,29 @@ FIXME: get rid of PUGH here
 
         IOUtil_AdvertiseFile (GH, filename, &advertised_file);
 
-        CCTK_ParameterFilename (sizeof (buffer), buffer);
-        fprintf (fdset_2D[dir], "#Parameter file %s\n", buffer);
-        Util_CurrentDate (sizeof (buffer), buffer);
-        fprintf (fdset_2D[dir], "#Created %s ", buffer);
-        Util_CurrentTime (sizeof (buffer), buffer);
-        fprintf (fdset_2D[dir], "%s\n", buffer);
-        fprintf (fdset_2D[dir], "#x-label %c\n", extensions[dir][0]);
-        fprintf (fdset_2D[dir], "#y-label %c\n", extensions[dir][1]);
-        fprintf (fdset_2D[dir], "#z-label %s\n", advertised_file.varname);
+        if (CCTK_Equals (out_fileinfo, "parameter filename") ||
+            CCTK_Equals (out_fileinfo, "all"))
+        {
+          buffer[0] = 0;
+          CCTK_ParameterFilename (sizeof (buffer), buffer);
+          fprintf (fdset_2D[dir], "#Parameter file %s\n", buffer);
+        }
+        if (CCTK_Equals (out_fileinfo, "creation date") ||
+            CCTK_Equals (out_fileinfo, "all"))
+        {
+          buffer[0] = 0;
+          Util_CurrentDate (sizeof (buffer), buffer);
+          fprintf (fdset_2D[dir], "#Created %s ", buffer);
+          Util_CurrentTime (sizeof (buffer), buffer);
+          fprintf (fdset_2D[dir], "%s\n", buffer);
+        }
+        if (CCTK_Equals (out_fileinfo, "axis labels") ||
+            CCTK_Equals (out_fileinfo, "all"))
+        {
+          fprintf (fdset_2D[dir], "#x-label %c\n", extensions[dir][0]);
+          fprintf (fdset_2D[dir], "#y-label %c\n", extensions[dir][1]);
+          fprintf (fdset_2D[dir], "#z-label %s\n", advertised_file.varname);
+        }
 
         free (advertised_file.varname);
       }