Index: /issm/trunk/src/m/classes/@pentaelem/Stress.m =================================================================== --- /issm/trunk/src/m/classes/@pentaelem/Stress.m (revision 1298) +++ /issm/trunk/src/m/classes/@pentaelem/Stress.m (revision 1299) @@ -80,5 +80,5 @@ %Build Pressure - if elementonstokes_param(pentaelem.id)==stokesenum(); + if elementonstokes_param(pentaelem.id)==StokesEnum(); pressure_g=GetParameterValue(pentaelem,pressure,gauss_coord); else %use pattyn's and MacAyeal's assumption: P=sigma_zz'+rho_ice*g*(s-z) Index: /issm/trunk/src/m/classes/@pentaelem/StressBed.m =================================================================== --- /issm/trunk/src/m/classes/@pentaelem/StressBed.m (revision 1298) +++ /issm/trunk/src/m/classes/@pentaelem/StressBed.m (revision 1299) @@ -84,5 +84,5 @@ %Build Pressure - if elementonstokes_param(pentaelem.id)==stokesenum(), + if elementonstokes_param(pentaelem.id)==StokesEnum(), pressure_g=GetParameterValue(pentaelem,pressure,gauss_coord); else %use pattyn's and MacAyeal's assumption: P=sigma_zz'+rho_ice*g*(s-z) Index: /issm/trunk/src/m/classes/@pentaelem/StressSurface.m =================================================================== --- /issm/trunk/src/m/classes/@pentaelem/StressSurface.m (revision 1298) +++ /issm/trunk/src/m/classes/@pentaelem/StressSurface.m (revision 1299) @@ -84,5 +84,5 @@ %Build Pressure - if elementonstokes_param(pentaelem.id)==stokesenum(), + if elementonstokes_param(pentaelem.id)==StokesEnum(), pressure_g=GetParameterValue(pentaelem,pressure,gauss_coord); else %use pattyn's and MacAyeal's assumption: P=sigma_zz'+rho_ice*g*(s-z) Index: /issm/trunk/src/m/solutions/cielo/SpawnCore.m =================================================================== --- /issm/trunk/src/m/solutions/cielo/SpawnCore.m (revision 1298) +++ /issm/trunk/src/m/solutions/cielo/SpawnCore.m (revision 1299) @@ -45,5 +45,5 @@ %now run the core solution -if analysis_type==diagnosticenum(), +if analysis_type==DiagnosticAnalysisEnum(), results=diagnostic_core(models,inputs); Index: /issm/trunk/src/m/solutions/cielo/thermal_core.m =================================================================== --- /issm/trunk/src/m/solutions/cielo/thermal_core.m (revision 1298) +++ /issm/trunk/src/m/solutions/cielo/thermal_core.m (revision 1299) @@ -9,5 +9,5 @@ m_m=models.m; -if m_t.parameters.sub_analysis_type==steadyenum, +if m_t.parameters.sub_analysis_type==SteadyAnalysisEnum(), results.time=0; Index: /issm/trunk/src/m/solutions/ice/ModelProcessorDiagnosticHoriz.m =================================================================== --- /issm/trunk/src/m/solutions/ice/ModelProcessorDiagnosticHoriz.m (revision 1298) +++ /issm/trunk/src/m/solutions/ice/ModelProcessorDiagnosticHoriz.m (revision 1299) @@ -24,7 +24,7 @@ %Allocate grids and elements if strcmpi(md.type,'2d'), - numberofelements_horiz=length(find(md.elements_type(:,1)==macayealenum())); -else - numberofelements_horiz=length(find(md.elements_type(:,1)==macayealenum() | md.elements_type(:,1)==pattynenum())); + numberofelements_horiz=length(find(md.elements_type(:,1)==MacAyealEnum())); +else + numberofelements_horiz=length(find(md.elements_type(:,1)==MacAyealEnum() | md.elements_type(:,1)==PattynEnum())); end elements=struct('element',cell(numberofelements_horiz,1)); @@ -34,5 +34,5 @@ %Deal with 2d elements if strcmpi(md.type,'2d'), - el3pos=find((md.elements_type(:,1)==macayealenum()) & (element_partitioning==labindex)); + el3pos=find((md.elements_type(:,1)==MacAyealEnum()) & (element_partitioning==labindex)); if ~isempty(el3pos), pos=[1:length(el3pos)]'; @@ -66,5 +66,5 @@ %3d elements %First create penta elements (ie non hutter) - el6pos=find((md.elements_type(:,1)==macayealenum() | md.elements_type(:,1)==pattynenum()) & (element_partitioning==labindex)); + el6pos=find((md.elements_type(:,1)==MacAyealEnum() | md.elements_type(:,1)==PattynEnum()) & (element_partitioning==labindex)); if ~isempty(el6pos), @@ -99,5 +99,5 @@ %For penta elements where we want to implement MacAyeal's element, we need to collapse %the formulation into trias: - pos=find(ismember(el6pos,find(md.elements_type(:,1)==macayealenum()))); + pos=find(ismember(el6pos,find(md.elements_type(:,1)==MacAyealEnum()))); elements(pos)=SetStructureField(elements(pos),'element','collapse',ones(length(pos),1)); @@ -167,5 +167,5 @@ if strcmpi(md.type,'3d'), for n=1:length(elements), - if md.elements_type(el6pos(n),1)==macayealenum(), + if md.elements_type(el6pos(n),1)==MacAyealEnum(), %all dofs associated to this element are frozen, except if the element is on the bed, and acts as a 'fake' pentaelem, %and a true 'macayeal' tria element. @@ -195,5 +195,5 @@ if strcmpi(md.type,'3d'), - if md.elements_type(md.segmentonneumann_diag(i,end))==macayealenum(), + if md.elements_type(md.segmentonneumann_diag(i,end))==MacAyealEnum(), loads(i).load=icefront; loads(i).load.eid=find(el6pos==md.segmentonneumann_diag(i,end)); @@ -203,5 +203,5 @@ loads(i).load.type='segment'; - elseif md.elements_type(md.segmentonneumann_diag(i,end))==pattynenum(), + elseif md.elements_type(md.segmentonneumann_diag(i,end))==PattynEnum(), %build a quad ice front for the penta element loads(i).load=icefront; @@ -214,10 +214,10 @@ else - if ~(md.elements_type(md.segmentonneumann_diag(i,end))==hutterenum()), + if ~(md.elements_type(md.segmentonneumann_diag(i,end))==HutterEnum()), error('diagnostic error message: unsupported element type'); end end else - if md.elements_type(md.segmentonneumann_diag(i,end))==macayealenum(), + if md.elements_type(md.segmentonneumann_diag(i,end))==MacAyealEnum(), loads(i).load=icefront; loads(i).load.eid=find(el3pos==md.segmentonneumann_diag(i,end)); @@ -228,5 +228,5 @@ else - if ~(md.elements_type(md.segmentonneumann_diag(i,end))==hutterenum()), + if ~(md.elements_type(md.segmentonneumann_diag(i,end))==HutterEnum()), error('diagnostic error message: unsupported element type'); end Index: /issm/trunk/src/m/solutions/ice/ModelProcessorDiagnosticStokes.m =================================================================== --- /issm/trunk/src/m/solutions/ice/ModelProcessorDiagnosticStokes.m (revision 1298) +++ /issm/trunk/src/m/solutions/ice/ModelProcessorDiagnosticStokes.m (revision 1299) @@ -23,5 +23,5 @@ %Allocate grids and elements -numberofstokeselements=size(find(md.elements_type(:,2)==stokesenum()),1); +numberofstokeselements=size(find(md.elements_type(:,2)==StokesEnum()),1); elements=struct('element',cell(numberofstokeselements,1)); materials=struct('material',cell(numberofstokeselements+1,1)); @@ -30,5 +30,5 @@ %3d elements %pos=find(element_partitioning==labindex); -pos=find(md.elements_type(:,2)==stokesenum()); +pos=find(md.elements_type(:,2)==StokesEnum()); stokesnewnumber=[1:numberofstokeselements]'; [elements(stokesnewnumber).element]=deal(pentaelem); @@ -116,5 +116,5 @@ %Build grids on the border of stokes %Get border grids -stokes_elements=find(md.elements_type(:,2)==stokesenum()); %find the elements on the stokes domain +stokes_elements=find(md.elements_type(:,2)==StokesEnum()); %find the elements on the stokes domain borderflags=zeros(md.numberofgrids,1); borderflags(md.elements(stokes_elements,:))=1; %find all the grids of the elements on stokes domain, ie stokes grids and borderstokes @@ -146,5 +146,5 @@ %build a quad ice front for the penta element loads(i).load=icefront; - loads(i).load.eid=find(segmentonneumann_diag_stokes(i,end)==find(md.elements_type(:,2)==stokesenum())); %elements contain only stokes elements, so we have to renumbered + loads(i).load.eid=find(segmentonneumann_diag_stokes(i,end)==find(md.elements_type(:,2)==StokesEnum())); %elements contain only stokes elements, so we have to renumbered loads(i).load.g(1)=segmentonneumann_diag_stokes(i,1); loads(i).load.g(2)=segmentonneumann_diag_stokes(i,2); Index: /issm/trunk/src/m/solutions/ice/ModelProcessorThermal.m =================================================================== --- /issm/trunk/src/m/solutions/ice/ModelProcessorThermal.m (revision 1298) +++ /issm/trunk/src/m/solutions/ice/ModelProcessorThermal.m (revision 1299) @@ -51,6 +51,6 @@ %For penta elements where we want to implement MacAyeal's element, we need to collapse %the formulation into trias: -el6pos=find((md.elements_type(:,1)==macayealenum() | md.elements_type(:,1)==pattynenum()) & (element_partitioning==labindex)); -pos2=find(ismember(el6pos,find(md.elements_type(:,1)==macayealenum()))); +el6pos=find((md.elements_type(:,1)==MacAyealEnum() | md.elements_type(:,1)==PattynEnum()) & (element_partitioning==labindex)); +pos2=find(ismember(el6pos,find(md.elements_type(:,1)==MacAyealEnum()))); elements(pos2)=SetStructureField(elements(pos2),'element','collapse',ones(length(pos2),1));