Changeset 15283

Timestamp:

06/19/13 08:48:57 (12 years ago)

Author:

bdef

Message:

CHG: fixing memory Leak and minor code modifications

Location:

issm/trunk-jpl/src/c/classes

Files:

• Elements/Tria.cpp (modified) (9 diffs)
• FemModel.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -6050 +6050 @@
 
         /*Check that all nodes are active, else return empty matrix*/
-        if(!this->AllActive()) return NULL;
+        if(!this->AllActive()){
+                delete gauss;
+                return NULL;
+        }
+
         /*Initialize Element matrix*/
         ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
@@ -6221 +6225 @@
 
         /*Check that all nodes are active, else return empty matrix*/
-        if(!this->AllActive()) return NULL;
-
+        if(!this->AllActive()){
+                delete gauss;
+                return NULL;
+        }
         /*Initialize Element vector*/
         ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters);
@@ -6260 +6266 @@
                 }
         }
-
+        delete gauss;
+        
         /*      Add residual if necessary*/
-        delete gauss;
         gauss=new GaussTria();
         for(int iv=0;iv<NUMVERTICES;iv++){
@@ -6490 +6496 @@
                 /*Assign output pointer*/
                 *ph_max=h_max;
-
 }
 /*}}}*/
@@ -6520 +6525 @@
                 case 0:
                         /*Just kipping the transfer to zero*/
+                        wh_trans=0.0;
                         break;
                 case 1:
@@ -6533 +6539 @@
                         
                         for(int i=0;i<numdof;i++){
-                                if(activeEpl[i]==0.0)continue;
+                                if(activeEpl[i]==0.0){
+                                        wh_trans=0.0;
+                                        continue;
+                                }
                                 
                                 eplstoring[i]=matpar->GetEplStoring();          
@@ -6556 +6565 @@
                 }
         }
+        /*Free ressources:*/
+        xDelete<int>(doflist);
 }
 /*}}}*/
@@ -6604 +6615 @@
         
         for(i=0;i<numdof;i++){
-
                 /*Activate EPL if residual is >0 */
                 if(residual[i]>0.){
@@ -6615 +6625 @@
                 }
 
-                /*Increase the size of the efficient system if needed*/
-                /*Increase is needed if the epl head reach the maximum value (sediment value for now)*/
+                /*Increase of the efficient system is needed if the epl head reach the maximum value (sediment max value for now)*/
                 this->GetHydrologyDCInefficientHmax(&h_max,nodes[i]);
-                if(eplhead[i]>=h_max){
-                        vec_mask->SetValue(nodes[i]->Sid(),1.,INS_VAL);
+                if(eplhead[i]>=h_max && this->AnyActive()){                     
                         for(j=0;j<numdof;j++){
-                                
+                                if(old_active[j]>0.){
+                                        vec_mask->SetValue(nodes[i]->Sid(),1.,INS_VAL);
+                                }
                                 /*Increase of the domain is on the downstream node in term of sediment head*/
                                 if(sedhead[j] == sedheadmin){

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -1583 +1583 @@
 void FemModel::HydrologyEPLupdateDomainx(void){ /*{{{*/
 
-        Vector<IssmDouble> *mask          = NULL;
-        IssmDouble         *serial_mask   = NULL;
-        Vector<IssmDouble> *active        = NULL;
-        IssmDouble         *serial_active = NULL;
+        Vector<IssmDouble>* mask          = NULL;
+        IssmDouble*         serial_mask   = NULL;
+        Vector<IssmDouble>* active        = NULL;
+        IssmDouble*         serial_active = NULL;
 
         /*Step 1: update maks, the mask might be extended by residual and/or using downstream sediment head*/
@@ -1661 +1661 @@
         InputUpdateFromVectorx(elements,nodes,vertices,loads,materials,parameters,transferg,WaterTransferEnum,NodesEnum);
 
-}
-/*}}}*/
+        delete transferg;
+}
+/*}}}*/