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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 56a1508e739d7e01e3ae1765e6cf610d6fee2778
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Thu Jan 18 08:47:30 2007 +1100

    Fix for face coordinates calculation in GfsFunction
    
    darcs-hash:20070117214730-d4795-f2631194ea86421c7357ed7dfd9b9b70cb5c0788.gz

diff --git a/src/simulation.c b/src/simulation.c
index e6f2b49..2bbc7a0 100644
--- a/src/simulation.c
+++ b/src/simulation.c
@@ -567,8 +567,8 @@ static gdouble cell_x (FttCell * cell, FttCellFace * face)
 
   g_return_val_if_fail (cell != NULL || face != NULL, 0.);
 
-  if (face && face->d/2 == 0)
-    ftt_face_pos (face, &p);
+  if (face)
+    gfs_face_ca (face, &p);
   else
     gfs_cell_cm (cell, &p);
   return p.x;
@@ -580,8 +580,8 @@ static gdouble cell_y (FttCell * cell, FttCellFace * face)
 
   g_return_val_if_fail (cell != NULL || face != NULL, 0.);
 
-  if (face && face->d/2 == 1)
-    ftt_face_pos (face, &p);
+  if (face)
+    gfs_face_ca (face, &p);
   else
     gfs_cell_cm (cell, &p);
   return p.y;
@@ -593,8 +593,8 @@ static gdouble cell_z (FttCell * cell, FttCellFace * face)
 
   g_return_val_if_fail (cell != NULL || face != NULL, 0.);
 
-  if (face && face->d/2 == 2)
-    ftt_face_pos (face, &p);
+  if (face)
+    gfs_face_ca (face, &p);
   else
     gfs_cell_cm (cell, &p);
   return p.z;
@@ -627,7 +627,7 @@ static gdouble cell_cx (FttCell * cell, FttCellFace * face)
 
   g_return_val_if_fail (cell != NULL || face != NULL, 0.);
 
-  if (face && face->d/2 == 0)
+  if (face)
     ftt_face_pos (face, &p);
   else
     ftt_cell_pos (cell, &p);
@@ -640,7 +640,7 @@ static gdouble cell_cy (FttCell * cell, FttCellFace * face)
 
   g_return_val_if_fail (cell != NULL || face != NULL, 0.);
 
-  if (face && face->d/2 == 1)
+  if (face)
     ftt_face_pos (face, &p);
   else
     ftt_cell_pos (cell, &p);
@@ -653,7 +653,7 @@ static gdouble cell_cz (FttCell * cell, FttCellFace * face)
 
   g_return_val_if_fail (cell != NULL || face != NULL, 0.);
 
-  if (face && face->d/2 == 2)
+  if (face)
     ftt_face_pos (face, &p);
   else
     ftt_cell_pos (cell, &p);
diff --git a/src/utils.c b/src/utils.c
index 46cb021..30ac025 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -574,7 +574,6 @@ static void function_read (GtsObject ** o, GtsFile * fp)
 	g_slist_free (lv);
       }
       if (ldv) {
-	fputs ("  g_return_val_if_fail (cell != NULL, 0.);\n", fin);
 	i = ldv;
 	while (i) {
 	  GfsDerivedVariable * v = i->data;

-- 
Gerris Flow Solver