Changeset 10205

Timestamp:

10/13/11 16:47:11 (13 years ago)

Author:

Mathieu Morlighem

Message:

Added BamgTriangulate for Delaunay Triangulations

Location:

issm/trunk/src

Files:

• c/Makefile.am (modified) (1 diff)
• c/io/Matlab/WriteMatlabData.cpp (modified) (1 diff)
• c/io/Matlab/matlabio.h (modified) (1 diff)
• c/modules/BamgTriangulatex (added)
• c/modules/BamgTriangulatex/BamgTriangulatex.cpp (added)
• c/modules/BamgTriangulatex/BamgTriangulatex.h (added)
• c/modules/modules.h (modified) (1 diff)
• c/objects/Bamg/Mesh.cpp (modified) (4 diffs)
• c/objects/Bamg/Mesh.h (modified) (3 diffs)
• mex/BamgTriangulate (added)
• mex/BamgTriangulate/BamgTriangulate.cpp (added)
• mex/BamgTriangulate/BamgTriangulate.h (added)
• mex/Makefile.am (modified) (2 diffs)
• mex/Test/Test.cpp (modified) (1 diff)
• mex/Test/Test.h (modified) (1 diff)

issm/trunk/src/c/Makefile.am

@@ -684 +684 @@
                                         ./modules/BamgConvertMeshx/BamgConvertMeshx.cpp\
                                         ./modules/BamgConvertMeshx/BamgConvertMeshx.h\
+                                        ./modules/BamgTriangulatex/BamgTriangulatex.cpp\
+                                        ./modules/BamgTriangulatex/BamgTriangulatex.h\
                                         ./modules/DragCoefficientAbsGradientx/DragCoefficientAbsGradientx.cpp\
                                         ./modules/DragCoefficientAbsGradientx/DragCoefficientAbsGradientx.h\

issm/trunk/src/c/io/Matlab/WriteMatlabData.cpp

@@ -81 +81 @@
 }
 /*}}}*/
+/*FUNCTION WriteMatlabData(mxArray** pdataref,int* matrix, int M,int N){{{1*/
+void WriteMatlabData(mxArray** pdataref,int* matrix, int M,int N){
+
+        mxArray* dataref=NULL;
+        mxArray* tdataref=NULL;
+
+        if(matrix){
+
+                /*convert to double matrix*/
+                double* doublematrix=(double*)xmalloc(M*N*sizeof(double));
+                for(int i=0;i<M*N;i++) doublematrix[i]=(double)matrix[i];
+
+                /*data is a double* pointer. Copy into a matrix: */
+                tdataref = mxCreateDoubleMatrix(0,0,mxREAL);
+                mxSetM(tdataref,(mwSize)N);
+                mxSetN(tdataref,(mwSize)M);
+                mxSetPr(tdataref,(double*)doublematrix);
+
+                //transpose
+                mexCallMATLAB(1,&dataref,1,&tdataref, "transpose");
+        }
+        else{
+                dataref = mxCreateDoubleMatrix(0,0,mxREAL);
+        }
+        *pdataref=dataref;
+}
+/*}}}*/
 /*FUNCTION WriteMatlabData(mxArray** pdataref,Vec vector){{{1*/
 void WriteMatlabData(mxArray** pdataref,Vec vector){

issm/trunk/src/c/io/Matlab/matlabio.h

@@ -18 +18 @@
 void WriteMatlabData(mxArray** pdataref,Mat matrix);
 void WriteMatlabData(mxArray** pdataref,double* matrix, int M,int N);
+void WriteMatlabData(mxArray** pdataref,int*    matrix, int M,int N);
 void WriteMatlabData(mxArray** pdataref,Vec vector);
 void WriteMatlabData(mxArray** pdataref,double* vector, int M);

issm/trunk/src/c/modules/modules.h

@@ -12 +12 @@
 #include "./Bamgx/Bamgx.h"
 #include "./BamgConvertMeshx/BamgConvertMeshx.h"
+#include "./BamgTriangulatex/BamgTriangulatex.h"
 #include "./Chacox/Chacox.h"
 #include "./ComputeBasalStressx/ComputeBasalStressx.h"

issm/trunk/src/c/objects/Bamg/Mesh.cpp

@@ -48 +48 @@
                 SetIntCoor();
                 ReconstructExistingMesh();
+        }
+        /*}}}1*/
+        /*FUNCTION Mesh::Mesh(double* x,double* y,int nods){{{1*/
+        Mesh::Mesh(double* x,double* y,int nods):Gh(*(new Geometry())),BTh(*this){
+                Triangulate(x,y,nods);
         }
         /*}}}1*/
@@ -998 +1003 @@
                         bamgopts->metric[i*3+2]=vertices[i].m.a22;
                 }
+        }
+        /*}}}1*/
+        /*FUNCTION Mesh::WriteIndex{{{1*/
+        void Mesh::WriteIndex(int** pindex,int* pnels){
+
+                /*Intermediary*/
+                int i,k,num;
+                int verbose=0;
+
+                /*output*/
+                int* index=NULL;
+
+                /*Get number of triangles*/
+                k=0;
+                for (i=0;i<nbt;i++){
+                        Triangle &t=triangles[i];
+                        if(t.det>0) k++;
+                }
+
+                if (k){
+                        index=(int*)xmalloc(3*k*sizeof(double));
+                        num=0;
+                        for (i=0;i<nbt;i++){
+                                Triangle &t=triangles[i];
+                                if (t.det>0 && !(t.Hidden(0)||t.Hidden(1) || t.Hidden(2) )){
+                                        index[num*3+0]=GetId(t[0])+1; //back to M indexing
+                                        index[num*3+1]=GetId(t[1])+1; //back to M indexing
+                                        index[num*3+2]=GetId(t[2])+1; //back to M indexing
+                                        num=num+1;
+                                }
+                        }
+                }
+
+                /*Assign output pointers*/
+                *pindex=index;
+                *pnels=k;
         }
         /*}}}1*/
@@ -4888 +4929 @@
 }
 /*}}}1*/
+/*FUNCTION Mesh::Triangulate{{{1*/
+void Mesh::Triangulate(double* x,double* y,int nods){
+
+        int verbose=0;
+        int i;
+        Metric M1(1);
+
+        /*Initialize mesh*/
+        Init(nods);//this resets nbv to 0
+        nbv=nods;
+
+        //Vertices
+        if(verbose) printf("Reading vertices (%i)\n",nbv);
+        for (i=0;i<nbv;i++){
+                vertices[i].r.x=x[i];
+                vertices[i].r.y=y[i];
+                vertices[i].ReferenceNumber=1;
+                vertices[i].DirOfSearch =NoDirOfSearch;
+                vertices[i].m=M1;
+                vertices[i].color=0;
+        }
+        maxnbt=2*maxnbv-2; // for filling The Holes and quadrilaterals 
+
+        /*Insert Vertices*/
+        Insert();
+}
+/*}}}1*/
         /*FUNCTION Mesh::TriangulateFromGeom0{{{1*/
         void Mesh::TriangulateFromGeom0(BamgOpts* bamgopts){
@@ -4900 +4968 @@
                 const int          MaxSubEdge  = 10;
 
-                R2                 AB;
+                R2          AB;
                 GeomVertex *a, *b;
-                BamgVertex        *va, *vb;
+                BamgVertex *va,*vb;
                 GeomEdge   *e;
 

issm/trunk/src/c/objects/Bamg/Mesh.h

@@ -57 +57 @@
                         //Constructors/Destructors
                         Mesh(BamgGeom* bamggeom,BamgMesh* bamgmesh,BamgOpts* bamgopts);
-                        Mesh(double* index,double* x,double* y,int nods,int nels);
+                        Mesh(double* index,double* x,double* y,int nods,int nels);/*MeshConvert*/
+                        Mesh(double* x,double* y,int nods); /*BamgTriangulate*/
                         Mesh(Mesh &,Geometry * pGh=0,Mesh* pBTh=0,long maxnbv_in=0 ); //copy operator
                         Mesh(const Mesh &,const int *flag,const int *bb,BamgOpts* bamgopts); // truncature
@@ -114 +115 @@
                         void ReadMetric(const BamgOpts* bamgopts);
                         void WriteMetric(BamgOpts* bamgopts);
+                        void WriteIndex(int** pindex,int* pnels);
                         void AddMetric(BamgOpts* bamgopts);
                         void BuildMetric0(BamgOpts* bamgopts);
@@ -146 +148 @@
                         void TriangulateFromGeom1(BamgOpts* bamgopts,int KeepVertices=1);// the real constructor mesh adaption
                         void TriangulateFromGeom0(BamgOpts* bamgopts);// the real constructor mesh generator
+                        void Triangulate(double* x,double* y,int nods);
                         void Init(long);
         };

issm/trunk/src/mex/Makefile.am

@@ -10 +10 @@
                                 BamgMesher\
                                 BamgConvertMesh\
+                                BamgTriangulate\
                                 Chaco\
                                 ComputeBasalStress\
@@ -128 +129 @@
                                         BamgConvertMesh/BamgConvertMesh.h
 
+BamgTriangulate_SOURCES = BamgTriangulate/BamgTriangulate.cpp\
+                                                                  BamgTriangulate/BamgTriangulate.h
+
 Chaco_SOURCES = Chaco/Chaco.cpp\
                                         Chaco/Chaco.h

issm/trunk/src/mex/Test/Test.cpp

@@ -7 +7 @@
 void mexFunction( int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]){
 
-        Options *options = NULL;
-        double   test;
-        char    *name    = NULL;
-        bool     logical;
-        double  *matrix    = NULL;
-        int      numel;
+        char *string = NULL;
+        PetscErrorCode ierr;
 
-        MODULEBOOT();
-        MODULEEND();
+        FetchMatlabData(&string,STRING);
+
+         if (!strcmp(string,"Init")){
+                 ierr=PetscInitializeNoArguments();
+                 ierr=PetscPopSignalHandler();
+         }
+         else if(!strcmp(string,"Finalize")) {
+                 ierr=PetscFinalize();
+         }
+         else{
+                 printf("NOTHING to be done\n");
+         }
 }
 

issm/trunk/src/mex/Test/Test.h

@@ -14 +14 @@
     
 /* serial input macros: */
-#define DATASET (mxArray*)prhs[0]
+#define STRING (mxArray*)prhs[0]
 
 /* serial arg counts: */