Changeset 13910

Timestamp:

11/08/12 12:11:30 (12 years ago)

Author:

cborstad

Message:

BUG: reshape arrays for call to ContourToNodes and pass only filename since OrderedDict is not yet supported in FetchData

File:

• issm/trunk-jpl/src/m/mesh/bamg.py (modified) (3 diffs)

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

@@ -10 +10 @@
 from MatlabFuncs import *
 from BamgMesher import *
+from ContourToNodes import *
 
 def bamg(md,*args):
@@ -91 +92 @@
                         #Checks that all holes are INSIDE the principle domain outline
                         if i:
-                                flags=ContourToNodes(domaini['x'],domaini['y'],domain[0],0)
+                                flags=ContourToNodes(domaini['x'].reshape(-1,1),domaini['y'].reshape(-1,1),domainfile,0)
                                 if numpy.any(numpy.logical_not(flags)):
                                         raise RuntimeError("bamg error message: All holes should be strictly inside the principal domain")
@@ -117 +118 @@
 
                                 #detect whether all points of the rift are inside the domain
-                                flags=ContourToNodes(rifti['x'],rifti['y'],domain[0],0)
+                                flags=ContourToNodes(rifti['x'].reshape(-1,1),rifti['y'].reshape(-1,1),domain[0],0)
                                 if numpy.all(numpy.logical_not(flags)):
                                         raise RuntimeError("one rift has all its points outside of the domain outline")