Changeset 15994

Timestamp:

08/28/13 10:39:10 (12 years ago)

Author:

seroussi

Message:

BUG: fixed difference in NR test round (friction did not match)

File:

• issm/trunk-jpl/test/Par/RoundSheetShelf.par (modified) (3 diffs)

issm/trunk-jpl/test/Par/RoundSheetShelf.par

@@ -13 +13 @@
 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
 
-pos=find(md.mask.vertexongroundedice);
+pos=find(md.mask.groundedice_levelset>0.);
 md.geometry.bed(pos)=md.geometry.bed(pos)-300.*(radius(pos)-(rad-shelfextent))/(rad-shelfextent);
 md.geometry.surface=md.geometry.bed+md.geometry.thickness;
@@ -64 +64 @@
 md.surfaceforcings.mass_balance=-10.*ones(md.mesh.numberofvertices,1);
 md.basalforcings.melting_rate=zeros(md.mesh.numberofvertices,1);
-pos=find(md.mask.vertexonfloatingice);md.basalforcings.melting_rate(pos)=10.;
+pos=find(md.mask.groundedice_levelset>0.);md.basalforcings.melting_rate(pos)=10.;
 md.basalforcings.geothermalflux=ones(md.mesh.numberofvertices,1);
 
 %Friction
+radius=1.e6;
+shelfextent=2.e5;
 md.friction.coefficient=20.*ones(md.mesh.numberofvertices,1);
-md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
+xelem=md.mesh.x(md.mesh.elements)*[1;1;1]/3.;
+yelem=md.mesh.y(md.mesh.elements)*[1;1;1]/3.;
+rad=sqrt(xelem.^2+yelem.^2);
+flags=zeros(md.mesh.numberofelements,1);
+pos=find(rad>=(radius-shelfextent));
+md.friction.coefficient(md.mesh.elements(pos,:))=0.;
 md.friction.p=ones(md.mesh.numberofelements,1);
 md.friction.q=ones(md.mesh.numberofelements,1);
@@ -89 +96 @@
 md.groundingline.migration='AgressiveMigration';
 md.geometry.bathymetry=md.geometry.bed;
-pos=find(md.mask.vertexonfloatingice); md.geometry.bathymetry(pos)=md.geometry.bed(pos)-900.;
+pos=find(md.mask.groundedice_levelset<0.); md.geometry.bathymetry(pos)=md.geometry.bed(pos)-900.;
 
 %Deal with boundary conditions: