Adding output of the value of a scalar on processor 0. One day perhaps

we'll have this get info from other procs too.

Tom


git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/IOBasic/trunk@92 b589c3ab-70e8-4b4d-a09f-cba2dd200880

1 files changed, 60 insertions, 28 deletions

diff --git a/src/OutputInfo.c b/src/OutputInfo.c
index 779ac80..224c60b 100644
--- a/src/OutputInfo.c
+++ b/src/OutputInfo.c
@@ -123,17 +123,29 @@ int IOBasic_OutputInfoGH (cGH *GH)
     {
       if (myGH->do_outInfo[i])
       {
-        sprintf (ll, "                                        ");
-        ll[25 - strlen (CCTK_VarName (i))] = '\0';
-        sprintf (l1, "%s %s%s |", l1, CCTK_VarName (i), ll);
-        sprintf (l2, "%s Min          Max          |", l2);
-        sprintf (l3, "%s----------------------------", l3);
+        if(CCTK_GroupTypeFromVarI(i) != CCTK_SCALAR)
+        {
+          sprintf (ll, "                                        ");
+          ll[25 - strlen (CCTK_VarName (i))] = '\0';
+          sprintf (l1, "%s %s%s |", l1, CCTK_VarName (i), ll);
+          sprintf (l2, "%s Min          Max          |", l2);
+          sprintf (l3, "%s----------------------------", l3);
+        }
+        else
+        {
+          sprintf (ll, "                                        ");
+          ll[25 - strlen (CCTK_VarName (i))] = '\0';
+          sprintf (l1, "%s %s%s |", l1, CCTK_VarName (i), ll);
+          sprintf (l2, "%s Value                     |", l2);
+          sprintf (l3, "%s----------------------------", l3);
+        }
       }
     }
     printf ("%s\n%s\n%s\n%s\n", l3, l1, l2, l3);
     fflush (stdout);
   }
 
+
   /* Print the iteration/timestep information for all variables */        
   if (USE_DECIMAL_NOTATION (GH->cctk_time))
   {
@@ -170,47 +182,67 @@ int IOBasic_OutputInfoGH (cGH *GH)
       printf("  Last output iteration was = %d\n", myGH->outInfo_last[i]);
 #endif
 
-      /* Make the IO call */
-      ierr1 = IOBasic_WriteInfo (GH, &myGH->infovals[i][0], i, "minimum",vname);
-      ierr2 = IOBasic_WriteInfo (GH, &myGH->infovals[i][1], i, "maximum",vname);
-
+      if(CCTK_GroupTypeFromVarI(i) != CCTK_SCALAR)
+      {
+        /* Make the IO call */
+        ierr1 = IOBasic_WriteInfo (GH, &myGH->infovals[i][0], i, "minimum",vname);
+        ierr2 = IOBasic_WriteInfo (GH, &myGH->infovals[i][1], i, "maximum",vname);
+      }
+      else
+      {
+        myGH->infovals[i][0] = *(CCTK_REAL *)GH->data[i][0];
+        myGH->infovals[i][1] = *(CCTK_REAL *)GH->data[i][0];
+      }
       /* Register GF as having info output this iteration */
       myGH->outInfo_last[i] = GH->cctk_iteration;
     }
 
-    if (ierr1 == 0)
+    if(CCTK_GroupTypeFromVarI(i) != CCTK_SCALAR)
     {
-      /* finally print out the stuff */
-      if (USE_DECIMAL_NOTATION (myGH->infovals[i][0]))
+      if (ierr1 == 0)
       {
-        printf ("%12.8f |", myGH->infovals[i][0]);
+        /* finally print out the stuff */
+        if (USE_DECIMAL_NOTATION (myGH->infovals[i][0]))
+        {
+          printf ("%12.8f |", myGH->infovals[i][0]);
+        }
+        else
+        {
+          printf ("%10.6e |", myGH->infovals[i][0]);
+        }
       }
       else
       {
-        printf ("%10.6e |", myGH->infovals[i][0]);
+        printf(" ----------- |");
       }
-    }
-    else
-    {
-      printf(" ----------- |");
-    }
-
-    if (ierr2 == 0)
-    {
-      if (USE_DECIMAL_NOTATION (myGH->infovals[i][1]))
+      
+      if (ierr2 == 0)
       {
-        printf ("%12.8f |", myGH->infovals[i][1]);
+        if (USE_DECIMAL_NOTATION (myGH->infovals[i][1]))
+        {
+          printf ("%12.8f |", myGH->infovals[i][1]);
+        }
+        else
+        {
+        printf ("%10.6e |", myGH->infovals[i][1]);
+        }
       }
       else
       {
-        printf ("%10.6e |", myGH->infovals[i][1]);
+        printf(" ----------- |");
       }
     }
     else
     {
-      printf(" ----------- |");
-    }
-
+      if (USE_DECIMAL_NOTATION (myGH->infovals[i][0]))
+      {
+        printf (" %12.8f              |", myGH->infovals[i][0]);
+      }
+      else
+      {
+        printf (" %10.6e              |", myGH->infovals[i][0]);
+      }
+    }      
   } /* end of loop over all variables */
 
   /* Add the new line */