Changeset 20213

Timestamp:

02/18/16 17:22:51 (9 years ago)

Author:

jbondzio

Message:

BUG: update basal BC on all of the base, because otherwise this might lead to inconsitencies if node is shared by 2 CPUs and the grounding line moves across it

File:

• issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (modified) (4 diffs)

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

@@ -249 +249 @@
         if(!element->IsIceInElement()) return;
 
-        /* Only update Constraints at the base of grounded ice*/
-        if(!(element->IsOnBase()) || element->IsFloating()) return;
+        /* Only update constraints at the base. */
+        if(!(element->IsOnBase())) return;
 
         /*Intermediary*/
@@ -1208 +1208 @@
 void           EnthalpyAnalysis::GetBasalConstraints(Vector<IssmDouble>* vec_spc,Element* element){/*{{{*/
 
-        /* Check if ice in element */
-        if(!element->IsIceInElement()) return;
-
-        /* Only update Constraints at the base of grounded ice*/
-        if(!(element->IsOnBase()) || element->IsFloating()) return;
-
         /*Intermediary*/
         bool        isdynamicbasalspc;
@@ -1235 +1229 @@
         if(!element->IsIceInElement()) return;
 
-        /* Only update Constraints at the base of grounded ice*/
+        /* Only update constraints at the base. 
+         * Floating ice is not affected by basal BC decision chart. */
         if(!(element->IsOnBase()) || element->IsFloating()) return;
 
@@ -1305 +1300 @@
         if(!element->IsIceInElement()) return;
 
-        /* Only update Constraints at the base of grounded ice*/
+        /* Only update constraints at the base. 
+         * Floating ice is not affected by basal BC decision chart.*/
         if(!(element->IsOnBase()) || element->IsFloating()) return;