Changeset 21877 for issm/trunk-jpl/test/NightlyRun/test514.py

Timestamp:

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

Author:

Mathieu Morlighem

Message:

CHG: no more geometrical metric

File:

• issm/trunk-jpl/test/NightlyRun/test514.py (modified) (3 diffs)

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