Changeset 14293

Timestamp:

01/31/13 10:25:24 (12 years ago)

Author:

Mathieu Morlighem

Message:

NEW: renamed DomainOutlineWrite -> ExpWrite and added printarray for booleans

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• shared/Elements/PrintArrays.cpp (modified) (1 diff)
• shared/Elements/elements.h (modified) (1 diff)
• shared/Exp/ExpWrite.cpp (moved) (moved from issm/trunk-jpl/src/c/shared/Exp/DomainOutlineWrite.cpp ) (2 diffs)
• shared/Exp/exp.h (modified) (1 diff)

issm/trunk-jpl/src/c/Makefile.am

@@ -741 +741 @@
                         ./shared/Exp/IsInPoly.cpp\
                         ./shared/Exp/IsInPolySerial.cpp\
-                        ./shared/Exp/DomainOutlineWrite.cpp\
+                        ./shared/Exp/ExpWrite.cpp\
                         ./shared/TriMesh/trimesh.h\
                         ./shared/TriMesh/AssociateSegmentToElement.cpp\

issm/trunk-jpl/src/c/shared/Elements/PrintArrays.cpp

@@ -39 +39 @@
         _printLine_("");
 }
+void printarray(bool* array,int lines,int cols){
+        _printLine_("");
+        for(int i=0;i<lines;i++){  
+                _printString_("   [ ");
+                for(int j=0;j<cols;j++) _printString_( " " << array[i*cols+j]?1:0);
+                _printLine_(" ]");
+        }  
+        _printLine_("");
+}
 void printbinary(int n){
         unsigned int i=1L<<(sizeof(n)*8-1);

issm/trunk-jpl/src/c/shared/Elements/elements.h

@@ -40 +40 @@
 void printarray(IssmPDouble* array,int lines,int cols=1);
 void printarray(int* array,int lines,int cols=1);
+void printarray(bool* array,int lines,int cols=1);
 void printsparsity(IssmPDouble* array,int lines,int cols=1);
 void printbinary(int n);

issm/trunk-jpl/src/c/shared/Exp/ExpWrite.cpp

@@ -1 @@
-/*!\file:  DomainOutlineWrite.cpp
- * \brief DomainOutlineWrite.c: write the vertex coordinates defined in a domain 
+/*!\file:  Exp.cpp
+ * \brief Exp.cpp: write the vertex coordinates defined in a domain 
  * outline from Argus (.exp file). The first contour in the file is for 
- * the outside domain outline. The following contours represent holes in
- * the domain.
+ * the outside domain outline. 
  */
-
 #include <stdio.h>
 #include "../Alloc/alloc.h"
 #include "../../include/include.h"
 #include "../Exceptions/exceptions.h"
+#include "../../Container/DataSet.h"
+#include "../../classes/objects/Contour.h"
 
-int DomainOutlineWrite(int nprof,int* profnvertices,double** pprofx,double** pprofy,bool* closed,char* domainname){
-
-        /*Error management: */
-        int noerr=1;
-        int i,counter;
+int ExpWrite(int nprof,int* profnvertices,double** pprofx,double** pprofy,char* domainname){/*{{{*/
 
         /*I/O: */
@@ -21 +17 @@
 
         /*open domain outline file for writing: */
-        if ((fid=fopen(domainname,"w"))==NULL){
-                _error_("could not open domain file " << domainname); 
-                noerr=0; goto cleanupandreturn;
-        }
+        if((fid=fopen(domainname,"w"))==NULL) _error_("could not open domain file " << domainname); 
 
         /*Start writing profiles: */
-        for(counter=0;counter<nprof;counter++){
+        for(int counter=0;counter<nprof;counter++){
 
                 /*Write header: */
-                fprintf(fid,"%s %s\n","##","Name:");
-                fprintf(fid,"%s %s\n","##","Icon:0");
-                fprintf(fid,"%s %s %s %s\n","#","Points","Count","Value");
-
-                /*Write number of profile vertices: */
+                fprintf(fid,"## Name:%s\n",domainname);
+                fprintf(fid,"## Icon:0\n");
+                fprintf(fid,"# Points Count     Value\n");
                 fprintf(fid,"%u %s\n",profnvertices[counter]  ,"1.");
-
-                /*Write next line: */
-                fprintf(fid,"%s %s %s %s %s\n","#","X","pos","Y","pos");
+                fprintf(fid,"# X pos    Y pos\n");
 
                 /*Write vertices: */
-                for (i=0;i<profnvertices[counter];i++){
+                for(int i=0;i<profnvertices[counter];i++){
                         fprintf(fid,"%lf\t%lf\n",pprofx[counter][i],pprofy[counter][i]);
                 }
 
                 /*Write blank line: */
-                if(counter < nprof-1) fprintf(fid,"\n");
+                if(counter<nprof-1) fprintf(fid,"\n");
         }
 
-        /*close domain outline file: */
+        /*close Exp file: */
         fclose(fid);
 
-        cleanupandreturn: 
-        return noerr;
-}
+        return 1;
+}/*}}}*/
+int ExpWrite(DataSet* contours,char* domainname){/*{{{*/
+
+        /*I/O: */
+        FILE* fid=NULL;
+        Contour<double>* contour = NULL;
+
+        /*open domain outline file for writing: */
+        if((fid=fopen(domainname,"w"))==NULL) _error_("could not open domain file " << domainname); 
+
+        for(int counter=0;counter<contours->Size();counter++){
+                contour=(Contour<double>*)contours->GetObjectByOffset(counter);
+
+                /*Write header: */
+                fprintf(fid,"## Name:%s\n",domainname);
+                fprintf(fid,"## Icon:0\n");
+                fprintf(fid,"# Points Count     Value\n");
+                fprintf(fid,"%u %s\n",contour->nods  ,"1.");
+                fprintf(fid,"# X pos    Y pos\n");
+
+                /*Write vertices: */
+                for(int i=0;i<contour->nods;i++){
+                        fprintf(fid,"%lf\t%lf\n",contour->x[i],contour->y[i]);
+                }
+
+                /*Write blank line: */
+                if(counter<contours->Size()-1) fprintf(fid,"\n");
+        }
+
+        /*close Exp file: */
+        fclose(fid);
+
+        return 1;
+}/*}}}*/

issm/trunk-jpl/src/c/shared/Exp/exp.h

@@ -12 +12 @@
 
 int IsInPolySerial(double* in,double* xc,double* yc,int numvertices,double* x,double* y,int nods, int edgevalue);
-int DomainOutlineWrite(int nprof,int* profnvertices,double** pprofx,double** pprofy,bool* closed,char* domainname);
+int ExpWrite(int nprof,int* profnvertices,double** pprofx,double** pprofy,char* domainname);
+int ExpWrite(DataSet* contours,char* domainname);
 int pnpoly(int npol, double *xp, double *yp, double x, double y, int edgevalue);