Changeset 13971

Timestamp:

11/15/12 15:49:34 (12 years ago)

Author:

jschierm

Message:

NEW: Working test1601.py and test1602.py.

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• runme.m (modified) (1 diff)
• test1501.m (modified) (2 diffs)
• test1502.m (modified) (2 diffs)
• test1601.m (modified) (2 diffs)
• test1601.py (added)
• test1602.m (modified) (1 diff)
• test1602.py (added)

issm/trunk-jpl/test/NightlyRun/runme.m

@@ -67 +67 @@
 end
 % }}}
-%GET RANK and NUMPROCS for mutlithreaded runs  {{{
+%GET RANK and NUMPROCS for multithreaded runs  {{{
 rank=getfieldvalue(options,'rank',1);
 numprocs=getfieldvalue(options,'numprocs',1);

issm/trunk-jpl/test/NightlyRun/test1501.m

@@ -8 +8 @@
 md.transient.isthermal=0;
 
-md.timestepping.time_step=1;
+md.timestepping.time_step=1.;
 md.settings.output_frequency=1;
-md.timestepping.final_time=2000;
+md.timestepping.final_time=2000.;
 
 %Solve for thinning rate -> -1 * surface mass balance
-smb= 2*ones(md.mesh.numberofvertices,1);   
+smb= 2.*ones(md.mesh.numberofvertices,1);   
 md.surfaceforcings.mass_balance= smb;
 md.basalforcings.melting_rate= smb;
@@ -27 +27 @@
 smb = md.surfaceforcings.mass_balance;
 
-tooth= [ [ones(400,1)*(smb') - 10]' [ones(400,1)*(smb')]' ];
+tooth= [ [ones(400,1)*(smb') - 10.]' [ones(400,1)*(smb')]' ];
 smb=[ [ones(399,1)*(smb')]' smb  tooth tooth];
 
 md.surfaceforcings.mass_balance= smb;
-md.surfaceforcings.mass_balance(end+1,:)=[1:2000];
+md.surfaceforcings.mass_balance(end+1,:)=[1.:2000.];
 
 md=solve(md,TransientSolutionEnum());

issm/trunk-jpl/test/NightlyRun/test1502.m

@@ -9 +9 @@
 md.transient.isthermal=0;
 
-md.timestepping.time_step=1;
+md.timestepping.time_step=1.;
 md.settings.output_frequency=1;
-md.timestepping.final_time=2000;
+md.timestepping.final_time=2000.;
 
 %Solve for thinning rate -> -1 * surface mass balance
-smb= 2*ones(md.mesh.numberofvertices,1);   
+smb= 2.*ones(md.mesh.numberofvertices,1);   
 md.surfaceforcings.mass_balance= smb;
 md.basalforcings.melting_rate= smb;
@@ -28 +28 @@
 smb = md.surfaceforcings.mass_balance;
 
-tooth= [ [ones(400,1)*(smb') - 10]' [ones(400,1)*(smb')]' ];
+tooth= [ [ones(400,1)*(smb') - 10.]' [ones(400,1)*(smb')]' ];
 smb=[ [ones(399,1)*(smb')]' smb  tooth tooth];
 
 md.surfaceforcings.mass_balance= smb;
-md.surfaceforcings.mass_balance(end+1,:)=[1:2000];
+md.surfaceforcings.mass_balance(end+1,:)=[1.:2000.];
 
 md=solve(md,TransientSolutionEnum());

issm/trunk-jpl/test/NightlyRun/test1601.m

@@ -3 +3 @@
 md=parameterize(md,'../Par/SquareShelf.par');
 md=setflowequation(md,'macayeal','all');
-md.diagnostic.spcvx(find(md.mesh.y>0))=NaN;
-md.initialization.vx(:)=0;
-md.initialization.vy(:)=0;
-md.initialization.vel(:)=0;
+md.diagnostic.spcvx(find(md.mesh.y>0.))=NaN;
+md.initialization.vx(:)=0.;
+md.initialization.vy(:)=0.;
+md.initialization.vel(:)=0.;
 
-md.cluster=generic('name',oshostname,'np',2);
+md.cluster=generic('name',oshostname(),'np',2);
 md=solve(md,DiagnosticSolutionEnum());
 vel0=md.results.DiagnosticSolution.Vel;
 
-theta=30*pi/180;
+theta=30.*pi/180.;
 x=md.mesh.x;
 y=md.mesh.y;
@@ -27 +27 @@
 
 %Now, put CS back to normal except on the side where the spc are applied
-pos=find(x==0 | x==1000000);
+pos=find(x==0. | x==1000000.);
 md.diagnostic.referential(:)=NaN;
 md.diagnostic.referential(pos,1:3)=repmat([cos(theta),sin(theta),0],size(pos,1),1);

issm/trunk-jpl/test/NightlyRun/test1602.m

@@ -4 +4 @@
 md=extrude(md,5,1.);
 md=setflowequation(md,'pattyn','all');
-md.diagnostic.spcvx(find(md.mesh.y>0))=NaN;
-md.initialization.vx(:)=0;
-md.initialization.vy(:)=0;
-md.initialization.vel(:)=0;
+md.diagnostic.spcvx(find(md.mesh.y>0.))=NaN;
+md.initialization.vx(:)=0.;
+md.initialization.vy(:)=0.;
+md.initialization.vel(:)=0.;
 
-md.cluster=generic('name',oshostname,'np',3);
+md.cluster=generic('name',oshostname(),'np',3);
 md=solve(md,DiagnosticSolutionEnum());
 vel0=md.results.DiagnosticSolution.Vel;
 
-theta=30*pi/180;
+theta=30.*pi/180.;
 x=md.mesh.x;
 y=md.mesh.y;