Changeset 11935

Timestamp:

04/05/12 14:50:15 (13 years ago)

Author:

Eric.Larour

Message:

Sent ModuleEnd and ModuleBoot to Wrapper (not Matlab related).
New DomainOutlineRead overloaded prototype to return a dataset.

Location:

issm/trunk-jpl/src/c/shared

Files:

• Exp/DomainOutlineRead.cpp (modified) (5 diffs)
• Exp/exp.h (modified) (1 diff)
• Matlab/CheckNumMatlabArguments.cpp (modified) (1 diff)
• Matlab/ModuleBoot.cpp (deleted)
• Matlab/ModuleEnd.cpp (deleted)
• Matlab/matlabshared.h (modified) (1 diff)
• Matlab/mxGetField.cpp (deleted)
• Wrapper (added)
• Wrapper/ModuleBoot.cpp (added)
• Wrapper/ModuleEnd.cpp (added)
• Wrapper/wrappershared.h (added)
• shared.h (modified) (1 diff)

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

@@ -9 +9 @@
 #include "../Alloc/alloc.h"
 #include "../../include/include.h"
+#include "../../objects/objects.h"
 #include "../Exceptions/exceptions.h"
+#include "../../Container/DataSet.h"
 
 int DomainOutlineRead(int* pnprof,int** pprofnvertices,double*** ppprofx,double*** ppprofy,bool** pclosed,char* domainname,bool whole=true){
 
         
-        /*Error management: */
-        int noerr=1;
+        /*indexing: */
         int i,counter;
 
@@ -39 +40 @@
         if ((fid=fopen(domainname,"r"))==NULL){
                 _error_("%s%s","could not find domain file ",domainname); 
-                noerr=0; goto cleanupandreturn;
         }
 
@@ -95 +95 @@
                 /*Read vertices: */
                 for (i=0;i<n;i++){
-                        fscanf(fid,"%20lf %20lf\n",x+i,y+i);
+                        fscanf(fid,"%20lf %20lf\n",&x[i],&y[i]);
                 }
 
@@ -117 +117 @@
         fclose(fid);
 
-        cleanupandreturn: 
-        /*Free ressources: */
-        if(!noerr){
-                xfree((void**)&x);
-                xfree((void**)&y);
-                n=-1;
-        }
-        
         /*Assign output pointers: */
         *pnprof=nprof;
@@ -132 +124 @@
         if(pclosed)*pclosed=closed;
         else       xfree((void**)&closed);
-        return noerr;
 }
 
+DataSet* DomainOutlineRead(char* domainname,bool whole=true){
+
+        /*indexing: */
+        int i;
+
+        /*intermediary: */
+        int nprof;
+        int* profnvertices=NULL;
+        double** pprofx=NULL;
+        double** pprofy=NULL;
+
+        Contour* contour=NULL;
+
+        /*output: */
+        DataSet* domain=NULL;
+
+        /*get domain outline from intermediary function:*/
+        DomainOutlineRead(&nprof,&profnvertices,&pprofx, &pprofy, NULL,domainname,whole);
+
+        /*now create dataset of contours: */
+        domain=new DataSet(0);
+
+        for(i=0;i<nprof;i++){
+                domain->AddObject(new Contour(i,profnvertices[i],pprofx[i],pprofy[i],1));
+        }
+
+        return domain;
+}

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

@@ -13 +13 @@
 int IsOutsidePoly(Vector* in,double* xc,double* yc,int numvertices,double* x,double* y,int i0,int i1, int edgevalue);
 int IsInPolySerial(double* in,double* xc,double* yc,int numvertices,double* x,double* y,int nods, int edgevalue);
-int DomainOutlineRead(int* pnprof,int** pprofnvertices,double*** ppprofx,double*** ppprofy,bool** pclosed,char* domainname,bool whole);
 int DomainOutlineWrite(int nprof,int* profnvertices,double** pprofx,double** pprofy,bool* closed,char* domainname,bool whole);
 int pnpoly(int npol, double *xp, double *yp, double x, double y, int edgevalue);
 
+int      DomainOutlineRead(int* pnprof,int** pprofnvertices,double*** ppprofx,double*** ppprofy,bool** pclosed,char* domainname,bool whole);
+DataSet* DomainOutlineRead(char* domainname,bool whole);
+
+
 #endif

issm/trunk-jpl/src/c/shared/Matlab/CheckNumMatlabArguments.cpp

@@ -3 +3 @@
  */
 
-#ifdef _SERIAL_
+#ifdef HAVE_CONFIG_H
+        #include <config.h>
+#else
+#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
+#endif
+
+
+#if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
 
 #include "../Exceptions/exceptions.h"

issm/trunk-jpl/src/c/shared/Matlab/matlabshared.h

@@ -8 +8 @@
 #include "../../objects/objects.h"
 
-
-#if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
-int ModuleBoot(void);
-int ModuleEnd(void);
-#endif
-
 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
 #include "mex.h"

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

@@ -19 +19 @@
 #include "Bamg/shared.h"
 #include "Matlab/matlabshared.h"
+#include "Wrapper/wrappershared.h"
 
 #endif