Changeset 15753

Timestamp:

08/08/13 11:56:59 (12 years ago)

Author:

seroussi

Message:

BUG: fixed pressure for coupling HO/FS and starting debuging SSA/FS

File:

• issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (modified) (7 diffs)

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -9891 +9891 @@
 
         const int    numdofm=NDOF2*NUMVERTICES;
-        const int    numdofs=NDOF4*NUMVERTICES;
+        const int    numdofs=NDOF3*NUMVERTICES;
         const int    numdof2d=NDOF2*NUMVERTICES2D;
+        const int    numdofpressure=NDOF1*NUMVERTICES;
 
         int     i;
@@ -9898 +9899 @@
         IssmDouble  SSA_values[numdofm];
         IssmDouble  FS_values[numdofs];
+        IssmDouble  Pressure_values[numdofs];
         IssmDouble  vx[NUMVERTICES];
         IssmDouble  vy[NUMVERTICES];
@@ -9908 +9910 @@
         int*    doflistm        = NULL;
         int*    doflists        = NULL;
+        int*    doflistpressure = NULL;
         Penta   *penta          = NULL;
 
@@ -9917 +9920 @@
         penta->GetDofList(&doflistm,SSAApproximationEnum,GsetEnum);
         GetDofList(&doflists,FSvelocityEnum,GsetEnum);
+        GetDofListPressure(&doflistpressure,GsetEnum);
         this->parameters->FindParam(&FSreconditioning,DiagnosticFSreconditioningEnum);
 
@@ -9927 +9931 @@
                 SSA_values[i+numdof2d]=solution[doflistm[i]];
         }
-        for(i=0;i<numdofs;i++){
-                FS_values[i]=solution[doflists[i]];
-        }
+        for(i=0;i<numdofs;i++)FS_values[i]=solution[doflists[i]];
+        for(i=0;i<numdofpressure;i++) Pressure_values[i]=solution[doflistpressure[i]];
 
         /*Transform solution in Cartesian Space*/
@@ -9937 +9940 @@
         /*Ok, we have vx and vy in values, fill in vx and vy arrays: */
         for(i=0;i<NUMVERTICES;i++){
-                vx[i]=FS_values[i*NDOF4+0]+SSA_values[i*NDOF2+0];
-                vy[i]=FS_values[i*NDOF4+1]+SSA_values[i*NDOF2+1];
-                vzFS[i]=FS_values[i*NDOF4+2];
-                pressure[i]=FS_values[i*NDOF4+3]*FSreconditioning;
+                vx[i]=FS_values[i*NDOF3+0]+SSA_values[i*NDOF2+0];
+                vy[i]=FS_values[i*NDOF3+1]+SSA_values[i*NDOF2+1];
+                vzFS[i]=FS_values[i*NDOF3+2];
+                pressure[i]=Pressure_values[i*NDOF1]*FSreconditioning;
 
                 /*Check solution*/
@@ -10193 +10196 @@
                 vy[i]=FS_values[i*NDOF3+1]+HO_values[i*NDOF2+1];
                 vzFS[i]=FS_values[i*NDOF3+2];
-                pressure[i]=FS_values[i*NDOF1]*FSreconditioning;
+                pressure[i]=Pressure_values[i*NDOF1]*FSreconditioning;
 
                 /*Check solution*/