Changeset 5978

Timestamp:

09/23/10 07:47:55 (14 years ago)

Author:

seroussi

Message:

need to recondition stokes pressure in PattynStokes

File:

• issm/trunk/src/c/objects/Elements/Penta.cpp (modified) (5 diffs)

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

@@ -2397 +2397 @@
                 matice->GetViscosity3d(&viscosity, &epsilon[0]);
                 matice->GetViscosity3d(&oldviscosity, &oldepsilon[0]);
-
                 newviscosity=viscosity+viscosity_overshoot*(viscosity-oldviscosity);
+
                 D_scalar=2*newviscosity*gauss->weight*Jdet;
                 for (i=0;i<5;i++) D[i][i]=D_scalar;
@@ -3438 +3438 @@
         double      l1l6[6]; //for the six nodes of the penta
         double      Jdet2d;
-        Tria*       tria=NULL;
         GaussPenta  *gauss=NULL;
 
@@ -4658 +4657 @@
         int          dummy;
         double       pressure[NUMVERTICES];
-        double       surface[NUMVERTICES];
-        double       rho_ice,g;
         double       xyz_list[NUMVERTICES][3];
+        double       stokesreconditioning;
 
         double *vzpattyn_ptr         = NULL;
@@ -4672 +4670 @@
         GetDofList(&doflistp,PattynApproximationEnum,GsetEnum);
         GetDofList(&doflists,StokesApproximationEnum,GsetEnum);
+        this->parameters->FindParam(&stokesreconditioning,StokesReconditioningEnum);
 
         /*Get node data: */
@@ -4689 +4688 @@
                 vy[i]=stokes_values[i*numdofpervertexs+1]+pattyn_values[i*numdofpervertexp+1];
                 vzstokes[i]=stokes_values[i*numdofpervertexs+2];
-                pressure[i]=stokes_values[i*numdofpervertexs+3];
+                pressure[i]=stokes_values[i*numdofpervertexs+3]*stokesreconditioning;
         }