Changeset 22085 for issm/branches/trunk-larour-NatGeoScience2016/src/c/bamg/Mesh.h

Timestamp:

09/15/17 18:44:44 (8 years ago)

Author:

Eric.Larour

Message:

CHG: new bamg version.

File:

• issm/branches/trunk-larour-NatGeoScience2016/src/c/bamg/Mesh.h (modified) (8 diffs)

issm/branches/trunk-larour-NatGeoScience2016/src/c/bamg/Mesh.h

@@ -38 +38 @@
 
                         R2                            pmin,pmax;             // extrema
-                        double                        coefIcoor;             // coef to integer Icoor1;
+                        double                        coefIcoor;             // coef to integer
                         ListofIntersectionTriangles   lIntTria;
+                        int                           randomseed;            //used for random number generation
 
                         long                          NbVerticesOnGeomVertex;
@@ -76 +77 @@
                         I2 R2ToI2(const R2 & P) const;
                         R2 I2ToR2(const I2 & P) const;
-                        void AddVertex(BamgVertex & s,Triangle * t,Icoor2 *  =0) ;
-                        void Insert(bool random);
+                        void AddVertex(BamgVertex & s,Triangle * t,long long *  =0) ;
+                        void Insert();
                         void Echo(void);
                         void ForceBoundary();
@@ -91 +92 @@
                         void MaxSubDivision(double maxsubdiv);
                         void NewPoints(Mesh &,BamgOpts* bamgopts,int KeepVertices=1);
-                        long InsertNewPoints(long nbvold,long & NbTSwap,bool random); 
+                        long InsertNewPoints(long nbvold,long & NbTSwap); 
                         void TrianglesRenumberBySubDomain(bool justcompress=false);
                         void SmoothingVertex(int =3,double=0.3);
-                        Metric MetricAt (const R2 &) const;
+                        Metric MetricAt (const R2 &);
                         GeomEdge* ProjectOnCurve( Edge & AB, BamgVertex &  A, BamgVertex & B,double theta, BamgVertex & R,VertexOnEdge & BR,VertexOnGeom & GR);
                         long GetId(const Triangle & t) const;
@@ -103 +104 @@
                         long GetId(const Edge * t) const;
                         BamgVertex* NearestVertex(int i,int j) ;
-                        Triangle* TriangleFindFromCoord(const I2 & ,Icoor2 [3],Triangle *tstart=0) const;
+                        Triangle* TriangleFindFromCoord(const I2 & ,long long [3],Triangle *tstart=0);
                         void ReadMesh(int* index,double* x,double* y,int nods,int nels);
                         void ReadMesh(BamgMesh* bamgmesh, BamgOpts* bamgopts);
@@ -113 +114 @@
                         void BuildMetric0(BamgOpts* bamgopts);
                         void BuildMetric1(BamgOpts* bamgopts);
-                        void AddGeometryMetric(BamgOpts* bamgopts);
                         void BuildGeometryFromMesh(BamgOpts* bamgopts=NULL);
+                        int  RandomNumber(int max);
                         void ReconstructExistingMesh();
 
@@ -143 +144 @@
                         void Triangulate(double* x,double* y,int nods);
                         void Init(long);
+                        int ForceEdge(BamgVertex &a, BamgVertex & b,AdjacentTriangle & taret) ;
+                        int SwapForForcingEdge(BamgVertex   *  & pva ,BamgVertex  * &   pvb ,
+                                                AdjacentTriangle & tt1,long long & dets1,
+                                                long long & detsa,long long & detsb, int & nbswap);
         };
 
@@ -149 +154 @@
         void  swap(Triangle *t1,short a1,
                                 Triangle *t2,short a2,
-                                BamgVertex *s1,BamgVertex *s2,Icoor2 det1,Icoor2 det2);
-        int SwapForForcingEdge(BamgVertex   *  & pva ,BamgVertex  * &   pvb ,
-                                AdjacentTriangle & tt1,Icoor2 & dets1,
-                                Icoor2 & detsa,Icoor2 & detsb, int & nbswap);
-        int ForceEdge(BamgVertex &a, BamgVertex & b,AdjacentTriangle & taret) ;
+                                BamgVertex *s1,BamgVertex *s2,long long det1,long long det2);
+
         inline AdjacentTriangle Previous(const AdjacentTriangle & ta){
                 return AdjacentTriangle(ta.t,PreviousEdge[ta.a]);
@@ -166 +168 @@
                 int j=i;i=on->AdjVertexIndex[i];on=on->Adj[j];
         }
-        inline double qualite(const BamgVertex &va,const BamgVertex &vb,const BamgVertex &vc){
-                double ret; 
-                I2 ia=va,ib=vb,ic=vc;
-                I2 ab=ib-ia,bc=ic-ib,ac=ic-ia;
-                Icoor2 deta=Det(ab,ac);
-                if (deta <=0) ret = -1;
-                else {
-                        double a = sqrt((double) (ac,ac)),
-                                         b = sqrt((double) (bc,bc)),
-                                         c = sqrt((double) (ab,ab)),
-                                         p = a+b+c;
-                        double h= Max(Max(a,b),c),ro=deta/p;
-                        ret = ro/h;
-                }
-                return ret;
-        }
-
 }
 #endif