Changeset 3947 for issm/trunk/src/c/objects/Elements/Sing.cpp

Timestamp:

05/26/10 09:30:24 (15 years ago)

Author:

seroussi

Message:

modified hutter solution to be done by tria or penta

File:

• issm/trunk/src/c/objects/Elements/Sing.cpp (modified) (4 diffs)

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

@@ -333 +333 @@
         int    doflist[numdofs];
         int    numberofdofspernode;
+        int    connectivity;
+
+        /*dynamic objects pointed to by hooks: */
+        Node**  nodes=NULL;
+
+        /*recover objects from hooks: */
+        nodes=(Node**)hnodes.delivers();
+
+        /*Find connectivity of the node and divide Ke_gg by this connectivity*/
+        connectivity=nodes[0]->GetConnectivity();
+        Ke_gg[0][0]=1/(double)connectivity;
+        Ke_gg[1][1]=1/(double)connectivity;
 
         GetDofList(&doflist[0],&numberofdofspernode);
@@ -374 +386 @@
         double    rho_ice,gravity,n,B;
         double    thickness;
+        int       connectivity;
 
         /*dynamic objects pointed to by hooks: */
-        Node**  node=NULL;
+        Node**  nodes=NULL;
         Matpar* matpar=NULL;
         Matice* matice=NULL;
 
         /*recover objects from hooks: */
-        node=(Node**)hnodes.deliverp();
+        nodes=(Node**)hnodes.deliverp();
         matpar=(Matpar*)hmatpar.delivers();
         matice=(Matice*)hmatice.delivers();
@@ -389 +402 @@
 
         GetDofList(&doflist[0],&numberofdofspernode);
+
+        //Get connectivity of the node
+        connectivity=nodes[0]->GetConnectivity();
 
         //compute slope2 
@@ -406 +422 @@
         constant_part=-2*pow(rho_ice*gravity,n)*pow(slope2,((n-1)/2));
 
-        pe_g[0]=ub-2.0*pow(rho_ice*gravity,n)*pow(slope2,((n-1)/2.0))*pow(thickness,n)/(pow(B,n)*(n+1))*slope[0];
-        pe_g[1]=vb-2.0*pow(rho_ice*gravity,n)*pow(slope2,((n-1)/2.0))*pow(thickness,n)/(pow(B,n)*(n+1))*slope[1];
+        pe_g[0]=(ub-2.0*pow(rho_ice*gravity,n)*pow(slope2,((n-1)/2.0))*pow(thickness,n)/(pow(B,n)*(n+1))*slope[0])/(double)connectivity;
+        pe_g[1]=(vb-2.0*pow(rho_ice*gravity,n)*pow(slope2,((n-1)/2.0))*pow(thickness,n)/(pow(B,n)*(n+1))*slope[1])/(double)connectivity;
 
         VecSetValues(pg,numdofs,doflist,(const double*)pe_g,ADD_VALUES);
-
 
 }