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

Stephane Popinet popinet at users.sf.net
Tue Nov 24 12:24:07 UTC 2009


The following commit has been merged in the upstream branch:
commit 16a3e0fafaffa6e80bc784238803b4ad55693b7c
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Thu Jun 18 13:18:40 2009 +1000

    Bug fix for write() method of GfsSurface
    
    darcs-hash:20090618031840-d4795-08622665d24118d9be263b988393ff343b1e7087.gz

diff --git a/src/surface.c b/src/surface.c
index f60daad..410dcae 100644
--- a/src/surface.c
+++ b/src/surface.c
@@ -479,24 +479,26 @@ static void surface_write (GtsObject * o, FILE * fp)
     gfs_function_write (surface->f, fp);
     fputs (" )", fp);
   }
-  fputs (" {\n", fp);
-  if (gts_vector_norm (surface->translate) > 0.)
-    fprintf (fp, "  tx = %g ty = %g tz = %g\n",
-	     surface->translate[0], surface->translate[1], surface->translate[2]);
-  if (surface->scale[0] != 1. || surface->scale[1] != 1. || surface->scale[2] != 1.)
-    fprintf (fp, "  sx = %g sy = %g sz = %g\n",
-	     surface->scale[0], surface->scale[1], surface->scale[2]);
-  if (surface->rotate[0] != 0.)
-    fprintf (fp, "  rx = %g\n", surface->rotate[0]);
-  if (surface->rotate[1] != 0.)
-    fprintf (fp, "  ry = %g\n", surface->rotate[1]);
-  if (surface->rotate[2] != 0.)
-    fprintf (fp, "  rz = %g\n", surface->rotate[2]);
-  if (surface->flip)
-    fputs ("  flip = 1\n", fp);
-  if (surface->twod)
-    fputs ("  twod = 1\n", fp);
-  fputc ('}', fp);
+  if (surface->m) {
+    fputs (" {\n", fp);
+    if (gts_vector_norm (surface->translate) > 0.)
+      fprintf (fp, "  tx = %g ty = %g tz = %g\n",
+	       surface->translate[0], surface->translate[1], surface->translate[2]);
+    if (surface->scale[0] != 1. || surface->scale[1] != 1. || surface->scale[2] != 1.)
+      fprintf (fp, "  sx = %g sy = %g sz = %g\n",
+	       surface->scale[0], surface->scale[1], surface->scale[2]);
+    if (surface->rotate[0] != 0.)
+      fprintf (fp, "  rx = %g\n", surface->rotate[0]);
+    if (surface->rotate[1] != 0.)
+      fprintf (fp, "  ry = %g\n", surface->rotate[1]);
+    if (surface->rotate[2] != 0.)
+      fprintf (fp, "  rz = %g\n", surface->rotate[2]);
+    if (surface->flip)
+      fputs ("  flip = 1\n", fp);
+    if (surface->twod)
+      fputs ("  twod = 1\n", fp);
+    fputc ('}', fp);
+  }
 }
 
 static void surface_destroy (GtsObject * object)

-- 
Gerris Flow Solver



More information about the debian-science-commits mailing list