Changeset 11234


Ignore:
Timestamp:
01/27/12 06:25:30 (13 years ago)
Author:
Eric.Larour
Message:

Merge of trunk and trunk-jpl

Location:
issm/trunk-jpl/src/m/model
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/m/model/extrude.m

    r9848 r11234  
    5959
    6060if numlayers<2,
    61         disp('number of layers should be at least 2. returning initial model...');
    62         return
     61        error('number of layers should be at least 2');
     62end
     63if md.mesh.dimension==3,
     64        error('Cannot extrude a 3d mesh (extrude cannot be called more than once)');
    6365end
    6466
  • issm/trunk-jpl/src/m/model/parameterization/parameterize.m

    r9641 r11234  
    3636
    3737        %rename parameter file
     38        me2.message=regexprep(me2.message,[temporaryname '.m'],parametername);
    3839        for i=1:length(me2.stack)-1,
    39                 if (strncmp(fliplr(me2.stack(i).file),fliplr([temporaryname '.m']),length(temporaryname)+2))
    40                         me2.stack(i).file=parametername;
    41                 end
    42                 if strcmp(me2.stack(i).name,temporaryname),
    43                         me2.stack(i).name=parametername;
    44                 end
    45                 if strcmp(me2.stack(i).name,temporaryname),
    46                         %remove parameterize.m error "TemporaryParameterFile" misleading
     40                me2.stack(i).file=regexprep(me2.stack(i).file,[temporaryname '.m'],parametername);
     41                me2.stack(i).name=regexprep(me2.stack(i).name,[temporaryname '.m'],parametername);
     42                if strcmp(me2.stack(i).name,'parameterize'),
     43                        %remove error (eval(temporaryname);) misleading
    4744                        me2.stack(i)=[];
    4845                end
  • issm/trunk-jpl/src/m/model/plot/processmesh.m

    r9734 r11234  
    88
    99%some checks
     10if md.mesh.numberofvertices==0,
     11        error('plot error message: mesh is empty')
     12end
    1013if md.mesh.numberofvertices==md.mesh.numberofelements
    11         error('plot error message: the number of elements is the same as the number of nodes! cannot plot anything with model/plot, use matlab/plot instead')
     14        error(['plot error message: the number of elements is the same as the number of nodes...']);
    1215end
    1316
  • issm/trunk-jpl/src/m/model/setmask.m

    r9734 r11234  
    11function md=setmask(md,floatingicename,groundedicename)
    2 %GEOGRAPHY - establish boundaries between grounded and floating ice.
     2%SETMASK - establish boundaries between grounded and floating ice.
    33%
    44%   By default, ice is considered grounded. The contour floatingicename defines nodes
Note: See TracChangeset for help on using the changeset viewer.