source: issm/oecreview/Archive/18296-19100/ISSM-18726-18727.diff

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

@@ -1815 +1815 @@
         int*                eplzigzag_counter = NULL;
                 
         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));
         this->parameters->FindParam(&eplzigzag_counter,NULL,EplZigZagCounterEnum); 
@@ -1833 +1834 @@
         /*Update Mask*/
         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));
         for (int i=0;i<elements->Size();i++){
@@ -1841 +1842 @@
                 effanalysis->HydrologyEPLGetActive(active,element);
         }
 
+
         /*Assemble and serialize*/
         active->Assemble();
         serial_active=active->ToMPISerial();
@@ -1853 +1855 @@
                 if(node->InAnalysis(HydrologyDCEfficientAnalysisEnum)){
                         if(serial_active[node->Sid()]==1.){
                                 node->Activate();
-                                counter++;
+                                if(!node->IsClone());counter++;
                         }
                         else{
                                 node->Deactivate();
@@ -1899 +1901 @@
                 if(node->InAnalysis(L2ProjectionEPLAnalysisEnum)){
                         if(serial_active[node->Sid()]==1.){
                                 node->Activate();
-                                counter++;
+                                if(!node->IsClone());counter++;
                         }
                         else{
                                 node->Deactivate();