Changeset 13676

Timestamp:

10/15/12 14:34:31 (12 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added SquareSheetShelf.py

Location:

issm/trunk-jpl/test/Par

Files:

• 79North.py (modified) (1 diff)
• SquareSheetConstrained.py (modified) (1 diff)
• SquareSheetShelf.par (modified) (4 diffs)
• SquareSheetShelf.py (added)

issm/trunk-jpl/test/Par/79North.py

@@ -11 +11 @@
 
 #Geometry and observation
-f = netCDF4.Dataset('../Data/79North.nc','r')
+f         = netCDF4.Dataset('../Data/79North.nc','r')
 x         = reshape(f.variables['x'][:],(-1))
 y         = reshape(f.variables['y'][:],(-1))
-vx= f.variables['vx'][:]
-vy= f.variables['vy'][:]
+vx        = f.variables['vx'][:]
+vy        = f.variables['vy'][:]
 index     = f.variables['index'][:]
 surface   = f.variables['surface'][:]

issm/trunk-jpl/test/Par/SquareSheetConstrained.py

@@ -11 +11 @@
 
 #Geometry
-hmin=300
-hmax=1000
+hmin=300.
+hmax=1000.
 ymin=numpy.min(md.mesh.y)
 ymax=numpy.max(md.mesh.y)

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

@@ -2 +2 @@
 
 %Geometry
-hmin=300;
-hmax=1000;
+hmin=300.;
+hmax=1000.;
 ymin=min(md.mesh.y);
 ymax=max(md.mesh.y);
@@ -9 +9 @@
 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
 bed_sheet=-md.materials.rho_ice/md.materials.rho_water*(hmax+(hmin-hmax)*(ymax/2-ymin)/(ymax-ymin));
-pos=find(md.mesh.y<=ymax/2);
+pos=find(md.mesh.y<=ymax/2.);
 md.geometry.bed(pos)=bed_sheet;
 md.geometry.surface=md.geometry.bed+md.geometry.thickness;
@@ -26 +26 @@
 
 %Materials
-md.initialization.temperature=(273-20)*ones(md.mesh.numberofvertices,1);
+md.initialization.temperature=(273.-20.)*ones(md.mesh.numberofvertices,1);
 md.materials.rheology_B=paterson(md.initialization.temperature);
-md.materials.rheology_n=3*ones(md.mesh.numberofelements,1);
+md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1);
 
 %Accumulation and melting
-md.surfaceforcings.mass_balance=10*ones(md.mesh.numberofvertices,1);
-md.basalforcings.melting_rate=5*ones(md.mesh.numberofvertices,1);
+md.surfaceforcings.mass_balance=10.*ones(md.mesh.numberofvertices,1);
+md.basalforcings.melting_rate=5.*ones(md.mesh.numberofvertices,1);
 
 %Friction
 pos=find(md.mask.elementonfloatingice);
-md.friction.coefficient=20*ones(md.mesh.numberofvertices,1);
-md.friction.coefficient(md.mesh.elements(pos,:))=0;
+md.friction.coefficient=20.*ones(md.mesh.numberofvertices,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);
@@ -51 +51 @@
 md.diagnostic.reltol=0.05;
 md.diagnostic.abstol=NaN;
-md.timestepping.time_step=1;
-md.timestepping.final_time=3;
+md.timestepping.time_step=1.;
+md.timestepping.final_time=3.;
 
 %Deal with boundary conditions: