Changeset 16967

Timestamp:

11/27/13 14:02:26 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added 'rand' option to bamg so that NR tests work on multiple platforms

Location:

issm/trunk-jpl/src

Files:

• c/bamg/BamgOpts.cpp (modified) (1 diff)
• c/bamg/BamgOpts.h (modified) (1 diff)
• c/bamg/Mesh.cpp (modified) (9 diffs)
• c/bamg/Mesh.h (modified) (2 diffs)
• m/mesh/bamg.m (modified) (1 diff)
• m/mesh/bamg.py (modified) (1 diff)

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

@@ -20 +20 @@
         this->omega=0;
         this->power=0;
+        this->random=0;
         this->verbose=0;
 

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

@@ -25 +25 @@
                 double  omega;
                 double  power;
+                bool    random;
                 int     verbose;
 

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

@@ -2775 +2775 @@
         /*}}}*/
         /*FUNCTION Mesh::Insert{{{*/
-        void Mesh::Insert() {
+        void Mesh::Insert(bool random) {
                 /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/Insert)*/
 
@@ -2822 +2822 @@
                 //Get Prime number
                 const long PrimeNumber= BigPrimeNumber(nbv);
-                int   k0=rand()%nbv; 
+                int temp = rand(); if(random) temp = 756804110;
+                int  k0=temp%nbv; 
 
                 //Build orderedvertices
@@ -2904 +2905 @@
                         _printf_("      NbSwap/nbv:          " << NbSwap/nbv << "\n");
                 }
-
-#ifdef NBLOOPOPTIM
-
-                k0 = rand()%nbv ; 
-                for (int is4=0; is4<nbv; is4++) 
-                 orderedvertices[is4]= &vertices[k0 = (k0 + PrimeNumber)% nbv];
-
-                for(int Nbloop=0;Nbloop<NBLOOPOPTIM;Nbloop++){
-                        long  NbSwap = 0;
-                        for (int is1=0; is1<nbv; is1++) 
-                         NbSwap += orderedvertices[is1]->Optim(0,0);
-                        if (verbose>3) {
-                                _printf_("      Optim Loop: " << Nbloop << "\n");
-                                _printf_("      NbSwap/nbv:          " << NbSwap/nbv << "\n");
-                        }
-                        if(!NbSwap) break;
-                }
-                CreateSingleVertexToTriangleConnectivity(); 
-                // because we break the TriangleContainingTheVertex
-#endif
         }
         /*}}}*/
         /*FUNCTION Mesh::InsertNewPoints{{{*/
-        long Mesh::InsertNewPoints(long nbvold,long & NbTSwap) {
+        long Mesh::InsertNewPoints(long nbvold,long & NbTSwap,bool random) {
                 /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/InsertNewPoints)*/
 
@@ -2948 +2929 @@
                 const long PrimeNumber= BigPrimeNumber(nbv)  ;
                 //remainder of the division of rand() by nbvnew
-                long k3 = rand()%nbvnew;
+                int  temp = rand(); if(!random) temp = 1098566905;
+                long k3 = temp%nbvnew;
                 //loop over the new points
                 for (int is3=0; is3<nbvnew; is3++){
@@ -3212 +3194 @@
                         }
                         Bh.CreateSingleVertexToTriangleConnectivity();     
-                        InsertNewPoints(nbvold,NbTSwap)   ;            
+                        InsertNewPoints(nbvold,NbTSwap,bamgopts->random);
                 }  
                 else Bh.CreateSingleVertexToTriangleConnectivity();     
@@ -3270 +3252 @@
                           }// for triangle   
 
-                        if (!InsertNewPoints(nbvold,NbTSwap)) break;
+                        if (!InsertNewPoints(nbvold,NbTSwap,bamgopts->random)) break;
                         for (i=nbtold;i<nbt;i++) first_np_or_next_t[i]=iter;
                         Headt = nbt; // empty list 
@@ -4231 +4213 @@
 
         /*Insert Vertices*/
-        Insert();
+        Insert(true);
 }
 /*}}}*/
@@ -4534 +4516 @@
                 if (verbose>3) _printf_("      Creating initial Constrained Delaunay Triangulation...\n");
                 if (verbose>3) _printf_("         Inserting boundary points\n");
-                Insert();
+                Insert(bamgopts->random);
 
                 //Force the boundary
@@ -4862 +4844 @@
                 if (verbose>3) _printf_("      Creating initial Constrained Delaunay Triangulation...\n");
                 if (verbose>3) _printf_("         Inserting boundary points\n");
-                Insert();
+                Insert(bamgopts->random);
 
                 //Force the boundary

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

@@ -77 +77 @@
                         R2 I2ToR2(const I2 & P) const;
                         void AddVertex(BamgVertex & s,Triangle * t,Icoor2 *  =0) ;
-                        void Insert();
+                        void Insert(bool random);
                         void Echo(void);
                         void ForceBoundary();
@@ -92 +92 @@
                         void MakeBamgQuadtree();
                         void NewPoints(Mesh &,BamgOpts* bamgopts,int KeepVertices=1);
-                        long InsertNewPoints(long nbvold,long & NbTSwap) ; 
+                        long InsertNewPoints(long nbvold,long & NbTSwap,bool random); 
                         void TrianglesRenumberBySubDomain(bool justcompress=false);
                         void SmoothingVertex(int =3,double=0.3);

issm/trunk-jpl/src/m/mesh/bamg.m

@@ -325 +325 @@
 bamg_options.splitcorners=getfieldvalue(options,'splitcorners',1);
 bamg_options.geometricalmetric=getfieldvalue(options,'geometricalmetric',0);
+bamg_options.random=getfieldvalue(options,'rand',true);
 bamg_options.verbose=getfieldvalue(options,'verbose',1);
 %}}}

issm/trunk-jpl/src/m/mesh/bamg.py

@@ -309 +309 @@
         bamg_options['splitcorners']=options.getfieldvalue('splitcorners',1)
         bamg_options['geometricalmetric']=options.getfieldvalue('geometricalmetric',0)
+        bamg_options['random']=options.getfieldvalue('rand',True)
         bamg_options['verbose']=options.getfieldvalue('verbose',1)
         #}}}