Changeset 20249

Timestamp:

02/25/16 19:19:41 (9 years ago)

Author:

schlegel

Message:

CHG: clean up some memory

Location:

issm/trunk-jpl/src/c/analyses

Files:

• MasstransportAnalysis.cpp (modified) (1 diff)
• StressbalanceSIAAnalysis.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp

@@ -738 +738 @@
         xDelete<IssmDouble>(oldsurface);
         xDelete<IssmDouble>(phi);
+        xDelete<IssmDouble>(sealevel);
         xDelete<int>(doflist);
         if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;};

issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.cpp

@@ -425 +425 @@
                 drag_input = element->GetInput(FrictionCoefficientEnum);  _assert_(drag_input);
         }
-        else{
+        else if(frictionlaw==5){
                 friction=new Friction(element,3);
         }
@@ -512 +512 @@
         xDelete<int>(pairindices);
         xDelete<IssmDouble>(xyz_list);
-        delete friction;
+        if(frictionlaw==5) delete friction;
         return pe;