Changeset 8562

Timestamp:

06/08/11 14:05:07 (14 years ago)

Author:

Mathieu Morlighem

Message:

removed all hydro_gamma

Location:

issm/trunk/src/m

Files:

• classes/version/7.6/model.m (modified) (3 diffs)
• classes/version/7.7/model.m (modified) (3 diffs)
• model/marshall.m (modified) (1 diff)
• utils/OS/oshostname.m (modified) (1 diff)

issm/trunk/src/m/classes/version/7.6/model.m

@@ -278 +278 @@
                  %hydrology
                  watercolumn=NaN;
-                 hydro_n=NaN;
-                 hydro_CR=NaN;
-                 hydro_p=NaN;
-                 hydro_q=NaN;
-%                hydro_gamma=0;
+                 hydro_n=0;
+                 hydro_CR=0;
+                 hydro_p=0;
+                 hydro_q=0;
                  hydro_kn=0;
                  
@@ -399 +398 @@
                  melting_rate;
                  accumulation_rate;
+                 hydro_gamma;
                  % }}}
          end
@@ -790 +790 @@
                          md.hydro_p=2;
                          md.hydro_q=1;
-%                        md.hydro_gamma=1/(md.hydro_n*md.hydro_CR^md.hydro_p*(md.rho_water*md.g)^md.hydro_q);
                          md.hydro_kn=0;
 

issm/trunk/src/m/classes/version/7.7/model.m

@@ -278 +278 @@
                  %hydrology
                  watercolumn=NaN;
-                 hydro_n=NaN;
-                 hydro_CR=NaN;
-                 hydro_p=NaN;
-                 hydro_q=NaN;
-%                hydro_gamma=0;
+                 hydro_n=0;
+                 hydro_CR=0;
+                 hydro_p=0;
+                 hydro_q=0;
                  hydro_kn=0;
                  
@@ -399 +398 @@
                  melting_rate;
                  accumulation_rate;
+                 hydro_gamma;
                  % }}}
          end
@@ -862 +862 @@
                          md.hydro_p=2;
                          md.hydro_q=1;
-%                        md.hydro_gamma=1/(md.hydro_n*md.hydro_CR^md.hydro_p*(md.rho_water*md.g)^md.hydro_q);
                          md.hydro_kn=0;
 

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

@@ -212 +212 @@
 
 %Hydrology parameters
-%WriteData(fid,md.hydro_gamma,'Scalar','hydro_gamma');
 WriteData(fid,md.hydro_kn,'Scalar','hydro_kn');
 WriteData(fid,md.hydro_p,'Scalar','hydro_p');

issm/trunk/src/m/utils/OS/oshostname.m

@@ -6 +6 @@
 %
 
+hostname='macmathieu';
+return
 if ispc,
         [status,hostname]=system('hostname');hostname=hostname(1:end-1);