[cig-commits] commit: One more modification to keep the frictional

[Mercurial]

changeset:   113:94ee203bc85a
user:        LukeHodkinson
date:        Tue Aug 26 08:52:50 2008 +0000
files:       MaterialPoints/src/MaterialPointsSwarm.c
description:
One more modification to keep the frictional
boundaries in line.


diff -r 41cd28fb3d6e -r 94ee203bc85a MaterialPoints/src/MaterialPointsSwarm.c
--- a/MaterialPoints/src/MaterialPointsSwarm.c	Tue Aug 26 08:13:15 2008 +0000
+++ b/MaterialPoints/src/MaterialPointsSwarm.c	Tue Aug 26 08:52:50 2008 +0000
@@ -421,33 +421,25 @@ void _MaterialPointsSwarm_UpdateHook( vo
                            material = MaterialPointsSwarm_GetMaterialOn( self, materialPoint );
                            if( !strcmp( material->name, "quartzFriction" ) ) {
                               Grid_Lift( grid, cell, inds );
-                              if( inds[0] > 1 && inds[0] < grid->sizes[0] - 2 &&
-                                  inds[1] > 1 )
-                              {
+                              if( inds[0] < grid->sizes[0] - 2 && inds[1] > 1 ) {
                                  materialPoint->materialIndex = Materials_Register_GetIndex( self->materials_Register, "quartz" );
                               }
                            }
                            else if( !strcmp( material->name, "corundumFriction" ) ) {
                               Grid_Lift( grid, cell, inds );
-                              if( inds[0] > 1 && inds[0] < grid->sizes[0] - 2 &&
-                                  inds[1] > 1 )
-                              {
+                              if( inds[0] < grid->sizes[0] - 2 && inds[1] > 1 ) {
                                  materialPoint->materialIndex = Materials_Register_GetIndex( self->materials_Register, "corundum" );
                               }
                            }
                            if( !strcmp( material->name, "quartz" ) ) {
                               Grid_Lift( grid, cell, inds );
-                              if( inds[0] <= 1 || inds[0] >= grid->sizes[0] - 2 ||
-                                  inds[1] <= 1 )
-                              {
+                              if( inds[0] >= grid->sizes[0] - 2 || inds[1] <= 1 ) {
                                  materialPoint->materialIndex = Materials_Register_GetIndex( self->materials_Register, "quartzFriction" );
                               }
                            }
                            else if( !strcmp( material->name, "corundum" ) ) {
                               Grid_Lift( grid, cell, inds );
-                              if( inds[0] <= 1 || inds[0] >= grid->sizes[0] - 2 ||
-                                  inds[1] <= 1 )
-                              {
+                              if( inds[0] >= grid->sizes[0] - 2 || inds[1] <= 1 ) {
                                  materialPoint->materialIndex = Materials_Register_GetIndex( self->materials_Register, "corundumFriction" );
                               }
                            }