Changeset 21865

Timestamp:

07/25/17 13:13:20 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: getting rid of BinaryRand

Location:

issm/trunk-jpl/src/c

Files:

• bamg/BamgVertex.cpp (modified) (1 diff)
• bamg/BamgVertex.h (modified) (1 diff)
• bamg/ListofIntersectionTriangles.cpp (modified) (1 diff)
• bamg/ListofIntersectionTriangles.h (modified) (1 diff)
• bamg/Mesh.cpp (modified) (4 diffs)
• bamg/Mesh.h (modified) (2 diffs)
• shared/Bamg/BinaryRand.h (deleted)
• shared/Bamg/shared.h (modified) (1 diff)

issm/trunk-jpl/src/c/bamg/BamgVertex.cpp

@@ -122 +122 @@
         }
         /*}}}*/
-        double  BamgVertex::Smoothing(Mesh &Th,const Mesh &BTh,Triangle* &tstart ,double omega){/*{{{*/
+        double  BamgVertex::Smoothing(Mesh &Th,Mesh &BTh,Triangle* &tstart ,double omega){/*{{{*/
                 /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/Smoothing)*/
 

issm/trunk-jpl/src/c/bamg/BamgVertex.h

@@ -42 +42 @@
                         /*methods (No constructor and no destructors...)*/
                         BamgVertex();
-                        double Smoothing(Mesh & ,const Mesh & ,Triangle  * & ,double =1);
+                        double Smoothing(Mesh & ,Mesh & ,Triangle  * & ,double =1);
                         void   MetricFromHessian(const double Hxx,const double Hyx, const double Hyy, const double smin,const double smax,const double s,const double err,BamgOpts* bamgopts);
                         void   Echo();

issm/trunk-jpl/src/c/bamg/ListofIntersectionTriangles.cpp

@@ -188 +188 @@
         }
         /*}}}*/
-        void ListofIntersectionTriangles::SplitEdge(const Mesh & Bh, const R2 &A,const R2  &B,int nbegin) {/*{{{*/
+        void ListofIntersectionTriangles::SplitEdge(Mesh & Bh, const R2 &A,const R2  &B,int nbegin) {/*{{{*/
                 /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/ListofIntersectionTriangles)*/
 

issm/trunk-jpl/src/c/bamg/ListofIntersectionTriangles.h

@@ -63 +63 @@
                         int    NewItem(Triangle *tt,double d0,double d1,double d2);
                         int    NewItem(R2 ,const Metric &);
-                        void   SplitEdge(const Mesh &,const R2 &,const R2 &,int nbegin=0);
+                        void   SplitEdge(Mesh &,const R2 &,const R2 &,int nbegin=0);
                         double Length();
                         long   NewPoints(BamgVertex *,long &nbv,long maxnbv);

issm/trunk-jpl/src/c/bamg/Mesh.cpp

@@ -2950 +2950 @@
         }
         /*}}}*/
-        Metric Mesh::MetricAt(const R2 & A) const { /*{{{*/
+        Metric Mesh::MetricAt(const R2 & A){ /*{{{*/
                 /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/MetricAt)*/
 
@@ -3871 +3871 @@
         }
         /*}}}*/
-        Triangle * Mesh::TriangleFindFromCoord(const I2 & B,long long det3[3], Triangle *tstart) const {/*{{{*/
+        Triangle * Mesh::TriangleFindFromCoord(const I2 & B,long long det3[3], Triangle *tstart){/*{{{*/
                 /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/FindTriangleContening)*/
 
@@ -3946 +3946 @@
 
                         if (k==0) break;
-                        if (k==2 && BinaryRand()) Exchange(ii[0],ii[1]);
+                        if (k==2 && this->RandomNumber(1)) Exchange(ii[0],ii[1]);
                         _assert_(k<3);
                         AdjacentTriangle t1 = t->Adj(jj=ii[0]);
@@ -4795 +4795 @@
                          ToSwap =1; 
                         else // swap alleatoire 
-                         if (BinaryRand()) 
+                         if (this->RandomNumber(1)) 
                           ToSwap =2; 
                   }

issm/trunk-jpl/src/c/bamg/Mesh.h

@@ -95 +95 @@
                         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;
@@ -104 +104 @@
                         long GetId(const Edge * t) const;
                         BamgVertex* NearestVertex(int i,int j) ;
-                        Triangle* TriangleFindFromCoord(const I2 & ,long long [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);

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

@@ -8 +8 @@
 #include "Abs.h"
 #include "BigPrimeNumber.h"
-#include "BinaryRand.h"
 #include "Exchange.h"
 #include "extrema.h"