Changeset 17244

Timestamp:

02/07/14 17:10:12 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: done with HO 2d vertical (results does not seem to make sense yet

Location:

issm/trunk-jpl/src/c

Files:

• analyses/StressbalanceAnalysis.cpp (modified) (7 diffs)
• classes/Materials/Matice.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp

@@ -2056 +2056 @@
         /*Fetch number of nodes and dof for this finite element*/
         int numnodes = element->GetNumberOfNodes();
-        int numdof   = numnodes*2;
+        int numdof   = numnodes*(dim-1);
 
         /*Initialize Element matrix and vectors*/
@@ -2099 +2099 @@
 
         /*Transform Coordinate System*/
-        element->TransformStiffnessMatrixCoord(Ke,XYEnum);
+        if(dim==3) element->TransformStiffnessMatrixCoord(Ke,XYEnum);
 
         /*Clean up and return*/
@@ -2185 +2185 @@
 
         /*Transform Coordinate System*/
-        element->TransformStiffnessMatrixCoord(Ke,XYEnum);
+        if(dim==3) element->TransformStiffnessMatrixCoord(Ke,XYEnum);
 
         /*Clean up and return*/
@@ -2250 +2250 @@
 
         /*Transform coordinate system*/
-        element->TransformLoadVectorCoord(pe,XYEnum);
+        if(dim==3) element->TransformLoadVectorCoord(pe,XYEnum);
 
         /*Clean up and return*/
@@ -2308 +2308 @@
                 gauss->GaussPoint(ig);
                 surface_input->GetInputValue(&surface,gauss);
-                z=element->GetZcoord(gauss);
+                if(dim==3) z=element->GetZcoord(gauss);
+                else       z=element->GetYcoord(gauss);
                 element->NodalFunctions(basis,gauss);
                 element->JacobianDeterminantSurface(&Jdet,xyz_list_front,gauss);
@@ -2323 +2324 @@
 
         /*Transform coordinate system*/
-        element->TransformLoadVectorCoord(pe,XYEnum);
+        if(dim==3)element->TransformLoadVectorCoord(pe,XYEnum);
 
         /*Clean up and return*/
@@ -2506 +2507 @@
 
         /*Transform solution in Cartesian Space*/
-        element->TransformSolutionCoord(&values[0],XYEnum);
+        if(dim==3) element->TransformSolutionCoord(&values[0],XYEnum);
 
         /*Ok, we have vx and vy in values, fill in vx and vy arrays: */

issm/trunk-jpl/src/c/classes/Materials/Matice.cpp

@@ -406 +406 @@
         }
         else{
-                if((epsilon[0]==0) && (epsilon[1]==0) && (epsilon[2]==0)){
+                if((epsilon[0]==0) && (epsilon[1]==0)){
                         viscosity=0.5*pow(10.,14);
                 }