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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit b57d744618fbbcd2e68b5b0dd79cbd2802a83404
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Sat Oct 14 17:18:41 2006 +1000

    Bug fix for OutputPPM for 2D GfsOcean
    
    darcs-hash:20061014071841-d4795-c936275aa4f7ef8166471e357586698a93133d86.gz

diff --git a/src/ocean.h b/src/ocean.h
index fc94948..5c5b561 100644
--- a/src/ocean.h
+++ b/src/ocean.h
@@ -34,9 +34,10 @@ typedef struct _GfsOcean         GfsOcean;
 
 struct _GfsOcean {
   GfsSimulation parent;
-
+#if !FTT_2D
   GPtrArray * layer;
   GfsDomain * toplayer;
+#endif /* 2D3 or 3D */
 };
 
 #define GFS_OCEAN(obj)            GTS_OBJECT_CAST (obj,\
diff --git a/src/output.c b/src/output.c
index c885594..48b8d31 100644
--- a/src/output.c
+++ b/src/output.c
@@ -2843,7 +2843,11 @@ static gboolean gfs_output_ppm_event (GfsEvent * event, GfsSimulation * sim)
   if ((* GFS_EVENT_CLASS (GTS_OBJECT_CLASS (gfs_output_ppm_class ())->parent_class)->event) 
       (event, sim)) {
     GfsOutputScalar * output = GFS_OUTPUT_SCALAR (event);
+#if FTT_2D
+    GfsDomain * domain = GFS_DOMAIN (sim);
+#else /* 2D3 or 3D */
     GfsDomain * domain = GFS_IS_OCEAN (sim) ? GFS_OCEAN (sim)->toplayer : GFS_DOMAIN (sim);
+#endif /* 2D3 or 3D */
 
     gfs_write_ppm (domain,
 		   output->box,

-- 
Gerris Flow Solver