Changeset 8655

Timestamp:

06/17/11 13:02:51 (14 years ago)

Author:

Mathieu Morlighem

Message:

Fixed leak in thermal model

Location:

issm/trunk/src/c

Files:

• Container/Results.cpp (modified) (1 diff)
• objects/Elements/Penta.cpp (modified) (1 diff)

issm/trunk/src/c/Container/Results.cpp

@@ -165 +165 @@
 
         for(i=0;i<this->Size();i++){
-
                 ExternalResult* result=(ExternalResult*)this->GetObjectByOffset(i);
 
                 /*write result to disk: */
                 result->WriteData(fid,io_gather);
-
         }
 

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -3700 +3700 @@
         GaussPenta* gauss=NULL;
 
+        /* Ice/ocean heat exchange flux on ice shelf base */
+        if (!IsOnBed() || !IsOnShelf()) return NULL;
+
         /*Initialize Element vector*/
         ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters);
-
-        /* Ice/ocean heat exchange flux on ice shelf base */
-        if (!IsOnBed() || !IsOnShelf()) return NULL;
 
         /*Retrieve all inputs and parameters*/