Changeset 23507

Timestamp:

12/06/18 13:14:19 (6 years ago)

Author:

Mathieu Morlighem

Message:

BUG: dirichlets were not properly set

File:

• issm/trunk-jpl/src/c/analyses/GLheightadvectionAnalysis.cpp (modified) (5 diffs)

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

@@ -52 +52 @@
 }/*}}}*/
 ElementMatrix* GLheightadvectionAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/
-_error_("Not implemented");
+        _error_("Not implemented");
 }/*}}}*/
 ElementMatrix* GLheightadvectionAnalysis::CreateKMatrix(Element* element){/*{{{*/
@@ -88 +88 @@
         //Input* vx_input=element->GetInput(BaseSlopeXEnum); _assert_(vx_input);
         //Input* vy_input=element->GetInput(BaseSlopeYEnum); _assert_(vy_input);
-   Input* vx_input=element->GetInput(VxEnum); _assert_(vx_input);
+        Input* vx_input=element->GetInput(VxEnum); _assert_(vx_input);
         Input* vy_input=element->GetInput(VyEnum); _assert_(vy_input);
         Input* bc_input=element->GetInput(MeshVertexonboundaryEnum); _assert_(bc_input);
@@ -156 +156 @@
 }/*}}}*/
 void           GLheightadvectionAnalysis::GetSolutionFromInputs(Vector<IssmDouble>* solution,Element* element){/*{{{*/
-           _error_("not implemented yet");
+        _error_("not implemented yet");
 }/*}}}*/
 void           GLheightadvectionAnalysis::GradientJ(Vector<IssmDouble>* gradient,Element* element,int control_type,int control_index){/*{{{*/
@@ -184 +184 @@
                 Element    *element  = xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(i));
 
-                if(!element->IsIceInElement()) continue;
-                int         numnodes = element->GetNumberOfNodes();
-                IssmDouble *mask     = xNew<IssmDouble>(numnodes);
-                IssmDouble *bed      = xNew<IssmDouble>(numnodes);
-                IssmDouble *lset     = xNew<IssmDouble>(numnodes);
+                int         numnodes  = element->GetNumberOfNodes();
+                IssmDouble *mask      = xNew<IssmDouble>(numnodes);
+                IssmDouble *bed       = xNew<IssmDouble>(numnodes);
+                IssmDouble *ls_active = xNew<IssmDouble>(numnodes);
 
                 element->GetInputListOnNodes(&mask[0],MaskGroundediceLevelsetEnum);
                 element->GetInputListOnNodes(&bed[0],BaseEnum);
-                element->GetInputListOnNodes(&lset[0],MaskIceLevelsetEnum);
+                element->GetInputListOnNodes(&ls_active[0],IceMaskNodeActivationEnum);
 
                 for(int in=0;in<numnodes;in++){
                         Node* node=element->GetNode(in);
-                        if(mask[in]<0.){
+                        if(mask[in]<0. && ls_active[in]==1.){
                                 node->Activate();
                         }
@@ -206 +205 @@
                 xDelete<IssmDouble>(mask);
                 xDelete<IssmDouble>(bed);
-                xDelete<IssmDouble>(lset);
+                xDelete<IssmDouble>(ls_active);
         }