Changeset 10391

Timestamp:

10/31/11 16:47:26 (13 years ago)

Author:

Mathieu Morlighem

Message:

Added transformation coordinate for FS

Location:

issm/trunk/src/c/objects

Files:

• Elements/Penta.cpp (modified) (6 diffs)
• Loads/Icefront.cpp (modified) (1 diff)

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

@@ -5880 +5880 @@
         ReduceMatrixStokes(Ke->values, &Ke_temp[0][0]);
 
+        /*Transform Coordinate System*/
+        TransformStiffnessMatrixCoord(Ke,4);
+
         /*Clean up and return*/
         delete gauss;
@@ -5963 +5966 @@
                 for(i=0;i<numdof2d;i++) for(j=0;j<numdof2d;j++) Ke->values[i*numdof+j]+=Ke_drag_gaussian[i][j];
         }
+
+
+        /*Transform Coordinate System*/
+        TransformStiffnessMatrixCoord(Ke,4);
 
         /*Clean up and return*/
@@ -6678 +6685 @@
         ReduceVectorStokes(pe->values, &Ke_temp[0][0], &Pe_gaussian[0]);
 
+        /*Transform coordinate system*/
+        TransformLoadVectorCoord(pe,4);
+
         /*Clean up and return*/
         delete gauss;
@@ -6742 +6752 @@
                 for(i=0;i<NUMVERTICES;i++) for(j=0;j<3;j++) pe->values[i*NDOF4+j]+=(water_pressure+damper)*gauss->weight*Jdet2d*basis[i]*bed_normal[j];
         }
+
+        /*Transform coordinate system*/
+        TransformLoadVectorCoord(pe,4);
 
         /*Clean up and return*/
@@ -7672 +7685 @@
         int     i;
         double  values[numdof];
+        double  values0[numdof];
         double  vx[NUMVERTICES];
         double  vy[NUMVERTICES];
@@ -7684 +7698 @@
 
         /*Use the dof list to index into the solution vector: */
-        for(i=0;i<numdof;i++) values[i]=solution[doflist[i]];
+        for(i=0;i<numdof;i++) values0[i]=solution[doflist[i]];
+
+        /*Transform solution in Cartesian Space*/
+        TransformSolutionCoord(&values[0],&values0[0],NDOF4);
 
         /*Ok, we have vx and vy in values, fill in all arrays: */

issm/trunk/src/c/objects/Loads/Icefront.cpp

@@ -747 +747 @@
 
         /*Transform load vector*/
-        TransformLoadVectorCoord(pe,NUMVERTICESQUA,3);
+        TransformLoadVectorCoord(pe,NUMVERTICESQUA,4);
 
         /*Clean up and return*/