Changeset 22251

Timestamp:

11/12/17 03:30:39 (7 years ago)

Author:

tsantos

Message:

BUG: 'long to int' conversions should be avoid (src/c/bamg/Mesh.cpp, RandomNumber usage)

Location:

issm/trunk-jpl/src/c/bamg

Files:

• Mesh.cpp (modified) (3 diffs)
• Mesh.h (modified) (2 diffs)

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

@@ -2692 +2692 @@
                 //Get Prime number
                 const long PrimeNumber= BigPrimeNumber(nbv);
-                int  k0=this->RandomNumber(nbv);
+                long k0=this->RandomNumber(nbv);
 
                 //Build orderedvertices
@@ -2796 +2796 @@
                 /*construction of a random order*/
                 const long PrimeNumber= BigPrimeNumber(nbv)  ;
-                long k3 = long(this->RandomNumber(nbvnew));
+                long k3 = this->RandomNumber(nbvnew);
                 //loop over the new points
                 for (int is3=0; is3<nbvnew; is3++){
@@ -4690 +4690 @@
         }
         /*}}}*/
-        int  Mesh::RandomNumber(int max){/*{{{*/
+        long  Mesh::RandomNumber(long max){/*{{{*/
                 /*  Generate a random number from 0 to max-1 using linear congruential
                  *  random number generator*/

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

@@ -40 +40 @@
                         double                        coefIcoor;             // coef to integer
                         ListofIntersectionTriangles   lIntTria;
-                        int                           randomseed;            //used for random number generation
+                        long                                                                    randomseed;            //used for random number generation
 
                         long                          NbVerticesOnGeomVertex;
@@ -115 +115 @@
                         void BuildMetric1(BamgOpts* bamgopts);
                         void BuildGeometryFromMesh(BamgOpts* bamgopts=NULL);
-                        int  RandomNumber(int max);
+                        long  RandomNumber(long max);
                         void ReconstructExistingMesh();