Index: /issm/trunk/src/c/Makefile.am
===================================================================
--- /issm/trunk/src/c/Makefile.am	(revision 5905)
+++ /issm/trunk/src/c/Makefile.am	(revision 5906)
@@ -267,5 +267,4 @@
 					./shared/Sorting/sorting.h\
 					./shared/Elements/elements.h\
-					./shared/Elements/ResolvePointers.cpp\
 					./shared/Elements/Paterson.cpp\
 					./shared/Elements/GetVerticesCoordinates.cpp\
@@ -823,5 +822,4 @@
 					./shared/Sorting/sorting.h\
 					./shared/Elements/elements.h\
-					./shared/Elements/ResolvePointers.cpp\
 					./shared/Elements/Paterson.cpp\
 					./shared/Elements/GetVerticesCoordinates.cpp\
Index: /issm/trunk/src/c/shared/Elements/GetVerticesCoordinates.cpp
===================================================================
--- /issm/trunk/src/c/shared/Elements/GetVerticesCoordinates.cpp	(revision 5905)
+++ /issm/trunk/src/c/shared/Elements/GetVerticesCoordinates.cpp	(revision 5906)
@@ -5,14 +5,13 @@
 #include "../../objects/objects.h"
 
-int GetVerticesCoordinates( double* xyz,  Node** nodes, int numgrids){
+int GetVerticesCoordinates( double* xyz,  Node** nodes, int numvertices){
 
-	int i;
+	/*In debugging mode, check that nodes is not a NULL pointer*/
+	ISSMASSERT(nodes);
 
-	for ( i=0; i<numgrids; i++) {
+	for(int i=0;i<numvertices;i++) {
 		xyz[i*3+0]=nodes[i]->GetX();
 		xyz[i*3+1]=nodes[i]->GetY();
 		xyz[i*3+2]=nodes[i]->GetZ();
 	}
-
 }
-
Index: sm/trunk/src/c/shared/Elements/ResolvePointers.cpp
===================================================================
--- /issm/trunk/src/c/shared/Elements/ResolvePointers.cpp	(revision 5905)
+++ 	(revision )
@@ -1,54 +1,0 @@
-/*!\file: ResolvePointers.cpp
- * \brief go look for objects in a certain dataset, tracking them by their id. 
- */ 
-
-#ifdef HAVE_CONFIG_H
-	#include "config.h"
-#else
-#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
-#endif
-
-#include "../../objects/objects.h"
-#include "../../Container/Container.h"
-#include "../../include/include.h"
-#include "../Exceptions/exceptions.h"
-
-void ResolvePointers(Object** objects,int* object_ids,int* object_offsets,int num_objects,DataSet* dataset){
-
-	/*output: */
-
-	/*intermediary: */
-	Object* object=NULL;
-	int i;
-
-	for(i=0;i<num_objects;i++){
-
-		/*is this object id -1? If so, drop this search, it was not requested: */
-		if (object_ids[i]==-1)continue;
-
-		/*Check whether existing objects are correct: */
-		if(objects[i]){
-			if(objects[i]->Id()==object_ids[i]) continue; //this node is good.
-			else objects[i]=NULL; //this node was incorrect, reset it.
-		}
-
-		/*May be the object offsets into objects are valid?: */
-		if(object_offsets[i]!=UNDEF){
-			/* Look at the object_offsets[i]'th node in the nodes dataset. If it has the correct id, 
-			 * we are good: */
-			object=(Object*)dataset->GetObjectByOffset(object_offsets[i]);
-			if (object->Id()==object_ids[i]){
-				objects[i]=object;
-				continue;
-			}
-			else object_offsets[i]=UNDEF; //object offset was wrong, reset it.
-		}
-
-		/*Now, for objects that did not get resolved, and for which we have no offset, chase them in the dataset, by id: */
-		if(objects[i]==NULL){
-			objects[i]=(Object*)dataset->GetObjectById(object_offsets+i,object_ids[i]); //remember the offset for later on.
-			/*check the id is correct!: */
-			if (objects[i]->Id()!=object_ids[i])ISSMERROR("%s%i%s%i%s"," wrong id: ",objects[i]->Id()," vs ",object_ids[i],"  in resolved pointer!");
-		}
-	}
-}
Index: /issm/trunk/src/c/shared/Elements/elements.h
===================================================================
--- /issm/trunk/src/c/shared/Elements/elements.h	(revision 5905)
+++ /issm/trunk/src/c/shared/Elements/elements.h	(revision 5906)
@@ -9,15 +9,12 @@
 #include "../../Container/Container.h"
 
-void ResolvePointers(Object** objects,int* object_ids,int* object_offsets,int num_objects,DataSet* dataset);
 double Paterson(double temperature);
-int GetVerticesCoordinates(double* xyz,  Node** nodes, int numgrids);
+int    GetVerticesCoordinates(double* xyz,  Node** nodes, int numvertices);
+
 inline void printarray(double* array,int lines,int cols=1){
-	int i,j;
 	printf("\n");
-	for (i=0;i<lines;i++){  
+	for(int i=0;i<lines;i++){  
 		printf("   [ ");
-		for (j=0;j<cols;j++){
-			printf(" %12.6g ",array[i*cols+j]);
-		}  
+		for(int j=0;j<cols;j++) printf(" %12.6g ",array[i*cols+j]);
 		printf(" ]\n");
 	}  
@@ -25,11 +22,8 @@
 }
 inline void printarray(int* array,int lines,int cols=1){
-	int i,j;
 	printf("\n");
-	for (i=0;i<lines;i++){  
+	for(int i=0;i<lines;i++){  
 		printf("   [ ");
-		for (j=0;j<cols;j++){
-			printf(" %6i",array[i*cols+j]);
-		}  
+		for(int j=0;j<cols;j++) printf(" %6i",array[i*cols+j]);
 		printf(" ]\n");
 	}