Changeset 15396 for issm/trunk/src/c/shared/Exp/exp.h

Timestamp:

07/02/13 09:24:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 15394

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c/shared/Exp/exp.h (modified) (7 diffs)

issm/trunk

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

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

@@ -7 +7 @@
 
 #include <cstring>
-#include "../../classes/objects/Contour.h"
-#include "../../shared/Numerics/recast.h"
-#include "../../Container/Container.h"
+#include "../Numerics/recast.h"
+#include "../Exceptions/exceptions.h"
+#include "../MemOps/MemOps.h"
 
 int IsInPolySerial(double* in,double* xc,double* yc,int numvertices,double* x,double* y,int nods, int edgevalue);
 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);
 
-/*IsInPoly {{{*/
-template <class doubletype>
-int IsInPoly(SeqVec<doubletype>* in,double* xc,double* yc,int numvertices,double* x,double* y,int i0,int i1, int edgevalue){
+template <class doubletype> int IsInPoly(doubletype* in,double* xc,double* yc,int numvertices,double* x,double* y,int i0,int i1, int edgevalue){ /*{{{*/
 
         int i;
@@ -40 +37 @@
 
                 //Get current value of value[i] -> do not change it if != 0
-                in->GetValue(&value,i);
+                value=in[i];
                 if (reCast<bool,doubletype>(value)){
                         /*this vertex already is inside one of the contours, continue*/
@@ -54 +51 @@
                         value=pnpoly(numvertices,xc,yc,x0,y0,edgevalue);
                 }
-                in->SetValue(i,value,INS_VAL);
+                in[i]=value;
         }
          return 1;
 }/*}}}*/
-/*DomainOutlineRead{{{*/
-template <class doubletype>
-int DomainOutlineRead(int* pnprof,int** pprofnvertices,doubletype*** ppprofx,doubletype*** ppprofy,bool** pclosed,char* domainname){
+template <class doubletype> int ExpRead(int* pnprof,int** pprofnvertices,doubletype*** ppprofx,doubletype*** ppprofy,bool** pclosed,char* domainname){ /*{{{*/
 
         /*indexing: */
@@ -91 +86 @@
         nprof=1;
         for(;;){
-                fscanf(fid,"%255s %255s\n",chardummy,chardummy);
-                fscanf(fid,"%255s %255s\n",chardummy,chardummy);
-                fscanf(fid,"%255s %255s %255s %255s\n",chardummy,chardummy,chardummy,chardummy);
-                fscanf(fid,"%20u %255s\n",&n,chardummy);
-                fscanf(fid,"%255s %255s %255s %255s %255s\n",chardummy,chardummy,chardummy,chardummy,chardummy);
-                for (i=0;i<n;i++) fscanf(fid,"%20lf %20lf\n",&ddummy,&ddummy);
+                //## Name:filename
+                if(fscanf(fid,"%255s %255s\n",chardummy,chardummy)!=2) _error_("Could not read " << domainname);
+                //## Icon:0
+                if(fscanf(fid,"%255s %255s\n",chardummy,chardummy)!=2) _error_("Could not read " << domainname);
+                //# Points Count Value
+                if(fscanf(fid,"%255s %255s %255s %255s\n",chardummy,chardummy,chardummy,chardummy)!=4) _error_("Could not read " << domainname);
+                if(fscanf(fid,"%20u %255s\n",&n,chardummy)!=2) _error_("Could not read number of points in "<<domainname);
+                //# X pos Y pos
+                if(fscanf(fid,"%255s %255s %255s %255s %255s\n",chardummy,chardummy,chardummy,chardummy,chardummy)!=5) _error_("Could not read " << domainname);
+                for (i=0;i<n;i++){
+                        if(fscanf(fid,"%20lf %20lf\n",&ddummy,&ddummy)!=2){
+                                _error_("Could not read coordinate of vertex "<< i <<" of "<<domainname);
+                        }
+                }
                 /*check whether we are at the end of the file, otherwise, keep reading next profile:*/
-                if (feof(fid)) break;
+                if(feof(fid)) break;
                 nprof++;
         }
@@ -119 +122 @@
 
                 /*Skip header: */
-                fscanf(fid,"%255s %255s\n",chardummy,chardummy);
-                fscanf(fid,"%255s %255s\n",chardummy,chardummy);
-                fscanf(fid,"%255s %255s %255s %255s\n",chardummy,chardummy,chardummy,chardummy);
+                //## Name:filename
+                if(fscanf(fid,"%255s %255s\n",chardummy,chardummy)!=2) _error_("Could not read " << domainname);
+                //## Icon:0
+                if(fscanf(fid,"%255s %255s\n",chardummy,chardummy)!=2) _error_("Could not read " << domainname);
+                //# Points Count Value
+                if(fscanf(fid,"%255s %255s %255s %255s\n",chardummy,chardummy,chardummy,chardummy)!=4) _error_("Could not read " << domainname);
 
                 /*Get number of profile vertices: */
-                fscanf(fid,"%20u %255s\n",&n,chardummy);
+                if(fscanf(fid,"%20u %255s\n",&n,chardummy)!=2) _error_("Could not read number of points in "<<domainname);
 
                 /*Skip next line: */
-                fscanf(fid,"%255s %255s %255s %255s %255s\n",chardummy,chardummy,chardummy,chardummy,chardummy);
+                //# X pos Y pos
+                if(fscanf(fid,"%255s %255s %255s %255s %255s\n",chardummy,chardummy,chardummy,chardummy,chardummy)!=5) _error_("Could not read " << domainname);
 
                 /*Allocate vertices: */
@@ -135 +142 @@
                 /*Read vertices: */
                 for (i=0;i<n;i++){
-                        fscanf(fid,"%20lf %20lf\n",&x[i],&y[i]);
+                        if(fscanf(fid,"%20lf %20lf\n",&x[i],&y[i])!=2){
+                                _error_("Could not read coordinate of vertex "<<i<<" of "<<domainname);
+                        }
                 }
 
@@ -161 +170 @@
         if(pclosed) *pclosed=closed;
         else         xDelete<bool>(closed);
-} /*}}}*/
-/*DataSet* DomainOutlineRead(char* domainname){{{*/
-template <class doubletype>
-DataSet* DomainOutlineRead(char* domainname){
+        return 1;
 
-        /*intermediary: */
-        int                  nprof;
-        int                 *profnvertices = NULL;
-        doubletype         **pprofx        = NULL;
-        doubletype         **pprofy        = NULL;
-
-        /*output: */
-        DataSet *domain = NULL;
-
-        /*If domainname is an empty string, return empty dataset*/
-        if (strcmp(domainname,"")==0){
-                nprof=0;
-        }
-        else{
-                DomainOutlineRead(&nprof,&profnvertices,&pprofx, &pprofy, NULL,domainname);
-        }
-
-        /*now create dataset of contours: */
-        domain=new DataSet(0);
-
-        for(int i=0;i<nprof;i++){
-                domain->AddObject(new Contour<doubletype>(i,profnvertices[i],pprofx[i],pprofy[i],1));
-        }
-        return domain;
 } /*}}}*/
 

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache