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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 1779dab59dabbf2c3678daf28bb57242598cb46e
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Thu Jan 10 10:20:30 2008 +1100

    Stricter syntax checking for read() method of Domain
    
    darcs-hash:20080109232030-d4795-9a17f8f8578e086f2de94ca2a870b850b1edd253.gz

diff --git a/src/domain.c b/src/domain.c
index 12847d5..7bde91d 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -111,16 +111,27 @@ static void domain_read (GtsObject ** o, GtsFile * fp)
     return;
   }
 
+#if FTT_2D
+  if (var[3].set) {
+    gts_file_variable_error (fp, var, "z", "unknown identifier `z'");
+    return;
+  }
+  if (var[6].set) {
+    gts_file_variable_error (fp, var, "lz", "unknown identifier `lz'");
+    return;
+  }
+#endif
+
   if (var[4].set && domain->lambda.x <= 0.) {
-    gts_file_error (fp, "lx must be strictly positive");
+    gts_file_variable_error (fp, var, "lx", "lx must be strictly positive");
     return;
   }
   if (var[5].set && domain->lambda.y <= 0.) {
-    gts_file_error (fp, "ly must be strictly positive");
+    gts_file_variable_error (fp, var, "ly", "ly must be strictly positive");
     return;
   }
   if (var[6].set && domain->lambda.z <= 0.) {
-    gts_file_error (fp, "lz must be strictly positive");
+    gts_file_variable_error (fp, var, "lz", "lz must be strictly positive");
     return;
   }
 

-- 
Gerris Flow Solver