Changeset 14156

Timestamp:

12/13/12 10:09:01 (12 years ago)

Author:

jschierm

Message:

CHG: Eliminated roundoff errors in RoundSheetStaticEISMINT and updated appropriate archives.

Location:

issm/trunk-jpl/test

Files:

• Archives/Archive1205.nc (modified) ( previous)
• Archives/Archive1206.nc (modified) ( previous)
• Archives/Archive1207.nc (modified) ( previous)
• Par/RoundSheetStaticEISMINT.par (modified) (1 diff)
• Par/RoundSheetStaticEISMINT.py (modified) (1 diff)

issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.par ¶

@@ -4 +4 @@
 radius=sqrt((md.mesh.x).^2+(md.mesh.y).^2);
 radiusmax=max(radius);
+radius(find(radius>(1.-10^-9)*radiusmax))=radiusmax;    %eliminate roundoff issues in next statement
 md.geometry.thickness=hmin*ones(size(md.mesh.x,1),1)+hmax*(4.*((1./2.)^(4./3.)*ones(size(md.mesh.x,1),1)-((radius)./(2.*radiusmax)).^(4./3.))).^(3./8.);
 md.geometry.bed=0.*md.geometry.thickness;

issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.py ¶

@@ -7 +7 @@
 radius=numpy.sqrt((md.mesh.x)**2+(md.mesh.y)**2).reshape(-1,1)
 radiusmax=numpy.max(radius)
+radius[numpy.nonzero(radius>(1.-10**-9)*radiusmax)]=radiusmax    #eliminate roundoff issues in next statement
 md.geometry.thickness=hmin*numpy.ones((numpy.size(md.mesh.x),1))+hmax*(4.*((1./2.)**(4./3.)*numpy.ones((numpy.size(md.mesh.x),1))-((radius)/(2.*radiusmax))**(4./3.)))**(3./8.)
 md.geometry.bed=0.*md.geometry.thickness