Changeset 5906

Timestamp:

09/20/10 10:22:33 (14 years ago)

Author:

Mathieu Morlighem

Message:

Resolve pointer not needed anymore

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (2 diffs)
• shared/Elements/GetVerticesCoordinates.cpp (modified) (1 diff)
• shared/Elements/ResolvePointers.cpp (deleted)
• shared/Elements/elements.h (modified) (2 diffs)

issm/trunk/src/c/Makefile.am

@@ -267 +267 @@
                                         ./shared/Sorting/sorting.h\
                                         ./shared/Elements/elements.h\
-                                        ./shared/Elements/ResolvePointers.cpp\
                                         ./shared/Elements/Paterson.cpp\
                                         ./shared/Elements/GetVerticesCoordinates.cpp\
@@ -823 +822 @@
                                         ./shared/Sorting/sorting.h\
                                         ./shared/Elements/elements.h\
-                                        ./shared/Elements/ResolvePointers.cpp\
                                         ./shared/Elements/Paterson.cpp\
                                         ./shared/Elements/GetVerticesCoordinates.cpp\

issm/trunk/src/c/shared/Elements/GetVerticesCoordinates.cpp

@@ -5 +5 @@
 #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();
         }
-
 }
-

issm/trunk/src/c/shared/Elements/elements.h

@@ -9 +9 @@
 #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 +22 @@
 }
 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");
         }