Index: /issm/trunk-jpl/src/c/modules/FloatingiceMeltingRatePicox/FloatingiceMeltingRatePicox.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/FloatingiceMeltingRatePicox/FloatingiceMeltingRatePicox.cpp	(revision 26411)
+++ /issm/trunk-jpl/src/c/modules/FloatingiceMeltingRatePicox/FloatingiceMeltingRatePicox.cpp	(revision 26412)
@@ -164,13 +164,13 @@
 	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,4 +185,5 @@
 		toc_weighted_avg[basinid]+=toc*area;
 		soc_weighted_avg[basinid]+=soc*area;
+
 		if(basalelement->IsSpawnedElement()){basalelement->DeleteMaterials(); delete basalelement;};
 	}
@@ -207,11 +208,13 @@
 		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,4 +226,5 @@
 			overturning_weighted_avg[basinid]+=overturning*area;
 			basalelement->FindParam(&domaintype,DomainTypeEnum);
+
 			if(basalelement->IsSpawnedElement()){basalelement->DeleteMaterials(); delete basalelement;};
 		}
