Changeset 3994

Timestamp:

06/02/10 09:54:32 (15 years ago)

Author:

Mathieu Morlighem

Message:

moved md.type to md.dim and 2d to 2, 3d to 3

Location:

issm/trunk/src/m

Files:

• classes/@model/model.m (modified) (1 diff)
• classes/public/DepthAverage.m (modified) (1 diff)
• classes/public/PropagateFlagsUntilDistance.m (modified) (1 diff)
• classes/public/SectionValues.m (modified) (2 diffs)
• classes/public/averaging.m (modified) (1 diff)
• classes/public/balvel.m (modified) (1 diff)
• classes/public/bamg.m (modified) (2 diffs)
• classes/public/collapse.m (modified) (2 diffs)
• classes/public/display/displaymesh.m (modified) (1 diff)
• classes/public/extrude.m (modified) (1 diff)
• classes/public/ismodelselfconsistent.m (modified) (10 diffs)
• classes/public/isresultconsistent.m (modified) (3 diffs)
• classes/public/marshall.m (modified) (2 diffs)
• classes/public/mechanicalproperties.m (modified) (1 diff)
• classes/public/mesh/mesh.m (modified) (1 diff)
• classes/public/mesh/meshadaptation.m (modified) (1 diff)
• classes/public/mesh/meshconvert.m (modified) (1 diff)
• classes/public/mesh/meshnodensity.m (modified) (1 diff)
• classes/public/mesh/meshrefine.m (modified) (1 diff)
• classes/public/mesh/reorder.m (modified) (1 diff)
• classes/public/mesh/rifts/meshaddrifts.m (modified) (1 diff)
• classes/public/modelsextract.m (modified) (2 diffs)
• classes/public/plot/applyoptions.m (modified) (2 diffs)
• classes/public/plot/plot_basaldrag.m (modified) (1 diff)
• classes/public/plot/plot_penalties.m (modified) (1 diff)
• classes/public/plot/plot_pressureload.m (modified) (1 diff)
• classes/public/plot/plot_section.m (modified) (2 diffs)
• classes/public/plot/plot_segments.m (modified) (1 diff)
• classes/public/plot/plot_tensor_components.m (modified) (3 diffs)
• classes/public/plot/plot_tensor_principal.m (modified) (4 diffs)
• classes/public/plot/plot_tensor_principalaxis.m (modified) (2 diffs)
• classes/public/plot/plot_transient_results.m (modified) (2 diffs)
• classes/public/plot/processdata.m (modified) (5 diffs)
• classes/public/plot/processmesh.m (modified) (1 diff)
• classes/public/setelementstype.m (modified) (1 diff)
• classes/public/slope.m (modified) (2 diffs)
• solutions/jpl/transient.m (modified) (1 diff)
• utils/BC/SetIceSheetBC.m (modified) (1 diff)
• utils/BC/SetIceShelfBC.m (modified) (1 diff)
• utils/BC/SetMarineIceSheetBC.m (modified) (1 diff)
• utils/Mesh/argusmesh.m (modified) (1 diff)
• utils/Mesh/squaremesh.m (modified) (1 diff)
• utils/Nightly/testsgetfields.m (modified) (2 diffs)
• utils/Nightly/testsgettolerance.m (modified) (1 diff)

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

@@ -23 +23 @@
         %Mesh
         md.bamg=NaN;
-        md.type='';
+        md.dim=0;
         md.numberofelements=0;
         md.numberofgrids=0;

issm/trunk/src/m/classes/public/DepthAverage.m

@@ -9 +9 @@
 
 %check that the model given in input is 3d
-if ~strcmpi(md.type,'3d');
+if ~md.dim==3;
         error('DepthAverage error message: the model given in input must be 3d')
 end

issm/trunk/src/m/classes/public/PropagateFlagsUntilDistance.m

@@ -12 +12 @@
 
 %make 3d work in 2d: 
-if strcmpi(md.type,'3d'),
+if md.dim==3,
         md.x=md.x2d;
         md.y=md.y2d;

issm/trunk/src/m/classes/public/SectionValues.m

@@ -30 +30 @@
         error('SectionValues error message: wrong resolution type. Resolution must be an array [horizontal_resolution vertical_resolution]')
 end
-if strcmpi(md.type,'3d')
+if md.dim==3
         if (length(resolution)==2 & isnumeric(resolution(2)))
                 res_v=resolution(2);
@@ -79 +79 @@
 
 %New mesh and Data interpolation
-if strcmpi(md.type,'2d')
+if (md.dim==2)
 
         %Interpolation of data on specified points

issm/trunk/src/m/classes/public/averaging.m

@@ -31 +31 @@
 %build some variables
 line=index(:);
-if strcmpi(md.type,'3d')
+if md.dim==3
         rep=6;
         areas=GetAreas(index,md.x,md.y,md.z);

issm/trunk/src/m/classes/public/balvel.m

@@ -8 +8 @@
 %      [velx,vely,vel]=balvel(md)
 
-if ~strcmpi(md.type,'2d'),
+if md.dim~=2,
         error('Only 2d meshes are allowed to compute velocity balances');
 end

issm/trunk/src/m/classes/public/bamg.m

@@ -247 +247 @@
 
 % Bamg Mesh parameters {{{1
-if (~exist(options,'domain') & md.numberofgrids~=0 & strcmpi(md.type,'2d')),
+if (~exist(options,'domain') & md.numberofgrids~=0 & md.dim==2),
 
         if isstruct(md.bamg),
@@ -313 +313 @@
 
 %Fill in rest of fields:
-md.type='2d';
+md.dim=2;
 md.numberofelements=size(md.elements,1);
 md.numberofgrids=length(md.x);

issm/trunk/src/m/classes/public/collapse.m

@@ -12 +12 @@
 
 %Check that the model is really a 3d model
-if ~strcmpi(md.type,'3d'),
+if ~md.dim==3,
         error('collapse error message: only 3d mesh can be collapsed')
 end
@@ -118 +118 @@
 
 %Update mesh type
-md.type='2d';
+md.dim=2;

issm/trunk/src/m/classes/public/display/displaymesh.m

@@ -11 +11 @@
 disp(sprintf('   Mesh:')); 
 
-if strcmpi(md.type,'3d'),
+if md.dim==3,
 
         disp(sprintf('\n      Elements and nodes of the original 2d mesh:'));

issm/trunk/src/m/classes/public/extrude.m

@@ -123 +123 @@
 
 %Update mesh type
-md.type='3d';
+md.dim=3;
 
 %Build global 3d mesh 

issm/trunk/src/m/classes/public/ismodelselfconsistent.m

@@ -23 +23 @@
 
         %recursive call to ismodelselfconsistent
-        if strcmpi(md.type,'2d'),
+        if (md.dim==2),
                 analysis=[DiagnosticAnalysisEnum PrognosticAnalysisEnum];
         else
@@ -58 +58 @@
         error(['model not consistent: types of elements have not been set properly, run setelementstype first'])
 end
-if strcmpi(md.type,'2d'),
+if (md.dim==2),
         if (ismember(PattynFormulationEnum,md.elements_type(:,1)) |  ismember(StokesFormulationEnum,md.elements_type(:,2))),
                 error(['model not consistent: for a 2d model, only MacAyeal''s and Hutter''s elements are allowed']);
@@ -74 +74 @@
 
 %ICEFRONT
-if strcmpi(md.type,'2d'),
+if (md.dim==2),
         fields={'pressureload'};
         checksize(md,fields,[NaN 4]);
-elseif strcmpi(md.type,'3d'),
+elseif md.dim==3,
         fields={'pressureload'};
         checksize(md,fields,[NaN 6]);
@@ -86 +86 @@
 %ELEMENTS
 fields={'elements'};
-if strcmpi(md.type,'2d'),
+if (md.dim==2),
         checksize(md,fields,[md.numberofelements 3]);
 else
@@ -129 +129 @@
 %RIFTS
 if md.numrifts,
-        if ~strcmpi(md.type,'2d'),
+        if ~(md.dim==2),
                 error(['model not consistent: models with rifts are only supported in 2d for now!']);
         end
@@ -158 +158 @@
 
 %CONNECTIVITY
-if strcmpi(md.type,'2d'),
+if (md.dim==2),
         if md.connectivity<9, 
                 error('model not consistent: connectivity should be at least 9 for 2d models');
         end
 end
-if strcmpi(md.type,'3d'),
+if md.dim==3,
         if md.connectivity<24, 
                 error('model not consistent: connectivity should be at least 24 for 3d models');
@@ -224 +224 @@
 
         %CHECK THAT WE ARE NOT FULLY CONSTRAINED
-        if strcmpi(md.type,'2d'),
+        if (md.dim==2),
                 if isempty(find(~md.spcvelocity(:,1:2))),
                         error(['model not consistent: model ' md.name ' is totally constrained, no need to solve!']);
@@ -264 +264 @@
 
         %CHECK THAT WE ARE NOT FULLY CONSTRAINED
-        if strcmpi(md.type,'2d'),
+        if (md.dim==2),
                 if isempty(find(~md.spcthickness(:,1))),
                         error(['model not consistent: model ' md.name ' is totally constrained for prognostic, no need to solve!']);
@@ -291 +291 @@
 
         %dim: 
-        if strcmpi(md.type,'2d'),
+        if (md.dim==2),
                 error(['model not consistent: for a steadystate computation, model needs to be 3d']);
         end
@@ -300 +300 @@
 
         %EXTRUSION
-        if strcmp(md.type,'2d'),
+        if (md.dim==2),
                 error(['model not consistent: for a ' md.analysis_type ' computation, the model must be 3d, extrude it first!'])
         end
 
         %CHECK THAT WE ARE NOT FULLY CONSTRAINED
-        if strcmpi(md.type,'2d'),
-                if isempty(find(~md.spctemperature(:,1))),
-                        error(['model not consistent: model ' md.name ' is totally constrained for temperature, no need to solve!']);
-                end
+        if isempty(find(~md.spctemperature(:,1))),
+                error(['model not consistent: model ' md.name ' is totally constrained for temperature, no need to solve!']);
         end
 

issm/trunk/src/m/classes/public/isresultconsistent.m

@@ -28 +28 @@
 if analysis_type==DiagnosticAnalysisEnum() & md.control_analysis==0,
 
-        if strcmpi(md.type,'3d')
+        if (md.dim==3)
                 fields1={'results.DiagnosticAnalysis.vx','results.DiagnosticAnalysis.vy','results.DiagnosticAnalysis.vz','results.DiagnosticAnalysis.vel'};
                 fields2={'results.DiagnosticAnalysis.vel'};
@@ -158 +158 @@
         for iter=1:length(md.results.TransientAnalysis)
 
-                if strcmpi(md.type,'3d'),
+                if (md.dim==3),
                         fields1={['results.TransientAnalysis(' num2str(iter) ').vx'],['results.TransientAnalysis(' num2str(iter) ').vy'],...
                                 ['results.TransientAnalysis(' num2str(iter) ').vz'],['results.TransientAnalysis(' num2str(iter) ').vel'],...
@@ -195 +195 @@
 
                 %check melting (<=0 via penalties)
-                if strcmpi(md.type,'3d'),
+                if (md.dim==3),
                         if any(abs(md.results.TransientAnalysis(iter).melting(md.numberofgrids2d+1:end))>tolerance)
                                 disp(['''thermal'' result not consistent: increase penalty_melting (negative melting)']);

issm/trunk/src/m/classes/public/marshall.m

@@ -24 +24 @@
 WriteData(fid,md.analysis_type','Integer','analysis_type');
 WriteData(fid,md.sub_analysis_type','Integer','sub_analysis_type');
-WriteData(fid,md.type,'String','type');
+WriteData(fid,md.dim,'Integer','dim');
 WriteData(fid,md.numberofgrids,'Integer','numberofgrids');
 WriteData(fid,md.numberofelements,'Integer','numberofelements');
@@ -35 +35 @@
 WriteData(fid,md.gridonmacayeal,'Mat','gridonmacayeal');
 
-if strcmpi(md.type,'3d'),
+if md.dim==3,
         WriteData(fid,md.numberofelements2d,'Integer','numberofelements2d');
         WriteData(fid,md.numberofgrids2d,'Integer','numberofgrids2d');

issm/trunk/src/m/classes/public/mechanicalproperties.m

@@ -17 +17 @@
         error(['the input velocity should be of size ' num2str(md.numberofgrids) '!'])
 end
-if ~strcmpi(md.type,'2d')
+if ~(md.dim==2)
         error('only 2d model supported yet');
 end

issm/trunk/src/m/classes/public/mesh/mesh.m

@@ -91 +91 @@
 
 %type of model
-md.type='2d';
+md.dim=2;
         
 %augment counter  keeping track of what has been done to this model

issm/trunk/src/m/classes/public/mesh/meshadaptation.m

@@ -14 +14 @@
 
 %some checks
-if ~strcmpi(md.type,'2d')
+if ~(md.dim==2)
         error('meshadaptation error message: adaptation for 3d meshes not implemented yet')
 end

issm/trunk/src/m/classes/public/mesh/meshconvert.m

@@ -36 +36 @@
 
 %Fill in rest of fields:
-md.type='2d';
+md.dim=2;
 md.numberofelements=size(md.elements,1);
 md.numberofgrids=length(md.x);

issm/trunk/src/m/classes/public/mesh/meshnodensity.m

@@ -77 +77 @@
 
 %type of model
-md.type='2d';
+md.dim=2;
         
 %augment counter  keeping track of what has been done to this model

issm/trunk/src/m/classes/public/mesh/meshrefine.m

@@ -34 +34 @@
 
 %type of model
-md.type='2d';
+md.dim=2;
         
 %augment counter  keeping track of what has been done to this model

issm/trunk/src/m/classes/public/mesh/reorder.m

@@ -9 +9 @@
         error('reorder error message: no existing mesh, exiting...')
 end
-if strcmpi(md.type,'3d'),
+if md.dim==3,
         error('reorder error message: 3d models not supported yet, exiting...')
 end

issm/trunk/src/m/classes/public/mesh/rifts/meshaddrifts.m

@@ -91 +91 @@
 
 %type of model
-md.type='2d';
+md.dim=2;
         
 %augment counter  keeping track of what has been done to this model

issm/trunk/src/m/classes/public/modelsextract.m

@@ -21 +21 @@
 
 %2D or 3D?
-if strcmpi(md.type,'3d'),
+if md.dim==3,
         numberofelements=md.numberofelements2d; %this will be forgotten when we get out.
         flags=project2d(md,flags,1);
@@ -73 +73 @@
 for i=1:size(flag_list,1),
         disp(['   ' num2str(i) '/' num2str(size(flag_list,1))]);
-        if strcmpi(md.type,'3d'),
+        if md.dim==3,
                 flags2d=flag_list{i};
                 realflags=project3d(md,flags2d,'element');

issm/trunk/src/m/classes/public/plot/applyoptions.m

@@ -43 +43 @@
 
 %view 
-if strcmpi(md.type,'3d') & ~exist(options,'layer'),
+if md.dim==3 & ~exist(options,'layer'),
         view(getfieldvalue(options,'view',3));
 else
@@ -61 +61 @@
         eval(['axis ' getfieldvalue(options,'axis')]);
 else
-        if (strcmpi(md.type,'2d') | exist(options,'layer')),
+        if ((md.dim==2) | exist(options,'layer')),
                 axis tight equal;
         else

issm/trunk/src/m/classes/public/plot/plot_basaldrag.m

@@ -9 +9 @@
 
 %check layer
-if strcmpi(md.type,'3d')
+if md.dim==3,
         if getfieldvalue(options,'layer',1)~=1;
                 disp('plot_basaldrag warning: basal drag is displayed in the lower layer')

issm/trunk/src/m/classes/public/plot/plot_penalties.m

@@ -21 +21 @@
 end
 
-if ~strcmpi(md.type,'3d'),
+if ~md.dim==3,
         error('no penalties to plot for ''2d'' model');
 elseif isempty(md.penalties),

issm/trunk/src/m/classes/public/plot/plot_pressureload.m

@@ -14 +14 @@
 pressureload=md.pressureload;
 
-if strcmpi(md.type,'2d'),
+if (md.dim==2),
 
         %plot mesh

issm/trunk/src/m/classes/public/plot/plot_section.m

@@ -26 +26 @@
 %replug x and y onto model so that SectionValue treats the problem correctly
 if exist(options,'layer')
-        md.x=md.x2d; md.y=md.y2d; md.elements=md.elements2d; md.type='2d';
+        md.x=md.x2d; md.y=md.y2d; md.elements=md.elements2d; md.dim=2;
 end
 
@@ -165 +165 @@
 %apply options
 options=addfielddefault(options,'title','Section value');
-if strcmpi(md.type,'2d')
+if (md.dim==2)
         options=addfielddefault(options,'colorbar',0);
 end
-if (strcmpi(md.type,'2d') | getfieldvalue(options,'view')==2 )
+if ((md.dim==2) | getfieldvalue(options,'view')==2 )
         options=addfielddefault(options,'xlabel','Curvilinear coordinate');
         options=addfielddefault(options,'axis','auto');
 end
-if (strcmpi(md.type,'3d') & getfieldvalue(options,'view')==2 )
+if (md.dim==3 & getfieldvalue(options,'view')==2 )
         options=addfielddefault(options,'ylabel','z');
 end

issm/trunk/src/m/classes/public/plot/plot_segments.m

@@ -14 +14 @@
 segments=md.segments;
 
-if strcmpi(md.type,'2d'),
+if (md.dim==2),
         %plot mesh
         A=elements(:,1); B=elements(:,2); C=elements(:,3); 

issm/trunk/src/m/classes/public/plot/plot_tensor_components.m

@@ -10 +10 @@
 upperplots=fix((i-1)/width);
 if upperplots==0, leftplots=i-1; else leftplots=i-width*upperplots-1; end
-if strcmpi(md.type,'2d')%3 components -> 3 indexes
+if (md.dim==2)%3 components -> 3 indexes
         index1=4*width*upperplots+2*leftplots+1;
         index2=index1+1;
         index3=index1+width*2;
-elseif strcmpi(md.type,'3d')%6 components -> 6 indexes
+elseif md.dim==3%6 components -> 6 indexes
         index1=3*3*width*upperplots+3*leftplots+1;
         index2=index1+1;
@@ -28 +28 @@
 [tensor.yy isongrid isquiver]=processdata(md,tensor.yy,options);
 [tensor.xy isongrid isquiver]=processdata(md,tensor.xy,options);
-if  strcmpi(md.type,'3d')
+if  md.dim==3
         [tensor.xz isongrid isquiver]=processdata(md,tensor.xz,options);
         [tensor.yz isongrid isquiver]=processdata(md,tensor.yz,options);
@@ -34 +34 @@
 end
 
-if (strcmpi(md.type,'2d')),
+if ((md.dim==2)),
         subplot(2*width,2*width,index1),
         plot_unit(x,y,z,elements,tensor.xx,isongrid,is2d,isquiver,options)

issm/trunk/src/m/classes/public/plot/plot_tensor_principal.m

@@ -10 +10 @@
 upperplots=fix((i-1)/width);
 if upperplots==0, leftplots=i-1; else leftplots=i-width*upperplots-1; end
-if strcmpi(md.type,'2d')%3 components -> 3 indexes
+if (md.dim==2)%3 components -> 3 indexes
         index1=4*width*upperplots+2*leftplots+1;
         index2=index1+1;
@@ -16 +16 @@
         index4=index3+1;
         newwidth=2*width;
-elseif strcmpi(md.type,'3d')%6 components -> 6 indexes
+elseif md.dim==3%6 components -> 6 indexes
         index1=3*3*width*upperplots+3*leftplots+1;
         index2=index1+1;
@@ -31 +31 @@
 type2=[type 'axis2'];
 plot_tensor_principalaxis(md,options,newwidth,index2,tensor,type2,plot_options);
-if  strcmpi(md.type,'3d')
+if  md.dim==3
         type3=[type 'axis3'];
         plot_tensor_principalaxis(md,options,newwidth,index3,tensor,type3,plot_options);
@@ -40 +40 @@
 [tensor.principalvalue1 isongrid isquiver]=processdata(md,tensor.principalvalue1,options);
 [tensor.principalvalue2 isongrid isquiver]=processdata(md,tensor.principalvalue2,options);
-if  strcmpi(md.type,'3d')
+if  md.dim==3
         [tensor.principalvalue3 isongrid isquiver]=processdata(md,tensor.principalvalue3,options);
 end
 
-if (strcmpi(md.type,'2d')),
+if ((md.dim==2)),
         subplot(2*width,2*width,index3)
         plot_unit(x,y,z,elements,tensor.principalvalue1,isongrid,is2d,isquiver,options)

issm/trunk/src/m/classes/public/plot/plot_tensor_principalaxis.m

@@ -13 +13 @@
 [x y z elements is2d]=processmesh(md,options);
 
-if (strcmpi(md.type,'2d')),
+if ((md.dim==2)),
         eval(['Vx=tensor.principalaxis' type(end) '(:,1); Vy=tensor.principalaxis' type(end) '(:,2);'])
         eval(['value=tensor.principalvalue' type(end) ';']);
@@ -33 +33 @@
 
 %plot quivers
-if strcmpi(md.type,'2d'),
+if (md.dim==2),
 
         %density

issm/trunk/src/m/classes/public/plot/plot_transient_results.m

@@ -41 +41 @@
 clear string;
 
-if strcmpi(md.type,'3d'),
+if md.dim==3,
         string='plotmodel(md';
         for i=1:length(md.results.transient),
@@ -67 +67 @@
 clear string;
 
-if strcmpi(md.type,'3d'),
+if md.dim==3,
         string='plotmodel(md';
         for i=2:length(md.results.transient),

issm/trunk/src/m/classes/public/plot/processdata.m

@@ -25 +25 @@
 
 %check length
-if datasize(1)~=md.numberofgrids & datasize(1)~=md.numberofelements & datasize(1)~=md.numberofgrids*6 & (strcmpi(md.type,'3d') & ~(datasize(1)==md.numberofelements2d | datasize(1)==md.numberofgrids2d))
+if datasize(1)~=md.numberofgrids & datasize(1)~=md.numberofelements & datasize(1)~=md.numberofgrids*6 & (md.dim==3 & ~(datasize(1)==md.numberofelements2d | datasize(1)==md.numberofgrids2d))
         error('plotmodel error message: data not supported yet');
 end
@@ -34 +34 @@
 
         %check number of columns, add zeros if necessary,
-        if (strcmpi(md.type,'3d'))
+        if (md.dim==3)
                 if datasize(2)==2,
                         data=[data, zeros(datasize(1),1)];
@@ -40 +40 @@
                         error('plotmodel error message: data provided should have 2 or 3 columns for quiver plot, and 1 for regular plot');
                 end
-        elseif (strcmpi(md.type,'2d') & datasize(2)~=2),
+        elseif ((md.dim==2) & datasize(2)~=2),
                 error('plotmodel error message: data provided should have 2 columns for quiver plot, and 1 for regular plot');
         end
@@ -59 +59 @@
 
 %treat the case datasize(1)=grids2d
-if (strcmpi(md.type,'3d') & datasize(1)==md.numberofgrids2d),
+if (md.dim==3 & datasize(1)==md.numberofgrids2d),
         data=project3d(md,data,'node');
         datasize(1)=md.numberofgrids;
@@ -66 +66 @@
 
 %treat the case datasize(1)=grids2d
-if (strcmpi(md.type,'3d') & datasize(1)==md.numberofelements2d),
+if (md.dim==3 & datasize(1)==md.numberofelements2d),
         data=project3d(md,data,'element');
         datasize(1)=md.numberofelements;

issm/trunk/src/m/classes/public/plot/processmesh.m

@@ -24 +24 @@
 
 %is it a 2d plot?
-if strcmpi(md.type,'2d');
+if (md.dim==2);
         is2d=1;
 else

issm/trunk/src/m/classes/public/setelementstype.m

@@ -51 +51 @@
 
 %Check that no pattyn or stokes for 2d mesh
-if strcmpi(md.type,'2d'),
+if (md.dim==2),
         if any(stokesflag | pattynflag)
                 error('setelementstype error message: stokes and pattyn elements no allowed in 2d mesh, extrude it first')

issm/trunk/src/m/classes/public/slope.m

@@ -6 +6 @@
 
 %load some variables (it is much faster if the variab;es are loaded from md once for all) 
-if strcmpi(md.type,'2d'),
+if (md.dim==2),
         numberofelements=md.numberofelements;
         numberofgrids=md.numberofgrids;
@@ -26 +26 @@
 s=sqrt(sx.^2+sy.^2);
 
-if strcmpi(md.type,'3d'),
+if md.dim==3,
         sx=project3d(md,sx,'element');
         sy=project3d(md,sy,'element');

issm/trunk/src/m/solutions/jpl/transient.m

@@ -8 +8 @@
 t1=clock;
 
-if strcmpi(md.type,'2d'),
+if (md.dim==2),
         md=transient2d(md);
 else

issm/trunk/src/m/utils/BC/SetIceSheetBC.m

@@ -21 +21 @@
 
 %segment on neumann (Ice Front) -> none
-if strcmpi(md.type,'2d')
+if (md.dim==2)
         md.pressureload=zeros(0,4);
 else

issm/trunk/src/m/utils/BC/SetIceShelfBC.m

@@ -35 +35 @@
 %segment on Neumann (Ice Front)
 pos=find(gridonicefront(md.segments(:,1)) | gridonicefront(md.segments(:,2)));
-if strcmpi(md.type,'2d')
+if (md.dim==2)
         pressureload=md.segments(pos,:);
-elseif strcmpi(md.type,'3d')
+elseif md.dim==3
         pressureload_layer1=[md.segments(pos,1:2)  md.segments(pos,2)+md.numberofgrids2d  md.segments(pos,1)+md.numberofgrids2d  md.segments(pos,3)];
         pressureload=[];

issm/trunk/src/m/utils/BC/SetMarineIceSheetBC.m

@@ -46 +46 @@
 %segment on Neumann (Ice Front)
 pos=find(gridonicefront(md.segments(:,1)) | gridonicefront(md.segments(:,2)));
-if strcmpi(md.type,'2d')
+if (md.dim==2)
         pressureload=md.segments(pos,:);
-elseif strcmpi(md.type,'3d')
+elseif md.dim==3
         pressureload_layer1=[md.segments(pos,1:2)  md.segments(pos,2)+md.numberofgrids2d  md.segments(pos,1)+md.numberofgrids2d  md.segments(pos,3)];
         pressureload=[];

issm/trunk/src/m/utils/Mesh/argusmesh.m

@@ -88 +88 @@
 md.elementonsurface=ones(md.numberofelements,1);
 md.counter=1;
-md.type='2d';
+md.dim=2;
 md.riftoutline='';
 md.domainoutline=['' infile ''];

issm/trunk/src/m/utils/Mesh/squaremesh.m

@@ -73 +73 @@
 
 %plug other field
-md.type='2d';
+md.dim=2;
 md.counter=1;
 md.riftoutline='';

issm/trunk/src/m/utils/Nightly/testsgetfields.m

@@ -27 +27 @@
                 fields={'dakota.importancefactors'};
         else
-                if strcmpi(md.type,'3d')
+                if md.dim==3
                         fields={'DiagnosticAnalysis.vy','DiagnosticAnalysis.vz'};
                 else
@@ -44 +44 @@
 
 elseif (analysis_type==TransientAnalysisEnum), 
-        if strcmpi(md.type,'3d')
+        if md.dim==3
                 fields={'TransientAnalysis(end).vel','TransientAnalysis(end).pressure','TransientAnalysis(end).temperature','TransientAnalysis(end).melting','TransientAnalysis(end).thickness','TransientAnalysis(end).surface','TransientAnalysis(end).bed'};
         else

issm/trunk/src/m/utils/Nightly/testsgettolerance.m

@@ -35 +35 @@
 
         elseif (analysis_type==TransientAnalysisEnum),
-                if strcmpi(md.type,'2d'),
+                if (md.dim==2),
                         tolerance=10^-11;
                 else