Changeset 14310 for issm/trunk/test/Par/ISMIPD.par

Timestamp:

02/04/13 08:01:04 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 14308

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• test (modified) (1 prop)
• test/Par/ISMIPD.par (modified) (1 diff)

issm/trunk/test/Par/ISMIPD.par

@@ -2 +2 @@
 
 disp('      creating thickness');
-md.geometry.surface=2000-md.mesh.x*tan(0.1*pi/180); %to have z>0
-md.geometry.bed=md.geometry.surface-1000;
+md.geometry.surface=2000.-md.mesh.x*tan(0.1*pi/180.); %to have z>0
+md.geometry.bed=md.geometry.surface-1000.;
 md.geometry.thickness=md.geometry.surface-md.geometry.bed;
 
 disp('      creating drag');
-md.friction.coefficient=sqrt(md.constants.yts.*(1000+1000*sin(md.mesh.x*2*pi/max(md.mesh.x))));
+md.friction.coefficient=sqrt(md.constants.yts.*(1000.+1000.*sin(md.mesh.x*2.*pi/max(md.mesh.x))));
 %Take care of iceshelves: no basal drag
 pos=find(md.mask.elementonfloatingice);
-md.friction.coefficient(md.mesh.elements(pos,:))=0;
+md.friction.coefficient(md.mesh.elements(pos,:))=0.;
 md.friction.p=ones(md.mesh.numberofelements,1);
 md.friction.q=zeros(md.mesh.numberofelements,1);
 
-disp('      creating flow law paramter');
+disp('      creating flow law parameter');
 md.materials.rheology_B=6.8067*10^7*ones(md.mesh.numberofvertices,1);
-md.materials.rheology_n=3*ones(md.mesh.numberofelements,1);
+md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1);
 
-disp('      boundary conditions for diagnostic model: ');
-%Create node on boundary fist (because wi can not use mesh)
+disp('      boundary conditions for diagnostic model:');
+%Create node on boundary first (because we can not use mesh)
 md=SetIceSheetBC(md);