Changeset 8454

Timestamp:

05/31/11 15:08:44 (14 years ago)

Author:

Mathieu Morlighem

Message:

Fixed parametercontrolB and updated plot_basaldrag so that Neff>=0

Location:

issm/trunk/src/m/model

Files:

• parameterization/parametercontrolB.m (modified) (2 diffs)
• plot/plot_basaldrag.m (modified) (1 diff)

issm/trunk/src/m/model/parameterization/parametercontrolB.m

@@ -39 +39 @@
 end
 
+
 %cm_min
-cm_min=getfieldvalue(options,'cm_min',1);
-if (length(cm_min)~=1)
-        md.cm_min=1;
+cm_min=getfieldvalue(options,'cm_min',paterson(273.15+5)*ones(md.numberofnodes,1));
+if (length(cm_min)==1)
+        md.cm_min=cm_min*ones(md.numberofnodes,1);
+elseif (length(cm_min)==md.numberofnodes)
+        md.cm_min=cm_min;
 else
         md.cm_min=cm_min;
@@ -48 +51 @@
 
 %cm_max
-cm_max=getfieldvalue(options,'cm_max',10^10);
-if (length(cm_max)~=1)
-        md.cm_max=10^10;
+cm_max=getfieldvalue(options,'cm_max',paterson(273.15-70)*ones(md.numberofnodes,1));
+if (length(cm_max)==1)
+        md.cm_max=cm_max*ones(md.numberofnodes,1);
+elseif (length(cm_max)==md.numberofnodes)
+        md.cm_max=cm_max;
 else
         md.cm_max=cm_max;

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

@@ -30 +30 @@
 
 %compute basal drag
-drag=(md.g*(md.rho_ice*md.thickness+md.rho_water*md.bed)).^r.*(md.drag_coefficient).^2.*ub.^s/1000;
+drag=(max(md.g*(md.rho_ice*md.thickness+md.rho_water*md.bed),0)).^r.*(md.drag_coefficient).^2.*ub.^s/1000;
 
 %Figure out if this is a Section plot