Changeset 13494

Timestamp:

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

Author:

jschierm

Message:

NEW: test514.py now running.

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• test514.m (modified) (3 diffs)
• test514.py (added)

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

@@ -1 +1 @@
 %Simple mesh 1
-hVertices=10000*ones(27,1);
-hVertices(1:5)=1000;
-md=bamg(model,'domain','../Exp/Pig.exp','hmax',20000,'hVertices',hVertices,'gradation',3,'geometricalmetric',1);
+hVertices=10000.*ones(27,1);
+hVertices(1:5)=1000.;
+md=bamg(model,'domain','../Exp/Pig.exp','hmax',20000.,'hVertices',hVertices,'gradation',3.,'geometricalmetric',1);
 x1=md.mesh.x;
 y1=md.mesh.y;
 
 %Simple mesh 2
-md=bamg(model,'domain','../Exp/Pig.exp','hmax',10000);
+md=bamg(model,'domain','../Exp/Pig.exp','hmax',10000.);
 md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
 md=parameterize(md,'../Par/Pig.par');
@@ -15 +15 @@
 %refine existing mesh 1
 hessian=ComputeHessian(md.mesh.elements,md.mesh.x,md.mesh.y,md.inversion.vy_obs,'node');
-metric=ComputeMetric(hessian,2/9,1,1000,25*10^3,[]);
+metric=ComputeMetric(hessian,2./9.,1.,1000.,25.*10.^3,[]);
 md.miscellaneous.dummy=metric;
-md2=bamg(md,'metric',md.miscellaneous.dummy,'hmin',1000,'hmax',20000,'gradation',3,'geometricalmetric',1);
+md2=bamg(md,'metric',md.miscellaneous.dummy,'hmin',1000.,'hmax',20000.,'gradation',3.,'geometricalmetric',1);
 x3=md2.mesh.x;
 y3=md2.mesh.y;
 
 %refine existing mesh 2
-md2=bamg(md,'metric',md.miscellaneous.dummy,'hmin',1000,'hmax',20000,'gradation',3,'geometricalmetric',1,'anisomax',1);
+md2=bamg(md,'metric',md.miscellaneous.dummy,'hmin',1000.,'hmax',20000.,'gradation',3.,'geometricalmetric',1,'anisomax',1.);
 x4=md2.mesh.x;
 y4=md2.mesh.y;
@@ -29 +29 @@
 hVertices=NaN*ones(md.mesh.numberofvertices,1);
 hVertices(find(md.mesh.vertexonboundary))=500;
-md2=bamg(md,'metric',md.miscellaneous.dummy,'hmin',1000,'hmax',20000,'gradation',3,'geometricalmetric',1,'anisomax',1,'hVertices',hVertices);
+md2=bamg(md,'metric',md.miscellaneous.dummy,'hmin',1000.,'hmax',20000.,'gradation',3.,'geometricalmetric',1,'anisomax',1.,'hVertices',hVertices);
 x5=md2.mesh.x;
 y5=md2.mesh.y;
 
 %refine existing mesh 4
-md2=bamg(md,'field',md.inversion.vy_obs,'hmin',1000,'hmax',20000,'gradation',3,'geometricalmetric',1,'Hessiantype',0,'err',1);
+md2=bamg(md,'field',md.inversion.vy_obs,'hmin',1000.,'hmax',20000.,'gradation',3.,'geometricalmetric',1,'Hessiantype',0,'err',1.);
 x6=md2.mesh.x;
 y6=md2.mesh.y;
 
 %refine existing mesh 5
-md2=bamg(md,'field',[md.inversion.vy_obs md.geometry.thickness],'hmin',1000,'hmax',20000,'gradation',3,'geometricalmetric',1,'Hessiantype',1,'err',[10 100]); 
+md2=bamg(md,'field',[md.inversion.vy_obs md.geometry.thickness],'hmin',1000.,'hmax',20000.,'gradation',3.,'geometricalmetric',1,'Hessiantype',1,'err',[10. 100.]); 
 x7=md2.mesh.x;
 y7=md2.mesh.y;