Changeset 21877

Timestamp:

07/26/17 15:39:33 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: no more geometrical metric

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• test119.m (modified) (2 diffs)
• test119.py (modified) (2 diffs)
• test514.m (modified) (3 diffs)
• test514.py (modified) (3 diffs)

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

@@ -2 +2 @@
 
 %Simple mesh
-md=bamg(model(),'domain','../Exp/Square.exp','hmax',100000.,'rand',false);
+md=bamg(model(),'domain','../Exp/Square.exp','hmax',100000.);
 x1=md.mesh.x;
 y1=md.mesh.y;
 
 %hVertices
-md=bamg(model(),'domain','../Exp/Square.exp','hmax',300000.,'hVertices',[10000. 100000. 400000. 100000.]','rand',false);
+md=bamg(model(),'domain','../Exp/Square.exp','hmax',300000.,'hVertices',[10000. 100000. 400000. 100000.]');
 x2=md.mesh.x;
 y2=md.mesh.y;
@@ -13 +13 @@
 %big mesh
 t0=clock;
-md=bamg(model(),'domain','../Exp/Square.exp','hmax',3000.,'rand',false);
+md=bamg(model(),'domain','../Exp/Square.exp','hmax',3000.);
 nbelements=md.mesh.numberofelements;
 if nbelements>267895-50 & nbelements<267895+50

issm/trunk-jpl/test/NightlyRun/test119.py

@@ -8 +8 @@
 
 #Simple mesh
-md=bamg(model(),'domain','../Exp/Square.exp','hmax',100000.,'rand',False)
+md=bamg(model(),'domain','../Exp/Square.exp','hmax',100000.)
 x1=md.mesh.x
 y1=md.mesh.y
 
 #hVertices
-md=bamg(model(),'domain','../Exp/Square.exp','hmax',300000.,'hVertices',np.array([10000.,100000.,400000.,100000.]).reshape(-1,1),'rand',False)
+md=bamg(model(),'domain','../Exp/Square.exp','hmax',300000.,'hVertices',np.array([10000.,100000.,400000.,100000.]).reshape(-1,1))
 x2=md.mesh.x
 y2=md.mesh.y
@@ -19 +19 @@
 #big mesh
 t0=time.time()
-md=bamg(model(),'domain','../Exp/Square.exp','hmax',3000.,'rand',False)
+md=bamg(model(),'domain','../Exp/Square.exp','hmax',3000.)
 nbelements=md.mesh.numberofelements
 elapsedtime=time.time()-t0

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

@@ -3 +3 @@
 hVertices=10000.*ones(27,1);
 hVertices(1:5)=1000.;
-md=bamg(model(),'domain','../Exp/Pig.exp','hmax',20000.,'hVertices',hVertices,'gradation',3.,'geometricalmetric',1);
+md=bamg(model(),'domain','../Exp/Pig.exp','hmax',20000.,'hVertices',hVertices,'gradation',3.);
 x1=md.mesh.x;
 y1=md.mesh.y;
@@ -18 +18 @@
 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.);
 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.,'anisomax',1.);
 x4=md2.mesh.x;
 y4=md2.mesh.y;
@@ -30 +30 @@
 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.,'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.,'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.,'Hessiantype',1,'err',[10. 100.]); 
 x7=md2.mesh.x;
 y7=md2.mesh.y;

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

@@ -14 +14 @@
 hVertices=10000.*np.ones((27))
 hVertices[0:5]=1000.
-md=bamg(model(),'domain','../Exp/Pig.exp','hmax',20000.,'hVertices',hVertices,'gradation',3.,'geometricalmetric',1)
+md=bamg(model(),'domain','../Exp/Pig.exp','hmax',20000.,'hVertices',hVertices,'gradation',3.)
 x1=md.mesh.x
 y1=md.mesh.y
@@ -29 +29 @@
 metric=ComputeMetric(hessian,2./9.,1.,1000.,25.*10.**3,[])
 md.miscellaneous.dummy=metric
-md2=bamg(copy.deepcopy(md),'metric',md.miscellaneous.dummy,'hmin',1000.,'hmax',20000.,'gradation',3.,'geometricalmetric',1)
+md2=bamg(copy.deepcopy(md),'metric',md.miscellaneous.dummy,'hmin',1000.,'hmax',20000.,'gradation',3.)
 x3=md2.mesh.x
 y3=md2.mesh.y
 
 #refine existing mesh 2
-md2=bamg(copy.deepcopy(md),'metric',md.miscellaneous.dummy,'hmin',1000.,'hmax',20000.,'gradation',3.,'geometricalmetric',1,'anisomax',1.)
+md2=bamg(copy.deepcopy(md),'metric',md.miscellaneous.dummy,'hmin',1000.,'hmax',20000.,'gradation',3.,'anisomax',1.)
 x4=md2.mesh.x
 y4=md2.mesh.y
@@ -41 +41 @@
 hVertices=np.nan*np.ones((md.mesh.numberofvertices))
 hVertices[np.nonzero(md.mesh.vertexonboundary)]=500.
-md2=bamg(copy.deepcopy(md),'metric',md.miscellaneous.dummy,'hmin',1000.,'hmax',20000.,'gradation',3.,'geometricalmetric',1,'anisomax',1.,'hVertices',hVertices)
+md2=bamg(copy.deepcopy(md),'metric',md.miscellaneous.dummy,'hmin',1000.,'hmax',20000.,'gradation',3.,'anisomax',1.,'hVertices',hVertices)
 x5=md2.mesh.x
 y5=md2.mesh.y
 
 #refine existing mesh 4
-md2=bamg(copy.deepcopy(md),'field',md.inversion.vy_obs,'hmin',1000.,'hmax',20000.,'gradation',3.,'geometricalmetric',1,'Hessiantype',0,'err',np.array([[1.]]))
+md2=bamg(copy.deepcopy(md),'field',md.inversion.vy_obs,'hmin',1000.,'hmax',20000.,'gradation',3.,'Hessiantype',0,'err',np.array([[1.]]))
 x6=md2.mesh.x
 y6=md2.mesh.y
 
 #refine existing mesh 5
-md2=bamg(copy.deepcopy(md),'field',np.hstack((md.inversion.vy_obs,md.geometry.thickness)),'hmin',1000.,'hmax',20000.,'gradation',3.,'geometricalmetric',1,'Hessiantype',1,'err',np.array([[10.,100.]])) 
+md2=bamg(copy.deepcopy(md),'field',np.hstack((md.inversion.vy_obs,md.geometry.thickness)),'hmin',1000.,'hmax',20000.,'gradation',3.,'Hessiantype',1,'err',np.array([[10.,100.]])) 
 x7=md2.mesh.x
 y7=md2.mesh.y