Changeset 16960

Timestamp:

11/26/13 17:03:01 (11 years ago)

Author:

bdef

Message:

BUG: fixing leaks in hydrology

File:

• issm/trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp (modified) (6 diffs)

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

@@ -95 +95 @@
                         ug_epl_sub_iter=ug_epl->Duplicate();
                         ug_epl->Copy(ug_epl_sub_iter);
-
                 }
 
@@ -139 +138 @@
                                 duf=uf_sed_sub_iter->Duplicate();_assert_(duf);
                                 uf_sed_sub_iter->Copy(duf);_assert_(uf_sed_sub_iter);
-                                duf->AYPX(uf_sed,-1.0);
+                                duf->AYPX(uf_sed,-1.0);_assert_(duf);
                                 ndu_sed=duf->Norm(NORM_TWO);
-                                delete duf;
                                 nu_sed=uf_sed_sub_iter->Norm(NORM_TWO);
                                 if (xIsNan<IssmDouble>(ndu_sed) || xIsNan<IssmDouble>(nu_sed)) _error_("convergence criterion is NaN!");
+                                if (ndu_sed==0.0 && nu_sed==0.0) nu_sed=1.0e-6; /*Hacking the case where the EPL is used but empty*/
                                 if((ndu_sed/nu_sed)<eps_hyd){
                                 if(VerboseConvergence()) _printf0_("   # Inner sediment convergence achieve \n");
                                         sedconverged=true;
                                 }
+                                delete duf;
                         }
                         delete uf_sed_sub_iter;
@@ -166 +166 @@
                                 InputUpdateFromSolutionx(femmodel,ug_sed);
                                 InputUpdateFromConstantx(femmodel,sediment_kmax,HydrologySedimentKmaxEnum);
+                                delete uf_sed_sub_iter;
                                 break;
                         }
@@ -260 +261 @@
                                         InputUpdateFromConstantx(femmodel,sediment_kmax,MeltingOffsetEnum);
                                         InputUpdateFromSolutionx(femmodel,ug_epl);
+                                        delete ug_epl_sub_iter;
                                         break;
                                 }
@@ -320 +322 @@
                 if(hydroconverged)break;
         }
-
+        
         InputUpdateFromSolutionx(femmodel,ug_sed);
         if(isefficientlayer)InputUpdateFromSolutionx(femmodel,ug_epl);
@@ -329 +331 @@
         delete uf_sed;
         delete uf_epl;
-        delete uf_sed_sub_iter;
         delete uf_epl_sub_iter;
-        //delete dug;
+
 }