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

Stephane Popinet popinet at users.sf.net
Fri May 15 02:53:50 UTC 2009


The following commit has been merged in the upstream branch:
commit 560b67432dd0b827260f5cd2a6939c080b68bbda
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Tue Dec 19 06:52:43 2006 +1100

    Changed the format used by gfs_write_mac_velocity() to gnuplot
    
    darcs-hash:20061218195243-d4795-54f9a0188d15a59c7fc6a6f3b026b0f17a70daae.gz

diff --git a/src/graphic.c b/src/graphic.c
index 3b03cf3..816b9cb 100644
--- a/src/graphic.c
+++ b/src/graphic.c
@@ -875,7 +875,7 @@ static void write_mac (FttCellFace * face, gpointer * data)
 #endif /* not FTT_2D */
     default: g_assert_not_reached ();
     }
-    fprintf (fp, "VECT 1 3 0 3 0 %g %g %g %g %g %g %g %g %g\n",
+    fprintf (fp, "%g %g %g\n%g %g %g\n%g %g %g\n\n",
 	     p.x + f.x - (f.x - f.y/2.)/5.,
 	     p.y + f.y - (f.x/2. + f.y)/5.,
 	     p.z + f.z,
@@ -885,7 +885,7 @@ static void write_mac (FttCellFace * face, gpointer * data)
 	     p.x + f.x - (f.x + f.y/2.)/5.,
 	     p.y + f.y + (f.x/2. - f.y)/5.,
 	     p.z + f.z);
-    fprintf (fp, "VECT 1 2 0 2 0 %g %g %g %g %g %g\n",
+    fprintf (fp, "%g %g %g\n%g %g %g\n\n",
 	     p.x, p.y, p.z,
 	     p.x + f.x,
 	     p.y + f.y,
@@ -906,7 +906,6 @@ void gfs_write_mac_velocity (GfsDomain * domain,
   g_return_if_fail (domain != NULL);
   g_return_if_fail (fp != NULL);
 
-  fputs ("LIST{", fp);
   norm = gfs_domain_norm_velocity (domain, flags, level);
   scale = norm.infty > 0. ? 
     ftt_level_size (level < 0 ? gfs_domain_depth (domain) : level)*
@@ -916,7 +915,6 @@ void gfs_write_mac_velocity (GfsDomain * domain,
   data[2] = bbox;
   gfs_domain_face_traverse (domain, FTT_XYZ, FTT_PRE_ORDER, flags, level,
 			   (FttFaceTraverseFunc) write_mac, data);
-  fputc ('}', fp);
 }
 
 void gfs_draw_cells (FttCell * cell, 

-- 
Gerris Flow Solver



More information about the debian-science-commits mailing list