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

[walter at geodynamics.org]

Author: walter
Date: 2009-03-26 04:22:47 -0700 (Thu, 26 Mar 2009)
New Revision: 14465

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/Underworld/plugins/EulerDeform/EulerDeform.c
Log:
 r2605 at dante:  boo | 2009-03-26 04:22:49 -0700
 Fix an egregious bug in EulerDeform



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2601
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2605

Modified: long/3D/Gale/trunk/src/Underworld/plugins/EulerDeform/EulerDeform.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/EulerDeform/EulerDeform.c	2009-03-26 04:08:11 UTC (rev 14464)
+++ long/3D/Gale/trunk/src/Underworld/plugins/EulerDeform/EulerDeform.c	2009-03-26 11:22:47 UTC (rev 14465)
@@ -818,16 +818,18 @@
               crds[0]=mesh->verts[n];
               crds[1]=mesh->verts[n_in];
 
-              ijk_off[0]=ijk[0];
               ijk_off[1]=ijk[1];
 
-              if(crds[0][2]<crds[1][2])
+              if(crds[0][2]<crds[1][2] || ijk[2]==grid->sizes[2]-1)
                 offset=-1;
 
               ijk_off[2]=ijk[2]+offset;
+
+              ijk_off[0]=corner;
               n_temp_off=RegularMeshUtils_Node_3DTo1D(mesh,ijk_off);
+              ijk_off[0]=inside;
               n_temp_off_in=RegularMeshUtils_Node_3DTo1D(mesh,ijk_off);
-              if(!Mesh_GlobalToDomain(mesh,MT_VERTEX,n_temp_off,&n_off_in)
+              if(!Mesh_GlobalToDomain(mesh,MT_VERTEX,n_temp_off,&n_off)
                  || !Mesh_GlobalToDomain(mesh,MT_VERTEX,n_temp_off_in,&n_off_in))
                 {
                   printf("Can not map the neighbor of this coordinate to the local grid.\n %d %d %d %d",