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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 7a1f7e82aa37c66de74c1ae41a8196ac579e5bb1
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Tue May 12 13:18:55 2009 +1000

    Check that SolidMoving is used within SimulationMoving
    
    darcs-hash:20090512031855-d4795-1e7020b994b10a4d19bf9aef7f589ceca19514c0.gz

diff --git a/src/moving.c b/src/moving.c
index b745027..a9e7ff7 100644
--- a/src/moving.c
+++ b/src/moving.c
@@ -228,6 +228,11 @@ static void solid_moving_read (GtsObject ** o, GtsFile * fp)
     return;
   }
 
+  if (!GFS_IS_SIMULATION_MOVING (gfs_object_simulation (*o))) {
+    gts_file_error (fp, "GfsSolidMoving only makes sense with GfsSimulationMoving");
+    return;
+  }
+
   if (fp->type != '{') {
     gts_file_error (fp, "expecting an opening brace");
     return;

-- 
Gerris Flow Solver