Changeset 16137 for issm/trunk/test/Par/SquareEISMINT.par

Timestamp:

09/16/13 09:43:55 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16135

Location:

issm/trunk

Files:

• . (modified) (2 props)
• test (modified) (1 prop)
• test/Par/SquareEISMINT.par (modified) (2 diffs)

issm/trunk

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

issm/trunk/test/Par/SquareEISMINT.par

@@ -9 +9 @@
 
 disp('      creating drag');
-md.friction.coefficient=200.*ones(md.mesh.numberofvertices,1); %q=1.
-%Take care of iceshelves: no basal drag
-pos=find(md.mask.elementonfloatingice);
-md.friction.coefficient(md.mesh.elements(pos,:))=0.;
+md.friction.coefficient=200.*ones(md.mesh.numberofvertices,1);
+md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
 md.friction.p=ones(md.mesh.numberofelements,1);
 md.friction.q=ones(md.mesh.numberofelements,1);
@@ -39 +37 @@
 md.balancethickness.spcthickness=NaN*ones(md.mesh.numberofvertices,1);
 md.balancethickness.spcthickness(pos)=500.;
-md.prognostic.spcthickness=NaN*ones(md.mesh.numberofvertices,1);
-md.prognostic.spcthickness(pos)=500.;
-md.prognostic.stabilization=0; %Better result with no artificial diffusivity
+md.masstransport.spcthickness=NaN*ones(md.mesh.numberofvertices,1);
+md.masstransport.spcthickness(pos)=500.;
+md.masstransport.stabilization=0; %Better result with no artificial diffusivity
 md.thermal.stabilization=0;
 md.timestepping.final_time=500.;

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad