Changeset 4897


Ignore:
Timestamp:
07/30/10 08:08:20 (15 years ago)
Author:
seroussi
Message:

minor

Location:
issm/trunk/test/Validation/ISMIP
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/test/Validation/ISMIP/TestA/runme.m

    r4883 r4897  
    1010md=geography(md,'',''); %ice sheet test
    1111md=parameterize(md,'Square.par');
    12 md=extrude(md,10,1);
     12md=extrude(md,9,1);
     13md.verbose=10;
     14md.np=5;
     15md.cluster='wilkes';
    1316
     17%md=setelementstype(md,'macayeal','all');
    1418md=setelementstype(md,'pattyn','all');
    1519%md=setelementstype(md,'pattyn','all','stokes','all');
    … …  
    2125
    2226%Create MPCs to have periodic boundary conditions
    23 %posx=find(md.x==0);
    24 %posx2=find(md.x==max(md.x));
    25 %
    26 %posy=find(md.y==0 & md.x~=0 & md.x~=max(md.x)); %Don't take the same grids two times
    27 %posy2=find(md.y==max(md.y) & md.x~=0 & md.x~=max(md.x));
    28 %
    29 %md.penalties=[posx,posx2;posy,posy2];
     27posx=find(md.x==0);
     28posx2=find(md.x==max(md.x));
     29
     30posy=find(md.y==0 & md.x~=0 & md.x~=max(md.x)); %Don't take the same grids two times
     31posy2=find(md.y==max(md.y) & md.x~=0 & md.x~=max(md.x));
     32
     33md.penalties=[posx,posx2;posy,posy2];
    3034
    3135%Compute the diagnostic

  • issm/trunk/test/Validation/ISMIP/TestB/runme.m

    r4883 r4897  
    1111md=parameterize(md,'Square.par');
    1212md=extrude(md,10,1);
     13md.cluster='wilkes';
     14md.np=3;
    1315
    1416%md=setelementstype(md,'pattyn','all','stokes','all');
    … …  
    2022md.spcvelocity(pos,1:2)=1;
    2123
    22 %%Create MPCs to have periodic boundary conditions
    23 %posx=find(md.x==0);
    24 %posx2=find(md.x==max(md.x));
    25 %
    26 %posy=find(md.y==0 & md.x~=0 & md.x~=max(md.x)); %Don't take the same grids two times
    27 %posy2=find(md.y==max(md.y) & md.x~=0 & md.x~=max(md.x));
    28 %
    29 %md.penalties=[posx,posx2;posy,posy2];
     24%Create MPCs to have periodic boundary conditions
     25posx=find(md.x==0);
     26posx2=find(md.x==max(md.x));
     27
     28posy=find(md.y==0 & md.x~=0 & md.x~=max(md.x)); %Don't take the same grids two times
     29posy2=find(md.y==max(md.y) & md.x~=0 & md.x~=max(md.x));
     30
     31md.penalties=[posx,posx2;posy,posy2];
    3032
    3133%Compute the diagnostic

  • issm/trunk/test/Validation/ISMIP/TestC/Square.par

    r4883 r4897  
    99disp('      creating drag');
    1010md.drag_type=2; %0 none 1 plastic 2 viscous
    11 md.drag_coefficient=sqrt(md.yts.*(1000+1000*sin(md.x*2*pi/max(md.x)).*sin(md.y*2*pi/max(md.x)))./(md.g*(md.rho_ice*md.thickness+md.rho_water*md.bed)));
     11md.drag_coefficient=sqrt(md.yts.*(1000+1000*sin(md.x*2*pi/max(md.x/3)).*sin(md.y*2*pi/max(md.x/3)))./(md.g*(md.rho_ice*md.thickness+md.rho_water*md.bed)));
     12%md.drag_coefficient=sqrt(md.yts.*(1000+1000*sin(md.x*2*pi/max(md.x)).*sin(md.y*2*pi/max(md.x)))./(md.g*(md.rho_ice*md.thickness+md.rho_water*md.bed)));
    1213%Take care of iceshelves: no basal drag
    1314pos=find(md.elementoniceshelf);

  • issm/trunk/test/Validation/ISMIP/TestC/runme.m

    r4883 r4897  
    33
    44%TestC
    5 L=80000; %in m
    6 nx=20; %number of nodes in x direction
    7 ny=20;
     5L=3*80000; %in m (3 times the desired lenght for BC problems)
     6nx=60; %number of nodes in x direction
     7ny=60;
    88md=model;
    99md=squaremesh(md,L,L,nx,ny);
    … …  
    1515%md=setelementstype(md,'pattyn','all','stokes','all');
    1616
    17 %%Create MPCs to have periodic boundary conditions
    18 %posx=find(md.x==0);
    19 %posx2=find(md.x==L);
    20 %
    21 %posy=find(md.y==0 & md.x~=0 & md.x~=L); %Don't take the same grids two times
    22 %posy2=find(md.y==L & md.x~=0 & md.x~=L);
    23 %
    24 %md.penalties=[posx,posx2;posy,posy2];
     17%Create MPCs to have periodic boundary conditions
     18%md.spcvelocity=zeros(md.numberofgrids,6);
     19
     20posx=find(md.x==0);
     21posx2=find(md.x==L);
     22
     23posy=find(md.y==0 & md.x~=0 & md.x~=L); %Don't take the same grids two times
     24posy2=find(md.y==L & md.x~=0 & md.x~=L);
     25
     26md.penalties=[posx,posx2;posy,posy2];
    2527
    2628%Compute the diagnostic

  • issm/trunk/test/Validation/ISMIP/TestD/runme.m

    r4883 r4897  
    1212md=parameterize(md,'Square.par');
    1313md=extrude(md,10,1);
     14md.np=8;
     15md.cluster='wilkes';
    1416
    1517md=setelementstype(md,'pattyn','all');
    1618%md=setelementstype(md,'pattyn','all','stokes','all');
    1719
    18 %We need one grd on dirichlet (in the middle)
    19 %md.gridondirichlet_diag(33)=1;
    20 %md.dirichletvalues_diag(1,:)=[18/md.yts -3/md.yts];
     20%We need one grd on dirichlet: the 4 corners are set to zero
     21md.spcvelocity=zeros(md.numberofgrids,6);
     22pos=find((md.x==0 | md.x==max(md.x)) & (md.y==0 | md.y==max(md.y)));
     23md.spcvelocity(pos,1:3)=1;
    2124
    22 %%Create MPCs to have periodic boundary conditions
    23 %posx=find(md.x==0);
    24 %posx2=find(md.x==max(md.x));
    25 %
    26 %posy=find(md.y==0 & md.x~=0 & md.x~=max(md.x)); %Don't take the same grids two times
    27 %posy2=find(md.y==max(md.y) & md.x~=0 & md.x~=max(md.x));
    28 %
    29 %md.penalties=[posx,posx2;posy,posy2];
     25%Create MPCs to have periodic boundary conditions
     26posx=find(md.x==0);
     27posx2=find(md.x==max(md.x));
     28
     29posy=find(md.y==0 & md.x~=0 & md.x~=max(md.x)); %Don't take the same grids two times
     30posy2=find(md.y==max(md.y) & md.x~=0 & md.x~=max(md.x));
     31
     32md.penalties=[posx,posx2;posy,posy2];
    3033
    3134%Compute the diagnostic
Note: See TracChangeset for help on using the changeset viewer.