Changeset 26591 for issm/trunk-jpl/src

Timestamp:

11/10/21 13:23:24 (3 years ago)

Author:

bulthuis

Message:

BUG: Try to fix bugs pseudo-random number generators

Location:

issm/trunk-jpl/src/c

Files:

• shared/Random/randomgenerator.h (modified) (2 diffs)
• solutionsequences/solutionsequence_sampling.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/shared/Random/randomgenerator.h

@@ -20 +20 @@
     double ubound;
 
-    int drnd() { return( _seed = ( a * _seed + c ) % m ); }
-
   public:
 
@@ -30 +28 @@
     void seed( unsigned int s ) { _seed = s; }
     unsigned int get_seed() { return _seed; }
-    double generator() { return (ubound-lbound)*(double) drnd()/ m + lbound; }
+    double generator(){
+      _seed = ( a * _seed + c ) % m;
+      return (ubound-lbound)*(double) _seed/ m + lbound;
+    }
 
 };

issm/trunk-jpl/src/c/solutionsequences/solutionsequence_sampling.cpp

@@ -18 +18 @@
 
         /*Define seed*/
-        rnd_normal_distribution distribution;
+        //rnd_normal_distribution distribution;
         if(seed<0){
                 std::random_device rd;
@@ -29 +29 @@
                 seed = seed + 783728*my_rank; // change default seed for parallel simulations (by considering an arbitrary shif based on the rank number)
         }
-        distribution.seed(seed);
+        //distribution.seed(seed);
 
         int        *local_indices = NULL;
@@ -38 +38 @@
         ppf->GetLocalSize(&M);
         for(int i=0;i<M;i++){
-                rdnumber = distribution.generator();
+                rdnumber = 1.0;//distribution.generator();
                 ppf->SetValue(local_indices[i],rdnumber,INS_VAL);
         }