Changeset 6235

Timestamp:

10/11/10 10:51:32 (15 years ago)

Author:

seroussi

Message:

modify my_vertices to be able to track clone vertices

Location:

issm/trunk/src/c/modules/ModelProcessorx

Files:

• ElementsAndVerticesPartitioning.cpp (modified) (5 diffs)
• ModelProcessorx.h (modified) (1 diff)
• NodesPartitioning.cpp (modified) (3 diffs)

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

@@ -18 +18 @@
 #include "../ModelProcessorx/ModelProcessorx.h"
 
-void  ElementsAndVerticesPartitioning(bool** pmy_elements, bool** pmy_vertices, IoModel* iomodel, ConstDataHandle iomodel_handle){
+void  ElementsAndVerticesPartitioning(bool** pmy_elements, int** pmy_vertices, IoModel* iomodel, ConstDataHandle iomodel_handle){
 
         int i;
@@ -27 +27 @@
         /*output: */
         bool* my_elements=NULL;
-        bool* my_vertices=NULL;
+        int* my_vertices=NULL;
 
         /*intermediary: */
@@ -77 +77 @@
 
         /*Used later on: */
-        my_vertices=(bool*)xcalloc(iomodel->numberofvertices,sizeof(bool));
+        my_vertices=(int*)xcalloc(iomodel->numberofvertices,sizeof(int));
         my_elements=(bool*)xcalloc(iomodel->numberofelements,sizeof(bool));
 
@@ -93 +93 @@
                          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)*(iomodel->elements+elements_width*i+0)-1]=true;
-                        my_vertices[(int)*(iomodel->elements+elements_width*i+1)-1]=true;
-                        my_vertices[(int)*(iomodel->elements+elements_width*i+2)-1]=true;
+                        my_vertices[(int)*(iomodel->elements+elements_width*i+0)-1]=1;
+                        my_vertices[(int)*(iomodel->elements+elements_width*i+1)-1]=1;
+                        my_vertices[(int)*(iomodel->elements+elements_width*i+2)-1]=1;
                         
                         if(elements_width==6){
-                                my_vertices[(int)*(iomodel->elements+elements_width*i+3)-1]=true;
-                                my_vertices[(int)*(iomodel->elements+elements_width*i+4)-1]=true;
-                                my_vertices[(int)*(iomodel->elements+elements_width*i+5)-1]=true;
+                                my_vertices[(int)*(iomodel->elements+elements_width*i+3)-1]=1;
+                                my_vertices[(int)*(iomodel->elements+elements_width*i+4)-1]=1;
+                                my_vertices[(int)*(iomodel->elements+elements_width*i+5)-1]=1;
                         }
                 }
@@ -112 +112 @@
         IoModelFetchData(&iomodel->penalties,&iomodel->numpenalties,NULL,iomodel_handle,"penalties");
         for(i=0;i<iomodel->numpenalties;i++){
-                if(my_vertices[(int)iomodel->penalties[2*i+0]-1]){
-                        my_vertices[(int)iomodel->penalties[2*i+1]-1]=true;
+                if(my_vertices[(int)iomodel->penalties[2*i+0]-1] && !my_vertices[(int)iomodel->penalties[2*i+1]-1]){
+                        my_vertices[(int)iomodel->penalties[2*i+1]-1]=2; //to know that these elements are not on the partition
                 }
         }

issm/trunk/src/c/modules/ModelProcessorx/ModelProcessorx.h

@@ -86 +86 @@
 
 /*partitioning: */
-void  ElementsAndVerticesPartitioning(bool** pmy_elements, bool** pmy_vertices, IoModel* iomodel, ConstDataHandle iomodel_handle);
-void  NodesPartitioning(bool** pmy_nodes,bool* my_elements, bool* my_vertices,  IoModel* iomodel, ConstDataHandle iomodel_handle,bool continuous);
+void  ElementsAndVerticesPartitioning(bool** pmy_elements, int** pmy_vertices, IoModel* iomodel, ConstDataHandle iomodel_handle);
+void  NodesPartitioning(bool** pmy_nodes,bool* my_elements, int* my_vertices,  IoModel* iomodel, ConstDataHandle iomodel_handle,bool continuous);
 
 /*Connectivity*/

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

@@ -18 +18 @@
 #include "../ModelProcessorx/ModelProcessorx.h"
 
-void  DiscontinuousGalerkinNodesPartitioning(bool** pmy_nodes,bool* my_elements, bool* my_vertices, IoModel* iomodel, ConstDataHandle iomodel_handle);
-void  ContinuousGalerkinNodesPartitioning(bool** pmy_nodes,bool* my_elements, bool* my_vertices, IoModel* iomodel, ConstDataHandle iomodel_handle);
+void  DiscontinuousGalerkinNodesPartitioning(bool** pmy_nodes,bool* my_elements, int* my_vertices, IoModel* iomodel, ConstDataHandle iomodel_handle);
+void  ContinuousGalerkinNodesPartitioning(bool** pmy_nodes,bool* my_elements, int* my_vertices, IoModel* iomodel, ConstDataHandle iomodel_handle);
 
-void  NodesPartitioning(bool** pmy_nodes,bool* my_elements, bool* my_vertices, IoModel* iomodel, ConstDataHandle iomodel_handle,bool continuous){
+void  NodesPartitioning(bool** pmy_nodes,bool* my_elements, int* my_vertices, IoModel* iomodel, ConstDataHandle iomodel_handle,bool continuous){
         
         /*First thing, this is a new partition for a new analysis_type, therefore, to avoid a leak, erase the nodes partition that might come through pmy_nodes: */
@@ -33 +33 @@
 }
 
-void  ContinuousGalerkinNodesPartitioning(bool** pmy_nodes,bool* my_elements, bool* my_vertices, IoModel* iomodel, ConstDataHandle iomodel_handle){
+void  ContinuousGalerkinNodesPartitioning(bool** pmy_nodes,bool* my_elements, int* my_vertices, IoModel* iomodel, ConstDataHandle iomodel_handle){
 
         /*as many nodes as there are vertices */
@@ -48 +48 @@
 
 
-void  DiscontinuousGalerkinNodesPartitioning(bool** pmy_nodes,bool* my_elements, bool* my_vertices, IoModel* iomodel, ConstDataHandle iomodel_handle){
+void  DiscontinuousGalerkinNodesPartitioning(bool** pmy_nodes,bool* my_elements, int* my_vertices, IoModel* iomodel, ConstDataHandle iomodel_handle){
 
         /*each element has it own nodes (as many as vertices) + additional nodes from neighbouring elements for each edge. This yields to a very different partition for