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

[walter at geodynamics.org]

Author: walter
Date: 2008-07-16 16:35:43 -0700 (Wed, 16 Jul 2008)
New Revision: 12422

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/Underworld/plugins/EulerDeform/EulerDeform.c
Log:
 r2275 at earth:  boo | 2008-07-16 16:34:10 -0700
 Fix a bug where the corners of static sides were not being fixed.



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

Modified: long/3D/Gale/trunk/src/Underworld/plugins/EulerDeform/EulerDeform.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/EulerDeform/EulerDeform.c	2008-07-16 18:38:29 UTC (rev 12421)
+++ long/3D/Gale/trunk/src/Underworld/plugins/EulerDeform/EulerDeform.c	2008-07-16 23:35:43 UTC (rev 12422)
@@ -279,45 +279,17 @@
     add=False;
     RegularMeshUtils_Node_1DTo3D
       ( sys->mesh, Mesh_DomainToGlobal( sys->mesh, MT_VERTEX, n_i ), ijk );
-    if(ijk[0]==0)
-      if(sys->staticLeft)
-        add=True;
-      else
-        continue;
+    if((ijk[0]==0 && sys->staticLeft)
+       || (ijk[0]==grid->sizes[0]-1 && sys->staticRight)
+       || (ijk[1]==0 && sys->staticBottom)
+       || (ijk[1]==grid->sizes[1]-1 && sys->staticTop))
+      add=True;
 
-    if(ijk[0]==grid->sizes[0]-1)
-      if(sys->staticRight)
-        add=True;
-      else
-        continue;
-
-    if(ijk[1]==0)
-      if(sys->staticBottom)
-        add=True;
-      else
-        continue;
-
-    if(ijk[1]==grid->sizes[1]-1)
-      if(sys->staticTop)
-        add=True;
-    /* If wrapping the top, that does not imply fixing the corner, but
-       it does not preclude it either. */
-      else if(!sys->wrapTop)
-        continue;
-
     if(sys->mesh->topo->nDims == 3)
       {
-        if(ijk[2]==0)
-          if(sys->staticBack)
-            add=True;
-          else
-            continue;
-        
-        if(ijk[2]==grid->sizes[2]-1)
-          if(sys->staticFront)
-            add=True;
-          else
-        continue;
+        if((ijk[2]==0 && sys->staticBack)
+           || (ijk[2]==grid->sizes[2]-1) && sys->staticFront)
+          add=True;
       }
     if( add )
       IndexSet_Add( set, n_i );