[cig-commits] r6283 - in long/3D/Gale/trunk/src/StgFEM: . Discretisation/src

[walter at geodynamics.org]

Author: walter
Date: 2007-03-18 22:01:00 -0700 (Sun, 18 Mar 2007)
New Revision: 6283

Modified:
   long/3D/Gale/trunk/src/StgFEM/
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/RegularTrilinear.c
Log:
 r1059 at earth (orig r787):  LukeHodkinson | 2007-03-15 15:43:33 -0700
 Swapping hard number comparisons to approximate
 comparisons.
 



Property changes on: long/3D/Gale/trunk/src/StgFEM
___________________________________________________________________
Name: svk:merge
   - 38867592-cf10-0410-9e16-a142ea72ac34:/cig:880
db209038-57f2-0310-97fa-b160e0ae9d04:/branches/decomp3d:785
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:669
   + 38867592-cf10-0410-9e16-a142ea72ac34:/cig:880
db209038-57f2-0310-97fa-b160e0ae9d04:/branches/decomp3d:787
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:669

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/RegularTrilinear.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/RegularTrilinear.c	2007-03-19 05:00:57 UTC (rev 6282)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/RegularTrilinear.c	2007-03-19 05:01:00 UTC (rev 6283)
@@ -152,9 +152,9 @@
 	w = vert[1][2] - vert[0][2];
 	localCoord[2] = 2.0 * (globalCoord[2] - vert[0][2]) / w - 1.0;
 
-	assert( localCoord[0] >= -1.0 && localCoord[0] <= 1.0 );
-	assert( localCoord[1] >= -1.0 && localCoord[1] <= 1.0 );
-	assert( localCoord[2] >= -1.0 && localCoord[2] <= 1.0 );
+	assert( Num_InRange( localCoord[0], -1.0, 1.0 ) );
+	assert( Num_InRange( localCoord[1], -1.0, 1.0 ) );
+	assert( Num_InRange( localCoord[2], -1.0, 1.0 ) );
 }