Changeset 22261

Timestamp:

11/15/17 10:38:17 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: no vz calculation on inactive elements

Location:

issm/trunk-jpl/src/c

Files:

• analyses/StressbalanceVerticalAnalysis.cpp (modified) (3 diffs)
• cores/movingfront_core.cpp (modified) (2 diffs)

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

@@ -139 +139 @@
 ElementMatrix* StressbalanceVerticalAnalysis::CreateKMatrix(Element* element){/*{{{*/
 
+        /* Check if ice in element */
+        if(!element->IsIceInElement()) return NULL;
+
         bool hack = false;
 
@@ -278 +281 @@
 }/*}}}*/
 ElementVector* StressbalanceVerticalAnalysis::CreatePVector(Element* element){/*{{{*/
+
+        /* Check if ice in element */
+        if(!element->IsIceInElement()) return NULL;
 
         bool hack = false;
@@ -617 +623 @@
 void           StressbalanceVerticalAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/
         /*Default, do nothing*/
+        SetActiveNodesLSMx(femmodel);
         return;
 }/*}}}*/

issm/trunk-jpl/src/c/cores/movingfront_core.cpp

@@ -40 +40 @@
         /* determine variables for extrapolation */
         num_extrapol_vars=0;
-        if(isstressbalance) num_extrapol_vars+=2;
+        if(isstressbalance) num_extrapol_vars+=3;
         if(ismasstransport) num_extrapol_vars+=1;
         if(isthermal && domaintype==Domain3DEnum) num_extrapol_vars+=1;
@@ -48 +48 @@
                 extrapol_vars[index]=VxEnum; index++;
                 extrapol_vars[index]=VyEnum; index++;
+                extrapol_vars[index]=VzEnum; index++;
         }
         if(ismasstransport){extrapol_vars[index]=ThicknessEnum; index++;}