Changeset 26412

Timestamp:

08/24/21 05:56:37 (4 years ago)

Author:

Mathieu Morlighem

Message:

BUG: memory leak, fixed basal element problem

File:

• issm/trunk-jpl/src/c/modules/FloatingiceMeltingRatePicox/FloatingiceMeltingRatePicox.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/modules/FloatingiceMeltingRatePicox/FloatingiceMeltingRatePicox.cpp

@@ -164 +164 @@
         for(Object* & object : femmodel->elements->objects){
                 Element* element=xDynamicCast<Element*>(object);
+
+                /*Check whether we should continue*/
                 if(!element->IsOnBase()) continue;
+                if(!element->IsIceInElement() || !element->IsAllFloating()) continue;
+                int el_boxid;
+                element->GetInputValue(&el_boxid,BasalforcingsPicoBoxIdEnum);
+                if(el_boxid!=boxid) continue;
+
                 Element* basalelement = element->SpawnBasalElement();
-                if(!basalelement->IsIceInElement() || !basalelement->IsAllFloating()){
-                        if(basalelement->IsSpawnedElement()){basalelement->DeleteMaterials(); delete basalelement;};
-                        continue;
-                }
-                int el_boxid;
-                basalelement->GetInputValue(&el_boxid,BasalforcingsPicoBoxIdEnum);
-                if(el_boxid!=boxid) continue;
 
                 Input* tocs_input=basalelement->GetInput(BasalforcingsPicoSubShelfOceanTempEnum); _assert_(tocs_input); 
@@ -185 +185 @@
                 toc_weighted_avg[basinid]+=toc*area;
                 soc_weighted_avg[basinid]+=soc*area;
+
                 if(basalelement->IsSpawnedElement()){basalelement->DeleteMaterials(); delete basalelement;};
         }
@@ -207 +208 @@
                 for(Object* & object : femmodel->elements->objects){
                         Element* element=xDynamicCast<Element*>(object);
+
+                        /*Check whether we should continue or not*/
                         if(!element->IsOnBase()) continue;
+                        if(!element->IsIceInElement() || !element->IsAllFloating()) continue;
+                        int el_boxid;
+                        element->GetInputValue(&el_boxid,BasalforcingsPicoBoxIdEnum);
+                        if(el_boxid!=boxid) continue;
+
                         Element* basalelement = element->SpawnBasalElement();
-                        if(!basalelement->IsIceInElement() || !basalelement->IsAllFloating()) continue;
-                        int el_boxid;
-                        basalelement->GetInputValue(&el_boxid,BasalforcingsPicoBoxIdEnum);
-                        if(el_boxid!=boxid) continue;
-
                 Input* overturnings_input=basalelement->GetInput(BasalforcingsPicoSubShelfOceanOverturningEnum); _assert_(overturnings_input);
 
@@ -223 +226 @@
                         overturning_weighted_avg[basinid]+=overturning*area;
                         basalelement->FindParam(&domaintype,DomainTypeEnum);
+
                         if(basalelement->IsSpawnedElement()){basalelement->DeleteMaterials(); delete basalelement;};
                 }