Changeset 5785

Timestamp:

09/13/10 15:59:12 (15 years ago)

Author:

seroussi

Message:

some modifications for PattynStokes

Location:

issm/trunk/src/c/objects/Elements

Files:

• Penta.cpp (modified) (4 diffs)
• Tria.cpp (modified) (4 diffs)

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

@@ -3577 +3577 @@
         double du[3];
         double dv[3];
-        double dudx,dvdy;
+        double dw[3];
+        double dudx,dvdy,dwdz;
+
+        /*Get some parameters*/
+        int approximation;
 
         /*If on water, skip: */
         if(IsOnWater())return;
+        inputs->GetParameterValue(&approximation,ApproximationEnum);
 
         /*If we are on the bedrock, spawn a tria on the bedrock, and use it to build the 
@@ -3598 +3603 @@
         Input* vx_input=inputs->GetInput(VxEnum); ISSMASSERT(vx_input);
         Input* vy_input=inputs->GetInput(VyEnum); ISSMASSERT(vy_input);
+        Input* vz_input=NULL;
+        if(approximation==PattynStokesApproximationEnum){
+                vz_input=inputs->GetInput(VzEnum); ISSMASSERT(vz_input);
+        }
 
         /* Start  looping on the number of gaussian points: */
@@ -3608 +3617 @@
                 vx_input->GetParameterDerivativeValue(&du[0],&xyz_list[0][0],gauss);
                 vy_input->GetParameterDerivativeValue(&dv[0],&xyz_list[0][0],gauss);
+                if(approximation==PattynStokesApproximationEnum){
+                        vz_input->GetParameterDerivativeValue(&dw[0],&xyz_list[0][0],gauss);
+                        dwdz=dw[2];
+                }
+                else dwdz=0;
                 dudx=du[0];
                 dvdy=dv[1];
@@ -3619 +3633 @@
                 /*Build pe_g_gaussian vector: */
                 for (i=0;i<NUMVERTICES;i++){
-                        pe_g_gaussian[i]=(dudx+dvdy)*Jdet*gauss->weight*l1l6[i];
+                        pe_g_gaussian[i]=(dudx+dvdy+dwdz)*Jdet*gauss->weight*l1l6[i];
                 }
 

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

@@ -4137 +4137 @@
 
         /*input parameters for structural analysis (diagnostic): */
-        double  vx,vy;
+        double  vx,vy,vz;
         double  meltingvalue;
         double  slope[2];
         double  dbdx,dbdy;
+        int     approximation;
 
         /* Get node coordinates and dof list: */
@@ -4147 +4148 @@
 
         /*Retrieve all inputs we will be needing: */
+        inputs->GetParameterValue(&approximation,ApproximationEnum);
         Input* melting_input=inputs->GetInput(MeltingRateEnum); ISSMASSERT(melting_input);
         Input* vx_input=inputs->GetInput(VxEnum);               ISSMASSERT(vx_input);
         Input* vy_input=inputs->GetInput(VyEnum);               ISSMASSERT(vy_input);
+        Input* vz_input=NULL;
+        if(approximation==PattynStokesApproximationEnum){
+                vz_input=inputs->GetInput(VzEnum);            ISSMASSERT(vz_input);
+        }
         Input* bed_input=inputs->GetInput(BedEnum);             ISSMASSERT(bed_input);
 
@@ -4165 +4171 @@
                 vx_input->GetParameterValue(&vx, gauss);
                 vy_input->GetParameterValue(&vy, gauss);
+                if(approximation==PattynStokesApproximationEnum){
+                        vz_input->GetParameterValue(&vz, gauss);
+                }
+                else vz=0;
 
                 /*Get bed slope: */
@@ -4179 +4189 @@
                 /*Build gaussian vector: */
                 for(i=0;i<NUMVERTICES;i++){
-                        pe_g_gaussian[i]=-Jdet*gauss->weight*(vx*dbdx+vy*dbdy-meltingvalue)*L[i];
+                        pe_g_gaussian[i]=-Jdet*gauss->weight*(vx*dbdx+vy*dbdy-vz-meltingvalue)*L[i];
                 }