Changeset 3872 for issm/trunk/src/c/ModelProcessorx/CreateSingleNodeToElementConnectivity.cpp

Timestamp:

05/21/10 10:32:40 (15 years ago)

Author:

Mathieu Morlighem

Message:

fix parallelization of Pengrid's hook to element

File:

• issm/trunk/src/c/ModelProcessorx/CreateSingleNodeToElementConnectivity.cpp (modified) (3 diffs)

issm/trunk/src/c/ModelProcessorx/CreateSingleNodeToElementConnectivity.cpp

@@ -19 +19 @@
         int i,j;
         int vertexid;
+        int elementswidth;
 
         /*output*/
@@ -26 +27 @@
         ISSMASSERT(iomodel->numberofvertices);
         ISSMASSERT(iomodel->numberofelements);
+        ISSMASSERT(iomodel->my_elements);
         ISSMASSERT(iomodel->elements);
 
@@ -31 +33 @@
         connectivity=(int*)xcalloc(iomodel->numberofvertices,sizeof(int));
 
+        /*Get element width (3 or 6)*/
         if (strcmp(iomodel->meshtype,"2d")==0){
-                for (i=0;i<iomodel->numberofelements;i++){
-                        for (j=0;j<3;j++){
-                                vertexid=(int)iomodel->elements[3*i+j];
-                                ISSMASSERT(vertexid-1<iomodel->numberofvertices);
-                                connectivity[vertexid-1]=i;
-                        }
-                }
+                elementswidth=3;
         }
         else{
-                for (i=0;i<iomodel->numberofelements;i++){
-                        for (j=0;j<6;j++){
-                                vertexid=(int)iomodel->elements[6*i+j];
-                                ISSMASSERT(vertexid-1<iomodel->numberofvertices);
-                                connectivity[vertexid-1]=i;
+                elementswidth=6;
+        }
+
+        /*Create connectivity table*/
+        for (i=0;i<iomodel->numberofelements;i++){
+                /*!! in parallel we do not want the vertex to be connected to an element that is not in its partition!!*/
+                if(iomodel->my_elements[i]){
+                        for (j=0;j<elementswidth;j++){
+                                vertexid=(int)iomodel->elements[elementswidth*i+j];
+                                ISSMASSERT(vertexid>0 && vertexid-1<iomodel->numberofvertices);
+                                connectivity[vertexid-1]=i+1;
                         }
                 }
         }
 
+        /*Assign to iomodel*/
         iomodel->singlenodetoelementconnectivity=connectivity;