Changeset 15496 for issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

Timestamp:

07/16/13 08:40:57 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: GetNumberOfNodes conflicting with Reference element NumberOfNodes function

File:

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

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -122 +122 @@
 
         /*Intermediaries*/
-        const int numnodes = this->GetNumberOfNodes();
+        const int numnodes = this->NumberOfNodes();
 
         /*Output */
@@ -896 +896 @@
         _assert_(sidlist);
         _assert_(nodes);
-        int numnodes = this->GetNumberOfNodes();
+        int numnodes = this->NumberOfNodes();
 
         for(int i=0;i<numnodes;i++){
                 sidlist[i]=nodes[i]->Sid();
-        }
-}
-/*}}}*/
-/*FUNCTION Tria::GetNumberOfNodes{{{*/
-int Tria::GetNumberOfNodes(void){
-
-        if(this->nodes==NULL) return 0;
-
-        switch(this->element_type){
-                case P1Enum:
-                        return 3;
-                case P1DGEnum:
-                        return 3;
-                case P2Enum:
-                        return 6;
-                default:
-                        _error_("Element type "<<EnumToStringx(this->element_type)<<" not supported yet");
         }
 }
@@ -5216 +5199 @@
 
         /*Constants*/
-        const int numnodes = this->GetNumberOfNodes();
+        const int numnodes = this->NumberOfNodes();
         const int numdof   = NDOF2*numnodes;