Changeset 5259

Timestamp:

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

Author:

seroussi

Message:

added approximation_type argument in GetNumberOfDofs

Location:

issm/trunk/src/c/objects

Files:

• Elements/Penta.cpp (modified) (2 diffs)
• Elements/Tria.cpp (modified) (2 diffs)
• Node.cpp (modified) (2 diffs)
• Node.h (modified) (1 diff)

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -4533 +4533 @@
         /*First, figure out size of doflist: */
         for(i=0;i<6;i++){
-                numberofdofs+=nodes[i]->GetNumberOfDofs();
+                numberofdofs+=nodes[i]->GetNumberOfDofs(approximation_enum);
         }
 
@@ -4543 +4543 @@
         for(i=0;i<6;i++){
                 nodes[i]->GetDofList(doflist+count,approximation_enum);
-                count+=nodes[i]->GetNumberOfDofs();
+                count+=nodes[i]->GetNumberOfDofs(approximation_enum);
         }
 

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -5543 +5543 @@
         /*First, figure out size of doflist: */
         for(i=0;i<3;i++){
-                numberofdofs+=nodes[i]->GetNumberOfDofs();
+                numberofdofs+=nodes[i]->GetNumberOfDofs(approximation_enum);
         }
 
@@ -5552 +5552 @@
         count=0;
         for(i=0;i<3;i++){
-                nodes[i]->GetDofList(doflist+count);
-                count+=nodes[i]->GetNumberOfDofs();
+                nodes[i]->GetDofList(doflist+count,approximation_enum);
+                count+=nodes[i]->GetNumberOfDofs(approximation_enum);
         }
 

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;
 
 }

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

@@ -68 +68 @@
                 void  SetVertexDof(int in_dof);
                 bool  InAnalysis(int analysis_type);
-                int   GetNumberOfDofs();
+                int   GetNumberOfDofs(int approximation_enum=0);
                 int   IsClone();
                 void  ApplyConstraint(Vec yg,int dof,double value);