1 files changed, 19 insertions, 25 deletions

diff --git a/src/Output1D.c b/src/Output1D.c
index dae1ffd..8c18aed 100644
--- a/src/Output1D.c
+++ b/src/Output1D.c
@@ -294,7 +294,6 @@ int IOASCII_TriggerOutput1D (const cGH *GH, int vindex)
 static void CheckSteerableParameters (asciiioGH *myGH)
 {
   int i, num_vars, out_old, times_set;
-  int verboselength;
   char *fullname, *msg;
   static int out1D_vars_lastset = -1;
   DECLARE_CCTK_PARAMETERS
@@ -310,13 +309,16 @@ static void CheckSteerableParameters (asciiioGH *myGH)
   }
 
   /* Report if frequency changed */
-  if (myGH->out1D_every != out_old)
+  if (myGH->out1D_every != out_old && ! CCTK_Equals (newverbose, "none"))
   {
-    if (CCTK_Equals (newverbose, "standard") ||
-        CCTK_Equals (newverbose, "full"))
+    if (myGH->out1D_every > 0)
     {
-      CCTK_VInfo (CCTK_THORNSTRING, "IOASCII_1D: Output every %d iterations",
-                  myGH->out1D_every);
+      CCTK_VInfo (CCTK_THORNSTRING, "IOASCII_1D: Periodic output every %d "
+                  "iterations", myGH->out1D_every);
+    }
+    else
+    {
+      CCTK_INFO ("IOASCII_1D: Periodic output turned off");
     }
   }
 
@@ -329,31 +331,23 @@ static void CheckSteerableParameters (asciiioGH *myGH)
     CCTK_TraverseString (out1D_vars, SetOutputFlag, myGH->do_out1D,
                          CCTK_GROUP_OR_VAR);
 
-    if (CCTK_Equals (newverbose, "standard") ||
-        CCTK_Equals (newverbose, "full"))
+    if (! CCTK_Equals (newverbose, "none"))
     {
-
-      /* Count the length of the string */
-      verboselength = 0;
-      for (i = 0; i < num_vars; i++)
-      {
-        if (myGH->do_out1D[i])
-        {
-          fullname = CCTK_FullName (i);
-          verboselength += strlen(fullname)+1;
-          free (fullname);
-        }
-      }
-      verboselength += strlen("IOASCII_1D: Output requested for ");
-      msg = (char *)malloc((verboselength+1)*sizeof(char));
-
-      sprintf(msg,"IOASCII_1D: Output requested for ");
+      msg = NULL;
       for (i = 0; i < num_vars; i++)
       {
         if (myGH->do_out1D[i])
         {
           fullname = CCTK_FullName (i);
-          sprintf (msg, "%s %s",msg,fullname);
+          if (! msg)
+          {
+            Util_asprintf (&msg, "IOASCII_1D: Periodic output requested for "
+                           "'%s'", fullname);
+          }
+          else
+          {
+            Util_asprintf (&msg, "%s, '%s'", msg, fullname);
+          }
           free (fullname);
         }
       }