Changeset 15198 for issm/trunk-jpl/src/c/classes/Node.cpp

Timestamp:

06/06/13 10:35:32 (12 years ago)

Author:

Mathieu Morlighem

Message:

NEW: Added active field in node for node activation/deactivation

File:

• issm/trunk-jpl/src/c/classes/Node.cpp (modified) (6 diffs)

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

@@ -68 +68 @@
         if (!iomodel->Data(MaskVertexonwaterEnum)) _error_("iomodel->nodeonwater is NULL");
         if (reCast<bool>(iomodel->Data(MaskVertexonwaterEnum)[io_index])){
-                for(k=1;k<=gsize;k++){
-                        this->FreezeDof(k);
-                }
+                this->Deactivate();
         }
 
@@ -86 +84 @@
                         _assert_(iomodel->Data(FlowequationVertexEquationEnum));
                         if (iomodel->Data(FlowequationVertexEquationEnum)[io_index]==MacAyealApproximationEnum && !reCast<int>(iomodel->Data(MeshVertexonbedEnum)[io_index])){
-                                for(k=1;k<=gsize;k++) this->FreezeDof(k);
+                                this->Deactivate();
                         }
                         if (iomodel->Data(FlowequationVertexEquationEnum)[io_index]==L1L2ApproximationEnum && !reCast<int>(iomodel->Data(MeshVertexonbedEnum)[io_index])){
-                                for(k=1;k<=gsize;k++) this->FreezeDof(k);
+                                this->Deactivate();
                         }
                         if (iomodel->Data(FlowequationVertexEquationEnum)[io_index]==MacAyealPattynApproximationEnum && reCast<int>(iomodel->Data(FlowequationBordermacayealEnum)[io_index])){
                                 if(!reCast<int>(iomodel->Data(MeshVertexonbedEnum)[io_index])){
-                                        for(k=1;k<=gsize;k++) this->FreezeDof(k);
+                                        this->Deactivate();
                                 }
                         }
@@ -104 +102 @@
                 /*spc all nodes on hutter*/
                 if (iomodel->Data(FlowequationVertexEquationEnum)[io_index]==HutterApproximationEnum){
-                        for(k=1;k<=gsize;k++){
-                                this->FreezeDof(k);
-                        }
+                        this->Deactivate();
                 }
         }
@@ -116 +112 @@
                 /*Constrain all nodes that are not Hutter*/
                 if (reCast<int>(iomodel->Data(FlowequationVertexEquationEnum)[io_index])!=HutterApproximationEnum){
-                        for(k=1;k<=gsize;k++){
-                                this->FreezeDof(k);
-                        }
+                        this->Deactivate();
                 }
         }
@@ -134 +128 @@
                         _assert_(iomodel->Data(MeshVertexonbedEnum));
                         if (!(reCast<bool>(iomodel->Data(MeshVertexonbedEnum)[io_index]))){
-                                for(k=1;k<=gsize;k++){
-                                        this->FreezeDof(k);
-                                }
+                                this->Deactivate();
                         }
                 }
@@ -497 +489 @@
 
         DofInSSet(dof-1); //with 0 displacement for this dof.
+
+}
+/*}}}*/
+/*FUNCTION Node::Deactivate{{{*/
+void  Node::Deactivate(void){
+
+        indexing.Deactivate();
 
 }