Changeset 17193

Timestamp:

01/29/14 09:51:49 (11 years ago)

Author:

jbondzio

Message:

CHG: coupling between LSM and stressbalance by checking for ice in element

File:

• issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (modified) (6 diffs)

issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp

@@ -1114 +1114 @@
         Element* basalelement;
 
+        /* Check if ice in element */
+        if(!element->IsIceInElement()) return NULL;
+
         /*Get basal element*/
         element->FindParam(&meshtype,MeshTypeEnum);
@@ -1141 +1144 @@
 
         /*Return if element is inactive*/
-        if(element->IsFloating()) return NULL;
+        if(element->IsFloating() || !element->IsIceInElement()) return NULL;
 
         /*Intermediaries*/
@@ -1214 +1217 @@
 }/*}}}*/
 ElementMatrix* StressbalanceAnalysis::CreateKMatrixSSAViscous(Element* element){/*{{{*/
+
+        /* Check if ice in element */
+        if(!element->IsIceInElement()) return NULL;
 
         /*Intermediaries*/
@@ -1275 +1281 @@
 }/*}}}*/
 ElementVector* StressbalanceAnalysis::CreatePVectorSSA(Element* element){/*{{{*/
+
+        /* Check if ice in element */
+        if(!element->IsIceInElement()) return NULL;
 
         /*Intermediaries*/
@@ -1306 +1315 @@
 ElementVector* StressbalanceAnalysis::CreatePVectorSSADrivingStress(Element* element){/*{{{*/
 
+        /* Check if ice in element */
+        if(!element->IsIceInElement()) return NULL;
+
         /*Intermediaries */
         IssmDouble  thickness,Jdet,slope[2];
@@ -1351 +1363 @@
 }/*}}}*/
 ElementVector* StressbalanceAnalysis::CreatePVectorSSAFront(Element* element){/*{{{*/
+
+        /* Check if ice in element */
+        if(!element->IsIceInElement()) return NULL;
 
         /*If no front, return NULL*/