Changeset 5259 for issm/trunk/src/c/objects/Node.cpp

Timestamp:

08/13/10 16:59:27 (15 years ago)

Author:

seroussi

Message:

added approximation_type argument in GetNumberOfDofs

File:

• issm/trunk/src/c/objects/Node.cpp (modified) (2 diffs)

issm/trunk/src/c/objects/Node.cpp

@@ -334 +334 @@
 void  Node::GetDofList(int* outdoflist,int approximation_enum){
         int i;
-        for(i=0;i<this->indexing.numberofdofs;i++){
-                outdoflist[i]=indexing.doflist[i];
+        int count=0;
+
+        if(approximation_enum && this->indexing.doftype){ //if an approximation is specified and this node has several approsimations
+                for(i=0;i<this->indexing.numberofdofs;i++){
+                        if(indexing.doftype[i]==approximation_enum){
+                                outdoflist[count]=indexing.doflist[i];
+                                count++;
+                        }
+                }
+                ISSMASSERT(count);
+        }
+        else{
+                for(i=0;i<this->indexing.numberofdofs;i++){
+                        outdoflist[i]=indexing.doflist[i];
+                }
         }
 }
@@ -455 +468 @@
 /*}}}*/
 /*FUNCTION Node::GetNumberOfDofs{{{1*/
-int   Node::GetNumberOfDofs(){
-        
-        return this->indexing.numberofdofs;
+int   Node::GetNumberOfDofs(int approximation_enum){
+        
+        int i;
+        int numdofs=0;
+
+        /*Count the dofs if an approximation is specified and the node contains several dofs type*/
+        if(approximation_enum && this->indexing.doftype){
+                for(i=0;i<this->indexing.numberofdofs;i++){
+                        if(this->indexing.doftype[i]==approximation_enum) numdofs++;
+                }
+        }
+        else numdofs=this->indexing.numberofdofs;
+
+        ISSMASSERT(numdofs); 
+        return numdofs;
 
 }