Changeset 8454


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/m/model/parameterization/parametercontrolB.m

    r8298 r8454  
    3939end
    4040
     41
    4142%cm_min
    42 cm_min=getfieldvalue(options,'cm_min',1);
    43 if (length(cm_min)~=1)
    44         md.cm_min=1;
     43cm_min=getfieldvalue(options,'cm_min',paterson(273.15+5)*ones(md.numberofnodes,1));
     44if (length(cm_min)==1)
     45        md.cm_min=cm_min*ones(md.numberofnodes,1);
     46elseif (length(cm_min)==md.numberofnodes)
     47        md.cm_min=cm_min;
    4548else
    4649        md.cm_min=cm_min;
     
    4851
    4952%cm_max
    50 cm_max=getfieldvalue(options,'cm_max',10^10);
    51 if (length(cm_max)~=1)
    52         md.cm_max=10^10;
     53cm_max=getfieldvalue(options,'cm_max',paterson(273.15-70)*ones(md.numberofnodes,1));
     54if (length(cm_max)==1)
     55        md.cm_max=cm_max*ones(md.numberofnodes,1);
     56elseif (length(cm_max)==md.numberofnodes)
     57        md.cm_max=cm_max;
    5358else
    5459        md.cm_max=cm_max;
  • issm/trunk/src/m/model/plot/plot_basaldrag.m

    r6340 r8454  
    3030
    3131%compute basal drag
    32 drag=(md.g*(md.rho_ice*md.thickness+md.rho_water*md.bed)).^r.*(md.drag_coefficient).^2.*ub.^s/1000;
     32drag=(max(md.g*(md.rho_ice*md.thickness+md.rho_water*md.bed),0)).^r.*(md.drag_coefficient).^2.*ub.^s/1000;
    3333
    3434%Figure out if this is a Section plot
Note: See TracChangeset for help on using the changeset viewer.