Changeset 21481

Timestamp:

01/11/17 09:55:03 (8 years ago)

Author:

jbondzio

Message:

BUG: applying enthalpy basal BCs on ice only can cause inconsistencies in fsets across partitions.

File:

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

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

@@ -267 +267 @@
 void           EnthalpyAnalysis::ApplyBasalConstraints(IssmDouble* serial_spc,Element* element){/*{{{*/
 
-        /* Check if ice in element */
-        if(!element->IsIceInElement()) return;
-
+        /* Do not check if ice in element, this may lead to inconsistencies between cpu partitions */
         /* Only update constraints at the base. */
         if(!(element->IsOnBase())) return;
@@ -299 +297 @@
                 /*apply or release spc*/
                 node=element->GetNode(indices[i]);
+                if(!node->IsActive()) continue;
                 if(serial_spc[node->Sid()]==1.){
                         pressure_input->GetInputValue(&pressure, gauss);
                         node->ApplyConstraint(0,PureIceEnthalpy(element,pressure));
                 }
-                else                    
+                else {
                         node->DofInFSet(0);
+                }
         }