Changeset 24059

Timestamp:

07/02/19 09:40:30 (6 years ago)

Author:

seroussi

Message:

BUG: penalties were not accounted for, still not working but getting there

Location:

issm/trunk-jpl/src/c/modules/ModelProcessorx

Files:

• CreateElementsVerticesAndMaterials.cpp (modified) (1 diff)
• ElementsAndVerticesPartitioning.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp

@@ -288 +288 @@
                 }
         }
+
+        /*Take care of penalties*/
+        int numvertex_pairing;
+        int *vertex_pairing = NULL;
+        iomodel->FetchData(&vertex_pairing,&numvertex_pairing,NULL,"md.stressbalance.vertex_pairing");
+        for(int i=0;i<numvertex_pairing;i++){
+                int id1 = vertex_pairing[2*i+0]-1;
+                int id2 = vertex_pairing[2*i+1]-1;
+                for(int e=0;e<num_procs;e++){
+                        if(IsVertexInRank(vertices_ranks,vertices_proc_count,id1,e)){
+                                AddVertexToRank(vertices_ranks,vertices_proc_count,id2,e);
+                        }
+                }
+        }
+        xDelete<int>(vertex_pairing);
+        iomodel->FetchData(&vertex_pairing,&numvertex_pairing,NULL,"md.masstransport.vertex_pairing");
+        for(int i=0;i<numvertex_pairing;i++){
+                int id1 = vertex_pairing[2*i+0]-1;
+                int id2 = vertex_pairing[2*i+1]-1;
+                for(int e=0;e<num_procs;e++){
+                        if(IsVertexInRank(vertices_ranks,vertices_proc_count,id1,e)){
+                                AddVertexToRank(vertices_ranks,vertices_proc_count,id2,e);
+                        }
+                }
+        }
+        xDelete<int>(vertex_pairing);
 
         /*Create vector of size total numnodes, initialized with -1, that will keep track of local ids*/

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

@@ -20 +20 @@
         int numberofvertices2d;
         int numlayers;
-        int numvertex_pairing;
 
         /*intermediary: */