Changeset 4846 for issm/trunk

Timestamp:

07/28/10 15:07:43 (15 years ago)

Author:

seroussi

Message:

fixed problem with pressure steadystate

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

@@ -2151 +2151 @@
         GetDofList(&doflist[0],&dummy);
 
-        /*Get node data: */
-        GetVerticesCoordinates(&xyz_list[0][0], nodes, numvertices);
-
         /*Use the dof list to index into the solution vector: */
         for(i=0;i<numdof;i++){
@@ -2174 +2171 @@
         penta=this;
         for(;;){
+
+                /*Get node data: */
+                GetVerticesCoordinates(&xyz_list[0][0],penta->nodes,numvertices);
 
                 /*Now Compute vel*/
@@ -2186 +2186 @@
 
                 /*Now compute pressure*/
-                inputs->GetParameterValues(&surface[0],&gauss[0][0],6,SurfaceEnum);
+                penta->inputs->GetParameterValues(&surface[0],&gauss[0][0],6,SurfaceEnum);
                 for(i=0;i<numvertices;i++){
                         pressure[i]=rho_ice*g*(surface[i]-xyz_list[i][2]);
@@ -2448 +2448 @@
          * status, otherwise, we'll wipe them off: */
         this->inputs->ChangeEnum(VzEnum,VzOldEnum);
+        this->inputs->ChangeEnum(PressureEnum,PressureOldEnum);
 
         /*Add vz and vel as inputs to the penta element: */

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

@@ -5792 +5792 @@
 
         int          dummy;
-        Input*       VzInput=NULL;
-        double*      VzPtr=NULL;
+        Input*       vz_input=NULL;
+        double*      vz_ptr=NULL;
         
         /*Get dof list: */
@@ -5810 +5810 @@
 
         /*Get Vz*/
-        VzInput=inputs->GetInput(VzEnum);
-        if (VzInput){
-                if (VzInput->Enum()!=TriaVertexInputEnum){
-                        ISSMERROR("Cannot compute Vel as Vz is of type %s",EnumAsString(VzInput->Enum()));
+        vz_input=inputs->GetInput(VzEnum);
+        if (vz_input){
+                if (vz_input->Enum()!=TriaVertexInputEnum){
+                        ISSMERROR("Cannot compute Vel as Vz is of type %s",EnumAsString(vz_input->Enum()));
                 }
-                VzInput->GetValuesPtr(&VzPtr,&dummy);
-                for(i=0;i<numvertices;i++) vz[i]=VzPtr[i];
+                vz_input->GetValuesPtr(&vz_ptr,&dummy);
+                for(i=0;i<numvertices;i++) vz[i]=vz_ptr[i];
         }
         else{
@@ -5870 +5870 @@
 
         int          dummy;
-        Input*       VzInput=NULL;
-        double*      VzPtr=NULL;
+        Input*       vz_input=NULL;
+        double*      vz_ptr=NULL;
         
         /*Get dof list: */
@@ -5888 +5888 @@
 
         /*Get Vz*/
-        VzInput=inputs->GetInput(VzEnum);
-        if (VzInput){
-                if (VzInput->Enum()!=TriaVertexInputEnum){
-                        ISSMERROR("Cannot compute Vel as Vz is of type %s",EnumAsString(VzInput->Enum()));
+        vz_input=inputs->GetInput(VzEnum);
+        if (vz_input){
+                if (vz_input->Enum()!=TriaVertexInputEnum){
+                        ISSMERROR("Cannot compute Vel as Vz is of type %s",EnumAsString(vz_input->Enum()));
                 }
-                VzInput->GetValuesPtr(&VzPtr,&dummy);
-                for(i=0;i<numvertices;i++) vz[i]=VzPtr[i];
+                vz_input->GetValuesPtr(&vz_ptr,&dummy);
+                for(i=0;i<numvertices;i++) vz[i]=vz_ptr[i];
         }
         else{