Changeset 301

Timestamp:

05/07/09 12:10:59 (16 years ago)

Author:

Eric.Larour

Message:

Added pressure computation

Location:

issm/trunk/src/c/objects

Files:

• Element.h (modified) (1 diff)
• Input.cpp (modified) (1 diff)
• Node.cpp (modified) (2 diffs)
• Node.h (modified) (1 diff)
• Penta.cpp (modified) (2 diffs)
• Penta.h (modified) (2 diffs)
• Tria.cpp (modified) (3 diffs)
• Tria.h (modified) (2 diffs)

issm/trunk/src/c/objects/Element.h

@@ -38 +38 @@
                 virtual void  GradjB(Vec grad_g,double* u_g,double* lambda_g,void* inputs,int analysis_type)=0;
         virtual double Misfit(double* u_g,double* u_g_obs,void* inputs,int analysis_type)=0;
+        virtual void  ComputePressure(Vec p_g)=0;
 
                 int           Enum();

issm/trunk/src/c/objects/Input.cpp

@@ -150 +150 @@
 
                 /*Get 1d dof of this node: */
-                dof1=node->GetDoflist1();
+                dof1=node->GetDofList1();
 
                 for(j=0;j<ndofin;j++){

issm/trunk/src/c/objects/Node.cpp

@@ -426 +426 @@
 }
 
+int   Node::GetDofList1(void){
+        return doflist1[0];
+}
 
 double Node::GetX(){return x[0];}
@@ -488 +491 @@
 }
                 
-int   Node::GetDoflist1(void){
-        return doflist1[0];
-}

issm/trunk/src/c/objects/Node.h

@@ -66 +66 @@
                 void  CreateVecSets(Vec pv_g,Vec pv_m,Vec pv_n,Vec pv_f,Vec pv_s);
                 void  GetDofList(int* outdoflist,int* pnumberofdofspernode);
-                int   GetDoflist1(void);
+                int   GetDofList1(void);
                 double GetX();
                 double GetY();

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

@@ -947 +947 @@
 }
 
-
+void  Penta::GetDofList1(int* doflist){
+
+        int i;
+        for(i=0;i<6;i++){
+                doflist[i]=nodes[i]->GetDofList1();
+        }
+
+}
 #undef __FUNCT__ 
 #define __FUNCT__ "Penta::GetStrainRate"
@@ -1753 +1760 @@
 
 }
+
+#undef __FUNCT__ 
+#define __FUNCT__ "Penta::ComputePressure"
+void  Penta::ComputePressure(Vec pg){
+
+        int i;
+        const int numgrids=6;
+        int doflist[numgrids];
+        double pressure[numgrids];
+        double rho_ice,g;
+        double       xyz_list[numgrids][3];
+                
+        /*Get node data: */
+        GetElementNodeData( &xyz_list[0][0], nodes, numgrids);
+        
+        /*pressure is lithostatic: */
+        //md.pressure=md.rho_ice*md.g*(md.surface-md.z); a la matlab
+
+        /*Get dof list on which we will plug the pressure values: */
+        GetDofList1(&doflist[0]);
+
+        /*pressure is lithostatic: */
+        rho_ice=matpar->GetRhoIce();
+        g=matpar->GetG();
+        for(i=0;i<numgrids;i++){
+                pressure[i]=rho_ice*g*(s[i]-xyz_list[i][2]);
+        }
+        
+        /*plug local pressure values into global pressure vector: */
+        VecSetValues(pg,numgrids,doflist,(const double*)pressure,INSERT_VALUES);
+
+}

issm/trunk/src/c/objects/Penta.h

@@ -78 +78 @@
                 void  UpdateFromInputs(void* inputs);
                 void  GetDofList(int* doflist,int* pnumberofdofs);
+                void  GetDofList1(int* doflist);
                 void* GetMatPar();
                 int   GetShelf();
@@ -109 +110 @@
                 void  GetNodalFunctions(double* l1l2l3l4l5l6, double* gauss_l1l2l3l4);
                 void  VelocityExtrude(Vec ug,double* ug_serial);
+                void  ComputePressure(Vec p_g);
 
 };

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

@@ -905 +905 @@
 }
 
+void  Tria::GetDofList1(int* doflist){
+
+        int i;
+        for(i=0;i<3;i++){
+                doflist[i]=nodes[i]->GetDofList1();
+        }
+
+}
+
 
 #undef __FUNCT__ 
@@ -1742 +1751 @@
         /* node data: */
         const int    numgrids=3;
+        const int    NDOF1=1;
         const int    NDOF2=2;
         const int    numdofs=NDOF2*numgrids;
@@ -2366 +2376 @@
 
 }
+
+#undef __FUNCT__ 
+#define __FUNCT__ "Tria::ComputePressure"
+void  Tria::ComputePressure(Vec pg){
+
+        int i;
+        const int numgrids=3;
+        int doflist[numgrids];
+        double pressure[numgrids];
+        double rho_ice,g;
+
+        /*Get dof list on which we will plug the pressure values: */
+        GetDofList1(&doflist[0]);
+
+        /*pressure is lithostatic: */
+        rho_ice=matpar->GetRhoIce();
+        g=matpar->GetG();
+        for(i=0;i<numgrids;i++){
+                pressure[i]=rho_ice*g*h[i];
+        }
+        
+        /*plug local pressure values into global pressure vector: */
+        VecSetValues(pg,numgrids,doflist,(const double*)pressure,INSERT_VALUES);
+
+}

issm/trunk/src/c/objects/Tria.h

@@ -69 +69 @@
                 void  UpdateFromInputs(void* inputs);
                 void  GetDofList(int* doflist,int* pnumberofdofs);
-                
+                void  GetDofList1(int* doflist);
                 void  CreateKMatrixDiagnosticHoriz(Mat Kgg,void* inputs,int analysis_type);
                 void  CreateKMatrixDiagnosticHorizFriction(Mat Kgg,void* inputs,int analysis_type);
@@ -105 +105 @@
                 void  MaticeConfiguration(Matice* matice,int matice_offset);
                 void  MatparConfiguration(Matpar* matpar,int matpar_offset);
+                void  ComputePressure(Vec p_g);