[cig-commits] commit:

[Mercurial]

changeset:   150:1a93c33c1f42
user:        LukeHodkinson
date:        Fri Aug 29 16:44:16 2008 +0000
files:       Utils/src/ContactVC.c Utils/src/RegularMeshUtils.c Utils/src/RegularRemesher.c
description:
Making the contact VC's stretch all the way across
the wall.


diff -r ee2240d07250 -r 1a93c33c1f42 Utils/src/ContactVC.c
--- a/Utils/src/ContactVC.c	Fri Aug 29 16:42:55 2008 +0000
+++ b/Utils/src/ContactVC.c	Fri Aug 29 16:44:16 2008 +0000
@@ -345,8 +345,7 @@ IndexSet* _ContactVC_GetSet(void* variab
          else {
             if( self->deep ) {
                set = RegularMeshUtils_CreateContactBottomSet(
-                  self->_mesh, gen->contactDepth[0][0], gen->contactDepth[0][1],
-                  gen->contactDepth[1][0] );
+                  self->_mesh, 0, 0, gen->contactDepth[1][0] );
             }
             else {
                set = RegularMeshUtils_CreateContactBottomSet(
@@ -377,8 +376,7 @@ IndexSet* _ContactVC_GetSet(void* variab
          else {
             if( self->deep ) {
                set = RegularMeshUtils_CreateContactRightSet(
-                  self->_mesh, gen->contactDepth[1][0], gen->contactDepth[1][1],
-                  gen->contactDepth[0][1] );
+                  self->_mesh, 0, 0, gen->contactDepth[0][1] );
             }
             else {
                set = RegularMeshUtils_CreateContactRightSet(
diff -r ee2240d07250 -r 1a93c33c1f42 Utils/src/RegularMeshUtils.c
--- a/Utils/src/RegularMeshUtils.c	Fri Aug 29 16:42:55 2008 +0000
+++ b/Utils/src/RegularMeshUtils.c	Fri Aug 29 16:44:16 2008 +0000
@@ -888,7 +888,7 @@ IndexSet* RegularMeshUtils_CreateContact
 */
    left = lowDepth;
    right = grid->sizes[0] - 1 - uppDepth;
-   bottom = inDepth;
+   bottom = 0;
    top = inDepth;
    for( ii = 0; ii < nNodes; ii++ ) {
       Grid_Lift( grid, Mesh_DomainToGlobal( mesh, 0, ii ), ijk );
@@ -957,8 +957,8 @@ IndexSet* RegularMeshUtils_CreateContact
 */
    left = grid->sizes[0] - 1 - inDepth;
    right = grid->sizes[0] - 1;
-   bottom = 0;
-   top = grid->sizes[1] - 1;
+   bottom = lowDepth;
+   top = grid->sizes[1] - 1- uppDepth;
    for( ii = 0; ii < nNodes; ii++ ) {
       Grid_Lift( grid, Mesh_DomainToGlobal( mesh, 0, ii ), ijk );
       if( ijk[0] >= left && ijk[0] <= right && ijk[1] >= bottom && ijk[1] <= top )
diff -r ee2240d07250 -r 1a93c33c1f42 Utils/src/RegularRemesher.c
--- a/Utils/src/RegularRemesher.c	Fri Aug 29 16:42:55 2008 +0000
+++ b/Utils/src/RegularRemesher.c	Fri Aug 29 16:44:16 2008 +0000
@@ -246,7 +246,7 @@ void _RegularRemesher_Remesh( void* _sel
                mesh->verts[v_i][d_i] = leftCrd + (gen->contactDepth[d_i][0] ? gen->contactGeom[d_i] : 0.0) +
                   ((double)(center - gen->contactDepth[d_i][0]) / 
                    (double)(vGrid->sizes[d_i] - (gen->contactDepth[d_i][0] + gen->contactDepth[d_i][1]) - 1)) *
-                  ((rightCrd - leftCrd) - (gen->contactDepth[d_i][1] ? 2.0 : 1.0) * gen->contactGeom[d_i]);
+                  ((rightCrd - leftCrd) - ((gen->contactDepth[d_i][1] ? 1.0 : 0.0) + (gen->contactDepth[d_i][0] ? 1.0 : 0.0)) * gen->contactGeom[d_i]);
             }
          }
          else {