Changeset 13975 for issm/trunk/test/NightlyRun/test1602.m

Timestamp:

11/16/12 08:10:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13974

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• test (modified) (2 props)
• test/NightlyRun/test1602.m (modified) (2 diffs)

issm/trunk/test/NightlyRun/test1602.m

@@ -1 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000.);
 md=setmask(md,'../Exp/SquareShelf.exp','');
 md=parameterize(md,'../Par/SquareSheetShelf.par');
-md=extrude(md,5,1);
+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=solve(md,DiagnosticSolutionEnum);
+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;
@@ -21 +21 @@
 md.diagnostic.referential(:,1:3)=repmat([cos(theta),sin(theta),0],md.mesh.numberofvertices,1);
 md.diagnostic.referential(:,4:6)=repmat([0,0,1],md.mesh.numberofvertices,1);
-md=solve(md,DiagnosticSolutionEnum);
+md=solve(md,DiagnosticSolutionEnum());
 vel1=md.results.DiagnosticSolution.Vel;