Changeset 7674

Timestamp:

03/22/11 16:01:55 (14 years ago)

Author:

Eric.Larour

Message:

Fixed problem with hydro_gamma.

Location:

issm/trunk/src

Files:

• c/objects/Elements/Tria.cpp (modified) (3 diffs)
• c/objects/IoModel.cpp (modified) (1 diff)
• c/objects/IoModel.h (modified) (1 diff)
• c/objects/Materials/Matpar.cpp (modified) (1 diff)
• m/model/marshall.m (modified) (1 diff)
• m/model/plot/latlonoverlay.m (modified) (1 diff)

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

@@ -1203 +1203 @@
         double     Ke_gg_gaussian2[numdof][numdof]  ={0.0};
         double     Ke_gg_gaussian3[numdof][numdof]  ={0.0};
-        double     gamma;
+        double     hydro_gamma;
         double     DL_scalar1;
         double     DL_scalar2;
@@ -1217 +1217 @@
         
         /*retrieve material parameters: */
-        gamma=matpar->GetGamma();
+        hydro_gamma=matpar->GetGamma();
 
         /* Start  looping on the number of gaussian points: */
@@ -1244 +1244 @@
 
                 if(dt){
-                        DL_scalar2=-gauss->weight*Jdettria*gamma*K[0]*dt; //don't forget the -
-                        DL_scalar3=-gauss->weight*Jdettria*gamma*K[1]*dt; //don't forget the -
+                        DL_scalar2=-gauss->weight*Jdettria*hydro_gamma*K[0]*dt; //don't forget the -
+                        DL_scalar3=-gauss->weight*Jdettria*hydro_gamma*K[1]*dt; //don't forget the -
 
                 }
                 else{
-                        DL_scalar2=-gauss->weight*Jdettria*gamma*K[0]; //don't forget the -
-                        DL_scalar3=-gauss->weight*Jdettria*gamma*K[1]; //don't forget the -
+                        DL_scalar2=-gauss->weight*Jdettria*hydro_gamma*K[0]; //don't forget the -
+                        DL_scalar3=-gauss->weight*Jdettria*hydro_gamma*K[1]; //don't forget the -
                 }
                 

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

@@ -201 +201 @@
         /*!Get thermal parameters: */
         IoModelFetchData(&this->beta,iomodel_handle,"beta");
-        IoModelFetchData(&this->gamma,iomodel_handle,"gamma");
-        IoModelFetchData(&this->kn,iomodel_handle,"kn");
+        IoModelFetchData(&this->hydro_gamma,iomodel_handle,"hydro_gamma");
+        IoModelFetchData(&this->hydro_kn,iomodel_handle,"hydro_kn");
         IoModelFetchData(&this->meltingpoint,iomodel_handle,"meltingpoint");
         IoModelFetchData(&this->latentheat,iomodel_handle,"latentheat");

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

@@ -164 +164 @@
                 /*thermal parameters: */
                 double beta;
-                double gamma;
-                double kn;
+                double hydro_gamma;
+                double hydro_kn;
                 double meltingpoint;
                 double latentheat;

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

@@ -48 +48 @@
         matpar_mixed_layer_capacity=iomodel->mixed_layer_capacity; 
         matpar_thermal_exchange_velocity=iomodel->thermal_exchange_velocity; 
-        matpar_gamma=iomodel->gamma; 
-        matpar_kn=iomodel->kn; 
+        matpar_gamma=iomodel->hydro_gamma; 
+        matpar_kn=iomodel->hydro_kn; 
 
         this->mid=matpar_mid; 

issm/trunk/src/m/model/marshall.m

@@ -153 +153 @@
 %Thermal parameters
 WriteData(fid,md.beta,'Scalar','beta');
-WriteData(fid,md.hydro_gamma,'Scalar','gamma'); 
-WriteData(fid,md.hydro_kn,'Scalar','kn');
+WriteData(fid,md.hydro_gamma,'Scalar','hydro_gamma'); 
+WriteData(fid,md.hydro_kn,'Scalar','hydro_kn');
 WriteData(fid,md.meltingpoint,'Scalar','meltingpoint');
 WriteData(fid,md.latentheat,'Scalar','latentheat');

issm/trunk/src/m/model/plot/latlonoverlay.m

@@ -23 +23 @@
                 latstep=3; lonstep=3;
                 resolution=0.1;
-                color=[1 1 1];
+                color=[1 0 1];
         else return; end
 else