[cig-commits] r5685 - in long/3D/Gale/trunk/src/Underworld: . plugins/EulerDeform

[walter at geodynamics.org]

Author: walter
Date: 2007-01-05 11:39:42 -0800 (Fri, 05 Jan 2007)
New Revision: 5685

Modified:
   long/3D/Gale/trunk/src/Underworld/
   long/3D/Gale/trunk/src/Underworld/plugins/EulerDeform/EulerDeform.c
Log:
 r806 at earth (orig r407):  LukeHodkinson | 2007-01-04 16:01:15 -0800
 Fixed a bug causing an assertion in 3D parallel.
 
 



Property changes on: long/3D/Gale/trunk/src/Underworld
___________________________________________________________________
Name: svk:merge
   - 9570c393-cf10-0410-b476-9a651db1e55a:/cig:775
c24a034b-ab11-0410-afe6-cfe714e2959e:/branches/decomp3d:404
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:396
   + 9570c393-cf10-0410-b476-9a651db1e55a:/cig:775
c24a034b-ab11-0410-afe6-cfe714e2959e:/branches/decomp3d:407
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:396

Modified: long/3D/Gale/trunk/src/Underworld/plugins/EulerDeform/EulerDeform.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/EulerDeform/EulerDeform.c	2007-01-05 19:39:38 UTC (rev 5684)
+++ long/3D/Gale/trunk/src/Underworld/plugins/EulerDeform/EulerDeform.c	2007-01-05 19:39:42 UTC (rev 5685)
@@ -873,8 +873,7 @@
 
 			/* Get old and new coordinate. */
 			centerInd = Grid_Project( grm, ijk );
-			insist( Mesh_GlobalToDomain( mesh, MT_VERTEX, centerInd, &centerInd ) );
-			if( centerInd >= nLocalNodes )
+			if( !Mesh_GlobalToDomain( mesh, MT_VERTEX, centerInd, &centerInd ) || centerInd >= nLocalNodes )
 				return;
 
 			newCrd[0] = mesh->verts[centerInd][0];