Changeset 15250 for issm/trunk-jpl/src/c/classes/FemModel.cpp

Timestamp:

06/13/13 09:10:14 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing node sid indexing (need to check analysis first)

File:

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

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

@@ -1589 +1589 @@
 
         /*Step 1: update maks, the mask might be extended by residual and/or using downstream sediment head*/
-        mask=new Vector<IssmDouble>(nodes->NumberOfNodes());
+        mask=new Vector<IssmDouble>(nodes->NumberOfNodes(HydrologyDCEfficientAnalysisEnum));
         for (int i=0;i<elements->Size();i++){
                 Element* element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
@@ -1605 +1605 @@
 
         /*Step 2: update node activity. If one element is connected to mask=1, all nodes are active*/
-        active=new Vector<IssmDouble>(nodes->NumberOfNodes());
+        active=new Vector<IssmDouble>(nodes->NumberOfNodes(HydrologyDCEfficientAnalysisEnum));
         for (int i=0;i<elements->Size();i++){
                 Element* element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
@@ -1617 +1617 @@
 
         /*Update node activation accordingly*/
+        int counter =0;
         for (int i=0;i<nodes->Size();i++){
                 Node* node=dynamic_cast<Node*>(nodes->GetObjectByOffset(i));
-                if(serial_active[node->Sid()]==1.){
-                        node->Activate();
-                }
-                else{
-                        node->Deactivate();
+                if(node->InAnalysis(HydrologyDCEfficientAnalysisEnum)){
+                        if(serial_active[node->Sid()]==1.){
+                                node->Activate();
+                                counter++;
+                        }
+                        else{
+                                node->Deactivate();
+                        }
                 }
         }
         xDelete<IssmDouble>(serial_active);
+        if(VerboseSolution()) _printf0_("   Number of active nodes in EPL layer: "<< counter <<"\n");
 
 }