Changeset 25559

Timestamp:

09/11/20 09:44:41 (5 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing Basile's commit

File:

• issm/trunk-jpl/src/c/modules/Trianglex/Trianglex.cpp (modified) (6 diffs)

issm/trunk-jpl/src/c/modules/Trianglex/Trianglex.cpp

@@ -42 +42 @@
         /*Create initial triangulation to call triangulate(). First number of points:*/
         in.numberofpoints=0;
-        for (Object* & object : domain->objects){
-                contour=(Contour<IssmPDouble>*)object;
+        for (i=0;i<domain->Size();i++){
+                contour=(Contour<IssmPDouble>*)domain->GetObjectByOffset(i);
                 in.numberofpoints+=contour->nods-1;
         }
-        for (Object* & object : rifts->objects){
-                contour=(Contour<IssmPDouble>*)object;
+        for (i=0;i<rifts->Size();i++){
+                contour=(Contour<IssmPDouble>*)rifts->GetObjectByOffset(i);
                 in.numberofpoints+=contour->nods;
         }
@@ -58 +58 @@
 
         counter=0;
-        for (Object* & object : domain->objects){
-                contour=(Contour<IssmPDouble>*)object;
+        for (i=0;i<domain->Size();i++){
+                contour=(Contour<IssmPDouble>*)domain->GetObjectByOffset(i);
                 for (j=0;j<contour->nods-1;j++){
                         in.pointlist[2*counter+0]=contour->x[j];
@@ -66 +66 @@
                 }
         }
-        for (Object* & object : rifts->objects){
-                contour=(Contour<IssmPDouble>*)object;
+        for (i=0;i<rifts->Size();i++){
+                contour=(Contour<IssmPDouble>*)rifts->GetObjectByOffset(i);
                 for (j=0;j<contour->nods;j++){
                         in.pointlist[2*counter+0]=contour->x[j];
@@ -85 +85 @@
         /*Build segments. First figure out number of segments: holes and closed outlines have as many segments as vertices: */
         in.numberofsegments=0;
-        for (Object* & object : domain->objects){
-                contour=(Contour<IssmPDouble>*)object;
+        for (i=0;i<domain->Size();i++){
+                contour=(Contour<IssmPDouble>*)domain->GetObjectByOffset(i);
                 in.numberofsegments+=contour->nods-1;
         }
-        for (Object* & object : rifts->objects){
-                contour=(Contour<IssmPDouble>*)object;
+        for(i=0;i<rifts->Size();i++){
+                contour=(Contour<IssmPDouble>*)rifts->GetObjectByOffset(i);
                 /*for rifts, we have one less segment as we have vertices*/
                 in.numberofsegments+=contour->nods-1;
@@ -99 +99 @@
         counter=0;
         backcounter=0;
-        for (Object* & object : domain->objects){
-                contour=(Contour<IssmPDouble>*)object;
+        for (i=0;i<domain->Size();i++){
+                contour=(Contour<IssmPDouble>*)domain->GetObjectByOffset(i);
                 for (j=0;j<contour->nods-2;j++){
                         in.segmentlist[2*counter+0]=counter;
@@ -115 +115 @@
         }
         counter2=counter;
-        for (Object* & object : rifts->objects){
-                contour=(Contour<IssmPDouble>*)object;
+        for (i=0;i<rifts->Size();i++){
+                contour=(Contour<IssmPDouble>*)rifts->GetObjectByOffset(i);
                 for (j=0;j<(contour->nods-1);j++){
                         in.segmentlist[2*counter2+0]=counter;