Changeset 13975 for issm/trunk/src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp

Timestamp:

11/16/12 08:10:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13974

Location:

issm/trunk

Files:

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

issm/trunk/src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp

@@ -22 +22 @@
         int i;
 
-        extern int my_rank;
-        extern int num_procs;
+        int my_rank;
+        int num_procs;
         int    numberofelements;
         int    numberofvertices;
@@ -46 +46 @@
         IssmDouble* riftinfo=NULL;
         IssmDouble* vertex_pairing=NULL;
+
+        /*Get my_rank:*/
+        my_rank=IssmComm::GetRank();
+        num_procs=IssmComm::GetSize();
 
         /*Fetch parameters: */
@@ -102 +106 @@
 
                         my_elements[i]=true;
-                        
+
                         /*Now that we are here, we can also start building the list of vertices belonging to this cpu partition: we use 
                          *the  element index to do this. For each element n, we know index[n][0:2] holds the indices (matlab indexing) 
@@ -110 +114 @@
                         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[reCast<int>(*(elements+elements_width*i+3))-1]=1;