Changeset 8538

Timestamp:

06/07/11 16:40:31 (14 years ago)

Author:

Mathieu Morlighem

Message:

Added hydro_p and hydro_q in matpar

Location:

issm/trunk/src/c/objects

Files:

• Elements/Tria.cpp (modified) (2 diffs)
• IoModel.cpp (modified) (1 diff)
• IoModel.h (modified) (1 diff)
• Materials/Matpar.cpp (modified) (2 diffs)
• Materials/Matpar.h (modified) (2 diffs)

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

@@ -991 +991 @@
         double     Ke_gg_gaussian2[numdof][numdof]  ={0.0};
         double     Ke_gg_gaussian3[numdof][numdof]  ={0.0};
-        double     hydro_gamma;
+        double     hydro_gamma,hydro_p,hydro_q;
         double     DL_scalar1;
         double     DL_scalar2;
@@ -1003 +1003 @@
         GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES);
         this->parameters->FindParam(&dt,DtEnum);
-        
+
         /*retrieve material parameters: */
         hydro_gamma=matpar->GetGamma();
+        hydro_p    =matpar->GetHydroP();
+        hydro_q    =matpar->GetHydroQ();
 
         /* Start  looping on the number of gaussian points: */

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

@@ -213 +213 @@
         IoModelFetchData(&this->hydro_gamma,iomodel_handle,"hydro_gamma");
         IoModelFetchData(&this->hydro_kn,iomodel_handle,"hydro_kn");
+        IoModelFetchData(&this->hydro_p,iomodel_handle,"hydro_p");
+        IoModelFetchData(&this->hydro_q,iomodel_handle,"hydro_q");
         IoModelFetchData(&this->meltingpoint,iomodel_handle,"meltingpoint");
         IoModelFetchData(&this->referencetemperature,iomodel_handle,"referencetemperature");

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

@@ -172 +172 @@
                 double hydro_gamma;
                 double hydro_kn;
+                double hydro_p;
+                double hydro_q;
                 double meltingpoint;
                 double referencetemperature;

issm/trunk/src/c/objects/Materials/Matpar.cpp

@@ -67 +67 @@
         this->gamma=matpar_gamma; 
         this->kn=matpar_kn; 
+        this->hydro_p=iomodel->hydro_p; 
+        this->hydro_q=iomodel->hydro_q; 
 
 }
@@ -402 +404 @@
 }
 /*}}}1*/
+/*FUNCTION Matpar::GetHydroP {{{1*/
+double Matpar::GetHydroP(){
+        return hydro_p;
+}
+/*}}}1*/
+/*FUNCTION Matqar::GetHydroQ {{{1*/
+double Matqar::GetHydroQ(){
+        return hydro_q;
+}
+/*}}}1*/
 /*FUNCTION Matpar::TMeltingPoint {{{1*/
 double Matpar::TMeltingPoint(double pressure){

issm/trunk/src/c/objects/Materials/Matpar.h

@@ -27 +27 @@
                 double  thermal_exchange_velocity;
                 double  g;
+
                 /*hydrology: */
                 double  kn; 
                 double  gamma;
+                double  hydro_p;
+                double  hydro_q;
 
         public:
@@ -81 +84 @@
                 double GetGamma();
                 double GetKn();
+                double GetHydroP();
+                double GetHydroQ();
                 double TMeltingPoint(double pressure);
                 double PureIceEnthalpy(double pressure);