Changeset 17104

Timestamp:

01/13/14 16:20:20 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing node numbering for OneLayerP4z elements

File:

• issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateNodes.cpp (modified) (7 diffs)

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

@@ -159 +159 @@
                                                 nodes->AddObject(node);
                                         }
+                                        counter=counter+3;
                                 }
                                 else if(iomodel->edges[i*3+2]==1){/*Basal edges*/
@@ -171 +172 @@
                                                 nodes->AddObject(node);
                                         }
+                                        counter=counter+4;
                                 }
                                 else if(iomodel->edges[i*3+2]==3){/*Top edges*/
@@ -177 +179 @@
                                                 nodes->AddObject(node);
                                         }
+                                        counter=counter+1;
                                 }
                                 else{
                                         _error_("not supported");
                                 }
-                                counter=counter+4;
                         }
                         break;
@@ -305 +307 @@
                                                 nodes->AddObject(node);
                                         }
+                                        counter=counter+3;
                                 }
                                 else if(iomodel->edges[i*3+2]==1){/*Basal edges*/
@@ -317 +320 @@
                                                 nodes->AddObject(node);
                                         }
+                                        counter=counter+4;
                                 }
                                 else if(iomodel->edges[i*3+2]==3){/*Top edges*/
@@ -323 +327 @@
                                                 nodes->AddObject(node);
                                         }
+                                        counter=counter+1;
                                 }
                                 else{
                                         _error_("not supported");
                                 }
-                                counter=counter+4;
                         }
                         /*P1xP3 pressure*/
@@ -333 +337 @@
                         for(i=0;i<iomodel->numberofvertices;i++){
                                 if(iomodel->my_vertices[i]){
-                                        nodes->AddObject(new Node(vnodes+i+1,i,lid++,i,iomodel,analysis,FSpressureEnum));
-                                }
-                        }
-
-                        counter = iomodel->numberofvertices;
+                                        nodes->AddObject(new Node(vnodes+i+1,counter+1,lid++,i,iomodel,analysis,FSpressureEnum));
+                                }
+                                counter++;
+                        }
                         for(i=0;i<iomodel->numberofedges;i++){
                                 if(iomodel->edges[i*3+2]==2){