[cig-commits] commit: Do not compute anything if we are going to abort anyway in NearestNeighborMapper when finding materials

[Mercurial]

changeset:   427:7beaa8b041b8
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Tue Sep 27 15:19:01 2011 -0700
files:       MaterialPoints/src/NearestNeighborMapper.cxx
description:
Do not compute anything if we are going to abort anyway in NearestNeighborMapper when finding materials


diff -r 1d2e51c48e20 -r 7beaa8b041b8 MaterialPoints/src/NearestNeighborMapper.cxx
--- a/MaterialPoints/src/NearestNeighborMapper.cxx	Sun Sep 18 12:46:03 2011 -0700
+++ b/MaterialPoints/src/NearestNeighborMapper.cxx	Tue Sep 27 15:19:01 2011 -0700
@@ -181,17 +181,14 @@ MaterialPointsSwarm** _NearestNeighborMa
 
 Material_Index _NearestNeighborMapper_GetMaterialIndexOn
 ( void* mapper, void* point ) {
-  NearestNeighborMapper* self = (NearestNeighborMapper*)mapper;
   abort();
-  return IntegrationPointMapper_GetMaterialIndexOn(self->swarm->mapper,point);
+  return 0;
 }
 
 void* _NearestNeighborMapper_GetExtensionOn( void* mapper, void* point,
                                              ExtensionInfo_Index extHandle ) {
-  NearestNeighborMapper* self = (NearestNeighborMapper*)mapper;
   abort();
-  return IntegrationPointMapper_GetExtensionOn(self->swarm->mapper,point,
-                                               extHandle);
+  return NULL;
 }
 
 double _NearestNeighborMapper_GetDoubleFromExtension
@@ -199,11 +196,8 @@ double _NearestNeighborMapper_GetDoubleF
  void* intPoint,
  ExtensionInfo_Index extHandle,
  int offs) {
-  NearestNeighborMapper* self = (NearestNeighborMapper*)mapper;
   abort();
-  return IntegrationPointMapper_GetDoubleFromExtension(self->swarm->mapper,
-                                                       intPoint,
-                                                       extHandle, offs);
+  return 0;
 }
 
 double _NearestNeighborMapper_GetDoubleFromMaterial
@@ -211,9 +205,6 @@ double _NearestNeighborMapper_GetDoubleF
  void* intPoint,
  ExtensionInfo_Index extHandle,
  int offs) {
-  NearestNeighborMapper* self = (NearestNeighborMapper*)mapper;
   abort();
-  return IntegrationPointMapper_GetDoubleFromMaterial(self->swarm->mapper,
-                                                      intPoint,
-                                                      extHandle, offs);
+  return 0;
 }