Changeset 15449

Timestamp:

07/05/13 17:51:28 (12 years ago)

Author:

bdef

Message:

BUG: Fixing Memory Leak

File:

• issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateLoadsHydrologyDCInefficient.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateLoadsHydrologyDCInefficient.cpp

@@ -10 +10 @@
 
         /*Intermediary*/
-        int      hydrology_model;
+        int hydrology_model;
+        int dim;   
 
         /*Recover pointer: */
@@ -17 +18 @@
         /*Fetch parameters: */
         iomodel->Constant(&hydrology_model,HydrologyModelEnum);
+        iomodel->Constant(&dim,MeshDimensionEnum);
+        iomodel->FetchData(1,MeshVertexonbedEnum);
 
         /*Create loads if they do not exist yet*/
@@ -29 +32 @@
         CreateSingleNodeToElementConnectivity(iomodel);
         for(int i=0;i<iomodel->numberofvertices;i++){
-                /*keep only this partition's nodes:*/
-                if((iomodel->my_vertices[i]==1)){
-                        loads->AddObject(new Pengrid(iomodel->loadcounter+i+1,i,iomodel,HydrologyDCInefficientAnalysisEnum));
+                if (!dim==3){
+                        /*keep only this partition's nodes:*/
+                        if((iomodel->my_vertices[i]==1)){
+                                loads->AddObject(new Pengrid(iomodel->loadcounter+i+1,i,iomodel,HydrologyDCInefficientAnalysisEnum));
+                        }
+                }
+                else if(reCast<int>(iomodel->Data(MeshVertexonbedEnum)[i])){
+                        if((iomodel->my_vertices[i]==1)){
+                                loads->AddObject(new Pengrid(iomodel->loadcounter+i+1,i,iomodel,HydrologyDCInefficientAnalysisEnum));
+                        }       
                 }
         }
-
         /*Assign output pointer: */
         *ploads=loads;
+        iomodel->DeleteData(1,MeshVertexonbedEnum);
 }