Changeset 22380 for issm/trunk-jpl/src/c/bamg/Mesh.cpp

Timestamp:

01/29/18 14:39:39 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing bug if initial mesh is not generated by bamg

File:

• issm/trunk-jpl/src/c/bamg/Mesh.cpp (modified) (6 diffs)

issm/trunk-jpl/src/c/bamg/Mesh.cpp

@@ -30 +30 @@
                         _printf_("WARNING: mesh present but no geometry found. Reconstructing...\n");
                         BuildGeometryFromMesh(bamgopts);
-                        Gh.PostRead();
+                        Gh.PostRead(true);
                 }
 
@@ -1215 +1215 @@
                 /*Construction of the edges*/
 
-                //initialize st and edge4
+                /*initialize st and edge4*/
                 SetOfEdges4* edge4= new SetOfEdges4(nbt*3,nbv);
                 long*        st   = new long[nbt*3];
 
-                //initialize st as -1 (chaining algorithm)
+                /*initialize st as -1 (chaining algorithm)*/
                 for (i=0;i<nbt*3;i++) st[i]=-1;
 
-                //build edge4 (chain)
+                /*build edge4 (chain)*/
                 for (i=0;i<nbe;i++){
                         edge4->SortAndAdd(GetId(edges[i][0]),GetId(edges[i][1]));
                 }
-                //check that there is no double edge
+                /*check that there is no double edge*/
                 if (nbe !=  edge4->nb()){ 
                         delete [] st;
@@ -1234 +1234 @@
                 long nbeold = nbe;
 
-                //Go through the triangles and ass the edges in edge4 if they are not there yet
+                //Go through the triangles and add the edges in edge4 if they are not there yet
                 for (i=0;i<nbt;i++){
                         //3 edges per triangle
@@ -1251 +1251 @@
                                                 _error_("problem in Geometry reconstruction: an edge on boundary is duplicated (double element?)");
                                         }
-                                        //OK, the element is not on boundary, is belongs to 2 triangles -> build Adjacent triangles list
+                                        /*OK, the element is not on boundary, is belongs to 2 triangles -> build Adjacent triangles list*/
                                         triangles[i].SetAdj2(j,triangles + st[k] / 3,(int) (st[k]%3));
                                         if (invisible)  triangles[i].SetHidden(j);
-                                        // if k < nbe mark the edge as on Boundary (Locked)
+                                        /* if k < nbe mark the edge as on Boundary (Locked)*/
                                         if (k<nbe) {
                                                 triangles[i].SetLocked(j);
                                         }
-                                        //set st[k] as negative so that the edge should not be called again
+                                        /*set st[k] as negative so that the edge should not be called again*/
                                         st[k]=-2-st[k]; 
                                 }
-                                //else (see 3 lines above), the edge has been called more than twice: return error
                                 else {
+                                        /*else (see 3 lines above), the edge has been called more than twice: return error*/
                                         _printf_("The edge (" << GetId(triangles[i][VerticesOfTriangularEdge[j][0]]) << "," << GetId(triangles[i][VerticesOfTriangularEdge[j][1]]) << ") belongs to more than 2 triangles (" << k << ")\n");
                                         _printf_("Edge " << j << " of triangle " << i << "\n");
@@ -1286 +1286 @@
                 }
 
-                // check consistency of edge[].adj and geometrical required  vertices
+                /*check consistency of edge[].adj and geometrical required  vertices*/
                 k=0; kk=0;
                 for (i=0;i<nbedges;i++){
@@ -1304 +1304 @@
 
                 /*Constructions of edges*/
-
                 k += kk;
                 kk=0;