Changeset 12878 for issm/branches/trunk-jpl-damage/src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp

Timestamp:

08/02/12 17:13:12 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into trunk-jpl-damage through revision 12877

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp (modified) (6 diffs)

issm/branches/trunk-jpl-damage/src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp

@@ -10 +10 @@
 
 #include <string.h>
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 #include "../../shared/shared.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
@@ -42 +42 @@
         int  el1,el2;
         int    dim;
-        double* elements=NULL;
-        double* elements2d=NULL;
-        double* riftinfo=NULL;
-        double* vertex_pairing=NULL;
+        IssmDouble* elements=NULL;
+        IssmDouble* elements2d=NULL;
+        IssmDouble* riftinfo=NULL;
+        IssmDouble* vertex_pairing=NULL;
 
         /*Fetch parameters: */
@@ -76 +76 @@
 
         /*Free elements and elements2d: */
-        xfree((void**)&elements);
-        xfree((void**)&elements2d);
+        xDelete<IssmDouble>(elements);
+        xDelete<IssmDouble>(elements2d);
 
         /*Deal with rifts, they have to be included into one partition only, not several: */
@@ -83 +83 @@
                 iomodel->FetchData(&riftinfo,&numrifts,NULL,RiftsRiftstructEnum);
                 for(i=0;i<numrifts;i++){
-                        el1=(int)*(riftinfo+RIFTINFOSIZE*i+2)-1; //matlab indexing to c indexing
-                        el2=(int)*(riftinfo+RIFTINFOSIZE*i+3)-1; //matlab indexing to c indexing
+                        el1=reCast<int>(*(riftinfo+RIFTINFOSIZE*i+2))-1; //matlab indexing to c indexing
+                        el2=reCast<int>(*(riftinfo+RIFTINFOSIZE*i+3))-1; //matlab indexing to c indexing
                         epart[el2]=epart[el1]; //ensures that this pair of elements will be in the same partition, as well as the corresponding vertices;
                 }
-                xfree((void**)&riftinfo); 
+                xDelete<IssmDouble>(riftinfo); 
         }
 
         /*Used later on: */
-        my_vertices=(int*)xcalloc(numberofvertices,sizeof(int));
-        my_elements=(bool*)xcalloc(numberofelements,sizeof(bool));
+        my_vertices=xNewZeroInit<int>(numberofvertices);
+        my_elements=xNewZeroInit<bool>(numberofelements);
 
         /*Start figuring out, out of the partition, which elements belong to this cpu: */
@@ -107 +107 @@
                          into the vertices coordinates. If we start plugging 1 into my_vertices for each index[n][i] (i=0:2), then my_vertices 
                          will hold which vertices belong to this partition*/
-                        my_vertices[(int)*(elements+elements_width*i+0)-1]=1;
-                        my_vertices[(int)*(elements+elements_width*i+1)-1]=1;
-                        my_vertices[(int)*(elements+elements_width*i+2)-1]=1;
+                        my_vertices[reCast<int>(*(elements+elements_width*i+0))-1]=1;
+                        my_vertices[reCast<int>(*(elements+elements_width*i+1))-1]=1;
+                        my_vertices[reCast<int>(*(elements+elements_width*i+2))-1]=1;
                         
                         if(elements_width==6){
-                                my_vertices[(int)*(elements+elements_width*i+3)-1]=1;
-                                my_vertices[(int)*(elements+elements_width*i+4)-1]=1;
-                                my_vertices[(int)*(elements+elements_width*i+5)-1]=1;
+                                my_vertices[reCast<int>(*(elements+elements_width*i+3))-1]=1;
+                                my_vertices[reCast<int>(*(elements+elements_width*i+4))-1]=1;
+                                my_vertices[reCast<int>(*(elements+elements_width*i+5))-1]=1;
                         }
                 }
         }//for (i=0;i<numberofelements;i++)
         /*Free data : */
-        xfree((void**)&elements);
+        xDelete<IssmDouble>(elements);
 
         /*We might have vertex_pairing in which case, some vertices have to be cloned:
@@ -126 +126 @@
         iomodel->FetchData(&vertex_pairing,&numvertex_pairing,NULL,DiagnosticVertexPairingEnum);
         for(i=0;i<numvertex_pairing;i++){
-                if(my_vertices[(int)vertex_pairing[2*i+0]-1] && !my_vertices[(int)vertex_pairing[2*i+1]-1]){
-                        my_vertices[(int)vertex_pairing[2*i+1]-1]=2; //to know that these elements are not on the partition
+                if(my_vertices[reCast<int>(vertex_pairing[2*i+0])-1] && !my_vertices[reCast<int>(vertex_pairing[2*i+1])-1]){
+                        my_vertices[reCast<int>(vertex_pairing[2*i+1])-1]=2; //to know that these elements are not on the partition
                 }
         }
-        xfree((void**)&vertex_pairing);
+        xDelete<IssmDouble>(vertex_pairing);
         iomodel->FetchData(&vertex_pairing,&numvertex_pairing,NULL,PrognosticVertexPairingEnum);
         for(i=0;i<numvertex_pairing;i++){
-                if(my_vertices[(int)vertex_pairing[2*i+0]-1] && !my_vertices[(int)vertex_pairing[2*i+1]-1]){
-                        my_vertices[(int)vertex_pairing[2*i+1]-1]=2; //to know that these elements are not on the partition
+                if(my_vertices[reCast<int>(vertex_pairing[2*i+0])-1] && !my_vertices[reCast<int>(vertex_pairing[2*i+1])-1]){
+                        my_vertices[reCast<int>(vertex_pairing[2*i+1])-1]=2; //to know that these elements are not on the partition
                 }
         }
-        xfree((void**)&vertex_pairing);
+        xDelete<IssmDouble>(vertex_pairing);
 
         /*Free ressources:*/
-        xfree((void**)&npart);
-        xfree((void**)&epart);
+        xDelete<int>(npart);
+        xDelete<int>(epart);
 
         /*Assign output pointers:*/