[cig-commits] commit: Removing the gigantic hack I made earlier.

[Mercurial]

changeset:   114:3872a13a51c9
user:        LukeHodkinson
date:        Sat Aug 30 13:16:03 2008 +0000
files:       MaterialPoints/src/MaterialPointsSwarm.c
description:
Removing the gigantic hack I made earlier.


diff -r 94ee203bc85a -r 3872a13a51c9 MaterialPoints/src/MaterialPointsSwarm.c
--- a/MaterialPoints/src/MaterialPointsSwarm.c	Tue Aug 26 08:52:50 2008 +0000
+++ b/MaterialPoints/src/MaterialPointsSwarm.c	Sat Aug 30 13:16:03 2008 +0000
@@ -407,43 +407,6 @@ void _MaterialPointsSwarm_UpdateHook( vo
 				materialPoint->coord[ I_AXIS ],
 				materialPoint->coord[ J_AXIS ],
 				materialPoint->coord[ K_AXIS ] );
-
-                        /* Super hack. For the geomod benchmarks we need to convert frictional
-                           materials into regular materials as they cross the frictional boundaries. */
-                        if( self->geomodHack ) {
-                           Material* material;
-                           FeMesh* mesh;
-                           Grid* grid;
-                           int inds[3];
-
-                           mesh = (FeMesh*)((ElementCellLayout*)self->cellLayout)->mesh;
-                           grid = *Mesh_GetExtension( mesh, Grid**, "elementGrid" );
-                           material = MaterialPointsSwarm_GetMaterialOn( self, materialPoint );
-                           if( !strcmp( material->name, "quartzFriction" ) ) {
-                              Grid_Lift( grid, cell, inds );
-                              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] < 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] >= 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] >= grid->sizes[0] - 2 || inds[1] <= 1 ) {
-                                 materialPoint->materialIndex = Materials_Register_GetIndex( self->materials_Register, "corundumFriction" );
-                              }
-                           }
-                        }
 		}
 	}