Changeset 24066

Timestamp:

07/04/19 05:30:40 (6 years ago)

Author:

Mathieu Morlighem

Message:

BUG: do not look for penalties in AMR runs

Location:

issm/trunk-jpl/src/c

Files:

• classes/IoModel.cpp (modified) (1 diff)
• modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/IoModel.cpp

@@ -2540 +2540 @@
 
                 /*First set FILE* position to the beginning of the file: */
+                _assert_(fid);
                 fseek(fid,0,SEEK_SET);
 

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

@@ -289 +289 @@
         }
 
-        /*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);
+        /*Take care of penalties (only in non-AMR for now)*/
+        if(!isamr){
+                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*/