Changeset 9947

Timestamp:

09/27/11 08:29:39 (14 years ago)

Author:

Mathieu Morlighem

Message:

Fixed runme

Location:

issm/trunk/examples/SquareIceShelf

Files:

• Square.par (modified) (1 diff)
• runme.m (modified) (1 diff)

issm/trunk/examples/SquareIceShelf/Square.par

@@ -4 +4 @@
 hmin=300;
 hmax=1000;
-ymin=min(md.y);
-ymax=max(md.y);
-md.thickness=hmax+(hmin-hmax)*(md.y-ymin)/(ymax-ymin);
-md.bed=-md.rho_ice/md.rho_water*md.thickness;
-md.surface=md.bed+md.thickness;
+ymin=min(md.mesh.y);
+ymax=max(md.mesh.y);
+md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y-ymin)/(ymax-ymin);
+md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
+md.geometry.surface=md.geometry.bed+md.geometry.thickness;
 
 disp('      creating drag');
-md.drag_type=2; %0 none 1 plastic 2 viscous
-pos=find(md.elementoniceshelf);
-md.drag_coefficient=200*ones(md.numberofnodes,1); %q=1.
-md.drag_coefficient(md.elements(pos,:))=0;
-md.drag_p=ones(md.numberofelements,1);
-md.drag_q=ones(md.numberofelements,1);
-
-disp('      creating temperature');
-md.observed_temperature=(273-20)*ones(md.numberofnodes,1);
+pos=find(md.mask.elementonfloatingice);
+md.friction.coefficient=200*ones(md.mesh.numberofvertices,1); %q=1.
+md.friction.coefficient(md.mesh.elements(pos,:))=0;
+md.friction.p=ones(md.mesh.numberofelements,1);
+md.friction.q=ones(md.mesh.numberofelements,1);
 
 disp('      initial velocity');
-md.vx=zeros(md.numberofnodes,1);
-md.vy=zeros(md.numberofnodes,1);
-md.vz=zeros(md.numberofnodes,1);
-md.vel=zeros(md.numberofnodes,1);
+md.initialization.vx=zeros(md.mesh.numberofvertices,1);
+md.initialization.vy=zeros(md.mesh.numberofvertices,1);
+md.initialization.vz=zeros(md.mesh.numberofvertices,1);
+md.initialization.vel=zeros(md.mesh.numberofvertices,1);
 
 disp('      creating flow law paramter');
-md.rheology_B=paterson(md.observed_temperature);
-md.rheology_n=3*ones(md.numberofelements,1);
+md.materials.rheology_B=paterson((273-20)*ones(md.mesh.numberofvertices,1));
+md.materials.rheology_n=3*ones(md.mesh.numberofelements,1);
 
 disp('      creating boundary conditions');

issm/trunk/examples/SquareIceShelf/runme.m

@@ -1 +1 @@
 md=model;
-md=mesh(md,'DomainOutline.exp',100000);
-md=geography(md,'all','');
+md=setmesh(md,'DomainOutline.exp',100000);
+md=setmask(md,'all','');
 md=parameterize(md,'Square.par');
-md=setelementstype(md,'macayeal','all');
+md=setflowequation(md,'macayeal','all');
 md=solve(md,DiagnosticSolutionEnum);