Changeset 7647

Timestamp:

03/15/11 09:06:01 (14 years ago)

Author:

Eric.Larour

Message:

added nuna field (for outcroppings) + new hydrology related fields

File:

• issm/trunk/src/m/classes/model.m (modified) (5 diffs)

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

@@ -123 +123 @@
                  meltingpoint=0;
                  beta=0;
+                 
                  mixed_layer_capacity=0;
                  thermal_exchange_velocity=0;
@@ -143 +144 @@
                  elementonicesheet=NaN;
                  elementonwater=NaN;
+                 elementonnuna=NaN;
                  gridoniceshelf=NaN;
                  gridonicesheet=NaN;
                  gridonwater=NaN;
+                 gridonnuna=NaN;
                  surface=NaN;
                  thickness=NaN;
@@ -159 +162 @@
                  spctemperature=NaN;
                  spcthickness=NaN;
+                 spcwatercolumn=NaN;
 
                  %Observations
@@ -256 +260 @@
                  melting_rate_correction_apply=NaN;
                  pressure=NaN;
-
+                 
+                 %hydrology
+                 watercolumn=NaN;
+                 hydro_n=NaN;
+                 hydro_CR=NaN;
+                 hydro_p=NaN;
+                 hydro_q=NaN;
+                 hydro_gamma=0;
+                 hydro_kn=0;
+                 
                  %Parallelisation parameters
                  cluster=NaN;
@@ -703 +716 @@
                          md.kff=1;
 
+                         %hydrology:  from Johnson's 2002 thesis, section 3.5.4
+                         md.hydro_n=.02;
+                         md.hydro_CR=2;
+                         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;
+
+
                          %i/o:
                          md.io_gather=1;