Index: /issm/trunk-jpl/test/NightlyRun/test2002.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2002.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test2002.m (revision 24862) @@ -41,9 +41,9 @@ %make sure that the ice level set is all inclusive: md.mask.land_levelset=zeros(md.mesh.numberofvertices,1); -md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1); +md.mask.ocean_levelset=-ones(md.mesh.numberofvertices,1); %make sure that the elements that have loads are fully grounded: pos=find(md.slr.deltathickness); -md.mask.groundedice_levelset(md.mesh.elements(pos,:))=1; +md.mask.ocean_levelset(md.mesh.elements(pos,:))=1; %make sure wherever there is an ice load, that the mask is set to ice: Index: /issm/trunk-jpl/test/NightlyRun/test2002.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2002.py (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test2002.py (revision 24862) @@ -55,9 +55,9 @@ #make sure that the ice level set is all inclusive: md.mask.land_levelset = np.zeros((md.mesh.numberofvertices)) -md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices)) +md.mask.ocean_levelset = -np.ones((md.mesh.numberofvertices)) #make sure that the elements that have loads are fully grounded: pos = np.nonzero(md.slr.deltathickness)[0] -md.mask.groundedice_levelset[md.mesh.elements[pos, :] - 1] = 1 +md.mask.ocean_levelset[md.mesh.elements[pos, :] - 1] = 1 #make sure wherever there is an ice load, that the mask is set to ice: Index: /issm/trunk-jpl/test/NightlyRun/test2003.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2003.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test2003.m (revision 24862) @@ -39,9 +39,9 @@ %make sure that the ice level set is all inclusive: md.mask.land_levelset=zeros(md.mesh.numberofvertices,1); -md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1); +md.mask.ocean_levelset=-ones(md.mesh.numberofvertices,1); %make sure that the elements that have loads are fully grounded: pos=find(md.slr.deltathickness); -md.mask.groundedice_levelset(md.mesh.elements(pos,:))=1; +md.mask.ocean_levelset(md.mesh.elements(pos,:))=1; %make sure wherever there is an ice load, that the mask is set to ice: Index: /issm/trunk-jpl/test/NightlyRun/test2003.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2003.py (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test2003.py (revision 24862) @@ -58,9 +58,9 @@ #make sure that the ice level set is all inclusive: md.mask.land_levelset = np.zeros((md.mesh.numberofvertices, )) -md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices, )) +md.mask.ocean_levelset = -np.ones((md.mesh.numberofvertices, )) #make sure that the elements that have loads are fully grounded: pos = np.nonzero(md.slr.deltathickness)[0] -md.mask.groundedice_levelset[md.mesh.elements[pos, :] - 1] = 1 +md.mask.ocean_levelset[md.mesh.elements[pos, :] - 1] = 1 #make sure wherever there is an ice load, that the mask is set to ice: Index: /issm/trunk-jpl/test/NightlyRun/test2010.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2010.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test2010.m (revision 24862) @@ -42,9 +42,9 @@ %make sure that the ice level set is all inclusive: md.mask.land_levelset=zeros(md.mesh.numberofvertices,1); -md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1); +md.mask.ocean_levelset=-ones(md.mesh.numberofvertices,1); %make sure that the elements that have loads are fully grounded: pos=find(md.slr.deltathickness); -md.mask.groundedice_levelset(md.mesh.elements(pos,:))=1; +md.mask.ocean_levelset(md.mesh.elements(pos,:))=1; %make sure wherever there is an ice load, that the mask is set to ice: Index: /issm/trunk-jpl/test/NightlyRun/test2010.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2010.py (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test2010.py (revision 24862) @@ -58,9 +58,9 @@ #make sure that the ice level set is all inclusive: md.mask.land_levelset = np.zeros((md.mesh.numberofvertices, )) -md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices, )) +md.mask.ocean_levelset = -np.ones((md.mesh.numberofvertices, )) #make sure that the elements that have loads are fully grounded: pos = np.nonzero(md.slr.deltathickness)[0] -md.mask.groundedice_levelset[md.mesh.elements[pos, :] - 1] = 1 +md.mask.ocean_levelset[md.mesh.elements[pos, :] - 1] = 1 #make sure wherever there is an ice load, that the mask is set to ice: Index: /issm/trunk-jpl/test/NightlyRun/test2101.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2101.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test2101.m (revision 24862) @@ -24,6 +24,6 @@ %is ice grounded? - md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1); - pos=find(md.mask.ice_levelset<=0); md.mask.groundedice_levelset(pos)=1; + md.mask.ocean_levelset=-ones(md.mesh.numberofvertices,1); + pos=find(md.mask.ice_levelset<=0); md.mask.ocean_levelset(pos)=1; %make sure ice domain is on the continent: Index: /issm/trunk-jpl/test/NightlyRun/test2101.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2101.py (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test2101.py (revision 24862) @@ -38,7 +38,7 @@ #is ice grounded? -md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices, )) +md.mask.ocean_levelset = -np.ones((md.mesh.numberofvertices, )) pos = np.where(md.mask.ice_levelset <= 0) -md.mask.groundedice_levelset[pos] = 1 +md.mask.ocean_levelset[pos] = 1 #make sure ice domain is on the continent: Index: /issm/trunk-jpl/test/NightlyRun/test2110.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2110.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test2110.m (revision 24862) @@ -26,6 +26,6 @@ %is ice grounded? - md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1); - pos=find(md.mask.ice_levelset<=0); md.mask.groundedice_levelset(pos)=1; + md.mask.ocean_levelset=-ones(md.mesh.numberofvertices,1); + pos=find(md.mask.ice_levelset<=0); md.mask.ocean_levelset(pos)=1; % }}} Index: /issm/trunk-jpl/test/NightlyRun/test2110.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2110.py (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test2110.py (revision 24862) @@ -37,7 +37,7 @@ #is ice grounded? -md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices, )) +md.mask.ocean_levelset = -np.ones((md.mesh.numberofvertices, )) pos = np.where(md.mask.ice_levelset <= 0) -md.mask.groundedice_levelset[pos] = 1 +md.mask.ocean_levelset[pos] = 1 # }}} Index: /issm/trunk-jpl/test/NightlyRun/test2111.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2111.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test2111.m (revision 24862) @@ -26,6 +26,6 @@ %is ice grounded? - md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1); - pos=find(md.mask.ice_levelset<=0); md.mask.groundedice_levelset(pos)=1; + md.mask.ocean_levelset=-ones(md.mesh.numberofvertices,1); + pos=find(md.mask.ice_levelset<=0); md.mask.ocean_levelset(pos)=1; % }}} %geometry: {{{ Index: /issm/trunk-jpl/test/NightlyRun/test2111.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2111.py (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test2111.py (revision 24862) @@ -37,7 +37,7 @@ #is ice grounded? -md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices, )) +md.mask.ocean_levelset = -np.ones((md.mesh.numberofvertices, )) pos = np.where(md.mask.ice_levelset <= 0) -md.mask.groundedice_levelset[pos] = 1 +md.mask.ocean_levelset[pos] = 1 # }}} #geometry: {{{ Index: /issm/trunk-jpl/test/NightlyRun/test2112.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2112.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test2112.m (revision 24862) @@ -26,6 +26,6 @@ %is ice grounded? - md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1); - pos=find(md.mask.ice_levelset<=0); md.mask.groundedice_levelset(pos)=1; + md.mask.ocean_levelset=-ones(md.mesh.numberofvertices,1); + pos=find(md.mask.ice_levelset<=0); md.mask.ocean_levelset(pos)=1; % }}} %geometry: {{{ Index: /issm/trunk-jpl/test/NightlyRun/test2112.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2112.py (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test2112.py (revision 24862) @@ -36,7 +36,7 @@ #is ice grounded? -md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices, )) +md.mask.ocean_levelset = -np.ones((md.mesh.numberofvertices, )) pos = np.where(md.mask.ice_levelset <= 0) -md.mask.groundedice_levelset[pos] = 1 +md.mask.ocean_levelset[pos] = 1 # }}} #geometry: {{{ Index: /issm/trunk-jpl/test/NightlyRun/test2113.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2113.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test2113.m (revision 24862) @@ -27,6 +27,6 @@ %is ice grounded? - md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1); - pos=find(md.mask.ice_levelset<=0); md.mask.groundedice_levelset(pos)=1; + md.mask.ocean_levelset=-ones(md.mesh.numberofvertices,1); + pos=find(md.mask.ice_levelset<=0); md.mask.ocean_levelset(pos)=1; % }}} %geometry: {{{ Index: /issm/trunk-jpl/test/NightlyRun/test2113.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2113.py (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test2113.py (revision 24862) @@ -38,7 +38,7 @@ #is ice grounded? -md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices, )) +md.mask.ocean_levelset = -np.ones((md.mesh.numberofvertices, )) pos = np.where(md.mask.ice_levelset <= 0) -md.mask.groundedice_levelset[pos] = 1 +md.mask.ocean_levelset[pos] = 1 # }}} #geometry: {{{ Index: /issm/trunk-jpl/test/NightlyRun/test2424.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2424.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test2424.m (revision 24862) @@ -35,4 +35,4 @@ field_names{end+1}=sprintf('Time-%g-yr-ice_levelset-S-sl-(1-di)*H',md.results.TransientSolution(i).time); field_tolerances{end+1}=1e-12; - field_values{end+1}= md.results.TransientSolution(i).MaskGroundediceLevelset- (md.geometry.surface-md.results.TransientSolution(i).Sealevel-(1-md.materials.rho_ice/md.materials.rho_water)*md.geometry.thickness); + field_values{end+1}= md.results.TransientSolution(i).MaskOceanLevelset- (md.geometry.surface-md.results.TransientSolution(i).Sealevel-(1-md.materials.rho_ice/md.materials.rho_water)*md.geometry.thickness); end Index: /issm/trunk-jpl/test/NightlyRun/test2424.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2424.py (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test2424.py (revision 24862) @@ -47,3 +47,3 @@ field_names.append('Time-' + str(md.results.TransientSolution[i].time) + '-yr-ice_levelset-S-sl-(1-di) * H') field_tolerances.append(1e-12) - field_values.append(md.results.TransientSolution[i].MaskGroundediceLevelset.reshape(-1, ) - (md.geometry.surface - md.results.TransientSolution[i].Sealevel.reshape(-1, ) - (1 - md.materials.rho_ice / md.materials.rho_water) * md.geometry.thickness)) + field_values.append(md.results.TransientSolution[i].MaskOceanLevelset.reshape(-1, ) - (md.geometry.surface - md.results.TransientSolution[i].Sealevel.reshape(-1, ) - (1 - md.materials.rho_ice / md.materials.rho_water) * md.geometry.thickness)) Index: /issm/trunk-jpl/test/NightlyRun/test3480.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3480.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test3480.m (revision 24862) @@ -8,6 +8,6 @@ md.geometry.bed =-100-md.mesh.x/1000; md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water; -md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; -pos=find(md.mask.groundedice_levelset>=0); +md.mask.ocean_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; +pos=find(md.mask.ocean_levelset>=0); md.geometry.base(pos)=md.geometry.bed(pos); md.geometry.surface=md.geometry.base+md.geometry.thickness; @@ -49,5 +49,5 @@ md.transient.isthermal=0; -pos=find(md.mask.groundedice_levelset<0); +pos=find(md.mask.ocean_levelset<0); md.basalforcings.groundedice_melting_rate=zeros(md.mesh.numberofvertices,1); md.basalforcings.floatingice_melting_rate=25*zeros(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/test/NightlyRun/test3481.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3481.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test3481.m (revision 24862) @@ -8,6 +8,6 @@ md.geometry.bed =-100-md.mesh.x/1000; md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water; -md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; -pos=find(md.mask.groundedice_levelset>=0); +md.mask.ocean_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; +pos=find(md.mask.ocean_levelset>=0); md.geometry.base(pos)=md.geometry.bed(pos); md.geometry.surface=md.geometry.base+md.geometry.thickness; @@ -55,5 +55,5 @@ md.transient.isthermal=0; -pos=find(md.mask.groundedice_levelset<0); +pos=find(md.mask.ocean_levelset<0); md.basalforcings.groundedice_melting_rate=zeros(md.mesh.numberofvertices,1); md.basalforcings.floatingice_melting_rate=25*zeros(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/test/NightlyRun/test4001.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test4001.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test4001.m (revision 24862) @@ -439,16 +439,16 @@ %level sets: - md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1); + md.mask.ocean_levelset=-ones(md.mesh.numberofvertices,1); md.mask.ice_levelset=ones(md.mesh.numberofvertices,1); pos=find(ice_mask); md.mask.ice_levelset(pos)=-1; - pos=find(~iceshelf_mask & ice_mask); md.mask.groundedice_levelset(pos)=1; + pos=find(~iceshelf_mask & ice_mask); md.mask.ocean_levelset(pos)=1; %identify edges of grounded ice: - groundedice_levelset=md.mask.groundedice_levelset; + ocean_levelset=md.mask.ocean_levelset; for i=1:md.mesh.numberofelements, - m=groundedice_levelset(md.mesh.elements(i,:)); + m=ocean_levelset(md.mesh.elements(i,:)); if abs(sum(m))~=3, - pos=find(m==1); md.mask.groundedice_levelset(md.mesh.elements(i,pos))=0; + pos=find(m==1); md.mask.ocean_levelset(md.mesh.elements(i,pos))=0; end end @@ -483,5 +483,5 @@ %friction: md.friction.coefficient=30*ones(md.mesh.numberofvertices,1); - pos=find(md.mask.groundedice_levelset<=0); + pos=find(md.mask.ocean_levelset<=0); md.friction.coefficient(pos)=0; md.friction.p=ones(md.mesh.numberofelements,1); @@ -521,5 +521,5 @@ vertex_on_boundary=zeros(md.mesh.numberofvertices,1); vertex_on_boundary(md.mesh.segments(:,1:2))=1; - pos=find(vertex_on_boundary & md.mask.groundedice_levelset<=0); + pos=find(vertex_on_boundary & md.mask.ocean_levelset<=0); md.stressbalance.spcvx(pos)=md.initialization.vx(pos); md.stressbalance.spcvy(pos)=md.initialization.vy(pos); @@ -838,5 +838,5 @@ md.initialization.vel=md.results.TransientSolution(end).Vel; md.initialization.pressure=md.results.TransientSolution(end).Pressure; - md.mask.groundedice_levelset=md.results.TransientSolution(end).MaskGroundediceLevelset; + md.mask.ocean_levelset=md.results.TransientSolution(end).MaskOceanLevelset; md.results.TransientSolution(end).FloatingiceMeltingRate=md.basalforcings.floatingice_melting_rate; @@ -862,7 +862,7 @@ fnm=['run/SHICE_fwFluxtave_0000017520.data']; melting_rate_4=readbin(fnm,[Nx Ny]); -field_names ={'Base1','Melting1','Vx2','Vy2','Thickness2','Base2','MaskGroundediceLevelset2','FloatingiceMeltingRate2',... - 'Melting2','Vx3','Vy3','Thickness3','Base3','MaskGroundediceLevelset3','FloatingiceMeltingRate3',... - 'Melting3','Vx4','Vy4','Thickness4','Base4','MaskGroundediceLevelset4','FloatingiceMeltingRate4','Melting4'}; +field_names ={'Base1','Melting1','Vx2','Vy2','Thickness2','Base2','MaskOceanLevelset2','FloatingiceMeltingRate2',... + 'Melting2','Vx3','Vy3','Thickness3','Base3','MaskOceanLevelset3','FloatingiceMeltingRate3',... + 'Melting3','Vx4','Vy4','Thickness4','Base4','MaskOceanLevelset4','FloatingiceMeltingRate4','Melting4'}; field_tolerances={2e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13,... @@ -875,5 +875,5 @@ (md.results(2).TransientSolution(end).Thickness),... (md.results(2).TransientSolution(end).Base),... - (md.results(2).TransientSolution(end).MaskGroundediceLevelset),... + (md.results(2).TransientSolution(end).MaskOceanLevelset),... (md.results(2).TransientSolution(end).FloatingiceMeltingRate),... (melting_rate_2(:)),... @@ -882,5 +882,5 @@ (md.results(3).TransientSolution(end).Thickness),... (md.results(3).TransientSolution(end).Base),... - (md.results(3).TransientSolution(end).MaskGroundediceLevelset),... + (md.results(3).TransientSolution(end).MaskOceanLevelset),... (md.results(3).TransientSolution(end).FloatingiceMeltingRate),... (melting_rate_3(:)),... @@ -889,5 +889,5 @@ (md.results(4).TransientSolution(end).Thickness),... (md.results(4).TransientSolution(end).Base),... - (md.results(4).TransientSolution(end).MaskGroundediceLevelset),... + (md.results(4).TransientSolution(end).MaskOceanLevelset),... (md.results(4).TransientSolution(end).FloatingiceMeltingRate),... (melting_rate_4(:)),... Index: /issm/trunk-jpl/test/NightlyRun/test4002.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test4002.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test4002.m (revision 24862) @@ -440,16 +440,16 @@ %level sets: - md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1); + md.mask.ocean_levelset=-ones(md.mesh.numberofvertices,1); md.mask.ice_levelset=ones(md.mesh.numberofvertices,1); pos=find(ice_mask); md.mask.ice_levelset(pos)=-1; - pos=find(~iceshelf_mask & ice_mask); md.mask.groundedice_levelset(pos)=1; + pos=find(~iceshelf_mask & ice_mask); md.mask.ocean_levelset(pos)=1; %identify edges of grounded ice: - groundedice_levelset=md.mask.groundedice_levelset; + ocean_levelset=md.mask.ocean_levelset; for i=1:md.mesh.numberofelements, - m=groundedice_levelset(md.mesh.elements(i,:)); + m=ocean_levelset(md.mesh.elements(i,:)); if abs(sum(m))~=3, - pos=find(m==1); md.mask.groundedice_levelset(md.mesh.elements(i,pos))=0; + pos=find(m==1); md.mask.ocean_levelset(md.mesh.elements(i,pos))=0; end end @@ -484,5 +484,5 @@ %friction: md.friction.coefficient=30*ones(md.mesh.numberofvertices,1); - pos=find(md.mask.groundedice_levelset<=0); + pos=find(md.mask.ocean_levelset<=0); md.friction.coefficient(pos)=0; md.friction.p=ones(md.mesh.numberofelements,1); @@ -522,5 +522,5 @@ vertex_on_boundary=zeros(md.mesh.numberofvertices,1); vertex_on_boundary(md.mesh.segments(:,1:2))=1; - pos=find(vertex_on_boundary & md.mask.groundedice_levelset<=0); + pos=find(vertex_on_boundary & md.mask.ocean_levelset<=0); md.stressbalance.spcvx(pos)=md.initialization.vx(pos); md.stressbalance.spcvy(pos)=md.initialization.vy(pos); @@ -836,5 +836,5 @@ md.initialization.vel=md.results.TransientSolution(end).Vel; md.initialization.pressure=md.results.TransientSolution(end).Pressure; - md.mask.groundedice_levelset=md.results.TransientSolution(end).MaskGroundediceLevelset; + md.mask.ocean_levelset=md.results.TransientSolution(end).MaskOceanLevelset; md.results.TransientSolution(end).FloatingiceMeltingRate=md.basalforcings.floatingice_melting_rate; @@ -1027,7 +1027,7 @@ fnm=['run/SHICE_fwFluxtave.0000000024.data']; melting_rate_4=readbin(fnm,[Nx Ny]); -field_names ={'Base1','Melting1','Vx2','Vy2','Thickness2','Base2','MaskGroundediceLevelset2','FloatingiceMeltingRate2',... - 'Melting2','Vx3','Vy3','Thickness3','Base3','MaskGroundediceLevelset3','FloatingiceMeltingRate3',... - 'Melting3','Vx4','Vy4','Thickness4','Base4','MaskGroundediceLevelset4','FloatingiceMeltingRate4','Melting4'}; +field_names ={'Base1','Melting1','Vx2','Vy2','Thickness2','Base2','MaskOceanLevelset2','FloatingiceMeltingRate2',... + 'Melting2','Vx3','Vy3','Thickness3','Base3','MaskOceanLevelset3','FloatingiceMeltingRate3',... + 'Melting3','Vx4','Vy4','Thickness4','Base4','MaskOceanLevelset4','FloatingiceMeltingRate4','Melting4'}; field_tolerances={2e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13,... @@ -1040,5 +1040,5 @@ (md.results.TransientSolution(2).Thickness),... (md.results.TransientSolution(2).Base),... - (md.results.TransientSolution(2).MaskGroundediceLevelset),... + (md.results.TransientSolution(2).MaskOceanLevelset),... (md.results.TransientSolution(2).BasalforcingsFloatingiceMeltingRate),... (melting_rate_2(:)),... @@ -1047,5 +1047,5 @@ (md.results.TransientSolution(3).Thickness),... (md.results.TransientSolution(3).Base),... - (md.results.TransientSolution(3).MaskGroundediceLevelset),... + (md.results.TransientSolution(3).MaskOceanLevelset),... (md.results.TransientSolution(3).BasalforcingsFloatingiceMeltingRate),... (melting_rate_3(:)),... @@ -1054,5 +1054,5 @@ (md.results.TransientSolution(4).Thickness),... (md.results.TransientSolution(4).Base),... - (md.results.TransientSolution(4).MaskGroundediceLevelset),... + (md.results.TransientSolution(4).MaskOceanLevelset),... (md.results.TransientSolution(4).BasalforcingsFloatingiceMeltingRate),... (melting_rate_4(:)),... Index: /issm/trunk-jpl/test/NightlyRun/test4003.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test4003.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test4003.m (revision 24862) @@ -228,5 +228,5 @@ %level sets: - md.mask.groundedice_levelset=iceshelf_mask(:); + md.mask.ocean_levelset=iceshelf_mask(:); md.mask.ice_levelset=-ones(md.mesh.numberofvertices,1); @@ -251,5 +251,5 @@ %friction: md.friction.coefficient=0*ones(md.mesh.numberofvertices,1); - pos=find(md.mask.groundedice_levelset>0); + pos=find(md.mask.ocean_levelset>0); md.friction.coefficient(pos)=5; md.friction.p=ones(md.mesh.numberofelements,1); @@ -372,5 +372,5 @@ md.cluster.np=2; md.cluster.executionpath=[pwd '/run']; - md.transient.requested_outputs={'default','MaskGroundediceLevelset'}; + md.transient.requested_outputs={'default','MaskOceanLevelset'}; md=solveiceocean(md,'Transient','runtimename',false); @@ -654,5 +654,5 @@ md.initialization.vel=md.results.TransientSolution(end).Vel; md.initialization.pressure=md.results.TransientSolution(end).Pressure; - md.mask.groundedice_levelset=md.results.TransientSolution(end).MaskGroundediceLevelset; + md.mask.ocean_levelset=md.results.TransientSolution(end).MaskOceanLevelset; md.results.TransientSolution(end).FloatingiceMeltingRate=md.basalforcings.floatingice_melting_rate; @@ -679,7 +679,7 @@ fnm=['run/SHICE_fwFlux.0000011550.data']; melting_rate_4=readbin(fnm,[Nx Ny]); -field_names ={'Base1','Melting1','Vx2','Vy2','Thickness2','Base2','MaskGroundediceLevelset2','FloatingiceMeltingRate2',... - 'Melting2','Vx3','Vy3','Thickness3','Base3','MaskGroundediceLevelset3','FloatingiceMeltingRate3',... - 'Melting3','Vx4','Vy4','Thickness4','Base4','MaskGroundediceLevelset4','FloatingiceMeltingRate4','Melting4'}; +field_names ={'Base1','Melting1','Vx2','Vy2','Thickness2','Base2','MaskOceanLevelset2','FloatingiceMeltingRate2',... + 'Melting2','Vx3','Vy3','Thickness3','Base3','MaskOceanLevelset3','FloatingiceMeltingRate3',... + 'Melting3','Vx4','Vy4','Thickness4','Base4','MaskOceanLevelset4','FloatingiceMeltingRate4','Melting4'}; field_tolerances={2e-13,1e-13,7e-13,7e-13,1e-13,1e-13,1e-13,1e-12,... 1e-13, 1e-12, 1e-12, 1e-13, 1e-13, 1e-13, 1e-12,... @@ -692,5 +692,5 @@ (md.results.TransientSolution(2).Thickness),... (md.results.TransientSolution(2).Base),... - (md.results.TransientSolution(2).MaskGroundediceLevelset),... + (md.results.TransientSolution(2).MaskOceanLevelset),... (md.results.TransientSolution(2).BasalforcingsFloatingiceMeltingRate),... (melting_rate_2(:)),... @@ -699,5 +699,5 @@ (md.results.TransientSolution(3).Thickness),... (md.results.TransientSolution(3).Base),... - (md.results.TransientSolution(3).MaskGroundediceLevelset),... + (md.results.TransientSolution(3).MaskOceanLevelset),... (md.results.TransientSolution(3).BasalforcingsFloatingiceMeltingRate),... (melting_rate_3(:)),... @@ -706,5 +706,5 @@ (md.results.TransientSolution(4).Thickness),... (md.results.TransientSolution(4).Base),... - (md.results.TransientSolution(4).MaskGroundediceLevelset),... + (md.results.TransientSolution(4).MaskOceanLevelset),... (md.results.TransientSolution(4).BasalforcingsFloatingiceMeltingRate),... (melting_rate_4(:)),... Index: /issm/trunk-jpl/test/NightlyRun/test408.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test408.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test408.m (revision 24862) @@ -4,5 +4,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.par'); md.geometry.bed=md.geometry.base; -pos=find(md.mask.groundedice_levelset<0); +pos=find(md.mask.ocean_levelset<0); md.geometry.bed(pos)=md.geometry.base(pos)-10; md.friction=frictioncoulomb(); Index: /issm/trunk-jpl/test/NightlyRun/test408.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test408.py (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test408.py (revision 24862) @@ -15,5 +15,5 @@ md = parameterize(md, '../Par/SquareSheetShelf.py') md.geometry.bed = copy.deepcopy(md.geometry.base) -pos = np.nonzero(md.mask.groundedice_levelset < 0.) +pos = np.nonzero(md.mask.ocean_levelset < 0.) md.geometry.bed[pos] = md.geometry.bed[pos] - 10 md.friction = frictioncoulomb() Index: /issm/trunk-jpl/test/NightlyRun/test423.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test423.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test423.m (revision 24862) @@ -28,22 +28,22 @@ md.groundingline.migration='AggressiveMigration'; md=solve(md,'Transient'); -element_on_iceshelf_agressive=(md.results.TransientSolution.MaskGroundediceLevelset); +element_on_iceshelf_agressive=(md.results.TransientSolution.MaskOceanLevelset); vel_agressive=(md.results.TransientSolution.Vel); md.groundingline.migration='SoftMigration'; md=solve(md,'Transient'); -element_on_iceshelf_soft=(md.results.TransientSolution.MaskGroundediceLevelset); +element_on_iceshelf_soft=(md.results.TransientSolution.MaskOceanLevelset); vel_soft=(md.results.TransientSolution.Vel); -md.mask.groundedice_levelset=md.geometry.thickness + md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; +md.mask.ocean_levelset=md.geometry.thickness + md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; md.groundingline.migration='SubelementMigration'; md.groundingline.friction_interpolation='SubelementFriction1'; md=solve(md,'Transient'); -element_on_iceshelf_subelement=(md.results.TransientSolution.MaskGroundediceLevelset); +element_on_iceshelf_subelement=(md.results.TransientSolution.MaskOceanLevelset); vel_subelement=(md.results.TransientSolution.Vel); md.groundingline.friction_interpolation='SubelementFriction2'; md=solve(md,'Transient'); -element_on_iceshelf_subelement2=(md.results.TransientSolution.MaskGroundediceLevelset); +element_on_iceshelf_subelement2=(md.results.TransientSolution.MaskOceanLevelset); vel_subelement2=(md.results.TransientSolution.Vel); Index: /issm/trunk-jpl/test/NightlyRun/test423.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test423.py (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test423.py (revision 24862) @@ -39,22 +39,22 @@ md.groundingline.migration = 'AggressiveMigration' md = solve(md, 'Transient') -element_on_iceshelf_agressive = md.results.TransientSolution[0].MaskGroundediceLevelset +element_on_iceshelf_agressive = md.results.TransientSolution[0].MaskOceanLevelset vel_agressive = md.results.TransientSolution[0].Vel md.groundingline.migration = 'SoftMigration' md = solve(md, 'Transient') -element_on_iceshelf_soft = md.results.TransientSolution[0].MaskGroundediceLevelset +element_on_iceshelf_soft = md.results.TransientSolution[0].MaskOceanLevelset vel_soft = md.results.TransientSolution[0].Vel -md.mask.groundedice_levelset = md.geometry.thickness + md.materials.rho_water / md.materials.rho_ice * md.geometry.bed +md.mask.ocean_levelset = md.geometry.thickness + md.materials.rho_water / md.materials.rho_ice * md.geometry.bed md.groundingline.migration = 'SubelementMigration' md.groundingline.friction_interpolation = 'SubelementFriction1' md = solve(md, 'Transient') -element_on_iceshelf_subelement = md.results.TransientSolution[0].MaskGroundediceLevelset +element_on_iceshelf_subelement = md.results.TransientSolution[0].MaskOceanLevelset vel_subelement = md.results.TransientSolution[0].Vel md.groundingline.friction_interpolation = 'SubelementFriction2' md = solve(md, 'Transient') -element_on_iceshelf_subelement2 = md.results.TransientSolution[0].MaskGroundediceLevelset +element_on_iceshelf_subelement2 = md.results.TransientSolution[0].MaskOceanLevelset vel_subelement2 = md.results.TransientSolution[0].Vel Index: /issm/trunk-jpl/test/NightlyRun/test424.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test424.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test424.m (revision 24862) @@ -31,5 +31,5 @@ (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).MaskGroundediceLevelset),... + (md.results.TransientSolution(1).MaskOceanLevelset),... (md.results.TransientSolution(1).IceVolume),... (md.results.TransientSolution(1).IceVolumeAboveFloatation),... @@ -42,5 +42,5 @@ (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).MaskGroundediceLevelset),... + (md.results.TransientSolution(2).MaskOceanLevelset),... (md.results.TransientSolution(2).IceVolume),... (md.results.TransientSolution(2).IceVolumeAboveFloatation),... @@ -53,5 +53,5 @@ (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).MaskGroundediceLevelset),... + (md.results.TransientSolution(3).MaskOceanLevelset),... (md.results.TransientSolution(3).IceVolume),... (md.results.TransientSolution(3).IceVolumeAboveFloatation),... Index: /issm/trunk-jpl/test/NightlyRun/test424.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test424.py (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test424.py (revision 24862) @@ -38,5 +38,5 @@ md.results.TransientSolution[0].Surface, md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].MaskGroundediceLevelset, + md.results.TransientSolution[0].MaskOceanLevelset, md.results.TransientSolution[0].IceVolume, md.results.TransientSolution[0].IceVolumeAboveFloatation, @@ -49,5 +49,5 @@ md.results.TransientSolution[1].Surface, md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].MaskGroundediceLevelset, + md.results.TransientSolution[1].MaskOceanLevelset, md.results.TransientSolution[1].IceVolume, md.results.TransientSolution[1].IceVolumeAboveFloatation, @@ -60,5 +60,5 @@ md.results.TransientSolution[2].Surface, md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].MaskGroundediceLevelset, + md.results.TransientSolution[2].MaskOceanLevelset, md.results.TransientSolution[2].IceVolume, md.results.TransientSolution[2].IceVolumeAboveFloatation, Index: /issm/trunk-jpl/test/NightlyRun/test425.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test425.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test425.m (revision 24862) @@ -29,12 +29,12 @@ (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).MaskGroundediceLevelset),... + (md.results.TransientSolution(1).MaskOceanLevelset),... (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).MaskGroundediceLevelset),... + (md.results.TransientSolution(2).MaskOceanLevelset),... (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).MaskGroundediceLevelset),... + (md.results.TransientSolution(3).MaskOceanLevelset),... }; Index: /issm/trunk-jpl/test/NightlyRun/test425.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test425.py (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test425.py (revision 24862) @@ -36,11 +36,11 @@ md.results.TransientSolution[0].Surface, md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].MaskGroundediceLevelset, + md.results.TransientSolution[0].MaskOceanLevelset, md.results.TransientSolution[1].Base, md.results.TransientSolution[1].Surface, md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].MaskGroundediceLevelset, + md.results.TransientSolution[1].MaskOceanLevelset, md.results.TransientSolution[2].Base, md.results.TransientSolution[2].Surface, md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].MaskGroundediceLevelset] + md.results.TransientSolution[2].MaskOceanLevelset] Index: /issm/trunk-jpl/test/NightlyRun/test426.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test426.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test426.m (revision 24862) @@ -33,5 +33,5 @@ (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).MaskGroundediceLevelset),... + (md.results.TransientSolution(1).MaskOceanLevelset),... (md.results.TransientSolution(1).IceVolume),... (md.results.TransientSolution(1).IceVolumeAboveFloatation),... @@ -45,5 +45,5 @@ (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).MaskGroundediceLevelset),... + (md.results.TransientSolution(2).MaskOceanLevelset),... (md.results.TransientSolution(2).IceVolume),... (md.results.TransientSolution(2).IceVolumeAboveFloatation),... @@ -57,5 +57,5 @@ (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).MaskGroundediceLevelset),... + (md.results.TransientSolution(3).MaskOceanLevelset),... (md.results.TransientSolution(3).IceVolume),... (md.results.TransientSolution(3).IceVolumeAboveFloatation),... Index: /issm/trunk-jpl/test/NightlyRun/test426.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test426.py (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test426.py (revision 24862) @@ -42,5 +42,5 @@ md.results.TransientSolution[0].Surface, md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].MaskGroundediceLevelset, + md.results.TransientSolution[0].MaskOceanLevelset, md.results.TransientSolution[0].IceVolume, md.results.TransientSolution[0].IceVolumeAboveFloatation, @@ -54,5 +54,5 @@ md.results.TransientSolution[1].Surface, md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].MaskGroundediceLevelset, + md.results.TransientSolution[1].MaskOceanLevelset, md.results.TransientSolution[1].IceVolume, md.results.TransientSolution[1].IceVolumeAboveFloatation, @@ -66,5 +66,5 @@ md.results.TransientSolution[2].Surface, md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].MaskGroundediceLevelset, + md.results.TransientSolution[2].MaskOceanLevelset, md.results.TransientSolution[2].IceVolume, md.results.TransientSolution[2].IceVolumeAboveFloatation, Index: /issm/trunk-jpl/test/NightlyRun/test427.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test427.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test427.m (revision 24862) @@ -31,12 +31,12 @@ (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).MaskGroundediceLevelset),... + (md.results.TransientSolution(1).MaskOceanLevelset),... (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).MaskGroundediceLevelset),... + (md.results.TransientSolution(2).MaskOceanLevelset),... (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).MaskGroundediceLevelset),... + (md.results.TransientSolution(3).MaskOceanLevelset),... }; Index: /issm/trunk-jpl/test/NightlyRun/test427.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test427.py (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test427.py (revision 24862) @@ -38,11 +38,11 @@ md.results.TransientSolution[0].Surface, md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].MaskGroundediceLevelset, + md.results.TransientSolution[0].MaskOceanLevelset, md.results.TransientSolution[1].Base, md.results.TransientSolution[1].Surface, md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].MaskGroundediceLevelset, + md.results.TransientSolution[1].MaskOceanLevelset, md.results.TransientSolution[2].Base, md.results.TransientSolution[2].Surface, md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].MaskGroundediceLevelset] + md.results.TransientSolution[2].MaskOceanLevelset] Index: /issm/trunk-jpl/test/NightlyRun/test430.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test430.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test430.m (revision 24862) @@ -8,6 +8,6 @@ md.geometry.bed =-100-md.mesh.x/1000; md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water; -md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; -pos=find(md.mask.groundedice_levelset>=0); +md.mask.ocean_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; +pos=find(md.mask.ocean_levelset>=0); md.geometry.base(pos)=md.geometry.bed(pos); md.geometry.surface=md.geometry.base+md.geometry.thickness; @@ -58,5 +58,5 @@ (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).MaskGroundediceLevelset),... + (md.results.TransientSolution(1).MaskOceanLevelset),... (md.results.TransientSolution(1).Vx),... (md.results.TransientSolution(1).Vy),... @@ -66,5 +66,5 @@ (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).MaskGroundediceLevelset),... + (md.results.TransientSolution(2).MaskOceanLevelset),... (md.results.TransientSolution(2).Vx),... (md.results.TransientSolution(2).Vy),... @@ -74,5 +74,5 @@ (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).MaskGroundediceLevelset),... + (md.results.TransientSolution(3).MaskOceanLevelset),... (md.results.TransientSolution(3).Vx),... (md.results.TransientSolution(3).Vy),... Index: /issm/trunk-jpl/test/NightlyRun/test430.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test430.py (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test430.py (revision 24862) @@ -17,6 +17,6 @@ md.geometry.bed = -100. - md.mesh.x / 1000. md.geometry.base = -md.geometry.thickness * md.materials.rho_ice / md.materials.rho_water -md.mask.groundedice_levelset = md.geometry.thickness + md.materials.rho_water / md.materials.rho_ice * md.geometry.bed -pos = np.where(md.mask.groundedice_levelset >= 0.) +md.mask.ocean_levelset = md.geometry.thickness + md.materials.rho_water / md.materials.rho_ice * md.geometry.bed +pos = np.where(md.mask.ocean_levelset >= 0.) md.geometry.base[pos] = md.geometry.bed[pos] md.geometry.surface = md.geometry.base + md.geometry.thickness @@ -71,5 +71,5 @@ md.results.TransientSolution[0].Surface, md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].MaskGroundediceLevelset, + md.results.TransientSolution[0].MaskOceanLevelset, md.results.TransientSolution[0].Vx, md.results.TransientSolution[0].Vy, @@ -79,5 +79,5 @@ md.results.TransientSolution[1].Surface, md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].MaskGroundediceLevelset, + md.results.TransientSolution[1].MaskOceanLevelset, md.results.TransientSolution[1].Vx, md.results.TransientSolution[1].Vy, @@ -87,5 +87,5 @@ md.results.TransientSolution[2].Surface, md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].MaskGroundediceLevelset, + md.results.TransientSolution[2].MaskOceanLevelset, md.results.TransientSolution[2].Vx, md.results.TransientSolution[2].Vy, Index: /issm/trunk-jpl/test/NightlyRun/test433.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test433.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test433.m (revision 24862) @@ -29,13 +29,13 @@ md.groundingline.migration='AggressiveMigration'; md=solve(md,'Transient'); -element_on_iceshelf_agressive=(md.results.TransientSolution.MaskGroundediceLevelset); +element_on_iceshelf_agressive=(md.results.TransientSolution.MaskOceanLevelset); md.groundingline.migration='SoftMigration'; md=solve(md,'Transient'); -element_on_iceshelf_soft=(md.results.TransientSolution.MaskGroundediceLevelset); +element_on_iceshelf_soft=(md.results.TransientSolution.MaskOceanLevelset); md.groundingline.migration='SubelementMigration'; md=solve(md,'Transient'); -element_on_iceshelf_subelement=(md.results.TransientSolution.MaskGroundediceLevelset); +element_on_iceshelf_subelement=(md.results.TransientSolution.MaskOceanLevelset); md.groundingline.migration='SubelementMigration'; @@ -44,5 +44,5 @@ md=setflowequation(md,'SSA','all'); md=solve(md,'Transient'); -element_on_iceshelf_subelement2=(md.results.TransientSolution.MaskGroundediceLevelset); +element_on_iceshelf_subelement2=(md.results.TransientSolution.MaskOceanLevelset); %Fields and tolerances to track changes Index: /issm/trunk-jpl/test/NightlyRun/test433.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test433.py (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test433.py (revision 24862) @@ -40,18 +40,18 @@ md.groundingline.migration = 'AggressiveMigration' md = solve(md, 'Transient') -element_on_iceshelf_agressive = md.results.TransientSolution[0].MaskGroundediceLevelset +element_on_iceshelf_agressive = md.results.TransientSolution[0].MaskOceanLevelset md.groundingline.migration = 'SoftMigration' md = solve(md, 'Transient') -element_on_iceshelf_soft = md.results.TransientSolution[0].MaskGroundediceLevelset +element_on_iceshelf_soft = md.results.TransientSolution[0].MaskOceanLevelset md.groundingline.migration = 'SubelementMigration' md = solve(md, 'Transient') -element_on_iceshelf_subelement = md.results.TransientSolution[0].MaskGroundediceLevelset +element_on_iceshelf_subelement = md.results.TransientSolution[0].MaskOceanLevelset md.groundingline.migration = 'SubelementMigration' md.groundingline.friction_interpolation = 'SubelementFriction2' md = solve(md, 'Transient') -element_on_iceshelf_subelement2 = md.results.TransientSolution[0].MaskGroundediceLevelset +element_on_iceshelf_subelement2 = md.results.TransientSolution[0].MaskOceanLevelset #Fields and tolerances to track changes Index: /issm/trunk-jpl/test/NightlyRun/test435.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test435.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test435.m (revision 24862) @@ -8,6 +8,6 @@ md.geometry.bed =-100-md.mesh.x/1000; md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water; -md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; -pos=find(md.mask.groundedice_levelset>=0); +md.mask.ocean_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; +pos=find(md.mask.ocean_levelset>=0); md.geometry.base(pos)=md.geometry.bed(pos); md.geometry.surface=md.geometry.base+md.geometry.thickness; @@ -61,5 +61,5 @@ (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).MaskGroundediceLevelset),... + (md.results.TransientSolution(1).MaskOceanLevelset),... (md.results.TransientSolution(1).Vx),... (md.results.TransientSolution(1).Vy),... @@ -70,5 +70,5 @@ (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).MaskGroundediceLevelset),... + (md.results.TransientSolution(2).MaskOceanLevelset),... (md.results.TransientSolution(2).Vx),... (md.results.TransientSolution(2).Vy),... @@ -79,5 +79,5 @@ (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).MaskGroundediceLevelset),... + (md.results.TransientSolution(3).MaskOceanLevelset),... (md.results.TransientSolution(3).Vx),... (md.results.TransientSolution(3).Vy),... Index: /issm/trunk-jpl/test/NightlyRun/test435.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test435.py (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test435.py (revision 24862) @@ -17,6 +17,6 @@ md.geometry.bed = -100. - md.mesh.x / 1000. md.geometry.base = -md.geometry.thickness * md.materials.rho_ice / md.materials.rho_water -md.mask.groundedice_levelset = md.geometry.thickness + md.materials.rho_water / md.materials.rho_ice * md.geometry.bed -pos = np.where(md.mask.groundedice_levelset >= 0) +md.mask.ocean_levelset = md.geometry.thickness + md.materials.rho_water / md.materials.rho_ice * md.geometry.bed +pos = np.where(md.mask.ocean_levelset >= 0) md.geometry.base[pos] = md.geometry.bed[pos] md.geometry.surface = md.geometry.base + md.geometry.thickness @@ -69,5 +69,5 @@ md.results.TransientSolution[0].Surface, md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].MaskGroundediceLevelset, + md.results.TransientSolution[0].MaskOceanLevelset, md.results.TransientSolution[0].Vx, md.results.TransientSolution[0].Vy, @@ -78,5 +78,5 @@ md.results.TransientSolution[1].Surface, md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].MaskGroundediceLevelset, + md.results.TransientSolution[1].MaskOceanLevelset, md.results.TransientSolution[1].Vx, md.results.TransientSolution[1].Vy, @@ -87,5 +87,5 @@ md.results.TransientSolution[2].Surface, md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].MaskGroundediceLevelset, + md.results.TransientSolution[2].MaskOceanLevelset, md.results.TransientSolution[2].Vx, md.results.TransientSolution[2].Vy, Index: /issm/trunk-jpl/test/NightlyRun/test441.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test441.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test441.m (revision 24862) @@ -8,6 +8,6 @@ md.geometry.bed =-100-md.mesh.x/1000; md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water; -md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; -pos=find(md.mask.groundedice_levelset>=0); +md.mask.ocean_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; +pos=find(md.mask.ocean_levelset>=0); md.geometry.base(pos)=md.geometry.bed(pos); md.geometry.surface=md.geometry.base+md.geometry.thickness; @@ -59,5 +59,5 @@ (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).MaskGroundediceLevelset),... + (md.results.TransientSolution(1).MaskOceanLevelset),... (md.results.TransientSolution(1).Vx),... (md.results.TransientSolution(1).Vy),... @@ -67,5 +67,5 @@ (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).MaskGroundediceLevelset),... + (md.results.TransientSolution(2).MaskOceanLevelset),... (md.results.TransientSolution(2).Vx),... (md.results.TransientSolution(2).Vy),... @@ -75,5 +75,5 @@ (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).MaskGroundediceLevelset),... + (md.results.TransientSolution(3).MaskOceanLevelset),... (md.results.TransientSolution(3).Vx),... (md.results.TransientSolution(3).Vy),... Index: /issm/trunk-jpl/test/NightlyRun/test441.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test441.py (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test441.py (revision 24862) @@ -17,6 +17,6 @@ md.geometry.bed = -100. - md.mesh.x / 1000. md.geometry.base = -md.geometry.thickness * md.materials.rho_ice / md.materials.rho_water -md.mask.groundedice_levelset = md.geometry.thickness + md.materials.rho_water / md.materials.rho_ice * md.geometry.bed -pos = np.array(np.where(md.mask.groundedice_levelset >= 0.)) +md.mask.ocean_levelset = md.geometry.thickness + md.materials.rho_water / md.materials.rho_ice * md.geometry.bed +pos = np.array(np.where(md.mask.ocean_levelset >= 0.)) md.geometry.base[pos] = md.geometry.bed[pos] md.geometry.surface = md.geometry.base + md.geometry.thickness @@ -69,5 +69,5 @@ md.results.TransientSolution[0].Surface, md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].MaskGroundediceLevelset, + md.results.TransientSolution[0].MaskOceanLevelset, md.results.TransientSolution[0].Vx, md.results.TransientSolution[0].Vy, @@ -77,5 +77,5 @@ md.results.TransientSolution[1].Surface, md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].MaskGroundediceLevelset, + md.results.TransientSolution[1].MaskOceanLevelset, md.results.TransientSolution[1].Vx, md.results.TransientSolution[1].Vy, @@ -85,5 +85,5 @@ md.results.TransientSolution[2].Surface, md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].MaskGroundediceLevelset, + md.results.TransientSolution[2].MaskOceanLevelset, md.results.TransientSolution[2].Vx, md.results.TransientSolution[2].Vy, Index: /issm/trunk-jpl/test/NightlyRun/test442.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test442.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test442.m (revision 24862) @@ -8,6 +8,6 @@ md.geometry.bed =-100-md.mesh.x/1000; md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water; -md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; -pos=find(md.mask.groundedice_levelset>=0); +md.mask.ocean_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; +pos=find(md.mask.ocean_levelset>=0); md.geometry.base(pos)=md.geometry.bed(pos); md.geometry.surface=md.geometry.base+md.geometry.thickness; @@ -62,5 +62,5 @@ (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).MaskGroundediceLevelset),... + (md.results.TransientSolution(1).MaskOceanLevelset),... (md.results.TransientSolution(1).Vx),... (md.results.TransientSolution(1).Vy),... @@ -71,5 +71,5 @@ (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).MaskGroundediceLevelset),... + (md.results.TransientSolution(2).MaskOceanLevelset),... (md.results.TransientSolution(2).Vx),... (md.results.TransientSolution(2).Vy),... @@ -80,5 +80,5 @@ (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).MaskGroundediceLevelset),... + (md.results.TransientSolution(3).MaskOceanLevelset),... (md.results.TransientSolution(3).Vx),... (md.results.TransientSolution(3).Vy),... Index: /issm/trunk-jpl/test/NightlyRun/test442.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test442.py (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test442.py (revision 24862) @@ -17,6 +17,6 @@ md.geometry.bed = -100. - md.mesh.x / 1000. md.geometry.base = -md.geometry.thickness * md.materials.rho_ice / md.materials.rho_water -md.mask.groundedice_levelset = md.geometry.thickness + md.materials.rho_water / md.materials.rho_ice * md.geometry.bed -pos = np.where(md.mask.groundedice_levelset >= 0.) +md.mask.ocean_levelset = md.geometry.thickness + md.materials.rho_water / md.materials.rho_ice * md.geometry.bed +pos = np.where(md.mask.ocean_levelset >= 0.) md.geometry.base[pos] = md.geometry.bed[pos] md.geometry.surface = md.geometry.base + md.geometry.thickness @@ -70,5 +70,5 @@ md.results.TransientSolution[0].Surface, md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].MaskGroundediceLevelset, + md.results.TransientSolution[0].MaskOceanLevelset, md.results.TransientSolution[0].Vx, md.results.TransientSolution[0].Vy, @@ -79,5 +79,5 @@ md.results.TransientSolution[1].Surface, md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].MaskGroundediceLevelset, + md.results.TransientSolution[1].MaskOceanLevelset, md.results.TransientSolution[1].Vx, md.results.TransientSolution[1].Vy, @@ -88,5 +88,5 @@ md.results.TransientSolution[2].Surface, md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].MaskGroundediceLevelset, + md.results.TransientSolution[2].MaskOceanLevelset, md.results.TransientSolution[2].Vx, md.results.TransientSolution[2].Vy, Index: /issm/trunk-jpl/test/NightlyRun/test443.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test443.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test443.m (revision 24862) @@ -4,5 +4,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.par'); md.geometry.bed=md.geometry.base; -pos=find(md.mask.groundedice_levelset<0); +pos=find(md.mask.ocean_levelset<0); md.geometry.bed(pos)=md.geometry.base(pos)-10; md.friction=frictioncoulomb(); Index: /issm/trunk-jpl/test/NightlyRun/test443.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test443.py (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test443.py (revision 24862) @@ -17,5 +17,5 @@ md = parameterize(md, '../Par/SquareSheetShelf.py') md.geometry.bed = copy.deepcopy(md.geometry.base) -pos = np.nonzero(md.mask.groundedice_levelset < 0.) +pos = np.nonzero(md.mask.ocean_levelset < 0.) md.geometry.bed[pos] = md.geometry.bed[pos] - 10 md.friction = frictioncoulomb() Index: /issm/trunk-jpl/test/NightlyRun/test444.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test444.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test444.m (revision 24862) @@ -4,5 +4,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.par'); md.geometry.bed=md.geometry.base; -pos=find(md.mask.groundedice_levelset<0); +pos=find(md.mask.ocean_levelset<0); md.geometry.bed(pos)=md.geometry.base(pos)-10; md.friction.coefficient=20.*ones(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/test/NightlyRun/test444.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test444.py (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test444.py (revision 24862) @@ -19,5 +19,5 @@ md = parameterize(md, '../Par/SquareSheetShelf.py') md.geometry.bed = md.geometry.base.copy() -pos = np.where(md.mask.groundedice_levelset < 0) +pos = np.where(md.mask.ocean_levelset < 0) md.geometry.bed[pos] = md.geometry.base[pos] - 10 md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices, )) Index: /issm/trunk-jpl/test/NightlyRun/test470.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test470.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test470.m (revision 24862) @@ -8,6 +8,6 @@ md.geometry.bed =-100-md.mesh.x/1000; md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water; -md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; -pos=find(md.mask.groundedice_levelset>=0); +md.mask.ocean_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; +pos=find(md.mask.ocean_levelset>=0); md.geometry.base(pos)=md.geometry.bed(pos); md.geometry.surface=md.geometry.base+md.geometry.thickness; @@ -56,5 +56,5 @@ (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).MaskGroundediceLevelset),... + (md.results.TransientSolution(1).MaskOceanLevelset),... (md.results.TransientSolution(1).Vx),... (md.results.TransientSolution(1).Vy),... @@ -64,5 +64,5 @@ (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).MaskGroundediceLevelset),... + (md.results.TransientSolution(2).MaskOceanLevelset),... (md.results.TransientSolution(2).Vx),... (md.results.TransientSolution(2).Vy),... @@ -72,5 +72,5 @@ (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).MaskGroundediceLevelset),... + (md.results.TransientSolution(3).MaskOceanLevelset),... (md.results.TransientSolution(3).Vx),... (md.results.TransientSolution(3).Vy),... Index: /issm/trunk-jpl/test/NightlyRun/test471.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test471.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test471.m (revision 24862) @@ -8,6 +8,6 @@ md.geometry.bed =-100-md.mesh.x/1000; md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water; -md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; -pos=find(md.mask.groundedice_levelset>=0); +md.mask.ocean_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; +pos=find(md.mask.ocean_levelset>=0); md.geometry.base(pos)=md.geometry.bed(pos); md.geometry.surface=md.geometry.base+md.geometry.thickness; @@ -56,5 +56,5 @@ (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).MaskGroundediceLevelset),... + (md.results.TransientSolution(1).MaskOceanLevelset),... (md.results.TransientSolution(1).Vx),... (md.results.TransientSolution(1).Vy),... @@ -64,5 +64,5 @@ (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).MaskGroundediceLevelset),... + (md.results.TransientSolution(2).MaskOceanLevelset),... (md.results.TransientSolution(2).Vx),... (md.results.TransientSolution(2).Vy),... @@ -72,5 +72,5 @@ (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).MaskGroundediceLevelset),... + (md.results.TransientSolution(3).MaskOceanLevelset),... (md.results.TransientSolution(3).Vx),... (md.results.TransientSolution(3).Vy),... Index: /issm/trunk-jpl/test/NightlyRun/test472.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test472.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test472.m (revision 24862) @@ -8,6 +8,6 @@ md.geometry.bed =-100-md.mesh.x/1000; md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water; -md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; -pos=find(md.mask.groundedice_levelset>=0); +md.mask.ocean_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; +pos=find(md.mask.ocean_levelset>=0); md.geometry.base(pos)=md.geometry.bed(pos); md.geometry.surface=md.geometry.base+md.geometry.thickness; @@ -68,5 +68,5 @@ (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).MaskGroundediceLevelset),... + (md.results.TransientSolution(1).MaskOceanLevelset),... (md.results.TransientSolution(1).Vx),... (md.results.TransientSolution(1).Vy),... @@ -77,5 +77,5 @@ (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).MaskGroundediceLevelset),... + (md.results.TransientSolution(2).MaskOceanLevelset),... (md.results.TransientSolution(2).Vx),... (md.results.TransientSolution(2).Vy),... @@ -86,5 +86,5 @@ (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).MaskGroundediceLevelset),... + (md.results.TransientSolution(3).MaskOceanLevelset),... (md.results.TransientSolution(3).Vx),... (md.results.TransientSolution(3).Vy),... Index: /issm/trunk-jpl/test/NightlyRun/test473.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test473.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test473.m (revision 24862) @@ -8,6 +8,6 @@ md.geometry.bed =-100-md.mesh.x/1000; md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water; -md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; -pos=find(md.mask.groundedice_levelset>=0); +md.mask.ocean_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; +pos=find(md.mask.ocean_levelset>=0); md.geometry.base(pos)=md.geometry.bed(pos); md.geometry.surface=md.geometry.base+md.geometry.thickness; @@ -64,5 +64,5 @@ (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).MaskGroundediceLevelset),... + (md.results.TransientSolution(1).MaskOceanLevelset),... (md.results.TransientSolution(1).Vx),... (md.results.TransientSolution(1).Vy),... @@ -73,5 +73,5 @@ (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).MaskGroundediceLevelset),... + (md.results.TransientSolution(2).MaskOceanLevelset),... (md.results.TransientSolution(2).Vx),... (md.results.TransientSolution(2).Vy),... @@ -82,5 +82,5 @@ (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).MaskGroundediceLevelset),... + (md.results.TransientSolution(3).MaskOceanLevelset),... (md.results.TransientSolution(3).Vx),... (md.results.TransientSolution(3).Vy),... Index: /issm/trunk-jpl/test/NightlyRun/test474.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test474.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test474.m (revision 24862) @@ -8,6 +8,6 @@ md.geometry.bed =-100-md.mesh.x/1000; md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water; -md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; -pos=find(md.mask.groundedice_levelset>=0); +md.mask.ocean_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; +pos=find(md.mask.ocean_levelset>=0); md.geometry.base(pos)=md.geometry.bed(pos); md.geometry.surface=md.geometry.base+md.geometry.thickness; @@ -57,5 +57,5 @@ (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).MaskGroundediceLevelset),... + (md.results.TransientSolution(1).MaskOceanLevelset),... (md.results.TransientSolution(1).Vx),... (md.results.TransientSolution(1).Vy),... @@ -65,5 +65,5 @@ (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).MaskGroundediceLevelset),... + (md.results.TransientSolution(2).MaskOceanLevelset),... (md.results.TransientSolution(2).Vx),... (md.results.TransientSolution(2).Vy),... @@ -73,5 +73,5 @@ (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).MaskGroundediceLevelset),... + (md.results.TransientSolution(3).MaskOceanLevelset),... (md.results.TransientSolution(3).Vx),... (md.results.TransientSolution(3).Vy),... Index: /issm/trunk-jpl/test/NightlyRun/test475.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test475.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test475.m (revision 24862) @@ -8,6 +8,6 @@ md.geometry.bed =-100-md.mesh.x/1000; md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water; -md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; -pos=find(md.mask.groundedice_levelset>=0); +md.mask.ocean_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; +pos=find(md.mask.ocean_levelset>=0); md.geometry.base(pos)=md.geometry.bed(pos); md.geometry.surface=md.geometry.base+md.geometry.thickness; @@ -57,5 +57,5 @@ (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).MaskGroundediceLevelset),... + (md.results.TransientSolution(1).MaskOceanLevelset),... (md.results.TransientSolution(1).Vx),... (md.results.TransientSolution(1).Vy),... @@ -65,5 +65,5 @@ (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).MaskGroundediceLevelset),... + (md.results.TransientSolution(2).MaskOceanLevelset),... (md.results.TransientSolution(2).Vx),... (md.results.TransientSolution(2).Vy),... @@ -73,5 +73,5 @@ (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).MaskGroundediceLevelset),... + (md.results.TransientSolution(3).MaskOceanLevelset),... (md.results.TransientSolution(3).Vx),... (md.results.TransientSolution(3).Vy),... Index: /issm/trunk-jpl/test/NightlyRun/test476.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test476.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test476.m (revision 24862) @@ -8,6 +8,6 @@ md.geometry.bed =-100-md.mesh.x/1000; md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water; -md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; -pos=find(md.mask.groundedice_levelset>=0); +md.mask.ocean_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; +pos=find(md.mask.ocean_levelset>=0); md.geometry.base(pos)=md.geometry.bed(pos); md.geometry.surface=md.geometry.base+md.geometry.thickness; @@ -51,5 +51,5 @@ (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... - (md.results.TransientSolution(1).MaskGroundediceLevelset),... + (md.results.TransientSolution(1).MaskOceanLevelset),... (md.results.TransientSolution(1).Vx),... (md.results.TransientSolution(1).Vy),... @@ -59,5 +59,5 @@ (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... - (md.results.TransientSolution(2).MaskGroundediceLevelset),... + (md.results.TransientSolution(2).MaskOceanLevelset),... (md.results.TransientSolution(2).Vx),... (md.results.TransientSolution(2).Vy),... @@ -67,5 +67,5 @@ (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).MaskGroundediceLevelset),... + (md.results.TransientSolution(3).MaskOceanLevelset),... (md.results.TransientSolution(3).Vx),... (md.results.TransientSolution(3).Vy),... Index: /issm/trunk-jpl/test/NightlyRun/test511.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test511.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test511.m (revision 24862) @@ -9,5 +9,5 @@ md=extrude(md,3,1.); md=setflowequation(md,'FS','all'); -md=extract(md,md.mask.groundedice_levelset<0.); +md=extract(md,md.mask.ocean_levelset<0.); %control parameters Index: /issm/trunk-jpl/test/NightlyRun/test511.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test511.py (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test511.py (revision 24862) @@ -18,5 +18,5 @@ md.extrude(3, 1.) md = setflowequation(md, 'FS', 'all') -md = md.extract(md.mask.groundedice_levelset < 0.) +md = md.extract(md.mask.ocean_levelset < 0.) #control parameters Index: /issm/trunk-jpl/test/NightlyRun/test613.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test613.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test613.m (revision 24862) @@ -7,5 +7,5 @@ %Ice sheet only -md=extract(md,md.mask.groundedice_levelset>0.); +md=extract(md,md.mask.ocean_levelset>0.); pos=find(md.mesh.vertexonboundary); md.balancethickness.spcthickness(pos)=md.geometry.thickness(pos); Index: /issm/trunk-jpl/test/NightlyRun/test613.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test613.py (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test613.py (revision 24862) @@ -19,5 +19,5 @@ #Ice sheet only -md = model.extract(md, md.mask.groundedice_levelset > 0.) +md = model.extract(md, md.mask.ocean_levelset > 0.) pos = np.nonzero(md.mesh.vertexonboundary) md.balancethickness.spcthickness[pos] = md.geometry.thickness[pos] Index: /issm/trunk-jpl/test/NightlyRun/test701.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test701.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test701.m (revision 24862) @@ -14,5 +14,5 @@ md.mask.ice_levelset = - ones(md.mesh.numberofvertices,1); md.mask.ice_levelset(find(vertexflags(md.mesh,2))) = 0; -md.mask.groundedice_levelset = double(md.mesh.x<0)-.5; +md.mask.ocean_levelset = double(md.mesh.x<0)-.5; %materials Index: /issm/trunk-jpl/test/NightlyRun/test701.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test701.py (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test701.py (revision 24862) @@ -21,5 +21,5 @@ md.mask.ice_levelset = -np.ones((md.mesh.numberofvertices)) md.mask.ice_levelset[np.where(md.mesh.vertexflags(2))] = 0. -md.mask.groundedice_levelset = np.zeros((md.mesh.numberofvertices)) - 0.5 +md.mask.ocean_levelset = np.zeros((md.mesh.numberofvertices)) - 0.5 #materials Index: /issm/trunk-jpl/test/NightlyRun/test702.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test702.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test702.m (revision 24862) @@ -16,5 +16,5 @@ md.mask.ice_levelset = - ones(md.mesh.numberofvertices,1); md.mask.ice_levelset(find(vertexflags(md.mesh,2))) = 0; -md.mask.groundedice_levelset = double(md.mesh.x<0)-.5; +md.mask.ocean_levelset = double(md.mesh.x<0)-.5; md.initialization.temperature=(273.-20.)*ones(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/test/NightlyRun/test702.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test702.py (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test702.py (revision 24862) @@ -27,6 +27,6 @@ md.mask.ice_levelset = -np.ones((md.mesh.numberofvertices, )) md.mask.ice_levelset[np.where(md.mesh.vertexflags(2))] = 0 -md.mask.groundedice_levelset = -0.5 * np.ones((md.mesh.numberofvertices)) -md.mask.groundedice_levelset[np.where(md.mesh.x < 0)] = 0.5 +md.mask.ocean_levelset = -0.5 * np.ones((md.mesh.numberofvertices)) +md.mask.ocean_levelset[np.where(md.mesh.x < 0)] = 0.5 #materials Index: /issm/trunk-jpl/test/NightlyRun/test703.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test703.m (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test703.m (revision 24862) @@ -16,5 +16,5 @@ md.mask.ice_levelset = - ones(md.mesh.numberofvertices,1); md.mask.ice_levelset(find(vertexflags(md.mesh,2))) = 0; -md.mask.groundedice_levelset = double(md.mesh.x<0)-.5; +md.mask.ocean_levelset = double(md.mesh.x<0)-.5; md.initialization.temperature=(273.-20.)*ones(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/test/NightlyRun/test703.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test703.py (revision 24861) +++ /issm/trunk-jpl/test/NightlyRun/test703.py (revision 24862) @@ -40,6 +40,6 @@ md.mask.ice_levelset = -np.ones((md.mesh.numberofvertices)) md.mask.ice_levelset[np.where(md.mesh.vertexflags(2))] = 0 -md.mask.groundedice_levelset = -0.5 * np.ones((md.mesh.numberofvertices)) -md.mask.groundedice_levelset[np.where(md.mesh.x < 0)] = 0.5 +md.mask.ocean_levelset = -0.5 * np.ones((md.mesh.numberofvertices)) +md.mask.ocean_levelset[np.where(md.mesh.x < 0)] = 0.5 #materials Index: /issm/trunk-jpl/test/Par/79North.py =================================================================== --- /issm/trunk-jpl/test/Par/79North.py (revision 24861) +++ /issm/trunk-jpl/test/Par/79North.py (revision 24862) @@ -33,5 +33,5 @@ #Friction md.friction.coefficient = 50. * numpy.ones((md.mesh.numberofvertices)) -md.friction.coefficient[numpy.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.coefficient[numpy.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0. md.friction.p = numpy.ones((md.mesh.numberofelements)) md.friction.q = numpy.ones((md.mesh.numberofelements)) @@ -39,5 +39,5 @@ #Ice shelf melting and surface mass balance md.basalforcings.floatingice_melting_rate = numpy.zeros((md.mesh.numberofvertices)) -md.basalforcings.floatingice_melting_rate[numpy.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.basalforcings.floatingice_melting_rate[numpy.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0. md.basalforcings.groundedice_melting_rate = numpy.zeros((md.mesh.numberofvertices)) md.smb.mass_balance = 15 * numpy.ones((md.mesh.numberofvertices)) Index: /issm/trunk-jpl/test/Par/GiaIvinsBenchmarksAB.py =================================================================== --- /issm/trunk-jpl/test/Par/GiaIvinsBenchmarksAB.py (revision 24861) +++ /issm/trunk-jpl/test/Par/GiaIvinsBenchmarksAB.py (revision 24862) @@ -60,5 +60,5 @@ #Friction md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices, )) -md.friction.coefficient[np.where(md.mask.groundedice_levelset < 0.)] = 0. +md.friction.coefficient[np.where(md.mask.ocean_levelset < 0.)] = 0. md.friction.p = np.ones((md.mesh.numberofelements, )) md.friction.q = np.ones((md.mesh.numberofelements, )) Index: /issm/trunk-jpl/test/Par/GiaIvinsBenchmarksCD.py =================================================================== --- /issm/trunk-jpl/test/Par/GiaIvinsBenchmarksCD.py (revision 24861) +++ /issm/trunk-jpl/test/Par/GiaIvinsBenchmarksCD.py (revision 24862) @@ -60,5 +60,5 @@ #Friction md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices, )) -md.friction.coefficient[np.where(md.mask.groundedice_levelset < 0.)] = 0. +md.friction.coefficient[np.where(md.mask.ocean_levelset < 0.)] = 0. md.friction.p = np.ones((md.mesh.numberofelements, )) md.friction.q = np.ones((md.mesh.numberofelements, )) Index: /issm/trunk-jpl/test/Par/ISMIPA.py =================================================================== --- /issm/trunk-jpl/test/Par/ISMIPA.py (revision 24861) +++ /issm/trunk-jpl/test/Par/ISMIPA.py (revision 24862) @@ -11,5 +11,5 @@ print(" creating drag") md.friction.coefficient = 200. * np.ones((md.mesh.numberofvertices)) -md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.coefficient[np.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0. md.friction.p = np.ones((md.mesh.numberofelements)) md.friction.q = np.ones((md.mesh.numberofelements)) Index: /issm/trunk-jpl/test/Par/ISMIPB.py =================================================================== --- /issm/trunk-jpl/test/Par/ISMIPB.py (revision 24861) +++ /issm/trunk-jpl/test/Par/ISMIPB.py (revision 24862) @@ -11,5 +11,5 @@ print(" creating drag") md.friction.coefficient = 200. * np.ones((md.mesh.numberofvertices)) -md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.coefficient[np.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0. md.friction.p = np.ones((md.mesh.numberofelements)) md.friction.q = np.ones((md.mesh.numberofelements)) Index: /issm/trunk-jpl/test/Par/ISMIPC.py =================================================================== --- /issm/trunk-jpl/test/Par/ISMIPC.py (revision 24861) +++ /issm/trunk-jpl/test/Par/ISMIPC.py (revision 24862) @@ -12,5 +12,5 @@ #md.friction.coefficient = sqrt(md.constants.yts. * (1000. + 1000. * sin(md.mesh.x * 2. * pi / max(md.mesh.x / 2.)). * sin(md.mesh.y * 2. * pi / max(md.mesh.x / 2.))). / (md.constants.g * (md.materials.rho_ice * md.geometry.thickness + md.materials.rho_water * md.geometry.base))) md.friction.coefficient = np.sqrt(md.constants.yts * (1000. + 1000. * np.sin(md.mesh.x * 2. * np.pi / np.max(md.mesh.x)) * np.sin(md.mesh.y * 2. * np.pi / np.max(md.mesh.x)))) -md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.coefficient[np.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0. md.friction.p = np.ones((md.mesh.numberofelements)) md.friction.q = np.zeros((md.mesh.numberofelements)) Index: /issm/trunk-jpl/test/Par/ISMIPD.py =================================================================== --- /issm/trunk-jpl/test/Par/ISMIPD.py (revision 24861) +++ /issm/trunk-jpl/test/Par/ISMIPD.py (revision 24862) @@ -11,5 +11,5 @@ print(" creating drag") md.friction.coefficient = np.sqrt(md.constants.yts * (1000. + 1000. * np.sin(md.mesh.x * 2. * np.pi / np.max(md.mesh.x)))) -md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.coefficient[np.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0. md.friction.p = np.ones((md.mesh.numberofelements)) md.friction.q = np.zeros((md.mesh.numberofelements)) Index: /issm/trunk-jpl/test/Par/IceCube.py =================================================================== --- /issm/trunk-jpl/test/Par/IceCube.py (revision 24861) +++ /issm/trunk-jpl/test/Par/IceCube.py (revision 24862) @@ -30,5 +30,5 @@ #Friction md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices)) -md.friction.coefficient[np.where(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.coefficient[np.where(md.mask.ocean_levelset < 0.)[0]] = 0. md.friction.p = np.ones((md.mesh.numberofelements)) md.friction.q = np.ones((md.mesh.numberofelements)) Index: /issm/trunk-jpl/test/Par/Pig.py =================================================================== --- /issm/trunk-jpl/test/Par/Pig.py (revision 24861) +++ /issm/trunk-jpl/test/Par/Pig.py (revision 24862) @@ -26,5 +26,5 @@ md.geometry.base = md.geometry.surface - md.geometry.thickness md.geometry.bed = np.array(md.geometry.base) -pos = np.where(md.mask.groundedice_levelset < 0.) +pos = np.where(md.mask.ocean_levelset < 0.) md.geometry.bed[pos] = InterpFromMeshToMesh2d(index, x, y, bed, md.mesh.x[pos], md.mesh.y[pos])[0][:, 0] md.initialization.vx = md.inversion.vx_obs @@ -41,5 +41,5 @@ #Friction md.friction.coefficient = 50. * np.ones((md.mesh.numberofvertices)) -md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.coefficient[np.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0. md.friction.p = np.ones((md.mesh.numberofelements)) md.friction.q = np.ones((md.mesh.numberofelements)) Index: /issm/trunk-jpl/test/Par/RoundSheetShelf.py =================================================================== --- /issm/trunk-jpl/test/Par/RoundSheetShelf.py (revision 24861) +++ /issm/trunk-jpl/test/Par/RoundSheetShelf.py (revision 24862) @@ -20,5 +20,5 @@ md.geometry.base = -md.materials.rho_ice / md.materials.rho_water * md.geometry.thickness -pos = np.nonzero(md.mask.groundedice_levelset > 0.)[0] +pos = np.nonzero(md.mask.ocean_levelset > 0.)[0] md.geometry.base[pos] = md.geometry.base[pos] - 300. * (radius[pos] - (rad - shelfextent)) / (rad - shelfextent) md.geometry.surface = md.geometry.base + md.geometry.thickness @@ -71,5 +71,5 @@ md.smb.mass_balance = -10. * np.ones((md.mesh.numberofvertices)) md.basalforcings.groundedice_melting_rate = np.zeros((md.mesh.numberofvertices)) -pos = np.nonzero(md.mask.groundedice_levelset > 0.)[0] +pos = np.nonzero(md.mask.ocean_levelset > 0.)[0] md.basalforcings.groundedice_melting_rate[pos] = 10. md.basalforcings.floatingice_melting_rate = np.zeros((md.mesh.numberofvertices)) @@ -104,5 +104,5 @@ md.groundingline.migration = 'AggressiveMigration' md.geometry.bed = copy.deepcopy(md.geometry.base) -pos = np.nonzero(md.mask.groundedice_levelset < 0.)[0] +pos = np.nonzero(md.mask.ocean_levelset < 0.)[0] md.geometry.bed[pos] = md.geometry.base[pos] - 900. Index: /issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.py =================================================================== --- /issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.py (revision 24861) +++ /issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.py (revision 24862) @@ -14,5 +14,5 @@ print(" creating drag") md.friction.coefficient = 20. * numpy.ones((md.mesh.numberofvertices)) -md.friction.coefficient[numpy.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.coefficient[numpy.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0. md.friction.p = numpy.ones((md.mesh.numberofelements)) md.friction.q = numpy.ones((md.mesh.numberofelements)) Index: /issm/trunk-jpl/test/Par/SquareEISMINT.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareEISMINT.py (revision 24861) +++ /issm/trunk-jpl/test/Par/SquareEISMINT.py (revision 24862) @@ -13,5 +13,5 @@ print(" creating drag") md.friction.coefficient = 200. * np.ones((md.mesh.numberofvertices)) -md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.coefficient[np.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0. md.friction.p = np.ones((md.mesh.numberofelements)) md.friction.q = np.ones((md.mesh.numberofelements)) Index: /issm/trunk-jpl/test/Par/SquareNoDyn.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareNoDyn.py (revision 24861) +++ /issm/trunk-jpl/test/Par/SquareNoDyn.py (revision 24862) @@ -21,5 +21,5 @@ #Friction md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices)) -md.friction.coefficient[np.where(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.coefficient[np.where(md.mask.ocean_levelset < 0.)[0]] = 0. md.friction.p = np.ones((md.mesh.numberofelements)) md.friction.q = np.ones((md.mesh.numberofelements)) Index: /issm/trunk-jpl/test/Par/SquareSheetConstrained.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareSheetConstrained.py (revision 24861) +++ /issm/trunk-jpl/test/Par/SquareSheetConstrained.py (revision 24862) @@ -44,5 +44,5 @@ #Friction md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices)) -md.friction.coefficient[np.where(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.coefficient[np.where(md.mask.ocean_levelset < 0.)[0]] = 0. md.friction.p = np.ones((md.mesh.numberofelements)) md.friction.q = np.ones((md.mesh.numberofelements)) Index: /issm/trunk-jpl/test/Par/SquareSheetConstrainedCO2.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareSheetConstrainedCO2.py (revision 24861) +++ /issm/trunk-jpl/test/Par/SquareSheetConstrainedCO2.py (revision 24862) @@ -61,5 +61,5 @@ #Friction md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices)) -md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.coefficient[np.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0. md.friction.p = np.ones((md.mesh.numberofelements)) md.friction.q = np.ones((md.mesh.numberofelements)) Index: /issm/trunk-jpl/test/Par/SquareSheetShelf.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareSheetShelf.py (revision 24861) +++ /issm/trunk-jpl/test/Par/SquareSheetShelf.py (revision 24862) @@ -48,5 +48,5 @@ #Friction md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices)) -md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.coefficient[np.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0. md.friction.p = np.ones((md.mesh.numberofelements)) md.friction.q = np.ones((md.mesh.numberofelements)) Index: /issm/trunk-jpl/test/Par/SquareShelf.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareShelf.py (revision 24861) +++ /issm/trunk-jpl/test/Par/SquareShelf.py (revision 24862) @@ -58,5 +58,5 @@ #Friction md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices)) -md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.coefficient[np.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0. md.friction.p = np.ones((md.mesh.numberofelements)) md.friction.q = np.ones((md.mesh.numberofelements)) Index: /issm/trunk-jpl/test/Par/SquareShelf2.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareShelf2.py (revision 24861) +++ /issm/trunk-jpl/test/Par/SquareShelf2.py (revision 24862) @@ -56,5 +56,5 @@ #Friction md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices)) -md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.coefficient[np.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0. md.friction.p = np.ones((md.mesh.numberofelements)) md.friction.q = np.ones((md.mesh.numberofelements)) Index: /issm/trunk-jpl/test/Par/SquareShelfConstrained.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareShelfConstrained.py (revision 24861) +++ /issm/trunk-jpl/test/Par/SquareShelfConstrained.py (revision 24862) @@ -45,5 +45,5 @@ #Friction md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices)) -md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.coefficient[np.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0. md.friction.p = np.ones((md.mesh.numberofelements)) md.friction.q = np.ones((md.mesh.numberofelements)) Index: /issm/trunk-jpl/test/Par/SquareThermal.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareThermal.py (revision 24861) +++ /issm/trunk-jpl/test/Par/SquareThermal.py (revision 24862) @@ -21,5 +21,5 @@ print(" creating drag") md.friction.coefficient = 200. * np.ones((md.mesh.numberofvertices)) -md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.coefficient[np.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0. md.friction.p = np.ones((md.mesh.numberofelements)) md.friction.q = np.ones((md.mesh.numberofelements)) @@ -49,3 +49,3 @@ md.thermal.spctemperature[:] = md.initialization.temperature md.basalforcings.geothermalflux = np.zeros((md.mesh.numberofvertices)) -md.basalforcings.geothermalflux[np.nonzero(md.mask.groundedice_levelset > 0.)[0]] = 1. * 10**-3 #1 mW / m^2 +md.basalforcings.geothermalflux[np.nonzero(md.mask.ocean_levelset > 0.)[0]] = 1. * 10**-3 #1 mW / m^2 Index: /issm/trunk-jpl/test/Par/ValleyGlacierShelf.py =================================================================== --- /issm/trunk-jpl/test/Par/ValleyGlacierShelf.py (revision 24861) +++ /issm/trunk-jpl/test/Par/ValleyGlacierShelf.py (revision 24862) @@ -31,5 +31,5 @@ #Mask md.mask.ice_levelset = x - alpha * Lx -md.mask.groundedice_levelset = np.ones((md.mesh.numberofvertices)) +md.mask.ocean_levelset = np.ones((md.mesh.numberofvertices)) #Initial velocity @@ -60,5 +60,5 @@ #Friction md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices)) -md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.coefficient[np.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0. md.friction.p = np.ones((md.mesh.numberofelements)) md.friction.q = np.ones((md.mesh.numberofelements))