Changeset 22271

Timestamp:

11/20/17 17:59:06 (7 years ago)

Author:

kruegern

Message:

FIX: fixed tests 119 and 514, removed 703 as it is incomplete

Location:

issm/trunk-jpl

Files:

• src/m/mesh/bamg.py (modified) (2 diffs)
• test/NightlyRun/test703.py (deleted)

issm/trunk-jpl/src/m/mesh/bamg.py

@@ -1 +1 @@
 import os.path
 import numpy as  np
+from mesh2d import *
 from mesh2dvertical import *
+from mesh3dsurface import *
 from collections import OrderedDict
 from pairoptions import pairoptions
@@ -92 +94 @@
 
                         #Check that the domain is closed
-                        if (domaini.x[0]!=domaini.x[-1] or domaini.y[0]!=domaini.y[-1]):
+                        if (domaini['x'][0]!=domaini['x'][-1] or domaini['y'][0]!=domaini['y'][-1]):
                                 raise RuntimeError("bamg error message: all contours provided in ''domain'' should be closed")
 
                         #Checks that all holes are INSIDE the principle domain outline
                         if i:
-                                flags=ContourToNodes(domaini.x,domaini.y,domainfile,0)[0]
+                                flags=ContourToNodes(domaini['x'],domaini['y'],domainfile,0)[0]
                                 if np.any(np.logical_not(flags)):
                                         raise RuntimeError("bamg error message: All holes should be strictly inside the principal domain")
 
                         #Add all points to bamg_geometry
-                        nods=domaini.nods-1    #the domain are closed 0=end
-                        bamg_geometry.Vertices=np.vstack((bamg_geometry.Vertices,np.vstack((domaini.x[0:nods],domaini.y[0:nods],np.ones((nods)))).T))
+                        nods=domaini['nods']-1    #the domain are closed 0=end
+                        bamg_geometry.Vertices=np.vstack((bamg_geometry.Vertices,np.vstack((domaini['x'][0:nods],domaini['y'][0:nods],np.ones((nods)))).T))
                         bamg_geometry.Edges   =np.vstack((bamg_geometry.Edges,np.vstack((np.arange(count+1,count+nods+1),np.hstack((np.arange(count+2,count+nods+1),count+1)),1.*np.ones((nods)))).T))
                         if i: