Changeset 21374

Timestamp:

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

Author:

Eric.Larour

Message:

CHG: fixed leak + conditional jump.

File:

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

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

@@ -85 +85 @@
                 slrconvergence(&converged,Sg,Sg_old,eps_rel,eps_abs);
 
+                /*free ressources: */
+                delete Sgo;
+
                 /*Increase count: */
                 count++;
@@ -120 +123 @@
         ndS=dSg->Norm(NORM_TWO); 
         
+        if (xIsNan<IssmDouble>(ndS)) _error_("convergence criterion is NaN!");
+        
         if(!xIsNan<IssmDouble>(eps_rel)){
                 nS=Sg_old->Norm(NORM_TWO);
+                if (xIsNan<IssmDouble>(nS)) _error_("convergence criterion is NaN!");
         }
 
-        if (xIsNan<IssmDouble>(ndS) || xIsNan<IssmDouble>(nS)) _error_("convergence criterion is NaN!");
 
         //clean up