Changeset 22461

Timestamp:

02/23/18 14:45:20 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: big change here, we do not extrapolate the nodes that are active but on places where phi>0, this will affect results and tests. Best thing to do before the week end...

File:

• issm/trunk-jpl/src/c/analyses/ExtrapolationAnalysis.cpp (modified) (3 diffs)

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

@@ -332 +332 @@
         /* Intermediaries */
         int extvar_enum;
-        IssmDouble phi,value;
+        IssmDouble active,value;
         Node* node = NULL;
 
@@ -338 +338 @@
         element->FindParam(&extvar_enum, ExtrapolationVariableEnum);
         
-        Input* levelset_input=element->GetInput(MaskIceLevelsetEnum); _assert_(levelset_input);
+        Input* active_input=element->GetInput(IceMaskNodeActivationEnum); _assert_(active_input);
         Input* extvar_input=element->GetInput(extvar_enum); _assert_(extvar_input);
 
@@ -345 +345 @@
                 gauss->GaussNode(element->GetElementType(),in);
                 node=element->GetNode(in);
-                levelset_input->GetInputValue(&phi,gauss);
+                active_input->GetInputValue(&active,gauss);
                 if(node->IsActive()){
-                        if(phi<=0.){
+                        if(active>0.5){
                                 /* if ice, set dirichlet BC */
                                 extvar_input->GetInputValue(&value,gauss);