Changeset 3948

Timestamp:

05/26/10 09:35:07 (15 years ago)

Author:

seroussi

Message:

minor

Location:

issm/trunk/src/c/objects

Files:

• Elements/Sing.cpp (modified) (4 diffs)
• Node.cpp (modified) (3 diffs)

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

@@ -336 +336 @@
 
         /*dynamic objects pointed to by hooks: */
-        Node**  nodes=NULL;
+        Node**  node=NULL;
 
         /*recover objects from hooks: */
-        nodes=(Node**)hnodes.delivers();
+        node=(Node**)hnodes.delivers();
 
         /*Find connectivity of the node and divide Ke_gg by this connectivity*/
-        connectivity=nodes[0]->GetConnectivity();
+        connectivity=node[0]->GetConnectivity();
         Ke_gg[0][0]=1/(double)connectivity;
         Ke_gg[1][1]=1/(double)connectivity;
@@ -368 +368 @@
 /*}}}*/
 /*FUNCTION Sing::CreatePVectorDiagnosticHutter {{{1*/
-
 void Sing::CreatePVectorDiagnosticHutter( Vec pg,  int analysis_type,int sub_analysis_type){
-        
         
         const int numgrids=1;
@@ -389 +387 @@
 
         /*dynamic objects pointed to by hooks: */
-        Node**  nodes=NULL;
+        Node**  node=NULL;
         Matpar* matpar=NULL;
         Matice* matice=NULL;
@@ -404 +402 @@
 
         //Get connectivity of the node
-        connectivity=nodes[0]->GetConnectivity();
+        connectivity=node[0]->GetConnectivity();
 
         //compute slope2 

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

@@ -57 +57 @@
 
         int k;
-        
         int numdofs;
         int vertex_id;
@@ -158 +157 @@
         }
         
-        
         //intialize inputs, and add as many inputs per element as requested: 
         this->inputs=new Inputs();
@@ -165 +163 @@
         if (iomodel->gridoniceshelf) this->inputs->AddInput(new BoolInput(NodeOnIceShelfEnum,(IssmBool)iomodel->gridoniceshelf[i]));
         if (iomodel->gridonicesheet) this->inputs->AddInput(new BoolInput(NodeOnIceSheetEnum,(IssmBool)iomodel->gridonicesheet[i]));
-        NumberNodeToElementConnectivityEnum;
         if (iomodel->numbernodetoelementconnectivity) this->inputs->AddInput(new IntInput(NumberNodeToElementConnectivityEnum,iomodel->numbernodetoelementconnectivity[i]));