[cig-commits] commit: Sorry, another hack to get things running. I'll

[Mercurial]

changeset:   111:a97f93eb103b
user:        LukeHodkinson
date:        Tue Aug 26 07:36:43 2008 +0000
files:       MaterialPoints/src/MaterialPointsSwarm.c
description:
Sorry, another hack to get things running. I'll
be back here to clean it up soon though.


diff -r 651d58bf14dd -r a97f93eb103b MaterialPoints/src/MaterialPointsSwarm.c
--- a/MaterialPoints/src/MaterialPointsSwarm.c	Tue Aug 26 02:27:15 2008 +0000
+++ b/MaterialPoints/src/MaterialPointsSwarm.c	Tue Aug 26 07:36:43 2008 +0000
@@ -435,6 +435,22 @@ void _MaterialPointsSwarm_UpdateHook( vo
                                  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 || inds[1] >= grid->sizes[1] - 2 )
+                              {
+                                 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 || inds[1] >= grid->sizes[1] - 2 )
+                              {
+                                 materialPoint->materialIndex = Materials_Register_GetIndex( self->materials_Register, "corundumFriction" );
+                              }
+                           }
                         }
 		}
 	}