Changeset 24863


Ignore:
Timestamp:
05/15/20 20:27:43 (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:
22 edited

Legend:

Unmodified
Added
Removed

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

    r22993 r24863  
    3030%Friction
    3131md.friction.coefficient=50.*ones(md.mesh.numberofvertices,1);
    32 md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
     32md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
    3333md.friction.p=ones(md.mesh.numberofelements,1);
    3434md.friction.q=ones(md.mesh.numberofelements,1);
    … …  
    3636%Ice shelf melting and surface mass balance
    3737md.basalforcings.floatingice_melting_rate=zeros(md.mesh.numberofvertices,1);
    38 md.basalforcings.floatingice_melting_rate(find(md.mask.groundedice_levelset<0.))=0.;
     38md.basalforcings.floatingice_melting_rate(find(md.mask.ocean_levelset<0.))=0.;
    3939md.basalforcings.groundedice_melting_rate=zeros(md.mesh.numberofvertices,1);
    4040md.smb.mass_balance=15.*ones(md.mesh.numberofvertices,1);

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

    r23017 r24863  
    5252%Friction
    5353md.friction.coefficient=20.*ones(md.mesh.numberofvertices,1);
    54 md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
     54md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
    5555md.friction.p=ones(md.mesh.numberofelements,1);
    5656md.friction.q=ones(md.mesh.numberofelements,1);

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

    r23128 r24863  
    5151%Friction
    5252md.friction.coefficient=20.*ones(md.mesh.numberofvertices,1);
    53 md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
     53md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
    5454md.friction.p=ones(md.mesh.numberofelements,1);
    5555md.friction.q=ones(md.mesh.numberofelements,1);

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

    r17769 r24863  
    88disp('      creating drag');
    99md.friction.coefficient=200.*ones(md.mesh.numberofvertices,1);
    10 md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
     10md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
    1111md.friction.p=ones(md.mesh.numberofelements,1);
    1212md.friction.q=ones(md.mesh.numberofelements,1);

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

    r17769 r24863  
    88disp('      creating drag');
    99md.friction.coefficient=200.*ones(md.mesh.numberofvertices,1);
    10 md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
     10md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
    1111md.friction.p=ones(md.mesh.numberofelements,1);
    1212md.friction.q=ones(md.mesh.numberofelements,1);

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

    r17769 r24863  
    99%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)));
    1010md.friction.coefficient=sqrt(md.constants.yts.*(1000.+1000.*sin(md.mesh.x*2.*pi/max(md.mesh.x)).*sin(md.mesh.y*2.*pi/max(md.mesh.x))));
    11 md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
     11md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
    1212md.friction.p=ones(md.mesh.numberofelements,1);
    1313md.friction.q=zeros(md.mesh.numberofelements,1);

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

    r17769 r24863  
    88disp('      creating drag');
    99md.friction.coefficient=sqrt(md.constants.yts.*(1000.+1000.*sin(md.mesh.x*2.*pi/max(md.mesh.x))));
    10 md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
     10md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
    1111md.friction.p=ones(md.mesh.numberofelements,1);
    1212md.friction.q=zeros(md.mesh.numberofelements,1);

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

    r22993 r24863  
    2222%Friction
    2323md.friction.coefficient=20.*ones(md.mesh.numberofvertices,1);
    24 md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
     24md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
    2525md.friction.p=ones(md.mesh.numberofelements,1);
    2626md.friction.q=ones(md.mesh.numberofelements,1);

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

    r23829 r24863  
    2626md.geometry.base=md.geometry.surface-md.geometry.thickness;
    2727md.geometry.bed =md.geometry.base;
    28 pos = find(md.mask.groundedice_levelset<0);
     28pos = find(md.mask.ocean_levelset<0);
    2929md.geometry.bed(pos) =InterpFromMeshToMesh2d(index,x,y,bed,md.mesh.x(pos),md.mesh.y(pos));
    3030clear surface thickness vx_obs vy_obs x y index;
    … …  
    4242%Friction
    4343md.friction.coefficient=50*ones(md.mesh.numberofvertices,1);
    44 md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
     44md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
    4545md.friction.p=ones(md.mesh.numberofelements,1);
    4646md.friction.q=ones(md.mesh.numberofelements,1);

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

    r22575 r24863  
    1313md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
    1414
    15 pos=find(md.mask.groundedice_levelset>0.);
     15pos=find(md.mask.ocean_levelset>0.);
    1616md.geometry.base(pos)=md.geometry.base(pos)-300.*(radius(pos)-(rad-shelfextent))/(rad-shelfextent);
    1717md.geometry.surface=md.geometry.base+md.geometry.thickness;
    … …  
    6464md.smb.mass_balance=-10.*ones(md.mesh.numberofvertices,1);
    6565md.basalforcings.groundedice_melting_rate=zeros(md.mesh.numberofvertices,1);
    66 pos=find(md.mask.groundedice_levelset>0.);md.basalforcings.groundedice_melting_rate(pos)=10.;
     66pos=find(md.mask.ocean_levelset>0.);md.basalforcings.groundedice_melting_rate(pos)=10.;
    6767md.basalforcings.floatingice_melting_rate=zeros(md.mesh.numberofvertices,1);
    6868md.basalforcings.geothermalflux=ones(md.mesh.numberofvertices,1);
    … …  
    9696md.groundingline.migration='AggressiveMigration';
    9797md.geometry.bed=md.geometry.base;
    98 pos=find(md.mask.groundedice_levelset<0.); md.geometry.bed(pos)=md.geometry.base(pos)-900.;
     98pos=find(md.mask.ocean_levelset<0.); md.geometry.bed(pos)=md.geometry.base(pos)-900.;
    9999
    100100%Deal with boundary conditions:

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

    r24261 r24863  
    1111disp('      creating drag');
    1212md.friction.coefficient=20.*ones(md.mesh.numberofvertices,1);
    13 md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
     13md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
    1414md.friction.p=ones(md.mesh.numberofelements,1);
    1515md.friction.q=ones(md.mesh.numberofelements,1);

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

    r19527 r24863  
    1010disp('      creating drag');
    1111md.friction.coefficient=200.*ones(md.mesh.numberofvertices,1);
    12 md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
     12md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
    1313md.friction.p=ones(md.mesh.numberofelements,1);
    1414md.friction.q=ones(md.mesh.numberofelements,1);

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

    r24569 r24863  
    1313%Friction
    1414md.friction.coefficient=20.*ones(md.mesh.numberofvertices,1);
    15 md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
     15md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
    1616md.friction.p=ones(md.mesh.numberofelements,1);
    1717md.friction.q=ones(md.mesh.numberofelements,1);

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

    r22993 r24863  
    4242%Friction
    4343md.friction.coefficient=20.*ones(md.mesh.numberofvertices,1);
    44 md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
     44md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
    4545md.friction.p=ones(md.mesh.numberofelements,1);
    4646md.friction.q=ones(md.mesh.numberofelements,1);

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

    r24096 r24863  
    5353%Friction
    5454md.friction.coefficient=20*ones(md.mesh.numberofvertices,1);
    55 md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
     55md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
    5656md.friction.p=ones(md.mesh.numberofelements,1);
    5757md.friction.q=ones(md.mesh.numberofelements,1);

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

    r22993 r24863  
    4444%Friction
    4545md.friction.coefficient=20.*ones(md.mesh.numberofvertices,1);
    46 md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
     46md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
    4747md.friction.p=ones(md.mesh.numberofelements,1);
    4848md.friction.q=ones(md.mesh.numberofelements,1);

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

    r23836 r24863  
    3737%Friction
    3838md.friction.coefficient=20*ones(md.mesh.numberofvertices,1);
    39 md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
     39md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
    4040md.friction.p=ones(md.mesh.numberofelements,1);
    4141md.friction.q=ones(md.mesh.numberofelements,1);

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

    r22993 r24863  
    3636%Friction
    3737md.friction.coefficient=20*ones(md.mesh.numberofvertices,1);
    38 md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
     38md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
    3939md.friction.p=ones(md.mesh.numberofelements,1);
    4040md.friction.q=ones(md.mesh.numberofelements,1);

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

    r22575 r24863  
    4242%Friction
    4343md.friction.coefficient=20*ones(md.mesh.numberofvertices,1);
    44 md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
     44md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
    4545md.friction.p=ones(md.mesh.numberofelements,1);
    4646md.friction.q=ones(md.mesh.numberofelements,1);

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

    r22993 r24863  
    1717disp('      creating drag');
    1818md.friction.coefficient=200.*ones(md.mesh.numberofvertices,1);
    19 md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
     19md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
    2020md.friction.p=ones(md.mesh.numberofelements,1);
    2121md.friction.q=ones(md.mesh.numberofelements,1);
    … …  
    4444md.thermal.spctemperature(:)=md.initialization.temperature;
    4545md.basalforcings.geothermalflux=zeros(md.mesh.numberofvertices,1);
    46 md.basalforcings.geothermalflux(find(md.mask.groundedice_levelset>0.))=1.*10^-3; %1 mW/m^2
     46md.basalforcings.geothermalflux(find(md.mask.ocean_levelset>0.))=1.*10^-3; %1 mW/m^2

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

    r23652 r24863  
    2626%Mask
    2727md.mask.ice_levelset = x - alpha*Lx;
    28 md.mask.groundedice_levelset = ones(md.mesh.numberofvertices,1);
     28md.mask.ocean_levelset = ones(md.mesh.numberofvertices,1);
    2929
    3030%Initial velocity
    … …  
    5555%Friction
    5656md.friction.coefficient = 20.*ones(md.mesh.numberofvertices,1);
    57 md.friction.coefficient(find(md.mask.groundedice_levelset<0.)) = 0.;
     57md.friction.coefficient(find(md.mask.ocean_levelset<0.)) = 0.;
    5858md.friction.p = ones(md.mesh.numberofelements,1);
    5959md.friction.q = ones(md.mesh.numberofelements,1);

  • issm/trunk-jpl/test/SandBox/test2004.m

    r24809 r24863  
    124124        if bas.isnameany('antarctica-grounded'),
    125125
    126                 md.mask.groundedice_levelset=ones(md.mesh.numberofvertices,1);
     126                md.mask.ocean_levelset=ones(md.mesh.numberofvertices,1);
    127127        end
    128128        if bas.isnameany('ronne'),
    129129
    130                 md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1);
     130                md.mask.ocean_levelset=-ones(md.mesh.numberofvertices,1);
    131131
    132132                %correction to land and ocean levelset: ice shelf is not on land!
    133                 pos=find(md.mask.ice_levelset<=0 & md.mask.groundedice_levelset<=0);
     133                pos=find(md.mask.ice_levelset<=0 & md.mask.ocean_levelset<=0);
    134134                md.mask.ocean_levelset(pos)=1;
    135135                md.mask.land_levelset(pos)=-1;
    … …  
    255255
    256256        %grounded ice:
    257         md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1);
     257        md.mask.ocean_levelset=-ones(md.mesh.numberofvertices,1);
    258258
    259259        md.mask.glacier_levelset=zeros(md.mesh.numberofvertices,1);
    … …  
    324324
    325325%transfer a list of fields from each icecap and continent back to Earth:
    326 sl.transfer('mask.groundedice_levelset');
    327326sl.transfer('mask.ice_levelset');
    328327sl.transfer('mask.ocean_levelset');
Note: See TracChangeset for help on using the changeset viewer.