Changeset 24862


Ignore:
Timestamp:
05/15/20 20:21:51 (5 years ago)
Author:
Mathieu Morlighem
Message:

CHG: renaming groundedice_levelset -> ocean_levelset (negative if ocean present, positive outside

Location:
issm/trunk-jpl/test
Files:
87 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/test/NightlyRun/test2002.m

    r24750 r24862  
    4141%make sure that the ice level set is all inclusive:
    4242md.mask.land_levelset=zeros(md.mesh.numberofvertices,1);
    43 md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1);
     43md.mask.ocean_levelset=-ones(md.mesh.numberofvertices,1);
    4444
    4545%make sure that the elements that have loads are fully grounded:
    4646pos=find(md.slr.deltathickness);
    47 md.mask.groundedice_levelset(md.mesh.elements(pos,:))=1;
     47md.mask.ocean_levelset(md.mesh.elements(pos,:))=1;
    4848
    4949%make sure wherever there is an ice load, that the mask is set to ice:

  • issm/trunk-jpl/test/NightlyRun/test2002.py

    r24758 r24862  
    5555#make sure that the ice level set is all inclusive:
    5656md.mask.land_levelset = np.zeros((md.mesh.numberofvertices))
    57 md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices))
     57md.mask.ocean_levelset = -np.ones((md.mesh.numberofvertices))
    5858
    5959#make sure that the elements that have loads are fully grounded:
    6060pos = np.nonzero(md.slr.deltathickness)[0]
    61 md.mask.groundedice_levelset[md.mesh.elements[pos, :] - 1] = 1
     61md.mask.ocean_levelset[md.mesh.elements[pos, :] - 1] = 1
    6262
    6363#make sure wherever there is an ice load, that the mask is set to ice:

  • issm/trunk-jpl/test/NightlyRun/test2003.m

    r24482 r24862  
    3939%make sure that the ice level set is all inclusive:
    4040md.mask.land_levelset=zeros(md.mesh.numberofvertices,1);
    41 md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1);
     41md.mask.ocean_levelset=-ones(md.mesh.numberofvertices,1);
    4242
    4343%make sure that the elements that have loads are fully grounded:
    4444pos=find(md.slr.deltathickness);
    45 md.mask.groundedice_levelset(md.mesh.elements(pos,:))=1;
     45md.mask.ocean_levelset(md.mesh.elements(pos,:))=1;
    4646
    4747%make sure wherever there is an ice load, that the mask is set to ice:

  • issm/trunk-jpl/test/NightlyRun/test2003.py

    r24482 r24862  
    5858#make sure that the ice level set is all inclusive:
    5959md.mask.land_levelset = np.zeros((md.mesh.numberofvertices, ))
    60 md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices, ))
     60md.mask.ocean_levelset = -np.ones((md.mesh.numberofvertices, ))
    6161
    6262#make sure that the elements that have loads are fully grounded:
    6363pos = np.nonzero(md.slr.deltathickness)[0]
    64 md.mask.groundedice_levelset[md.mesh.elements[pos, :] - 1] = 1
     64md.mask.ocean_levelset[md.mesh.elements[pos, :] - 1] = 1
    6565
    6666#make sure wherever there is an ice load, that the mask is set to ice:

  • issm/trunk-jpl/test/NightlyRun/test2010.m

    r24482 r24862  
    4242%make sure that the ice level set is all inclusive:
    4343md.mask.land_levelset=zeros(md.mesh.numberofvertices,1);
    44 md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1);
     44md.mask.ocean_levelset=-ones(md.mesh.numberofvertices,1);
    4545
    4646%make sure that the elements that have loads are fully grounded:
    4747pos=find(md.slr.deltathickness);
    48 md.mask.groundedice_levelset(md.mesh.elements(pos,:))=1;
     48md.mask.ocean_levelset(md.mesh.elements(pos,:))=1;
    4949
    5050%make sure wherever there is an ice load, that the mask is set to ice:

  • issm/trunk-jpl/test/NightlyRun/test2010.py

    r24482 r24862  
    5858#make sure that the ice level set is all inclusive:
    5959md.mask.land_levelset = np.zeros((md.mesh.numberofvertices, ))
    60 md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices, ))
     60md.mask.ocean_levelset = -np.ones((md.mesh.numberofvertices, ))
    6161
    6262#make sure that the elements that have loads are fully grounded:
    6363pos = np.nonzero(md.slr.deltathickness)[0]
    64 md.mask.groundedice_levelset[md.mesh.elements[pos, :] - 1] = 1
     64md.mask.ocean_levelset[md.mesh.elements[pos, :] - 1] = 1
    6565
    6666#make sure wherever there is an ice load, that the mask is set to ice:

  • issm/trunk-jpl/test/NightlyRun/test2101.m

    r21306 r24862  
    2424
    2525        %is ice grounded?
    26         md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1);
    27         pos=find(md.mask.ice_levelset<=0); md.mask.groundedice_levelset(pos)=1;
     26        md.mask.ocean_levelset=-ones(md.mesh.numberofvertices,1);
     27        pos=find(md.mask.ice_levelset<=0); md.mask.ocean_levelset(pos)=1;
    2828
    2929        %make sure ice domain is on the continent:

  • issm/trunk-jpl/test/NightlyRun/test2101.py

    r24261 r24862  
    3838
    3939#is ice grounded?
    40 md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices, ))
     40md.mask.ocean_levelset = -np.ones((md.mesh.numberofvertices, ))
    4141pos = np.where(md.mask.ice_levelset <= 0)
    42 md.mask.groundedice_levelset[pos] = 1
     42md.mask.ocean_levelset[pos] = 1
    4343
    4444#make sure ice domain is on the continent:

  • issm/trunk-jpl/test/NightlyRun/test2110.m

    r22350 r24862  
    2626
    2727        %is ice grounded?
    28         md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1);
    29         pos=find(md.mask.ice_levelset<=0); md.mask.groundedice_levelset(pos)=1;
     28        md.mask.ocean_levelset=-ones(md.mesh.numberofvertices,1);
     29        pos=find(md.mask.ice_levelset<=0); md.mask.ocean_levelset(pos)=1;
    3030
    3131% }}}

  • issm/trunk-jpl/test/NightlyRun/test2110.py

    r24261 r24862  
    3737
    3838#is ice grounded?
    39 md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices, ))
     39md.mask.ocean_levelset = -np.ones((md.mesh.numberofvertices, ))
    4040pos = np.where(md.mask.ice_levelset <= 0)
    41 md.mask.groundedice_levelset[pos] = 1
     41md.mask.ocean_levelset[pos] = 1
    4242
    4343# }}}

  • issm/trunk-jpl/test/NightlyRun/test2111.m

    r22970 r24862  
    2626
    2727        %is ice grounded?
    28         md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1);
    29         pos=find(md.mask.ice_levelset<=0); md.mask.groundedice_levelset(pos)=1;
     28        md.mask.ocean_levelset=-ones(md.mesh.numberofvertices,1);
     29        pos=find(md.mask.ice_levelset<=0); md.mask.ocean_levelset(pos)=1;
    3030% }}}
    3131%geometry:  {{{

  • issm/trunk-jpl/test/NightlyRun/test2111.py

    r24261 r24862  
    3737
    3838#is ice grounded?
    39 md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices, ))
     39md.mask.ocean_levelset = -np.ones((md.mesh.numberofvertices, ))
    4040pos = np.where(md.mask.ice_levelset <= 0)
    41 md.mask.groundedice_levelset[pos] = 1
     41md.mask.ocean_levelset[pos] = 1
    4242# }}}
    4343#geometry:  {{{

  • issm/trunk-jpl/test/NightlyRun/test2112.m

    r22970 r24862  
    2626
    2727        %is ice grounded?
    28         md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1);
    29         pos=find(md.mask.ice_levelset<=0); md.mask.groundedice_levelset(pos)=1;
     28        md.mask.ocean_levelset=-ones(md.mesh.numberofvertices,1);
     29        pos=find(md.mask.ice_levelset<=0); md.mask.ocean_levelset(pos)=1;
    3030% }}}
    3131%geometry:  {{{

  • issm/trunk-jpl/test/NightlyRun/test2112.py

    r24261 r24862  
    3636
    3737#is ice grounded?
    38 md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices, ))
     38md.mask.ocean_levelset = -np.ones((md.mesh.numberofvertices, ))
    3939pos = np.where(md.mask.ice_levelset <= 0)
    40 md.mask.groundedice_levelset[pos] = 1
     40md.mask.ocean_levelset[pos] = 1
    4141# }}}
    4242#geometry:  {{{

  • issm/trunk-jpl/test/NightlyRun/test2113.m

    r22970 r24862  
    2727
    2828        %is ice grounded?
    29         md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1);
    30         pos=find(md.mask.ice_levelset<=0); md.mask.groundedice_levelset(pos)=1;
     29        md.mask.ocean_levelset=-ones(md.mesh.numberofvertices,1);
     30        pos=find(md.mask.ice_levelset<=0); md.mask.ocean_levelset(pos)=1;
    3131% }}}
    3232%geometry:  {{{

  • issm/trunk-jpl/test/NightlyRun/test2113.py

    r24261 r24862  
    3838
    3939#is ice grounded?
    40 md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices, ))
     40md.mask.ocean_levelset = -np.ones((md.mesh.numberofvertices, ))
    4141pos = np.where(md.mask.ice_levelset <= 0)
    42 md.mask.groundedice_levelset[pos] = 1
     42md.mask.ocean_levelset[pos] = 1
    4343# }}}
    4444#geometry:  {{{

  • issm/trunk-jpl/test/NightlyRun/test2424.m

    r21056 r24862  
    3535        field_names{end+1}=sprintf('Time-%g-yr-ice_levelset-S-sl-(1-di)*H',md.results.TransientSolution(i).time);
    3636        field_tolerances{end+1}=1e-12;
    37         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);
     37        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);
    3838end

  • issm/trunk-jpl/test/NightlyRun/test2424.py

    r24384 r24862  
    4747    field_names.append('Time-' + str(md.results.TransientSolution[i].time) + '-yr-ice_levelset-S-sl-(1-di) * H')
    4848    field_tolerances.append(1e-12)
    49     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))
     49    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))

  • issm/trunk-jpl/test/NightlyRun/test3480.m

    r23359 r24862  
    88md.geometry.bed =-100-md.mesh.x/1000;
    99md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water;
    10 md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
    11 pos=find(md.mask.groundedice_levelset>=0);
     10md.mask.ocean_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
     11pos=find(md.mask.ocean_levelset>=0);
    1212md.geometry.base(pos)=md.geometry.bed(pos);
    1313md.geometry.surface=md.geometry.base+md.geometry.thickness;
    … …  
    4949md.transient.isthermal=0;
    5050
    51 pos=find(md.mask.groundedice_levelset<0);
     51pos=find(md.mask.ocean_levelset<0);
    5252md.basalforcings.groundedice_melting_rate=zeros(md.mesh.numberofvertices,1);
    5353md.basalforcings.floatingice_melting_rate=25*zeros(md.mesh.numberofvertices,1);

  • issm/trunk-jpl/test/NightlyRun/test3481.m

    r23359 r24862  
    88md.geometry.bed =-100-md.mesh.x/1000;
    99md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water;
    10 md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
    11 pos=find(md.mask.groundedice_levelset>=0);
     10md.mask.ocean_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
     11pos=find(md.mask.ocean_levelset>=0);
    1212md.geometry.base(pos)=md.geometry.bed(pos);
    1313md.geometry.surface=md.geometry.base+md.geometry.thickness;
    … …  
    5555md.transient.isthermal=0;
    5656
    57 pos=find(md.mask.groundedice_levelset<0);
     57pos=find(md.mask.ocean_levelset<0);
    5858md.basalforcings.groundedice_melting_rate=zeros(md.mesh.numberofvertices,1);
    5959md.basalforcings.floatingice_melting_rate=25*zeros(md.mesh.numberofvertices,1);

  • issm/trunk-jpl/test/NightlyRun/test4001.m

    r24456 r24862  
    439439
    440440    %level sets:
    441     md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1);
     441    md.mask.ocean_levelset=-ones(md.mesh.numberofvertices,1);
    442442    md.mask.ice_levelset=ones(md.mesh.numberofvertices,1);
    443443
    444444    pos=find(ice_mask); md.mask.ice_levelset(pos)=-1;
    445     pos=find(~iceshelf_mask & ice_mask); md.mask.groundedice_levelset(pos)=1;
     445    pos=find(~iceshelf_mask & ice_mask); md.mask.ocean_levelset(pos)=1;
    446446
    447447    %identify edges of grounded ice:
    448     groundedice_levelset=md.mask.groundedice_levelset;
     448    ocean_levelset=md.mask.ocean_levelset;
    449449    for i=1:md.mesh.numberofelements,
    450         m=groundedice_levelset(md.mesh.elements(i,:));
     450        m=ocean_levelset(md.mesh.elements(i,:));
    451451        if abs(sum(m))~=3,
    452             pos=find(m==1); md.mask.groundedice_levelset(md.mesh.elements(i,pos))=0;
     452            pos=find(m==1); md.mask.ocean_levelset(md.mesh.elements(i,pos))=0;
    453453        end
    454454    end
    … …  
    483483    %friction:
    484484    md.friction.coefficient=30*ones(md.mesh.numberofvertices,1);
    485     pos=find(md.mask.groundedice_levelset<=0);
     485    pos=find(md.mask.ocean_levelset<=0);
    486486    md.friction.coefficient(pos)=0;
    487487    md.friction.p=ones(md.mesh.numberofelements,1);
    … …  
    521521    vertex_on_boundary=zeros(md.mesh.numberofvertices,1);
    522522    vertex_on_boundary(md.mesh.segments(:,1:2))=1;
    523     pos=find(vertex_on_boundary & md.mask.groundedice_levelset<=0);
     523    pos=find(vertex_on_boundary & md.mask.ocean_levelset<=0);
    524524    md.stressbalance.spcvx(pos)=md.initialization.vx(pos);
    525525    md.stressbalance.spcvy(pos)=md.initialization.vy(pos);
    … …  
    838838        md.initialization.vel=md.results.TransientSolution(end).Vel;
    839839        md.initialization.pressure=md.results.TransientSolution(end).Pressure;
    840         md.mask.groundedice_levelset=md.results.TransientSolution(end).MaskGroundediceLevelset;
     840        md.mask.ocean_levelset=md.results.TransientSolution(end).MaskOceanLevelset;
    841841        md.results.TransientSolution(end).FloatingiceMeltingRate=md.basalforcings.floatingice_melting_rate;
    842842
    … …  
    862862fnm=['run/SHICE_fwFluxtave_0000017520.data'];
    863863melting_rate_4=readbin(fnm,[Nx Ny]);
    864 field_names     ={'Base1','Melting1','Vx2','Vy2','Thickness2','Base2','MaskGroundediceLevelset2','FloatingiceMeltingRate2',...
    865     'Melting2','Vx3','Vy3','Thickness3','Base3','MaskGroundediceLevelset3','FloatingiceMeltingRate3',...
    866     'Melting3','Vx4','Vy4','Thickness4','Base4','MaskGroundediceLevelset4','FloatingiceMeltingRate4','Melting4'};
     864field_names     ={'Base1','Melting1','Vx2','Vy2','Thickness2','Base2','MaskOceanLevelset2','FloatingiceMeltingRate2',...
     865    'Melting2','Vx3','Vy3','Thickness3','Base3','MaskOceanLevelset3','FloatingiceMeltingRate3',...
     866    'Melting3','Vx4','Vy4','Thickness4','Base4','MaskOceanLevelset4','FloatingiceMeltingRate4','Melting4'};
    867867field_tolerances={2e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
    868868    1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13,...
    … …  
    875875    (md.results(2).TransientSolution(end).Thickness),...
    876876    (md.results(2).TransientSolution(end).Base),...
    877     (md.results(2).TransientSolution(end).MaskGroundediceLevelset),...
     877    (md.results(2).TransientSolution(end).MaskOceanLevelset),...
    878878    (md.results(2).TransientSolution(end).FloatingiceMeltingRate),...
    879879    (melting_rate_2(:)),...
    … …  
    882882    (md.results(3).TransientSolution(end).Thickness),...
    883883    (md.results(3).TransientSolution(end).Base),...
    884     (md.results(3).TransientSolution(end).MaskGroundediceLevelset),...
     884    (md.results(3).TransientSolution(end).MaskOceanLevelset),...
    885885    (md.results(3).TransientSolution(end).FloatingiceMeltingRate),...
    886886    (melting_rate_3(:)),...
    … …  
    889889    (md.results(4).TransientSolution(end).Thickness),...
    890890    (md.results(4).TransientSolution(end).Base),...
    891     (md.results(4).TransientSolution(end).MaskGroundediceLevelset),...
     891    (md.results(4).TransientSolution(end).MaskOceanLevelset),...
    892892    (md.results(4).TransientSolution(end).FloatingiceMeltingRate),...
    893893    (melting_rate_4(:)),...

  • issm/trunk-jpl/test/NightlyRun/test4002.m

    r24456 r24862  
    440440
    441441    %level sets:
    442     md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1);
     442    md.mask.ocean_levelset=-ones(md.mesh.numberofvertices,1);
    443443    md.mask.ice_levelset=ones(md.mesh.numberofvertices,1);
    444444
    445445    pos=find(ice_mask); md.mask.ice_levelset(pos)=-1;
    446     pos=find(~iceshelf_mask & ice_mask); md.mask.groundedice_levelset(pos)=1;
     446    pos=find(~iceshelf_mask & ice_mask); md.mask.ocean_levelset(pos)=1;
    447447
    448448    %identify edges of grounded ice:
    449     groundedice_levelset=md.mask.groundedice_levelset;
     449    ocean_levelset=md.mask.ocean_levelset;
    450450    for i=1:md.mesh.numberofelements,
    451         m=groundedice_levelset(md.mesh.elements(i,:));
     451        m=ocean_levelset(md.mesh.elements(i,:));
    452452        if abs(sum(m))~=3,
    453             pos=find(m==1); md.mask.groundedice_levelset(md.mesh.elements(i,pos))=0;
     453            pos=find(m==1); md.mask.ocean_levelset(md.mesh.elements(i,pos))=0;
    454454        end
    455455    end
    … …  
    484484    %friction:
    485485    md.friction.coefficient=30*ones(md.mesh.numberofvertices,1);
    486     pos=find(md.mask.groundedice_levelset<=0);
     486    pos=find(md.mask.ocean_levelset<=0);
    487487    md.friction.coefficient(pos)=0;
    488488    md.friction.p=ones(md.mesh.numberofelements,1);
    … …  
    522522    vertex_on_boundary=zeros(md.mesh.numberofvertices,1);
    523523    vertex_on_boundary(md.mesh.segments(:,1:2))=1;
    524     pos=find(vertex_on_boundary & md.mask.groundedice_levelset<=0);
     524    pos=find(vertex_on_boundary & md.mask.ocean_levelset<=0);
    525525    md.stressbalance.spcvx(pos)=md.initialization.vx(pos);
    526526    md.stressbalance.spcvy(pos)=md.initialization.vy(pos);
    … …  
    836836        md.initialization.vel=md.results.TransientSolution(end).Vel;
    837837        md.initialization.pressure=md.results.TransientSolution(end).Pressure;
    838         md.mask.groundedice_levelset=md.results.TransientSolution(end).MaskGroundediceLevelset;
     838        md.mask.ocean_levelset=md.results.TransientSolution(end).MaskOceanLevelset;
    839839        md.results.TransientSolution(end).FloatingiceMeltingRate=md.basalforcings.floatingice_melting_rate;
    840840
    … …  
    10271027fnm=['run/SHICE_fwFluxtave.0000000024.data'];
    10281028melting_rate_4=readbin(fnm,[Nx Ny]);
    1029 field_names     ={'Base1','Melting1','Vx2','Vy2','Thickness2','Base2','MaskGroundediceLevelset2','FloatingiceMeltingRate2',...
    1030     'Melting2','Vx3','Vy3','Thickness3','Base3','MaskGroundediceLevelset3','FloatingiceMeltingRate3',...
    1031     'Melting3','Vx4','Vy4','Thickness4','Base4','MaskGroundediceLevelset4','FloatingiceMeltingRate4','Melting4'};
     1029field_names     ={'Base1','Melting1','Vx2','Vy2','Thickness2','Base2','MaskOceanLevelset2','FloatingiceMeltingRate2',...
     1030    'Melting2','Vx3','Vy3','Thickness3','Base3','MaskOceanLevelset3','FloatingiceMeltingRate3',...
     1031    'Melting3','Vx4','Vy4','Thickness4','Base4','MaskOceanLevelset4','FloatingiceMeltingRate4','Melting4'};
    10321032field_tolerances={2e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
    10331033    1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13,...
    … …  
    10401040    (md.results.TransientSolution(2).Thickness),...
    10411041    (md.results.TransientSolution(2).Base),...
    1042     (md.results.TransientSolution(2).MaskGroundediceLevelset),...
     1042    (md.results.TransientSolution(2).MaskOceanLevelset),...
    10431043    (md.results.TransientSolution(2).BasalforcingsFloatingiceMeltingRate),...
    10441044    (melting_rate_2(:)),...
    … …  
    10471047    (md.results.TransientSolution(3).Thickness),...
    10481048    (md.results.TransientSolution(3).Base),...
    1049     (md.results.TransientSolution(3).MaskGroundediceLevelset),...
     1049    (md.results.TransientSolution(3).MaskOceanLevelset),...
    10501050    (md.results.TransientSolution(3).BasalforcingsFloatingiceMeltingRate),...
    10511051    (melting_rate_3(:)),...
    … …  
    10541054    (md.results.TransientSolution(4).Thickness),...
    10551055    (md.results.TransientSolution(4).Base),...
    1056     (md.results.TransientSolution(4).MaskGroundediceLevelset),...
     1056    (md.results.TransientSolution(4).MaskOceanLevelset),...
    10571057    (md.results.TransientSolution(4).BasalforcingsFloatingiceMeltingRate),...
    10581058    (melting_rate_4(:)),...

  • issm/trunk-jpl/test/NightlyRun/test4003.m

    r24456 r24862  
    228228
    229229        %level sets:
    230         md.mask.groundedice_levelset=iceshelf_mask(:);
     230        md.mask.ocean_levelset=iceshelf_mask(:);
    231231        md.mask.ice_levelset=-ones(md.mesh.numberofvertices,1);
    232232
    … …  
    251251        %friction:
    252252        md.friction.coefficient=0*ones(md.mesh.numberofvertices,1);
    253         pos=find(md.mask.groundedice_levelset>0);
     253        pos=find(md.mask.ocean_levelset>0);
    254254        md.friction.coefficient(pos)=5;
    255255        md.friction.p=ones(md.mesh.numberofelements,1);
    … …  
    372372                  md.cluster.np=2;
    373373                  md.cluster.executionpath=[pwd '/run'];
    374                   md.transient.requested_outputs={'default','MaskGroundediceLevelset'};
     374                  md.transient.requested_outputs={'default','MaskOceanLevelset'};
    375375
    376376                  md=solveiceocean(md,'Transient','runtimename',false);
    … …  
    654654                md.initialization.vel=md.results.TransientSolution(end).Vel;
    655655                md.initialization.pressure=md.results.TransientSolution(end).Pressure;
    656                 md.mask.groundedice_levelset=md.results.TransientSolution(end).MaskGroundediceLevelset;
     656                md.mask.ocean_levelset=md.results.TransientSolution(end).MaskOceanLevelset;
    657657                md.results.TransientSolution(end).FloatingiceMeltingRate=md.basalforcings.floatingice_melting_rate;
    658658
    … …  
    679679fnm=['run/SHICE_fwFlux.0000011550.data'];
    680680melting_rate_4=readbin(fnm,[Nx Ny]);
    681 field_names     ={'Base1','Melting1','Vx2','Vy2','Thickness2','Base2','MaskGroundediceLevelset2','FloatingiceMeltingRate2',...
    682         'Melting2','Vx3','Vy3','Thickness3','Base3','MaskGroundediceLevelset3','FloatingiceMeltingRate3',...
    683         'Melting3','Vx4','Vy4','Thickness4','Base4','MaskGroundediceLevelset4','FloatingiceMeltingRate4','Melting4'};
     681field_names     ={'Base1','Melting1','Vx2','Vy2','Thickness2','Base2','MaskOceanLevelset2','FloatingiceMeltingRate2',...
     682        'Melting2','Vx3','Vy3','Thickness3','Base3','MaskOceanLevelset3','FloatingiceMeltingRate3',...
     683        'Melting3','Vx4','Vy4','Thickness4','Base4','MaskOceanLevelset4','FloatingiceMeltingRate4','Melting4'};
    684684field_tolerances={2e-13,1e-13,7e-13,7e-13,1e-13,1e-13,1e-13,1e-12,...
    685685        1e-13, 1e-12, 1e-12, 1e-13, 1e-13, 1e-13, 1e-12,...
    … …  
    692692        (md.results.TransientSolution(2).Thickness),...
    693693        (md.results.TransientSolution(2).Base),...
    694         (md.results.TransientSolution(2).MaskGroundediceLevelset),...
     694        (md.results.TransientSolution(2).MaskOceanLevelset),...
    695695        (md.results.TransientSolution(2).BasalforcingsFloatingiceMeltingRate),...
    696696        (melting_rate_2(:)),...
    … …  
    699699        (md.results.TransientSolution(3).Thickness),...
    700700        (md.results.TransientSolution(3).Base),...
    701         (md.results.TransientSolution(3).MaskGroundediceLevelset),...
     701        (md.results.TransientSolution(3).MaskOceanLevelset),...
    702702        (md.results.TransientSolution(3).BasalforcingsFloatingiceMeltingRate),...
    703703        (melting_rate_3(:)),...
    … …  
    706706        (md.results.TransientSolution(4).Thickness),...
    707707        (md.results.TransientSolution(4).Base),...
    708         (md.results.TransientSolution(4).MaskGroundediceLevelset),...
     708        (md.results.TransientSolution(4).MaskOceanLevelset),...
    709709        (md.results.TransientSolution(4).BasalforcingsFloatingiceMeltingRate),...
    710710        (melting_rate_4(:)),...

  • issm/trunk-jpl/test/NightlyRun/test408.m

    r21820 r24862  
    44md=parameterize(md,'../Par/SquareSheetShelf.par');
    55md.geometry.bed=md.geometry.base;
    6 pos=find(md.mask.groundedice_levelset<0);
     6pos=find(md.mask.ocean_levelset<0);
    77md.geometry.bed(pos)=md.geometry.base(pos)-10;
    88md.friction=frictioncoulomb();

  • issm/trunk-jpl/test/NightlyRun/test408.py

    r23793 r24862  
    1515md = parameterize(md, '../Par/SquareSheetShelf.py')
    1616md.geometry.bed = copy.deepcopy(md.geometry.base)
    17 pos = np.nonzero(md.mask.groundedice_levelset < 0.)
     17pos = np.nonzero(md.mask.ocean_levelset < 0.)
    1818md.geometry.bed[pos] = md.geometry.bed[pos] - 10
    1919md.friction = frictioncoulomb()

  • issm/trunk-jpl/test/NightlyRun/test423.m

    r22993 r24862  
    2828md.groundingline.migration='AggressiveMigration';
    2929md=solve(md,'Transient');
    30 element_on_iceshelf_agressive=(md.results.TransientSolution.MaskGroundediceLevelset);
     30element_on_iceshelf_agressive=(md.results.TransientSolution.MaskOceanLevelset);
    3131vel_agressive=(md.results.TransientSolution.Vel);
    3232
    3333md.groundingline.migration='SoftMigration';
    3434md=solve(md,'Transient');
    35 element_on_iceshelf_soft=(md.results.TransientSolution.MaskGroundediceLevelset);
     35element_on_iceshelf_soft=(md.results.TransientSolution.MaskOceanLevelset);
    3636vel_soft=(md.results.TransientSolution.Vel);
    3737
    38 md.mask.groundedice_levelset=md.geometry.thickness + md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
     38md.mask.ocean_levelset=md.geometry.thickness + md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
    3939md.groundingline.migration='SubelementMigration';
    4040md.groundingline.friction_interpolation='SubelementFriction1';
    4141md=solve(md,'Transient');
    42 element_on_iceshelf_subelement=(md.results.TransientSolution.MaskGroundediceLevelset);
     42element_on_iceshelf_subelement=(md.results.TransientSolution.MaskOceanLevelset);
    4343vel_subelement=(md.results.TransientSolution.Vel);
    4444
    4545md.groundingline.friction_interpolation='SubelementFriction2';
    4646md=solve(md,'Transient');
    47 element_on_iceshelf_subelement2=(md.results.TransientSolution.MaskGroundediceLevelset);
     47element_on_iceshelf_subelement2=(md.results.TransientSolution.MaskOceanLevelset);
    4848vel_subelement2=(md.results.TransientSolution.Vel);
    4949

  • issm/trunk-jpl/test/NightlyRun/test423.py

    r24214 r24862  
    3939md.groundingline.migration = 'AggressiveMigration'
    4040md = solve(md, 'Transient')
    41 element_on_iceshelf_agressive = md.results.TransientSolution[0].MaskGroundediceLevelset
     41element_on_iceshelf_agressive = md.results.TransientSolution[0].MaskOceanLevelset
    4242vel_agressive = md.results.TransientSolution[0].Vel
    4343
    4444md.groundingline.migration = 'SoftMigration'
    4545md = solve(md, 'Transient')
    46 element_on_iceshelf_soft = md.results.TransientSolution[0].MaskGroundediceLevelset
     46element_on_iceshelf_soft = md.results.TransientSolution[0].MaskOceanLevelset
    4747vel_soft = md.results.TransientSolution[0].Vel
    4848
    49 md.mask.groundedice_levelset = md.geometry.thickness + md.materials.rho_water / md.materials.rho_ice * md.geometry.bed
     49md.mask.ocean_levelset = md.geometry.thickness + md.materials.rho_water / md.materials.rho_ice * md.geometry.bed
    5050md.groundingline.migration = 'SubelementMigration'
    5151md.groundingline.friction_interpolation = 'SubelementFriction1'
    5252md = solve(md, 'Transient')
    53 element_on_iceshelf_subelement = md.results.TransientSolution[0].MaskGroundediceLevelset
     53element_on_iceshelf_subelement = md.results.TransientSolution[0].MaskOceanLevelset
    5454vel_subelement = md.results.TransientSolution[0].Vel
    5555
    5656md.groundingline.friction_interpolation = 'SubelementFriction2'
    5757md = solve(md, 'Transient')
    58 element_on_iceshelf_subelement2 = md.results.TransientSolution[0].MaskGroundediceLevelset
     58element_on_iceshelf_subelement2 = md.results.TransientSolution[0].MaskOceanLevelset
    5959vel_subelement2 = md.results.TransientSolution[0].Vel
    6060

  • issm/trunk-jpl/test/NightlyRun/test424.m

    r22337 r24862  
    3131        (md.results.TransientSolution(1).Surface),...
    3232        (md.results.TransientSolution(1).Thickness),...
    33         (md.results.TransientSolution(1).MaskGroundediceLevelset),...
     33        (md.results.TransientSolution(1).MaskOceanLevelset),...
    3434        (md.results.TransientSolution(1).IceVolume),...
    3535        (md.results.TransientSolution(1).IceVolumeAboveFloatation),...
    … …  
    4242        (md.results.TransientSolution(2).Surface),...
    4343        (md.results.TransientSolution(2).Thickness),...
    44         (md.results.TransientSolution(2).MaskGroundediceLevelset),...
     44        (md.results.TransientSolution(2).MaskOceanLevelset),...
    4545        (md.results.TransientSolution(2).IceVolume),...
    4646        (md.results.TransientSolution(2).IceVolumeAboveFloatation),...
    … …  
    5353        (md.results.TransientSolution(3).Surface),...
    5454        (md.results.TransientSolution(3).Thickness),...
    55         (md.results.TransientSolution(3).MaskGroundediceLevelset),...
     55        (md.results.TransientSolution(3).MaskOceanLevelset),...
    5656        (md.results.TransientSolution(3).IceVolume),...
    5757        (md.results.TransientSolution(3).IceVolumeAboveFloatation),...

  • issm/trunk-jpl/test/NightlyRun/test424.py

    r24261 r24862  
    3838                md.results.TransientSolution[0].Surface,
    3939                md.results.TransientSolution[0].Thickness,
    40                 md.results.TransientSolution[0].MaskGroundediceLevelset,
     40                md.results.TransientSolution[0].MaskOceanLevelset,
    4141                md.results.TransientSolution[0].IceVolume,
    4242                md.results.TransientSolution[0].IceVolumeAboveFloatation,
    … …  
    4949                md.results.TransientSolution[1].Surface,
    5050                md.results.TransientSolution[1].Thickness,
    51                 md.results.TransientSolution[1].MaskGroundediceLevelset,
     51                md.results.TransientSolution[1].MaskOceanLevelset,
    5252                md.results.TransientSolution[1].IceVolume,
    5353                md.results.TransientSolution[1].IceVolumeAboveFloatation,
    … …  
    6060                md.results.TransientSolution[2].Surface,
    6161                md.results.TransientSolution[2].Thickness,
    62                 md.results.TransientSolution[2].MaskGroundediceLevelset,
     62                md.results.TransientSolution[2].MaskOceanLevelset,
    6363                md.results.TransientSolution[2].IceVolume,
    6464                md.results.TransientSolution[2].IceVolumeAboveFloatation,

  • issm/trunk-jpl/test/NightlyRun/test425.m

    r21056 r24862  
    2929        (md.results.TransientSolution(1).Surface),...
    3030        (md.results.TransientSolution(1).Thickness),...
    31         (md.results.TransientSolution(1).MaskGroundediceLevelset),...
     31        (md.results.TransientSolution(1).MaskOceanLevelset),...
    3232        (md.results.TransientSolution(2).Base),...
    3333        (md.results.TransientSolution(2).Surface),...
    3434        (md.results.TransientSolution(2).Thickness),...
    35         (md.results.TransientSolution(2).MaskGroundediceLevelset),...
     35        (md.results.TransientSolution(2).MaskOceanLevelset),...
    3636        (md.results.TransientSolution(3).Base),...
    3737        (md.results.TransientSolution(3).Surface),...
    3838        (md.results.TransientSolution(3).Thickness),...
    39         (md.results.TransientSolution(3).MaskGroundediceLevelset),...
     39        (md.results.TransientSolution(3).MaskOceanLevelset),...
    4040        };

  • issm/trunk-jpl/test/NightlyRun/test425.py

    r24261 r24862  
    3636                md.results.TransientSolution[0].Surface,
    3737                md.results.TransientSolution[0].Thickness,
    38                 md.results.TransientSolution[0].MaskGroundediceLevelset,
     38                md.results.TransientSolution[0].MaskOceanLevelset,
    3939                md.results.TransientSolution[1].Base,
    4040                md.results.TransientSolution[1].Surface,
    4141                md.results.TransientSolution[1].Thickness,
    42                 md.results.TransientSolution[1].MaskGroundediceLevelset,
     42                md.results.TransientSolution[1].MaskOceanLevelset,
    4343                md.results.TransientSolution[2].Base,
    4444                md.results.TransientSolution[2].Surface,
    4545                md.results.TransientSolution[2].Thickness,
    46                 md.results.TransientSolution[2].MaskGroundediceLevelset]
     46                md.results.TransientSolution[2].MaskOceanLevelset]

  • issm/trunk-jpl/test/NightlyRun/test426.m

    r23011 r24862  
    3333        (md.results.TransientSolution(1).Surface),...
    3434        (md.results.TransientSolution(1).Thickness),...
    35         (md.results.TransientSolution(1).MaskGroundediceLevelset),...
     35        (md.results.TransientSolution(1).MaskOceanLevelset),...
    3636        (md.results.TransientSolution(1).IceVolume),...
    3737        (md.results.TransientSolution(1).IceVolumeAboveFloatation),...
    … …  
    4545        (md.results.TransientSolution(2).Surface),...
    4646        (md.results.TransientSolution(2).Thickness),...
    47         (md.results.TransientSolution(2).MaskGroundediceLevelset),...
     47        (md.results.TransientSolution(2).MaskOceanLevelset),...
    4848        (md.results.TransientSolution(2).IceVolume),...
    4949        (md.results.TransientSolution(2).IceVolumeAboveFloatation),...
    … …  
    5757        (md.results.TransientSolution(3).Surface),...
    5858        (md.results.TransientSolution(3).Thickness),...
    59         (md.results.TransientSolution(3).MaskGroundediceLevelset),...
     59        (md.results.TransientSolution(3).MaskOceanLevelset),...
    6060        (md.results.TransientSolution(3).IceVolume),...
    6161        (md.results.TransientSolution(3).IceVolumeAboveFloatation),...

  • issm/trunk-jpl/test/NightlyRun/test426.py

    r24261 r24862  
    4242                md.results.TransientSolution[0].Surface,
    4343                md.results.TransientSolution[0].Thickness,
    44                 md.results.TransientSolution[0].MaskGroundediceLevelset,
     44                md.results.TransientSolution[0].MaskOceanLevelset,
    4545                md.results.TransientSolution[0].IceVolume,
    4646                md.results.TransientSolution[0].IceVolumeAboveFloatation,
    … …  
    5454                md.results.TransientSolution[1].Surface,
    5555                md.results.TransientSolution[1].Thickness,
    56                 md.results.TransientSolution[1].MaskGroundediceLevelset,
     56                md.results.TransientSolution[1].MaskOceanLevelset,
    5757                md.results.TransientSolution[1].IceVolume,
    5858                md.results.TransientSolution[1].IceVolumeAboveFloatation,
    … …  
    6666                md.results.TransientSolution[2].Surface,
    6767                md.results.TransientSolution[2].Thickness,
    68                 md.results.TransientSolution[2].MaskGroundediceLevelset,
     68                md.results.TransientSolution[2].MaskOceanLevelset,
    6969                md.results.TransientSolution[2].IceVolume,
    7070                md.results.TransientSolution[2].IceVolumeAboveFloatation,

  • issm/trunk-jpl/test/NightlyRun/test427.m

    r23011 r24862  
    3131        (md.results.TransientSolution(1).Surface),...
    3232        (md.results.TransientSolution(1).Thickness),...
    33         (md.results.TransientSolution(1).MaskGroundediceLevelset),...
     33        (md.results.TransientSolution(1).MaskOceanLevelset),...
    3434        (md.results.TransientSolution(2).Base),...
    3535        (md.results.TransientSolution(2).Surface),...
    3636        (md.results.TransientSolution(2).Thickness),...
    37         (md.results.TransientSolution(2).MaskGroundediceLevelset),...
     37        (md.results.TransientSolution(2).MaskOceanLevelset),...
    3838        (md.results.TransientSolution(3).Base),...
    3939        (md.results.TransientSolution(3).Surface),...
    4040        (md.results.TransientSolution(3).Thickness),...
    41         (md.results.TransientSolution(3).MaskGroundediceLevelset),...
     41        (md.results.TransientSolution(3).MaskOceanLevelset),...
    4242        };

  • issm/trunk-jpl/test/NightlyRun/test427.py

    r24261 r24862  
    3838                md.results.TransientSolution[0].Surface,
    3939                md.results.TransientSolution[0].Thickness,
    40                 md.results.TransientSolution[0].MaskGroundediceLevelset,
     40                md.results.TransientSolution[0].MaskOceanLevelset,
    4141                md.results.TransientSolution[1].Base,
    4242                md.results.TransientSolution[1].Surface,
    4343                md.results.TransientSolution[1].Thickness,
    44                 md.results.TransientSolution[1].MaskGroundediceLevelset,
     44                md.results.TransientSolution[1].MaskOceanLevelset,
    4545                md.results.TransientSolution[2].Base,
    4646                md.results.TransientSolution[2].Surface,
    4747                md.results.TransientSolution[2].Thickness,
    48                 md.results.TransientSolution[2].MaskGroundediceLevelset]
     48                md.results.TransientSolution[2].MaskOceanLevelset]

  • issm/trunk-jpl/test/NightlyRun/test430.m

    r22999 r24862  
    88md.geometry.bed =-100-md.mesh.x/1000;
    99md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water;
    10 md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
    11 pos=find(md.mask.groundedice_levelset>=0);
     10md.mask.ocean_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
     11pos=find(md.mask.ocean_levelset>=0);
    1212md.geometry.base(pos)=md.geometry.bed(pos);
    1313md.geometry.surface=md.geometry.base+md.geometry.thickness;
    … …  
    5858        (md.results.TransientSolution(1).Surface),...
    5959        (md.results.TransientSolution(1).Thickness),...
    60         (md.results.TransientSolution(1).MaskGroundediceLevelset),...
     60        (md.results.TransientSolution(1).MaskOceanLevelset),...
    6161        (md.results.TransientSolution(1).Vx),...
    6262        (md.results.TransientSolution(1).Vy),...
    … …  
    6666        (md.results.TransientSolution(2).Surface),...
    6767        (md.results.TransientSolution(2).Thickness),...
    68         (md.results.TransientSolution(2).MaskGroundediceLevelset),...
     68        (md.results.TransientSolution(2).MaskOceanLevelset),...
    6969        (md.results.TransientSolution(2).Vx),...
    7070        (md.results.TransientSolution(2).Vy),...
    … …  
    7474        (md.results.TransientSolution(3).Surface),...
    7575        (md.results.TransientSolution(3).Thickness),...
    76         (md.results.TransientSolution(3).MaskGroundediceLevelset),...
     76        (md.results.TransientSolution(3).MaskOceanLevelset),...
    7777        (md.results.TransientSolution(3).Vx),...
    7878        (md.results.TransientSolution(3).Vy),...

  • issm/trunk-jpl/test/NightlyRun/test430.py

    r24261 r24862  
    1717md.geometry.bed = -100. - md.mesh.x / 1000.
    1818md.geometry.base = -md.geometry.thickness * md.materials.rho_ice / md.materials.rho_water
    19 md.mask.groundedice_levelset = md.geometry.thickness + md.materials.rho_water / md.materials.rho_ice * md.geometry.bed
    20 pos = np.where(md.mask.groundedice_levelset >= 0.)
     19md.mask.ocean_levelset = md.geometry.thickness + md.materials.rho_water / md.materials.rho_ice * md.geometry.bed
     20pos = np.where(md.mask.ocean_levelset >= 0.)
    2121md.geometry.base[pos] = md.geometry.bed[pos]
    2222md.geometry.surface = md.geometry.base + md.geometry.thickness
    … …  
    7171                md.results.TransientSolution[0].Surface,
    7272                md.results.TransientSolution[0].Thickness,
    73                 md.results.TransientSolution[0].MaskGroundediceLevelset,
     73                md.results.TransientSolution[0].MaskOceanLevelset,
    7474                md.results.TransientSolution[0].Vx,
    7575                md.results.TransientSolution[0].Vy,
    … …  
    7979                md.results.TransientSolution[1].Surface,
    8080                md.results.TransientSolution[1].Thickness,
    81                 md.results.TransientSolution[1].MaskGroundediceLevelset,
     81                md.results.TransientSolution[1].MaskOceanLevelset,
    8282                md.results.TransientSolution[1].Vx,
    8383                md.results.TransientSolution[1].Vy,
    … …  
    8787                md.results.TransientSolution[2].Surface,
    8888                md.results.TransientSolution[2].Thickness,
    89                 md.results.TransientSolution[2].MaskGroundediceLevelset,
     89                md.results.TransientSolution[2].MaskOceanLevelset,
    9090                md.results.TransientSolution[2].Vx,
    9191                md.results.TransientSolution[2].Vy,

  • issm/trunk-jpl/test/NightlyRun/test433.m

    r22993 r24862  
    2929md.groundingline.migration='AggressiveMigration';
    3030md=solve(md,'Transient');
    31 element_on_iceshelf_agressive=(md.results.TransientSolution.MaskGroundediceLevelset);
     31element_on_iceshelf_agressive=(md.results.TransientSolution.MaskOceanLevelset);
    3232
    3333md.groundingline.migration='SoftMigration';
    3434md=solve(md,'Transient');
    35 element_on_iceshelf_soft=(md.results.TransientSolution.MaskGroundediceLevelset);
     35element_on_iceshelf_soft=(md.results.TransientSolution.MaskOceanLevelset);
    3636
    3737md.groundingline.migration='SubelementMigration';
    3838md=solve(md,'Transient');
    39 element_on_iceshelf_subelement=(md.results.TransientSolution.MaskGroundediceLevelset);
     39element_on_iceshelf_subelement=(md.results.TransientSolution.MaskOceanLevelset);
    4040
    4141md.groundingline.migration='SubelementMigration';
    … …  
    4444md=setflowequation(md,'SSA','all');
    4545md=solve(md,'Transient');
    46 element_on_iceshelf_subelement2=(md.results.TransientSolution.MaskGroundediceLevelset);
     46element_on_iceshelf_subelement2=(md.results.TransientSolution.MaskOceanLevelset);
    4747
    4848%Fields and tolerances to track changes

  • issm/trunk-jpl/test/NightlyRun/test433.py

    r24214 r24862  
    4040md.groundingline.migration = 'AggressiveMigration'
    4141md = solve(md, 'Transient')
    42 element_on_iceshelf_agressive = md.results.TransientSolution[0].MaskGroundediceLevelset
     42element_on_iceshelf_agressive = md.results.TransientSolution[0].MaskOceanLevelset
    4343
    4444md.groundingline.migration = 'SoftMigration'
    4545md = solve(md, 'Transient')
    46 element_on_iceshelf_soft = md.results.TransientSolution[0].MaskGroundediceLevelset
     46element_on_iceshelf_soft = md.results.TransientSolution[0].MaskOceanLevelset
    4747
    4848md.groundingline.migration = 'SubelementMigration'
    4949md = solve(md, 'Transient')
    50 element_on_iceshelf_subelement = md.results.TransientSolution[0].MaskGroundediceLevelset
     50element_on_iceshelf_subelement = md.results.TransientSolution[0].MaskOceanLevelset
    5151
    5252md.groundingline.migration = 'SubelementMigration'
    5353md.groundingline.friction_interpolation = 'SubelementFriction2'
    5454md = solve(md, 'Transient')
    55 element_on_iceshelf_subelement2 = md.results.TransientSolution[0].MaskGroundediceLevelset
     55element_on_iceshelf_subelement2 = md.results.TransientSolution[0].MaskOceanLevelset
    5656
    5757#Fields and tolerances to track changes

  • issm/trunk-jpl/test/NightlyRun/test435.m

    r23127 r24862  
    88md.geometry.bed =-100-md.mesh.x/1000;
    99md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water;
    10 md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
    11 pos=find(md.mask.groundedice_levelset>=0);
     10md.mask.ocean_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
     11pos=find(md.mask.ocean_levelset>=0);
    1212md.geometry.base(pos)=md.geometry.bed(pos);
    1313md.geometry.surface=md.geometry.base+md.geometry.thickness;
    … …  
    6161        (md.results.TransientSolution(1).Surface),...
    6262        (md.results.TransientSolution(1).Thickness),...
    63         (md.results.TransientSolution(1).MaskGroundediceLevelset),...
     63        (md.results.TransientSolution(1).MaskOceanLevelset),...
    6464        (md.results.TransientSolution(1).Vx),...
    6565        (md.results.TransientSolution(1).Vy),...
    … …  
    7070        (md.results.TransientSolution(2).Surface),...
    7171        (md.results.TransientSolution(2).Thickness),...
    72         (md.results.TransientSolution(2).MaskGroundediceLevelset),...
     72        (md.results.TransientSolution(2).MaskOceanLevelset),...
    7373        (md.results.TransientSolution(2).Vx),...
    7474        (md.results.TransientSolution(2).Vy),...
    … …  
    7979        (md.results.TransientSolution(3).Surface),...
    8080        (md.results.TransientSolution(3).Thickness),...
    81         (md.results.TransientSolution(3).MaskGroundediceLevelset),...
     81        (md.results.TransientSolution(3).MaskOceanLevelset),...
    8282        (md.results.TransientSolution(3).Vx),...
    8383        (md.results.TransientSolution(3).Vy),...

  • issm/trunk-jpl/test/NightlyRun/test435.py

    r24261 r24862  
    1717md.geometry.bed = -100. - md.mesh.x / 1000.
    1818md.geometry.base = -md.geometry.thickness * md.materials.rho_ice / md.materials.rho_water
    19 md.mask.groundedice_levelset = md.geometry.thickness + md.materials.rho_water / md.materials.rho_ice * md.geometry.bed
    20 pos = np.where(md.mask.groundedice_levelset >= 0)
     19md.mask.ocean_levelset = md.geometry.thickness + md.materials.rho_water / md.materials.rho_ice * md.geometry.bed
     20pos = np.where(md.mask.ocean_levelset >= 0)
    2121md.geometry.base[pos] = md.geometry.bed[pos]
    2222md.geometry.surface = md.geometry.base + md.geometry.thickness
    … …  
    6969                md.results.TransientSolution[0].Surface,
    7070                md.results.TransientSolution[0].Thickness,
    71                 md.results.TransientSolution[0].MaskGroundediceLevelset,
     71                md.results.TransientSolution[0].MaskOceanLevelset,
    7272                md.results.TransientSolution[0].Vx,
    7373                md.results.TransientSolution[0].Vy,
    … …  
    7878                md.results.TransientSolution[1].Surface,
    7979                md.results.TransientSolution[1].Thickness,
    80                 md.results.TransientSolution[1].MaskGroundediceLevelset,
     80                md.results.TransientSolution[1].MaskOceanLevelset,
    8181                md.results.TransientSolution[1].Vx,
    8282                md.results.TransientSolution[1].Vy,
    … …  
    8787                md.results.TransientSolution[2].Surface,
    8888                md.results.TransientSolution[2].Thickness,
    89                 md.results.TransientSolution[2].MaskGroundediceLevelset,
     89                md.results.TransientSolution[2].MaskOceanLevelset,
    9090                md.results.TransientSolution[2].Vx,
    9191                md.results.TransientSolution[2].Vy,

  • issm/trunk-jpl/test/NightlyRun/test441.m

    r23003 r24862  
    88md.geometry.bed =-100-md.mesh.x/1000;
    99md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water;
    10 md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
    11 pos=find(md.mask.groundedice_levelset>=0);
     10md.mask.ocean_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
     11pos=find(md.mask.ocean_levelset>=0);
    1212md.geometry.base(pos)=md.geometry.bed(pos);
    1313md.geometry.surface=md.geometry.base+md.geometry.thickness;
    … …  
    5959        (md.results.TransientSolution(1).Surface),...
    6060        (md.results.TransientSolution(1).Thickness),...
    61         (md.results.TransientSolution(1).MaskGroundediceLevelset),...
     61        (md.results.TransientSolution(1).MaskOceanLevelset),...
    6262        (md.results.TransientSolution(1).Vx),...
    6363        (md.results.TransientSolution(1).Vy),...
    … …  
    6767        (md.results.TransientSolution(2).Surface),...
    6868        (md.results.TransientSolution(2).Thickness),...
    69         (md.results.TransientSolution(2).MaskGroundediceLevelset),...
     69        (md.results.TransientSolution(2).MaskOceanLevelset),...
    7070        (md.results.TransientSolution(2).Vx),...
    7171        (md.results.TransientSolution(2).Vy),...
    … …  
    7575        (md.results.TransientSolution(3).Surface),...
    7676        (md.results.TransientSolution(3).Thickness),...
    77         (md.results.TransientSolution(3).MaskGroundediceLevelset),...
     77        (md.results.TransientSolution(3).MaskOceanLevelset),...
    7878        (md.results.TransientSolution(3).Vx),...
    7979        (md.results.TransientSolution(3).Vy),...

  • issm/trunk-jpl/test/NightlyRun/test441.py

    r24261 r24862  
    1717md.geometry.bed = -100. - md.mesh.x / 1000.
    1818md.geometry.base = -md.geometry.thickness * md.materials.rho_ice / md.materials.rho_water
    19 md.mask.groundedice_levelset = md.geometry.thickness + md.materials.rho_water / md.materials.rho_ice * md.geometry.bed
    20 pos = np.array(np.where(md.mask.groundedice_levelset >= 0.))
     19md.mask.ocean_levelset = md.geometry.thickness + md.materials.rho_water / md.materials.rho_ice * md.geometry.bed
     20pos = np.array(np.where(md.mask.ocean_levelset >= 0.))
    2121md.geometry.base[pos] = md.geometry.bed[pos]
    2222md.geometry.surface = md.geometry.base + md.geometry.thickness
    … …  
    6969                md.results.TransientSolution[0].Surface,
    7070                md.results.TransientSolution[0].Thickness,
    71                 md.results.TransientSolution[0].MaskGroundediceLevelset,
     71                md.results.TransientSolution[0].MaskOceanLevelset,
    7272                md.results.TransientSolution[0].Vx,
    7373                md.results.TransientSolution[0].Vy,
    … …  
    7777                md.results.TransientSolution[1].Surface,
    7878                md.results.TransientSolution[1].Thickness,
    79                 md.results.TransientSolution[1].MaskGroundediceLevelset,
     79                md.results.TransientSolution[1].MaskOceanLevelset,
    8080                md.results.TransientSolution[1].Vx,
    8181                md.results.TransientSolution[1].Vy,
    … …  
    8585                md.results.TransientSolution[2].Surface,
    8686                md.results.TransientSolution[2].Thickness,
    87                 md.results.TransientSolution[2].MaskGroundediceLevelset,
     87                md.results.TransientSolution[2].MaskOceanLevelset,
    8888                md.results.TransientSolution[2].Vx,
    8989                md.results.TransientSolution[2].Vy,

  • issm/trunk-jpl/test/NightlyRun/test442.m

    r23004 r24862  
    88md.geometry.bed =-100-md.mesh.x/1000;
    99md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water;
    10 md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
    11 pos=find(md.mask.groundedice_levelset>=0);
     10md.mask.ocean_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
     11pos=find(md.mask.ocean_levelset>=0);
    1212md.geometry.base(pos)=md.geometry.bed(pos);
    1313md.geometry.surface=md.geometry.base+md.geometry.thickness;
    … …  
    6262        (md.results.TransientSolution(1).Surface),...
    6363        (md.results.TransientSolution(1).Thickness),...
    64         (md.results.TransientSolution(1).MaskGroundediceLevelset),...
     64        (md.results.TransientSolution(1).MaskOceanLevelset),...
    6565        (md.results.TransientSolution(1).Vx),...
    6666        (md.results.TransientSolution(1).Vy),...
    … …  
    7171        (md.results.TransientSolution(2).Surface),...
    7272        (md.results.TransientSolution(2).Thickness),...
    73         (md.results.TransientSolution(2).MaskGroundediceLevelset),...
     73        (md.results.TransientSolution(2).MaskOceanLevelset),...
    7474        (md.results.TransientSolution(2).Vx),...
    7575        (md.results.TransientSolution(2).Vy),...
    … …  
    8080        (md.results.TransientSolution(3).Surface),...
    8181        (md.results.TransientSolution(3).Thickness),...
    82         (md.results.TransientSolution(3).MaskGroundediceLevelset),...
     82        (md.results.TransientSolution(3).MaskOceanLevelset),...
    8383        (md.results.TransientSolution(3).Vx),...
    8484        (md.results.TransientSolution(3).Vy),...

  • issm/trunk-jpl/test/NightlyRun/test442.py

    r24261 r24862  
    1717md.geometry.bed = -100. - md.mesh.x / 1000.
    1818md.geometry.base = -md.geometry.thickness * md.materials.rho_ice / md.materials.rho_water
    19 md.mask.groundedice_levelset = md.geometry.thickness + md.materials.rho_water / md.materials.rho_ice * md.geometry.bed
    20 pos = np.where(md.mask.groundedice_levelset >= 0.)
     19md.mask.ocean_levelset = md.geometry.thickness + md.materials.rho_water / md.materials.rho_ice * md.geometry.bed
     20pos = np.where(md.mask.ocean_levelset >= 0.)
    2121md.geometry.base[pos] = md.geometry.bed[pos]
    2222md.geometry.surface = md.geometry.base + md.geometry.thickness
    … …  
    7070                md.results.TransientSolution[0].Surface,
    7171                md.results.TransientSolution[0].Thickness,
    72                 md.results.TransientSolution[0].MaskGroundediceLevelset,
     72                md.results.TransientSolution[0].MaskOceanLevelset,
    7373                md.results.TransientSolution[0].Vx,
    7474                md.results.TransientSolution[0].Vy,
    … …  
    7979                md.results.TransientSolution[1].Surface,
    8080                md.results.TransientSolution[1].Thickness,
    81                 md.results.TransientSolution[1].MaskGroundediceLevelset,
     81                md.results.TransientSolution[1].MaskOceanLevelset,
    8282                md.results.TransientSolution[1].Vx,
    8383                md.results.TransientSolution[1].Vy,
    … …  
    8888                md.results.TransientSolution[2].Surface,
    8989                md.results.TransientSolution[2].Thickness,
    90                 md.results.TransientSolution[2].MaskGroundediceLevelset,
     90                md.results.TransientSolution[2].MaskOceanLevelset,
    9191                md.results.TransientSolution[2].Vx,
    9292                md.results.TransientSolution[2].Vy,

  • issm/trunk-jpl/test/NightlyRun/test443.m

    r22338 r24862  
    44md=parameterize(md,'../Par/SquareSheetShelf.par');
    55md.geometry.bed=md.geometry.base;
    6 pos=find(md.mask.groundedice_levelset<0);
     6pos=find(md.mask.ocean_levelset<0);
    77md.geometry.bed(pos)=md.geometry.base(pos)-10;
    88md.friction=frictioncoulomb();

  • issm/trunk-jpl/test/NightlyRun/test443.py

    r23793 r24862  
    1717md = parameterize(md, '../Par/SquareSheetShelf.py')
    1818md.geometry.bed = copy.deepcopy(md.geometry.base)
    19 pos = np.nonzero(md.mask.groundedice_levelset < 0.)
     19pos = np.nonzero(md.mask.ocean_levelset < 0.)
    2020md.geometry.bed[pos] = md.geometry.bed[pos] - 10
    2121md.friction = frictioncoulomb()

  • issm/trunk-jpl/test/NightlyRun/test444.m

    r24839 r24862  
    44md=parameterize(md,'../Par/SquareSheetShelf.par');
    55md.geometry.bed=md.geometry.base;
    6 pos=find(md.mask.groundedice_levelset<0);
     6pos=find(md.mask.ocean_levelset<0);
    77md.geometry.bed(pos)=md.geometry.base(pos)-10;
    88md.friction.coefficient=20.*ones(md.mesh.numberofvertices,1);

  • issm/trunk-jpl/test/NightlyRun/test444.py

    r24261 r24862  
    1919md = parameterize(md, '../Par/SquareSheetShelf.py')
    2020md.geometry.bed = md.geometry.base.copy()
    21 pos = np.where(md.mask.groundedice_levelset < 0)
     21pos = np.where(md.mask.ocean_levelset < 0)
    2222md.geometry.bed[pos] = md.geometry.base[pos] - 10
    2323md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices, ))

  • issm/trunk-jpl/test/NightlyRun/test470.m

    r23009 r24862  
    88md.geometry.bed =-100-md.mesh.x/1000;
    99md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water;
    10 md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
    11 pos=find(md.mask.groundedice_levelset>=0);
     10md.mask.ocean_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
     11pos=find(md.mask.ocean_levelset>=0);
    1212md.geometry.base(pos)=md.geometry.bed(pos);
    1313md.geometry.surface=md.geometry.base+md.geometry.thickness;
    … …  
    5656           (md.results.TransientSolution(1).Surface),...
    5757           (md.results.TransientSolution(1).Thickness),...
    58            (md.results.TransientSolution(1).MaskGroundediceLevelset),...
     58           (md.results.TransientSolution(1).MaskOceanLevelset),...
    5959           (md.results.TransientSolution(1).Vx),...
    6060           (md.results.TransientSolution(1).Vy),...
    … …  
    6464           (md.results.TransientSolution(2).Surface),...
    6565           (md.results.TransientSolution(2).Thickness),...
    66            (md.results.TransientSolution(2).MaskGroundediceLevelset),...
     66           (md.results.TransientSolution(2).MaskOceanLevelset),...
    6767           (md.results.TransientSolution(2).Vx),...
    6868           (md.results.TransientSolution(2).Vy),...
    … …  
    7272           (md.results.TransientSolution(3).Surface),...
    7373           (md.results.TransientSolution(3).Thickness),...
    74            (md.results.TransientSolution(3).MaskGroundediceLevelset),...
     74           (md.results.TransientSolution(3).MaskOceanLevelset),...
    7575           (md.results.TransientSolution(3).Vx),...
    7676           (md.results.TransientSolution(3).Vy),...

  • issm/trunk-jpl/test/NightlyRun/test471.m

    r23509 r24862  
    88md.geometry.bed =-100-md.mesh.x/1000;
    99md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water;
    10 md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
    11 pos=find(md.mask.groundedice_levelset>=0);
     10md.mask.ocean_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
     11pos=find(md.mask.ocean_levelset>=0);
    1212md.geometry.base(pos)=md.geometry.bed(pos);
    1313md.geometry.surface=md.geometry.base+md.geometry.thickness;
    … …  
    5656           (md.results.TransientSolution(1).Surface),...
    5757           (md.results.TransientSolution(1).Thickness),...
    58            (md.results.TransientSolution(1).MaskGroundediceLevelset),...
     58           (md.results.TransientSolution(1).MaskOceanLevelset),...
    5959           (md.results.TransientSolution(1).Vx),...
    6060           (md.results.TransientSolution(1).Vy),...
    … …  
    6464           (md.results.TransientSolution(2).Surface),...
    6565           (md.results.TransientSolution(2).Thickness),...
    66            (md.results.TransientSolution(2).MaskGroundediceLevelset),...
     66           (md.results.TransientSolution(2).MaskOceanLevelset),...
    6767           (md.results.TransientSolution(2).Vx),...
    6868           (md.results.TransientSolution(2).Vy),...
    … …  
    7272           (md.results.TransientSolution(3).Surface),...
    7373           (md.results.TransientSolution(3).Thickness),...
    74            (md.results.TransientSolution(3).MaskGroundediceLevelset),...
     74           (md.results.TransientSolution(3).MaskOceanLevelset),...
    7575           (md.results.TransientSolution(3).Vx),...
    7676           (md.results.TransientSolution(3).Vy),...

  • issm/trunk-jpl/test/NightlyRun/test472.m

    r24046 r24862  
    88md.geometry.bed =-100-md.mesh.x/1000;
    99md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water;
    10 md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
    11 pos=find(md.mask.groundedice_levelset>=0);
     10md.mask.ocean_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
     11pos=find(md.mask.ocean_levelset>=0);
    1212md.geometry.base(pos)=md.geometry.bed(pos);
    1313md.geometry.surface=md.geometry.base+md.geometry.thickness;
    … …  
    6868           (md.results.TransientSolution(1).Surface),...
    6969           (md.results.TransientSolution(1).Thickness),...
    70            (md.results.TransientSolution(1).MaskGroundediceLevelset),...
     70           (md.results.TransientSolution(1).MaskOceanLevelset),...
    7171           (md.results.TransientSolution(1).Vx),...
    7272           (md.results.TransientSolution(1).Vy),...
    … …  
    7777           (md.results.TransientSolution(2).Surface),...
    7878           (md.results.TransientSolution(2).Thickness),...
    79            (md.results.TransientSolution(2).MaskGroundediceLevelset),...
     79           (md.results.TransientSolution(2).MaskOceanLevelset),...
    8080           (md.results.TransientSolution(2).Vx),...
    8181           (md.results.TransientSolution(2).Vy),...
    … …  
    8686           (md.results.TransientSolution(3).Surface),...
    8787           (md.results.TransientSolution(3).Thickness),...
    88            (md.results.TransientSolution(3).MaskGroundediceLevelset),...
     88           (md.results.TransientSolution(3).MaskOceanLevelset),...
    8989           (md.results.TransientSolution(3).Vx),...
    9090           (md.results.TransientSolution(3).Vy),...

  • issm/trunk-jpl/test/NightlyRun/test473.m

    r24046 r24862  
    88md.geometry.bed =-100-md.mesh.x/1000;
    99md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water;
    10 md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
    11 pos=find(md.mask.groundedice_levelset>=0);
     10md.mask.ocean_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
     11pos=find(md.mask.ocean_levelset>=0);
    1212md.geometry.base(pos)=md.geometry.bed(pos);
    1313md.geometry.surface=md.geometry.base+md.geometry.thickness;
    … …  
    6464           (md.results.TransientSolution(1).Surface),...
    6565           (md.results.TransientSolution(1).Thickness),...
    66            (md.results.TransientSolution(1).MaskGroundediceLevelset),...
     66           (md.results.TransientSolution(1).MaskOceanLevelset),...
    6767           (md.results.TransientSolution(1).Vx),...
    6868           (md.results.TransientSolution(1).Vy),...
    … …  
    7373           (md.results.TransientSolution(2).Surface),...
    7474           (md.results.TransientSolution(2).Thickness),...
    75            (md.results.TransientSolution(2).MaskGroundediceLevelset),...
     75           (md.results.TransientSolution(2).MaskOceanLevelset),...
    7676           (md.results.TransientSolution(2).Vx),...
    7777           (md.results.TransientSolution(2).Vy),...
    … …  
    8282           (md.results.TransientSolution(3).Surface),...
    8383           (md.results.TransientSolution(3).Thickness),...
    84            (md.results.TransientSolution(3).MaskGroundediceLevelset),...
     84           (md.results.TransientSolution(3).MaskOceanLevelset),...
    8585           (md.results.TransientSolution(3).Vx),...
    8686           (md.results.TransientSolution(3).Vy),...

  • issm/trunk-jpl/test/NightlyRun/test474.m

    r24015 r24862  
    88md.geometry.bed =-100-md.mesh.x/1000;
    99md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water;
    10 md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
    11 pos=find(md.mask.groundedice_levelset>=0);
     10md.mask.ocean_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
     11pos=find(md.mask.ocean_levelset>=0);
    1212md.geometry.base(pos)=md.geometry.bed(pos);
    1313md.geometry.surface=md.geometry.base+md.geometry.thickness;
    … …  
    5757           (md.results.TransientSolution(1).Surface),...
    5858           (md.results.TransientSolution(1).Thickness),...
    59            (md.results.TransientSolution(1).MaskGroundediceLevelset),...
     59           (md.results.TransientSolution(1).MaskOceanLevelset),...
    6060           (md.results.TransientSolution(1).Vx),...
    6161           (md.results.TransientSolution(1).Vy),...
    … …  
    6565           (md.results.TransientSolution(2).Surface),...
    6666           (md.results.TransientSolution(2).Thickness),...
    67            (md.results.TransientSolution(2).MaskGroundediceLevelset),...
     67           (md.results.TransientSolution(2).MaskOceanLevelset),...
    6868           (md.results.TransientSolution(2).Vx),...
    6969           (md.results.TransientSolution(2).Vy),...
    … …  
    7373           (md.results.TransientSolution(3).Surface),...
    7474           (md.results.TransientSolution(3).Thickness),...
    75            (md.results.TransientSolution(3).MaskGroundediceLevelset),...
     75           (md.results.TransientSolution(3).MaskOceanLevelset),...
    7676           (md.results.TransientSolution(3).Vx),...
    7777           (md.results.TransientSolution(3).Vy),...

  • issm/trunk-jpl/test/NightlyRun/test475.m

    r24016 r24862  
    88md.geometry.bed =-100-md.mesh.x/1000;
    99md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water;
    10 md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
    11 pos=find(md.mask.groundedice_levelset>=0);
     10md.mask.ocean_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
     11pos=find(md.mask.ocean_levelset>=0);
    1212md.geometry.base(pos)=md.geometry.bed(pos);
    1313md.geometry.surface=md.geometry.base+md.geometry.thickness;
    … …  
    5757           (md.results.TransientSolution(1).Surface),...
    5858           (md.results.TransientSolution(1).Thickness),...
    59            (md.results.TransientSolution(1).MaskGroundediceLevelset),...
     59           (md.results.TransientSolution(1).MaskOceanLevelset),...
    6060           (md.results.TransientSolution(1).Vx),...
    6161           (md.results.TransientSolution(1).Vy),...
    … …  
    6565           (md.results.TransientSolution(2).Surface),...
    6666           (md.results.TransientSolution(2).Thickness),...
    67            (md.results.TransientSolution(2).MaskGroundediceLevelset),...
     67           (md.results.TransientSolution(2).MaskOceanLevelset),...
    6868           (md.results.TransientSolution(2).Vx),...
    6969           (md.results.TransientSolution(2).Vy),...
    … …  
    7373           (md.results.TransientSolution(3).Surface),...
    7474           (md.results.TransientSolution(3).Thickness),...
    75            (md.results.TransientSolution(3).MaskGroundediceLevelset),...
     75           (md.results.TransientSolution(3).MaskOceanLevelset),...
    7676           (md.results.TransientSolution(3).Vx),...
    7777           (md.results.TransientSolution(3).Vy),...

  • issm/trunk-jpl/test/NightlyRun/test476.m

    r24149 r24862  
    88md.geometry.bed =-100-md.mesh.x/1000;
    99md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water;
    10 md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
    11 pos=find(md.mask.groundedice_levelset>=0);
     10md.mask.ocean_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
     11pos=find(md.mask.ocean_levelset>=0);
    1212md.geometry.base(pos)=md.geometry.bed(pos);
    1313md.geometry.surface=md.geometry.base+md.geometry.thickness;
    … …  
    5151           (md.results.TransientSolution(1).Surface),...
    5252           (md.results.TransientSolution(1).Thickness),...
    53            (md.results.TransientSolution(1).MaskGroundediceLevelset),...
     53           (md.results.TransientSolution(1).MaskOceanLevelset),...
    5454           (md.results.TransientSolution(1).Vx),...
    5555           (md.results.TransientSolution(1).Vy),...
    … …  
    5959           (md.results.TransientSolution(2).Surface),...
    6060           (md.results.TransientSolution(2).Thickness),...
    61            (md.results.TransientSolution(2).MaskGroundediceLevelset),...
     61           (md.results.TransientSolution(2).MaskOceanLevelset),...
    6262           (md.results.TransientSolution(2).Vx),...
    6363           (md.results.TransientSolution(2).Vy),...
    … …  
    6767           (md.results.TransientSolution(3).Surface),...
    6868           (md.results.TransientSolution(3).Thickness),...
    69            (md.results.TransientSolution(3).MaskGroundediceLevelset),...
     69           (md.results.TransientSolution(3).MaskOceanLevelset),...
    7070           (md.results.TransientSolution(3).Vx),...
    7171           (md.results.TransientSolution(3).Vy),...

  • issm/trunk-jpl/test/NightlyRun/test511.m

    r21056 r24862  
    99md=extrude(md,3,1.);
    1010md=setflowequation(md,'FS','all');
    11 md=extract(md,md.mask.groundedice_levelset<0.);
     11md=extract(md,md.mask.ocean_levelset<0.);
    1212
    1313%control parameters

  • issm/trunk-jpl/test/NightlyRun/test511.py

    r24261 r24862  
    1818md.extrude(3, 1.)
    1919md = setflowequation(md, 'FS', 'all')
    20 md = md.extract(md.mask.groundedice_levelset < 0.)
     20md = md.extract(md.mask.ocean_levelset < 0.)
    2121
    2222#control parameters

  • issm/trunk-jpl/test/NightlyRun/test613.m

    r22501 r24862  
    77
    88%Ice sheet only
    9 md=extract(md,md.mask.groundedice_levelset>0.);
     9md=extract(md,md.mask.ocean_levelset>0.);
    1010pos=find(md.mesh.vertexonboundary);
    1111md.balancethickness.spcthickness(pos)=md.geometry.thickness(pos);

  • issm/trunk-jpl/test/NightlyRun/test613.py

    r24256 r24862  
    1919
    2020#Ice sheet only
    21 md = model.extract(md, md.mask.groundedice_levelset > 0.)
     21md = model.extract(md, md.mask.ocean_levelset > 0.)
    2222pos = np.nonzero(md.mesh.vertexonboundary)
    2323md.balancethickness.spcthickness[pos] = md.geometry.thickness[pos]

  • issm/trunk-jpl/test/NightlyRun/test701.m

    r23979 r24862  
    1414md.mask.ice_levelset  = - ones(md.mesh.numberofvertices,1);
    1515md.mask.ice_levelset(find(vertexflags(md.mesh,2))) = 0;
    16 md.mask.groundedice_levelset = double(md.mesh.x<0)-.5;
     16md.mask.ocean_levelset = double(md.mesh.x<0)-.5;
    1717
    1818%materials

  • issm/trunk-jpl/test/NightlyRun/test701.py

    r24711 r24862  
    2121md.mask.ice_levelset = -np.ones((md.mesh.numberofvertices))
    2222md.mask.ice_levelset[np.where(md.mesh.vertexflags(2))] = 0.
    23 md.mask.groundedice_levelset = np.zeros((md.mesh.numberofvertices)) - 0.5
     23md.mask.ocean_levelset = np.zeros((md.mesh.numberofvertices)) - 0.5
    2424
    2525#materials

  • issm/trunk-jpl/test/NightlyRun/test702.m

    r23979 r24862  
    1616md.mask.ice_levelset = - ones(md.mesh.numberofvertices,1);
    1717md.mask.ice_levelset(find(vertexflags(md.mesh,2))) = 0;
    18 md.mask.groundedice_levelset = double(md.mesh.x<0)-.5;
     18md.mask.ocean_levelset = double(md.mesh.x<0)-.5;
    1919
    2020md.initialization.temperature=(273.-20.)*ones(md.mesh.numberofvertices,1);

  • issm/trunk-jpl/test/NightlyRun/test702.py

    r24261 r24862  
    2727md.mask.ice_levelset = -np.ones((md.mesh.numberofvertices, ))
    2828md.mask.ice_levelset[np.where(md.mesh.vertexflags(2))] = 0
    29 md.mask.groundedice_levelset = -0.5 * np.ones((md.mesh.numberofvertices))
    30 md.mask.groundedice_levelset[np.where(md.mesh.x < 0)] = 0.5
     29md.mask.ocean_levelset = -0.5 * np.ones((md.mesh.numberofvertices))
     30md.mask.ocean_levelset[np.where(md.mesh.x < 0)] = 0.5
    3131
    3232#materials

  • issm/trunk-jpl/test/NightlyRun/test703.m

    r22993 r24862  
    1616md.mask.ice_levelset  = - ones(md.mesh.numberofvertices,1);
    1717md.mask.ice_levelset(find(vertexflags(md.mesh,2))) = 0;
    18 md.mask.groundedice_levelset = double(md.mesh.x<0)-.5;
     18md.mask.ocean_levelset = double(md.mesh.x<0)-.5;
    1919
    2020md.initialization.temperature=(273.-20.)*ones(md.mesh.numberofvertices,1);

  • issm/trunk-jpl/test/NightlyRun/test703.py

    r24261 r24862  
    4040md.mask.ice_levelset = -np.ones((md.mesh.numberofvertices))
    4141md.mask.ice_levelset[np.where(md.mesh.vertexflags(2))] = 0
    42 md.mask.groundedice_levelset = -0.5 * np.ones((md.mesh.numberofvertices))
    43 md.mask.groundedice_levelset[np.where(md.mesh.x < 0)] = 0.5
     42md.mask.ocean_levelset = -0.5 * np.ones((md.mesh.numberofvertices))
     43md.mask.ocean_levelset[np.where(md.mesh.x < 0)] = 0.5
    4444
    4545#materials

  • issm/trunk-jpl/test/Par/79North.py

    r24214 r24862  
    3333#Friction
    3434md.friction.coefficient = 50. * numpy.ones((md.mesh.numberofvertices))
    35 md.friction.coefficient[numpy.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0.
     35md.friction.coefficient[numpy.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0.
    3636md.friction.p = numpy.ones((md.mesh.numberofelements))
    3737md.friction.q = numpy.ones((md.mesh.numberofelements))
    … …  
    3939#Ice shelf melting and surface mass balance
    4040md.basalforcings.floatingice_melting_rate = numpy.zeros((md.mesh.numberofvertices))
    41 md.basalforcings.floatingice_melting_rate[numpy.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0.
     41md.basalforcings.floatingice_melting_rate[numpy.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0.
    4242md.basalforcings.groundedice_melting_rate = numpy.zeros((md.mesh.numberofvertices))
    4343md.smb.mass_balance = 15 * numpy.ones((md.mesh.numberofvertices))

  • issm/trunk-jpl/test/Par/GiaIvinsBenchmarksAB.py

    r24256 r24862  
    6060#Friction
    6161md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices, ))
    62 md.friction.coefficient[np.where(md.mask.groundedice_levelset < 0.)] = 0.
     62md.friction.coefficient[np.where(md.mask.ocean_levelset < 0.)] = 0.
    6363md.friction.p = np.ones((md.mesh.numberofelements, ))
    6464md.friction.q = np.ones((md.mesh.numberofelements, ))

  • issm/trunk-jpl/test/Par/GiaIvinsBenchmarksCD.py

    r24256 r24862  
    6060#Friction
    6161md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices, ))
    62 md.friction.coefficient[np.where(md.mask.groundedice_levelset < 0.)] = 0.
     62md.friction.coefficient[np.where(md.mask.ocean_levelset < 0.)] = 0.
    6363md.friction.p = np.ones((md.mesh.numberofelements, ))
    6464md.friction.q = np.ones((md.mesh.numberofelements, ))

  • issm/trunk-jpl/test/Par/ISMIPA.py

    r24214 r24862  
    1111print("      creating drag")
    1212md.friction.coefficient = 200. * np.ones((md.mesh.numberofvertices))
    13 md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0.
     13md.friction.coefficient[np.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0.
    1414md.friction.p = np.ones((md.mesh.numberofelements))
    1515md.friction.q = np.ones((md.mesh.numberofelements))

  • issm/trunk-jpl/test/Par/ISMIPB.py

    r24214 r24862  
    1111print("      creating drag")
    1212md.friction.coefficient = 200. * np.ones((md.mesh.numberofvertices))
    13 md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0.
     13md.friction.coefficient[np.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0.
    1414md.friction.p = np.ones((md.mesh.numberofelements))
    1515md.friction.q = np.ones((md.mesh.numberofelements))

  • issm/trunk-jpl/test/Par/ISMIPC.py

    r24214 r24862  
    1212#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)))
    1313md.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))))
    14 md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0.
     14md.friction.coefficient[np.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0.
    1515md.friction.p = np.ones((md.mesh.numberofelements))
    1616md.friction.q = np.zeros((md.mesh.numberofelements))

  • issm/trunk-jpl/test/Par/ISMIPD.py

    r24214 r24862  
    1111print("      creating drag")
    1212md.friction.coefficient = np.sqrt(md.constants.yts * (1000. + 1000. * np.sin(md.mesh.x * 2. * np.pi / np.max(md.mesh.x))))
    13 md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0.
     13md.friction.coefficient[np.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0.
    1414md.friction.p = np.ones((md.mesh.numberofelements))
    1515md.friction.q = np.zeros((md.mesh.numberofelements))

  • issm/trunk-jpl/test/Par/IceCube.py

    r24214 r24862  
    3030#Friction
    3131md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices))
    32 md.friction.coefficient[np.where(md.mask.groundedice_levelset < 0.)[0]] = 0.
     32md.friction.coefficient[np.where(md.mask.ocean_levelset < 0.)[0]] = 0.
    3333md.friction.p = np.ones((md.mesh.numberofelements))
    3434md.friction.q = np.ones((md.mesh.numberofelements))

  • issm/trunk-jpl/test/Par/Pig.py

    r24214 r24862  
    2626md.geometry.base = md.geometry.surface - md.geometry.thickness
    2727md.geometry.bed = np.array(md.geometry.base)
    28 pos = np.where(md.mask.groundedice_levelset < 0.)
     28pos = np.where(md.mask.ocean_levelset < 0.)
    2929md.geometry.bed[pos] = InterpFromMeshToMesh2d(index, x, y, bed, md.mesh.x[pos], md.mesh.y[pos])[0][:, 0]
    3030md.initialization.vx = md.inversion.vx_obs
    … …  
    4141#Friction
    4242md.friction.coefficient = 50. * np.ones((md.mesh.numberofvertices))
    43 md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0.
     43md.friction.coefficient[np.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0.
    4444md.friction.p = np.ones((md.mesh.numberofelements))
    4545md.friction.q = np.ones((md.mesh.numberofelements))

  • issm/trunk-jpl/test/Par/RoundSheetShelf.py

    r24256 r24862  
    2020md.geometry.base = -md.materials.rho_ice / md.materials.rho_water * md.geometry.thickness
    2121
    22 pos = np.nonzero(md.mask.groundedice_levelset > 0.)[0]
     22pos = np.nonzero(md.mask.ocean_levelset > 0.)[0]
    2323md.geometry.base[pos] = md.geometry.base[pos] - 300. * (radius[pos] - (rad - shelfextent)) / (rad - shelfextent)
    2424md.geometry.surface = md.geometry.base + md.geometry.thickness
    … …  
    7171md.smb.mass_balance = -10. * np.ones((md.mesh.numberofvertices))
    7272md.basalforcings.groundedice_melting_rate = np.zeros((md.mesh.numberofvertices))
    73 pos = np.nonzero(md.mask.groundedice_levelset > 0.)[0]
     73pos = np.nonzero(md.mask.ocean_levelset > 0.)[0]
    7474md.basalforcings.groundedice_melting_rate[pos] = 10.
    7575md.basalforcings.floatingice_melting_rate = np.zeros((md.mesh.numberofvertices))
    … …  
    104104md.groundingline.migration = 'AggressiveMigration'
    105105md.geometry.bed = copy.deepcopy(md.geometry.base)
    106 pos = np.nonzero(md.mask.groundedice_levelset < 0.)[0]
     106pos = np.nonzero(md.mask.ocean_levelset < 0.)[0]
    107107md.geometry.bed[pos] = md.geometry.base[pos] - 900.
    108108

  • issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.py

    r24261 r24862  
    1414print("      creating drag")
    1515md.friction.coefficient = 20. * numpy.ones((md.mesh.numberofvertices))
    16 md.friction.coefficient[numpy.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0.
     16md.friction.coefficient[numpy.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0.
    1717md.friction.p = numpy.ones((md.mesh.numberofelements))
    1818md.friction.q = numpy.ones((md.mesh.numberofelements))

  • issm/trunk-jpl/test/Par/SquareEISMINT.py

    r24214 r24862  
    1313print("      creating drag")
    1414md.friction.coefficient = 200. * np.ones((md.mesh.numberofvertices))
    15 md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0.
     15md.friction.coefficient[np.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0.
    1616md.friction.p = np.ones((md.mesh.numberofelements))
    1717md.friction.q = np.ones((md.mesh.numberofelements))

  • issm/trunk-jpl/test/Par/SquareNoDyn.py

    r24569 r24862  
    2121#Friction
    2222md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices))
    23 md.friction.coefficient[np.where(md.mask.groundedice_levelset < 0.)[0]] = 0.
     23md.friction.coefficient[np.where(md.mask.ocean_levelset < 0.)[0]] = 0.
    2424md.friction.p = np.ones((md.mesh.numberofelements))
    2525md.friction.q = np.ones((md.mesh.numberofelements))

  • issm/trunk-jpl/test/Par/SquareSheetConstrained.py

    r24214 r24862  
    4444#Friction
    4545md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices))
    46 md.friction.coefficient[np.where(md.mask.groundedice_levelset < 0.)[0]] = 0.
     46md.friction.coefficient[np.where(md.mask.ocean_levelset < 0.)[0]] = 0.
    4747md.friction.p = np.ones((md.mesh.numberofelements))
    4848md.friction.q = np.ones((md.mesh.numberofelements))

  • issm/trunk-jpl/test/Par/SquareSheetConstrainedCO2.py

    r24261 r24862  
    6161#Friction
    6262md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices))
    63 md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0.
     63md.friction.coefficient[np.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0.
    6464md.friction.p = np.ones((md.mesh.numberofelements))
    6565md.friction.q = np.ones((md.mesh.numberofelements))

  • issm/trunk-jpl/test/Par/SquareSheetShelf.py

    r24261 r24862  
    4848#Friction
    4949md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices))
    50 md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0.
     50md.friction.coefficient[np.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0.
    5151md.friction.p = np.ones((md.mesh.numberofelements))
    5252md.friction.q = np.ones((md.mesh.numberofelements))

  • issm/trunk-jpl/test/Par/SquareShelf.py

    r24214 r24862  
    5858#Friction
    5959md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices))
    60 md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0.
     60md.friction.coefficient[np.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0.
    6161md.friction.p = np.ones((md.mesh.numberofelements))
    6262md.friction.q = np.ones((md.mesh.numberofelements))

  • issm/trunk-jpl/test/Par/SquareShelf2.py

    r24214 r24862  
    5656#Friction
    5757md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices))
    58 md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0.
     58md.friction.coefficient[np.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0.
    5959md.friction.p = np.ones((md.mesh.numberofelements))
    6060md.friction.q = np.ones((md.mesh.numberofelements))

  • issm/trunk-jpl/test/Par/SquareShelfConstrained.py

    r24261 r24862  
    4545#Friction
    4646md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices))
    47 md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0.
     47md.friction.coefficient[np.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0.
    4848md.friction.p = np.ones((md.mesh.numberofelements))
    4949md.friction.q = np.ones((md.mesh.numberofelements))

  • issm/trunk-jpl/test/Par/SquareThermal.py

    r24261 r24862  
    2121print("      creating drag")
    2222md.friction.coefficient = 200. * np.ones((md.mesh.numberofvertices))
    23 md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0.
     23md.friction.coefficient[np.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0.
    2424md.friction.p = np.ones((md.mesh.numberofelements))
    2525md.friction.q = np.ones((md.mesh.numberofelements))
    … …  
    4949md.thermal.spctemperature[:] = md.initialization.temperature
    5050md.basalforcings.geothermalflux = np.zeros((md.mesh.numberofvertices))
    51 md.basalforcings.geothermalflux[np.nonzero(md.mask.groundedice_levelset > 0.)[0]] = 1. * 10**-3  #1 mW / m^2
     51md.basalforcings.geothermalflux[np.nonzero(md.mask.ocean_levelset > 0.)[0]] = 1. * 10**-3  #1 mW / m^2

  • issm/trunk-jpl/test/Par/ValleyGlacierShelf.py

    r24214 r24862  
    3131#Mask
    3232md.mask.ice_levelset = x - alpha * Lx
    33 md.mask.groundedice_levelset = np.ones((md.mesh.numberofvertices))
     33md.mask.ocean_levelset = np.ones((md.mesh.numberofvertices))
    3434
    3535#Initial velocity
    … …  
    6060#Friction
    6161md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices))
    62 md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0.
     62md.friction.coefficient[np.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0.
    6363md.friction.p = np.ones((md.mesh.numberofelements))
    6464md.friction.q = np.ones((md.mesh.numberofelements))
Note: See TracChangeset for help on using the changeset viewer.