Changeset 7877

Timestamp:

04/13/11 14:25:33 (14 years ago)

Author:

seroussi

Message:

minor

Location:

issm/trunk/test/Par

Files:

• ISMIPC.par (modified) (1 diff)
• ISMIPD.par (modified) (1 diff)
• ISMIPF.par (modified) (3 diffs)

issm/trunk/test/Par/ISMIPC.par

@@ -10 +10 @@
 md.drag_type=2; %0 none 1 plastic 2 viscous
 %md.drag_coefficient=sqrt(md.yts.*(1000+1000*sin(md.x*2*pi/max(md.x/2)).*sin(md.y*2*pi/max(md.x/2)))./(md.g*(md.rho_ice*md.thickness+md.rho_water*md.bed)));
-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)));
+md.drag_coefficient=sqrt(md.yts.*(1000+1000*sin(md.x*2*pi/max(md.x)).*sin(md.y*2*pi/max(md.x))));
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
 md.drag_coefficient(md.elements(pos,:))=0;
 md.drag_p=ones(md.numberofelements,1);
-md.drag_q=ones(md.numberofelements,1);
+md.drag_q=zeros(md.numberofelements,1);
 
 disp('      creating flow law paramter');

issm/trunk/test/Par/ISMIPD.par

@@ -9 +9 @@
 disp('      creating drag');
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag_coefficient=sqrt(md.yts.*(1000+1000*sin(md.x*2*pi/max(md.x)))./(md.g*(md.rho_ice*md.thickness+md.rho_water*md.bed)));
+md.drag_coefficient=sqrt(md.yts.*(1000+1000*sin(md.x*2*pi/max(md.x))));
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);

issm/trunk/test/Par/ISMIPF.par

@@ -3 +3 @@
 
 disp('      creating thickness');
-md.surface=-md.x*tan(3*pi/180)/1000;
+md.surface=-md.x*tan(3*pi/180);
 %md.bed=md.surface-1000;
 md.bed=md.surface-1000+100*exp(-((md.x-max(md.x)/2).^2+(md.y-max(md.y)/2).^2)/(10000^2));
@@ -11 +11 @@
 disp('      creating drag');
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag_coefficient=sqrt(md.yts.*(2.140373*10^-7*1000)^(-1));
+md.drag_coefficient=sqrt(md.yts/(2.140373*10^-7*1000))*ones(md.numberofgrids,1);
 md.drag_p=ones(md.numberofelements,1);
 md.drag_q=zeros(md.numberofelements,1);
@@ -29 +29 @@
 md.pressure=zeros(md.numberofgrids,1);
 md.temperature=255*ones(md.numberofgrids,1);
-pos=find(md.x==min(md.x) | md.x==max(md.x));
+pos=find(md.x==min(md.x) | md.x==max(md.x) | md.y==min(md.y) | md.y==max(md.y));
 md.spcthickness(pos,1)=1;
 md.spcthickness(pos,2)=md.thickness(pos);