Changeset 5447

Timestamp:

08/20/10 11:09:12 (15 years ago)

Author:

Mathieu Morlighem

Message:

As usual

Location:

issm/trunk/src/c/objects/Bamg

Files:

• BamgVertex.h (modified) (1 diff)
• EigenMetric.cpp (modified) (2 diffs)
• GeometricalEdge.cpp (modified) (2 diffs)
• Mesh.cpp (modified) (4 diffs)
• VertexOnGeom.cpp (modified) (1 diff)

issm/trunk/src/c/objects/Bamg/BamgVertex.h ¶

@@ -1 @@
-#ifndef _MESHVERTEX_H_
-#define _MESHVERTEX_H_
+#ifndef _BAMGVERTEX_H_
+#define _BAMGVERTEX_H_
 
 #include "./include.h"

issm/trunk/src/c/objects/Bamg/EigenMetric.cpp ¶

@@ -149 +149 @@
         /*FUNCTION EigenMetric::Max{{{1*/
         void   EigenMetric::Max(double a) { 
+                //change eigen values
                 lambda1=bamg::Max(a,lambda1); lambda2=bamg::Max(a,lambda2) ;
         }/*}}}*/
@@ -157 +158 @@
         /*FUNCTION EigenMetric::Maxh{{{1*/
         void   EigenMetric::Maxh(double h) {
+                //Call Max function
                 Max(1.0/(h*h));
         }/*}}}*/

issm/trunk/src/c/objects/Bamg/GeometricalEdge.cpp ¶

@@ -27 +27 @@
            R2 A=v[0]->r,B=v[1]->r;
                 double ca,cb,cta,ctb;
-                if ( theta<-1e-12){
-                        ISSMERROR("theta<-1e-12");
-                }
-                if ( theta>1+1e-12){
-                        ISSMERROR("theta>1+1e-12");
-                }
+
+                //Check that theta is in [0 1]
+                ISSMASSERT(theta>-1e-12 && theta<1+1e-12);
+
                 if (TgA()) 
                  if (TgB()) // interpolation d'hermite
@@ -172 +170 @@
         /*FUNCTION GeometricalEdge::SetRequired{{{1*/
         void   GeometricalEdge::SetRequired()    { 
-                type |= 64;/*=>=>6th digit to 1*/ 
+                type |= 64;/*=>6th digit to 1*/ 
         }/*}}}*/
           /*FUNCTION GeometricalEdge::Tg{{{1*/

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

@@ -224 +224 @@
         /*}}}1*/
         /*FUNCTION Mesh::Mesh(long maxnbv,Geometry & G,BamgOpts* bamgopts){{{1*/
-        Mesh::Mesh(long maxnbv,Geometry & G,BamgOpts* bamgopts) :Gh(G),BTh(*this){
+        Mesh::Mesh(long maxnbv,Geometry & G,BamgOpts* bamgopts):Gh(G),BTh(*this){
                 TriangulateFromGeom0(maxnbv,bamgopts);
         }
@@ -2674 +2674 @@
                 /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/PreInit)*/
 
-                long int verbose=0;
-
+                /* initialize random seed: */
                 srand(19999999);
+
+                /*Initialize fields*/
                 NbRef=0;
+                quadtree=NULL;
                 nbv=0;
+                nbt=0;
+                nbe=0;
+                edges=NULL;
+                nbq=0;
+                nbsubdomains=0;
+                subdomains=NULL;
                 maxnbv=maxnbv_in;
-                nbt=0;
-                nbq = 0;
-                maxnbt=2*maxnbv_in-2;
-                nbsubdomains=0;
+                maxnbt=2 *maxnbv_in-2;
                 NbVertexOnBThVertex=0;
+                VertexOnBThVertex=NULL;
                 NbVertexOnBThEdge=0;
-                VertexOnBThVertex=NULL;
                 VertexOnBThEdge=NULL;
-
                 NbCrackedVertices=0;
-                CrackedVertices  =NULL;  
-                NbCrackedEdges   =0;
-                CrackedEdges     =NULL;  
-                nbe = 0; 
-
+                CrackedVertices =NULL;
+                NbCrackedEdges =0;
+                CrackedEdges =NULL;
+                NbVerticesOnGeomVertex=0;
+                VerticesOnGeomVertex=NULL;
+                NbVerticesOnGeomEdge=0;
+                VerticesOnGeomEdge=NULL;
+
+                /*Allocate if maxnbv_in>0*/
                 if (maxnbv_in) {
                         vertices=new BamgVertex[maxnbv];
@@ -2709 +2717 @@
                         maxnbt=0;
                 } 
-
-                quadtree=NULL;
-                edges=NULL;
-                VerticesOnGeomVertex=NULL;
-                VerticesOnGeomEdge=NULL;
-                NbVerticesOnGeomVertex=0;
-                NbVerticesOnGeomEdge=0;
-                subdomains=NULL;
-                nbsubdomains=0;
         }
         /*}}}1*/
@@ -4874 +4873 @@
         void Mesh::TriangulateFromGeom0(long imaxnbv,BamgOpts* bamgopts){
                 /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/GeomToTriangles0)*/
-
                 /*Generate mesh from geometry*/
 

issm/trunk/src/c/objects/Bamg/VertexOnGeom.cpp ¶

@@ -11 +11 @@
 
         /*Constructors/Destructors*/
-        /*FUNCTION VertexOnGeom::constructor{{{1*/
+        /*FUNCTION VertexOnGeom::VertexOnGeom(){{{1*/
         VertexOnGeom::VertexOnGeom(): mv(0),abscisse(0){
                 gv=0;
         } 
         /*}}}*/
-        /*FUNCTION VertexOnGeom::constructor{{{1*/
+        /*FUNCTION VertexOnGeom::VertexOnGeom(BamgVertex & m,GeometricalVertex &g){{{1*/
         VertexOnGeom::VertexOnGeom(BamgVertex & m,GeometricalVertex &g) : mv(&m),abscisse(-1){
                 gv=&g;
         }
         /*}}}*/
-        /*FUNCTION VertexOnGeom::constructor{{{1*/
+        /*FUNCTION VertexOnGeom::VertexOnGeom(BamgVertex & m,GeometricalEdge &g,double s){{{1*/
         VertexOnGeom::VertexOnGeom(BamgVertex & m,GeometricalEdge &g,double s) : mv(&m),abscisse(s){
                 ge=&g;