source: issm/oecreview/Archive/15392-16133/ISSM-15496-15497.diff

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

@@ -121 +121 @@
 void Tria::SetwiseNodeConnectivity(int* pd_nz,int* po_nz,Node* node,bool* flags,int set1_enum,int set2_enum){
 
         /*Intermediaries*/
-        const int numnodes = this->NumberOfNodes();
+        const int numnodes = this->NumberofNodes();
 
         /*Output */
         int d_nz = 0;
@@ -895 +895 @@
 
         _assert_(sidlist);
         _assert_(nodes);
-        int numnodes = this->NumberOfNodes();
+        int numnodes = this->NumberofNodes();
 
         for(int i=0;i<numnodes;i++){
                 sidlist[i]=nodes[i]->Sid();
         }
 }
 /*}}}*/
+/*FUNCTION Tria::GetNumberOfNodes;{{{*/
+int Tria::GetNumberOfNodes(void){
+        return this->NumberofNodes();
+}
+/*}}}*/
 /*FUNCTION Tria::GetInputListOnVertices(IssmDouble* pvalue,int enumtype) {{{*/
 void Tria::GetInputListOnVertices(IssmDouble* pvalue,int enumtype){
 
@@ -5198 +5203 @@
 ElementMatrix* Tria::CreateKMatrixAdjointMacAyeal(void){
 
         /*Constants*/
-        const int numnodes = this->NumberOfNodes();
+        const int numnodes = this->NumberofNodes();
         const int numdof   = NDOF2*numnodes;
 
         /*Intermediaries */

../trunk-jpl/src/c/classes/Elements/Tria.h

@@ -83 +83 @@
                 void   Delta18oParameterization(void);
                 int    GetNodeIndex(Node* node);
                 void   GetNodesSidList(int* sidlist);
+                int    GetNumberOfNodes(void);
                 int    Sid();
                 bool   IsOnBed();
                 bool   IsFloating();

../trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -1010 +1010 @@
 
         _assert_(sidlist);
         _assert_(nodes);
-        int numnodes = this->NumberOfNodes();
+        int numnodes = this->NumberofNodes();
 
         for(int i=0;i<numnodes;i++){
                 sidlist[i]=nodes[i]->Sid();
         }
 }
 /*}}}*/
+/*FUNCTION Penta::GetNumberOfNodes;{{{*/
+int Penta::GetNumberOfNodes(void){
+        return this->NumberofNodes();
+}
+/*}}}*/
 /*FUNCTION Penta::GetInputListOnVertices(IssmDouble* pvalue,int enumtype) {{{*/
 void Penta::GetInputListOnVertices(IssmDouble* pvalue,int enumtype){
 
@@ -2616 +2621 @@
 void Penta::SetwiseNodeConnectivity(int* pd_nz,int* po_nz,Node* node,bool* flags,int set1_enum,int set2_enum){
 
         /*Intermediaries*/
-        const int numnodes = this->NumberOfNodes();
+        const int numnodes = this->NumberofNodes();
 
         /*Output */
         int d_nz = 0;

../trunk-jpl/src/c/classes/Elements/Penta.h

@@ -88 +88 @@
                 void   DeleteResults(void);
                 int    GetNodeIndex(Node* node);
                 void   GetNodesSidList(int* sidlist);
+                int    GetNumberOfNodes(void);
                 void   GetSolutionFromInputs(Vector<IssmDouble>* solution);
                 IssmDouble GetZcoord(GaussPenta* gauss);
                 void   GetVectorFromInputs(Vector<IssmDouble>* vector,int name_enum);