Changeset 18727

Timestamp:

11/03/14 16:12:49 (10 years ago)

Author:

bdef

Message:

CHG: modification in mask handling

File:

• issm/trunk-jpl/src/c/classes/FemModel.cpp (modified) (5 diffs)

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -1816 +1816 @@
                 
         HydrologyDCEfficientAnalysis* effanalysis =  new HydrologyDCEfficientAnalysis();
+        HydrologyDCInefficientAnalysis* inefanalysis =  new HydrologyDCInefficientAnalysis();
         /*Step 1: update mask, the mask might be extended by residual and/or using downstream sediment head*/
         mask=new Vector<IssmDouble>(this->nodes->NumberOfNodes(HydrologyDCEfficientAnalysisEnum));
@@ -1834 +1835 @@
         InputUpdateFromVectorx(this,serial_mask,HydrologydcMaskEplactiveNodeEnum,NodeSIdEnum);
         xDelete<IssmDouble>(serial_mask);
-
+        inefanalysis->ElementizeEplMask(this);
         /*Step 2: update node activity. If one element is connected to mask=1, all nodes are active*/
         active=new Vector<IssmDouble>(nodes->NumberOfNodes(HydrologyDCEfficientAnalysisEnum));
@@ -1841 +1842 @@
                 effanalysis->HydrologyEPLGetActive(active,element);
         }
+
 
         /*Assemble and serialize*/
@@ -1854 +1856 @@
                         if(serial_active[node->Sid()]==1.){
                                 node->Activate();
-                                counter++;
+                                if(!node->IsClone());counter++;
                         }
                         else{
@@ -1900 +1902 @@
                         if(serial_active[node->Sid()]==1.){
                                 node->Activate();
-                                counter++;
+                                if(!node->IsClone());counter++;
                         }
                         else{