Changeset 12878 for issm/branches/trunk-jpl-damage/src/modules/MeshProfileIntersection/MeshProfileIntersection.cpp

Timestamp:

08/02/12 17:13:12 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into trunk-jpl-damage through revision 12877

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/modules/MeshProfileIntersection/MeshProfileIntersection.cpp (modified) (3 diffs)

issm/branches/trunk-jpl-damage/src/modules/MeshProfileIntersection/MeshProfileIntersection.cpp

@@ -54 +54 @@
         //index
         FetchData(&double_index,&nel,&dummy,INDEX);
-        if(dummy!=3 && dummy!=6)_error_(" element triangulation should be of 3 or 6 column width!");
+        if(dummy!=3 && dummy!=6)_error2_("element triangulation should be of 3 or 6 column width!");
         index=(int*)xmalloc(nel*3*sizeof(int));
         for(i=0;i<nel;i++){
@@ -81 +81 @@
         /* Debugging of contours :{{{1*/
         /*for(i=0;i<numcontours;i++){
-                printf("\nContour echo: contour number  %i / %i\n",i+1,numcontours);
+                _printLine_("\nContour echo: contour number  " << i+1 << " / " << numcontours);
                 contouri=*(contours+i);
-                printf("   Number of vertices %i\n",contouri->nods);
+                _printLine_("   Number of vertices " << contouri->nods);
                 for (j=0;j<contouri->nods;j++){
-                        printf("   %lf %lf\n",*(contouri->x+j),*(contouri->y+j));
+                        _printLine_("   " << *(contouri->x+j) << "f " << *(contouri->y+j) << "f");
                 }
         }*/
@@ -102 +102 @@
 
 void MeshProfileIntersectionUsage(void){
-        printf("   usage:\n");
-        printf("   [segments]=MeshProfileIntersection(index,x,y,filename);\n");
-        printf("   where:\n");
-        printf("   input:\n");
-        printf("        index,x,y is a triangulation\n");
-        printf("        filename: name of Argus style .exp file containing the segments (can be groups of disconnected segments)\n");
-        printf("   output:\n");
-        printf("        segments: array made of x1,y1,x2,y2,element_id lines (x1,y1) and (x2,y2) are segment extremitis for a segment \n");
-        printf("        belonging to the elemnt_id element. there are as many lines in segments as there are segments intersecting the \n");
-        printf("        mesh.\n");
+        _printLine_("   usage:");
+        _printLine_("   [segments]=MeshProfileIntersection(index,x,y,filename);");
+        _printLine_("   where:");
+        _printLine_("   input:");
+        _printLine_("        index,x,y is a triangulation");
+        _printLine_("        filename: name of Argus style .exp file containing the segments (can be groups of disconnected segments)");
+        _printLine_("   output:");
+        _printLine_("        segments: array made of x1,y1,x2,y2,element_id lines (x1,y1) and (x2,y2) are segment extremitis for a segment ");
+        _printLine_("        belonging to the elemnt_id element. there are as many lines in segments as there are segments intersecting the ");
+        _printLine_("        mesh.");
 }