Changeset 26987

Timestamp:

05/04/22 13:46:00 (3 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing memory leaks

Location:

issm/trunk-jpl/src/c

Files:

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

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

@@ -18 +18 @@
 
       pseed = new unsigned int;
-                        *pseed = std::chrono::steady_clock::now().time_since_epoch()/std::chrono::milliseconds(1);
+                *pseed = std::chrono::steady_clock::now().time_since_epoch()/std::chrono::milliseconds(1);
       a = 1103515245;                  // BSD Formula
       c = 12345;                                             // BSD Formula
@@ -24 +24 @@
                         return;
         }/*}}}*/
-
   linear_congruential_engine::linear_congruential_engine(unsigned int _a, unsigned int _b, unsigned int _m){/*{{{*/
 
       pseed = new unsigned int;
-                        *pseed = std::chrono::steady_clock::now().time_since_epoch()/std::chrono::milliseconds(1);
+                *pseed = std::chrono::steady_clock::now().time_since_epoch()/std::chrono::milliseconds(1);
       a = _a;
       c = _b;
@@ -34 +33 @@
                         return;
         }/*}}}*/
-
         linear_congruential_engine::~linear_congruential_engine(){}
 

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

@@ -13 +13 @@
 void GaussianVector(Vector<IssmDouble>* ppf,int seed){/*{{{*/
 
-
-        /*Intermediaries*/
-        double      rdnumber;
-
         /*Define seed*/
         rnd::linear_congruential_engine random_engine;
-        if(seed>=0)
-        {
+        if(seed>=0){
                 int my_rank;
                 ISSM_MPI_Comm_rank(ISSM_MPI_COMM_WORLD,&my_rank);
@@ -28 +23 @@
 
         /* Define univariate distribution */
-
         rnd::normal_distribution distribution(0.0,1.0);
 
@@ -38 +32 @@
         ppf->GetLocalSize(&M);
         for(int i=0;i<M;i++){
-                rdnumber = distribution.generator(random_engine);
+                double rdnumber = distribution.generator(random_engine);
                 ppf->SetValue(local_indices[i],rdnumber,INS_VAL);
         }
         ppf->Assemble();
 
+        /*Cleanup*/
+        random_engine.free_resources();
+        xDelete<int>(local_indices);
+        xDelete<IssmDouble>(local_vector);
 }/*}}}*/
 void solutionsequence_sampling(FemModel* femmodel){