Changeset 5208

Timestamp:

08/12/10 15:32:14 (15 years ago)

Author:

Mathieu Morlighem

Message:

Fixed meshconvert

Location:

issm/trunk/src

Files:

• c/modules/BamgConvertMeshx/BamgConvertMeshx.cpp (modified) (1 diff)
• c/objects/Bamg/Geometry.cpp (modified) (1 diff)
• c/objects/Bamg/Mesh.cpp (modified) (4 diffs)
• c/objects/Bamg/Mesh.h (modified) (1 diff)
• m/classes/public/bamg.m (modified) (1 diff)
• m/utils/Model/loadmodel.m (modified) (1 diff)

issm/trunk/src/c/modules/BamgConvertMeshx/BamgConvertMeshx.cpp

@@ -21 +21 @@
         /*Options*/
         BamgOpts* bamgopts=NULL;
+        bamgopts=new BamgOpts();
 
         // read mesh

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

@@ -48 +48 @@
         Geometry::~Geometry() {
                 /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, MeshGeom.cpp/~Geometry)*/
-                ISSMASSERT(NbRef<=0);
-                if(vertices)  delete [] vertices;   vertices=0;
-                if(edges)     delete [] edges;      edges=0;
-                if(quadtree)  delete  quadtree;     quadtree=0;
-                if(curves)    delete  []curves;     curves=0;nbcurves=0;
+                if(NbRef>0)    ISSMERROR("Trying to delete geometry and NbRef>0");
+                if(vertices)   delete [] vertices;  vertices=0;
+                if(edges)      delete [] edges;     edges=0;
+                if(quadtree)   delete    quadtree;  quadtree=0;
+                if(curves)     delete [] curves;    curves=0;nbcurves=0;
                 if(subdomains) delete [] subdomains;subdomains=0;
                 Init();

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

@@ -2324 +2324 @@
                 //Reset BamgVertex to On
                 SetVertexFieldOn();
+
+        }
+        /*}}}1*/
+        /*FUNCTION Mesh::Echo{{{1*/
+        void Mesh::Echo(void) {
+
+                int i;
+
+                printf("Mesh Echo:\n");
+                printf("   nbv = %i\n",nbv);
+                printf("   nbt = %i\n",nbt);
+                printf("   nbe = %i\n",nbe);
+                printf("   nbq = %i\n",nbq);
+                printf("   index:\n");
+                for (i=0;i<nbt;i++){
+                        printf("   %4i: [%4i %4i %4i]\n",i+1,
+                                                ((BamgVertex *)triangles[i](0))?GetId(triangles[i][0])+1:0,
+                                                ((BamgVertex *)triangles[i](1))?GetId(triangles[i][1])+1:0,
+                                                ((BamgVertex *)triangles[i](2))?GetId(triangles[i][2])+1:0);
+                }
+                printf("   coordinates:\n");
+                for (i=0;i<nbv;i++){
+                        printf("   %4i: [%g %g]\n",i+1,vertices[i].r.x,vertices[i].r.y);
+                }
 
         }
@@ -2550 +2574 @@
                                         // see routine MakeGeometricalEdgeToEdge
                                         Edge &e = *GeometricalEdgetoEdge[Gh.GetId(eg)];
-                                        if (&e==NULL){
-                                                ISSMERROR("&e==NULL");
-                                        }
+                                        ISSMASSERT(&e);
                                         BamgVertex * v0 =  e(0),*v1 = e(1);
                                         Triangle *t  = v0->t;
@@ -2560 +2582 @@
                                         subdomains[i].direction = direction;
                                         subdomains[i].edge = &e;
-                                        if (!t || !direction){
-                                                ISSMERROR("!t || !direction");
-                                        }
+                                        ISSMASSERT(t && direction);
 
                                         AdjacentTriangle  ta(t,EdgesVertexTriangle[v0->vint][0]);// previous edges
 
                                         while (1) {
-                                                if ( v0 != ta.EdgeVertex(1) ){
-                                                        ISSMERROR("v0 != ta.EdgeVertex(1)");
-                                                }
+                                                ISSMASSERT(v0==ta.EdgeVertex(1));
                                                 if (ta.EdgeVertex(0) == v1) { // ok we find the edge
                                                         if (direction>0)  
@@ -4841 +4859 @@
 
                         //check that num is in [0 nbt[
-                        if (num<0 || num>=nbt){ ISSMERROR("num<0 || num>=nbt");}
+                        ISSMASSERT(num>=0 && num<nbt);
 
                         //reft of this triangle is the subdomain number

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

@@ -78 +78 @@
                         void AddVertex(BamgVertex & s,Triangle * t,Icoor2 *  =0) ;
                         void Insert();
+                        void Echo(void);
                         void ForceBoundary();
                         void FindSubDomain(int OutSide=0);

issm/trunk/src/m/classes/public/bamg.m

@@ -86 +86 @@
                 bamg_geometry.Vertices=[bamg_geometry.Vertices; [domain(i).x(1:nods) domain(i).y(1:nods) ones(nods,1)]];
                 bamg_geometry.Edges   =[bamg_geometry.Edges;    [transpose(count+1:count+nods) transpose([count+2:count+nods count+1])  1*ones(nods,1)]];
+                if i>1, bamg_geometry.SubDomains=[2 count+1 1 1];
 
                 %update counter

issm/trunk/src/m/utils/Model/loadmodel.m

@@ -19 +19 @@
 [stat,mess]=fileattrib(path);
 if( stat==0 | mess.UserRead~=1),
-        error(['loadmodel error message: file ' path ' is not readable (permission dinied).']);
+        %error(['loadmodel error message: file ' path ' is not readable (permission denied).']);
 end
 %check number of variables