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

Last change on this file since 16134 was 16134, checked in by Mathieu Morlighem, 12 years ago

Added Archive/15392-16133
File size: 3.3 KB
RevLine 
[16134]1Index: ../trunk-jpl/src/c/classes/Elements/Tria.cpp
2===================================================================
3--- ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 15496)
4+++ ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 15497)
5@@ -121,7 +121,7 @@
6 void Tria::SetwiseNodeConnectivity(int* pd_nz,int* po_nz,Node* node,bool* flags,int set1_enum,int set2_enum){
7
8 /*Intermediaries*/
9- const int numnodes = this->NumberOfNodes();
10+ const int numnodes = this->NumberofNodes();
11
12 /*Output */
13 int d_nz = 0;
14@@ -895,13 +895,18 @@
15
16 _assert_(sidlist);
17 _assert_(nodes);
18- int numnodes = this->NumberOfNodes();
19+ int numnodes = this->NumberofNodes();
20
21 for(int i=0;i<numnodes;i++){
22 sidlist[i]=nodes[i]->Sid();
23 }
24 }
25 /*}}}*/
26+/*FUNCTION Tria::GetNumberOfNodes;{{{*/
27+int Tria::GetNumberOfNodes(void){
28+ return this->NumberofNodes();
29+}
30+/*}}}*/
31 /*FUNCTION Tria::GetInputListOnVertices(IssmDouble* pvalue,int enumtype) {{{*/
32 void Tria::GetInputListOnVertices(IssmDouble* pvalue,int enumtype){
33
34@@ -5198,7 +5203,7 @@
35 ElementMatrix* Tria::CreateKMatrixAdjointMacAyeal(void){
36
37 /*Constants*/
38- const int numnodes = this->NumberOfNodes();
39+ const int numnodes = this->NumberofNodes();
40 const int numdof = NDOF2*numnodes;
41
42 /*Intermediaries */
43Index: ../trunk-jpl/src/c/classes/Elements/Tria.h
44===================================================================
45--- ../trunk-jpl/src/c/classes/Elements/Tria.h (revision 15496)
46+++ ../trunk-jpl/src/c/classes/Elements/Tria.h (revision 15497)
47@@ -83,6 +83,7 @@
48 void Delta18oParameterization(void);
49 int GetNodeIndex(Node* node);
50 void GetNodesSidList(int* sidlist);
51+ int GetNumberOfNodes(void);
52 int Sid();
53 bool IsOnBed();
54 bool IsFloating();
55Index: ../trunk-jpl/src/c/classes/Elements/Penta.cpp
56===================================================================
57--- ../trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 15496)
58+++ ../trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 15497)
59@@ -1010,13 +1010,18 @@
60
61 _assert_(sidlist);
62 _assert_(nodes);
63- int numnodes = this->NumberOfNodes();
64+ int numnodes = this->NumberofNodes();
65
66 for(int i=0;i<numnodes;i++){
67 sidlist[i]=nodes[i]->Sid();
68 }
69 }
70 /*}}}*/
71+/*FUNCTION Penta::GetNumberOfNodes;{{{*/
72+int Penta::GetNumberOfNodes(void){
73+ return this->NumberofNodes();
74+}
75+/*}}}*/
76 /*FUNCTION Penta::GetInputListOnVertices(IssmDouble* pvalue,int enumtype) {{{*/
77 void Penta::GetInputListOnVertices(IssmDouble* pvalue,int enumtype){
78
79@@ -2616,7 +2621,7 @@
80 void Penta::SetwiseNodeConnectivity(int* pd_nz,int* po_nz,Node* node,bool* flags,int set1_enum,int set2_enum){
81
82 /*Intermediaries*/
83- const int numnodes = this->NumberOfNodes();
84+ const int numnodes = this->NumberofNodes();
85
86 /*Output */
87 int d_nz = 0;
88Index: ../trunk-jpl/src/c/classes/Elements/Penta.h
89===================================================================
90--- ../trunk-jpl/src/c/classes/Elements/Penta.h (revision 15496)
91+++ ../trunk-jpl/src/c/classes/Elements/Penta.h (revision 15497)
92@@ -88,6 +88,7 @@
93 void DeleteResults(void);
94 int GetNodeIndex(Node* node);
95 void GetNodesSidList(int* sidlist);
96+ int GetNumberOfNodes(void);
97 void GetSolutionFromInputs(Vector<IssmDouble>* solution);
98 IssmDouble GetZcoord(GaussPenta* gauss);
99 void GetVectorFromInputs(Vector<IssmDouble>* vector,int name_enum);
Note: See TracBrowser for help on using the repository browser.