[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 247b03b1e6e4307b9e67989734e754886054d6e9
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Thu Jan 15 14:08:30 2009 +1100

    stderr and stdout are muted in parallel
    
    darcs-hash:20090115030830-d4795-b04d3013c3f25a7a011176edaa1a8945b4879c01.gz

diff --git a/src/output.c b/src/output.c
index c60803e..b1dfaea 100644
--- a/src/output.c
+++ b/src/output.c
@@ -239,13 +239,13 @@ static void gfs_output_read (GtsObject ** o, GtsFile * fp)
     output->format = g_strdup (fp->token->str);
     gts_file_next_token (fp);
     
-    if (!strcmp (output->format, "stderr")) {
-      output->file = gfs_output_file_open ("stderr", "w");
-      return;
-    }
-    
-    if (!strcmp (output->format, "stdout")) {
-      output->file = gfs_output_file_open ("stdout", "w");
+    if (!strcmp (output->format, "stderr") || !strcmp (output->format, "stdout")) {
+      if (GFS_DOMAIN (gfs_object_simulation (output))->pid > 0)
+	gfs_output_mute (output);
+      else {
+	g_assert (!output->file);
+	output->file = gfs_output_file_open (output->format, "w");
+      }
       return;
     }
     

-- 
Gerris Flow Solver