Changeset 5806

Timestamp:

09/14/10 15:49:24 (15 years ago)

Author:

seroussi

Message:

modifications for Pattyn/Stokes

File:

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

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

@@ -1866 +1866 @@
                                 }
                         }
+                        if(*(iomodel->elements_type+index)==PattynStokesApproximationEnum){
+                                /*Create VzPattyn and VzStokes Enums*/
+                                if(iomodel->vz && iomodel->gridonstokes){
+                                        for(i=0;i<6;i++) nodeinputs[i]=iomodel->vz[penta_vertex_ids[i]-1]/iomodel->yts*iomodel->gridonstokes[penta_vertex_ids[i]-1];
+                                        this->inputs->AddInput(new PentaVertexInput(VzStokesEnum,nodeinputs));
+                                        for(i=0;i<6;i++) nodeinputs[i]=iomodel->vz[penta_vertex_ids[i]-1]/iomodel->yts*(1-iomodel->gridonstokes[penta_vertex_ids[i]-1]);
+                                        this->inputs->AddInput(new PentaVertexInput(VzPattynEnum,nodeinputs));
+                                }
+                                else{
+                                        for(i=0;i<6;i++)nodeinputs[i]=0;
+                                        this->inputs->AddInput(new PentaVertexInput(VzStokesEnum,nodeinputs));
+                                        this->inputs->AddInput(new PentaVertexInput(VzPattynEnum,nodeinputs));
+                                }
+                        }
                         break;
 
@@ -1890 +1904 @@
                 else if (*(iomodel->elements_type+index)==StokesApproximationEnum){
                         this->inputs->AddInput(new IntInput(ApproximationEnum,StokesApproximationEnum));
+                }
+                else if (*(iomodel->elements_type+index)==PattynStokesApproximationEnum){
+                        this->inputs->AddInput(new IntInput(ApproximationEnum,PattynStokesApproximationEnum));
                 }
                 else if (*(iomodel->elements_type+index)==NoneApproximationEnum){
@@ -4921 +4938 @@
         int         approximation;
 
+        /*Get the approximation and do nothing if the element in Stokes or None*/
+        inputs->GetParameterValue(&approximation,ApproximationEnum);
+        if(approximation==StokesApproximationEnum || approximation==NoneApproximationEnum){
+                return;
+        }
+
         /*Get dof list: */
         GetDofList(&doflist,NoneApproximationEnum,GsetEnum);
@@ -4926 +4949 @@
         /*Get node data: */
         GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES);
-        inputs->GetParameterValue(&approximation,ApproximationEnum);
 
         /*Use the dof list to index into the solution vector: */