Ignore:
Timestamp:
01/27/12 08:19:58 (13 years ago)
Author:
Eric.Larour
Message:

merged trunk-jpl and trunk for revision 11236

Location:
issm/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk

  • issm/trunk/src/m/classes/prognostic.m

    r11027 r11237  
    77        properties (SetAccess=public)
    88                 spcthickness           = NaN;
     9                 min_thickness          = 0;
    910                 hydrostatic_adjustment = 0;
    1011                 stabilization          = 0;
    … …  
    3637                        obj.penalty_factor=3;
    3738
     39                        %Minimum ice thickness that can be used
     40                        obj.min_thickness=1;
     41
    3842                        %Hydrostatic adjustment
    3943                        obj.hydrostatic_adjustment='Absolute';
    … …  
    4751                        checkfield(md,'prognostic.hydrostatic_adjustment','values',{'Absolute' 'Incremental'});
    4852                        checkfield(md,'prognostic.stabilization','values',[0 1 3]);
     53                        checkfield(md,'prognostic.min_thickness','>',0);
    4954
    5055                end % }}}
    … …  
    5257                        disp(sprintf('   Prognostic solution parameters:'));
    5358                        fielddisplay(obj,'spcthickness','thickness constraints (NaN means no constraint)');
     59                        fielddisplay(obj,'min_thickness','minimum ice thickness allowed');
    5460                        fielddisplay(obj,'hydrostatic_adjustment','adjustment of ice shelves surface and bed elevations: ''Incremental'' or ''Absolute'' ');
    5561                        fielddisplay(obj,'stabilization','0->no, 1->artificial_diffusivity, 3->discontinuous Galerkin');
    … …  
    6268                function marshall(obj,fid) % {{{
    6369                        WriteData(fid,'object',obj,'fieldname','spcthickness','format','DoubleMat','mattype',1);
     70                        WriteData(fid,'object',obj,'fieldname','min_thickness','format','Double');
    6471                        WriteData(fid,'data',StringToEnum(obj.hydrostatic_adjustment),'format','Integer','enum',PrognosticHydrostaticAdjustmentEnum);
    6572                        WriteData(fid,'object',obj,'fieldname','stabilization','format','Integer');
Note: See TracChangeset for help on using the changeset viewer.