Changeset 25711 for issm/trunk-jpl/src/c/modules/QmuStatisticsx/QmuStatisticsx.cpp

Timestamp:

10/22/20 16:15:12 (4 years ago)

Author:

jdquinn

Message:

CHG: Uncommitted change for Boost + Valgrind config; memory leak

File:

• issm/trunk-jpl/src/c/modules/QmuStatisticsx/QmuStatisticsx.cpp (modified) (9 diffs)

issm/trunk-jpl/src/c/modules/QmuStatisticsx/QmuStatisticsx.cpp

@@ -669 +669 @@
         _printf0_("Done aggregating time mean histogram:\n");
         IssmComm::SetComm(ISSM_MPI_COMM_WORLD);
+
+        return 1;
 }
 /*}}}*/
@@ -1004 +1006 @@
         IssmComm::SetComm(ISSM_MPI_COMM_WORLD);
 
+        return 1;
 } /*}}}*/
 int ComputeSampleSeries(Parameters* parameters,Results* results,int color, ISSM_MPI_Comm statcomm){ /*{{{*/
@@ -1164 +1167 @@
         IssmComm::SetComm(ISSM_MPI_COMM_WORLD);
 
+        return 1;
 } /*}}}*/
 int OutputStatistics(Parameters* parameters,Results* results,int color,ISSM_MPI_Comm statcomm){ /*{{{*/
@@ -1197 +1201 @@
 
         OutputResultsx(femmodel);
+
+        return 1;
 } /*}}}*/
 bool DakotaDirStructure(int argc,char** argv){ /*{{{*/
@@ -1231 +1237 @@
         if(!statistics){
                 delete iomodel;
-                fclose(fid); 
+                xDelete<char>(input_file);
+                fclose(fid);
                 return false; //important return value!
         }
@@ -1247 +1254 @@
                 }
         }
+
+        /*Delete resources:*/
+        delete iomodel;
+        xDelete<char>(input_file);
 
         //close model file: 
@@ -1307 +1318 @@
         if(!statistics){
                 delete iomodel;
+                xDelete<char>(input_file);
                 fclose(fid); 
                 return 0;
-        }
-
-        //create parameters datasets with al the qmu statistics settings we need: 
-        if(statistics){
+        }else{
+                //create parameters datasets with al the qmu statistics settings we need: 
 
                 /*Initialize parameters and results:*/
@@ -1389 +1399 @@
                         else _error_(" error creating qmu statistics methods parameters: unsupported method " << name);
                 }
+
+                /*Delete resources:*/
+                xDelete<char>(input_file);
+                delete iomodel;
         }
+
         //close model file: 
         fclose(fid);
@@ -1399 +1414 @@
         ISSM_MPI_Barrier(ISSM_MPI_COMM_WORLD); _printf0_("Output file.\n");
 
-        /*Delete ressources:*/
+        /*Delete resources:*/
         delete parameters; 
         delete results;
 
-
-        
+        return 1;
 } /*}}}*/