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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit e1f52aac0e9e60e429da7092f679bbd5f298ec57
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Wed Oct 25 08:41:50 2006 +1000

    Removed non-standard C++-style comments
    
    darcs-hash:20061024224150-d4795-5b109d3a3ae22f826d5ed0166194ae4f4efb4133.gz

diff --git a/src/ocean.c b/src/ocean.c
index 0928a16..f5d82e2 100644
--- a/src/ocean.c
+++ b/src/ocean.c
@@ -306,8 +306,8 @@ static void ocean_run (GfsSimulation * sim)
     gts_container_foreach (GTS_CONTAINER (sim->events), (GtsFunc) gfs_event_half_do, sim);
 
     gfs_correct_normal_velocities_weighted (domain, 2, p, g, 0., FALSE); 
-    // just there so that the call below 
-    // has sthg to free
+    /* just there so that the call below 
+       has sthg to free */
     gfs_centered_velocity_advection_diffusion (domain, 2,
 					       &sim->advection_params,
 					       g,
@@ -790,7 +790,7 @@ static void hydrostatic_pressure (FttCell * cell, gpointer * data)
   while (f.neighbor) {
     g_assert (ftt_face_type (&f) == FTT_FINE_FINE);
     r1 = gfs_face_interpolated_value (&f, rho->i);
-    //    g_assert (r1 >= r);
+    /* g_assert (r1 >= r); */
     r = r1;
     GFS_VARIABLE (f.neighbor, vp->i) = p = p + (*g)*r;
     f.cell = f.neighbor;

-- 
Gerris Flow Solver