Changeset 21373

Timestamp:

11/12/16 19:36:29 (8 years ago)

Author:

Eric.Larour

Message:

CHG: fixed a leak + don't accumulate when we run sea level rise solution.

File:

• issm/branches/trunk-larour-NatGeoScience2016/src/c/cores/sealevelrise_core.cpp (modified) (2 diffs)

issm/branches/trunk-larour-NatGeoScience2016/src/c/cores/sealevelrise_core.cpp

@@ -143 +143 @@
                 if(numoutputs){for(int i=0;i<numoutputs;i++){xDelete<char>(requested_outputs[i]);} xDelete<char*>(requested_outputs);}
         }
+        /*Free ressources: */
+        delete longitude; 
+        delete latitude; 
+        delete radius; 
+        delete xx; 
+        delete yy; 
+        delete zz; 
 
         /*transfer sea-level back to ice caps: */
@@ -419 +426 @@
         int frequency=1;
         int count;
-        
+        int solution_type;
+        
+        femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
+        if(solution_type==SealevelriseSolutionEnum)return false ;  //we don't accumulate when we run this solution type!
+
         femmodel->parameters->FindParam(&frequency,SealevelriseRunFrequencyEnum);
         femmodel->parameters->FindParam(&count,SealevelriseRunCountEnum);