Changeset 25455 for issm/trunk-jpl/src/m/mesh/rifts/meshprocessoutsiderifts.py

Timestamp:

08/25/20 00:32:13 (5 years ago)

Author:

jdquinn

Message:

CHG: Saving chnages so that Basile has access to potential fix to solidearthmodel class

File:

• issm/trunk-jpl/src/m/mesh/rifts/meshprocessoutsiderifts.py (modified) (6 diffs)

issm/trunk-jpl/src/m/mesh/rifts/meshprocessoutsiderifts.py

@@ -1 +1 @@
 import numpy as np
+
+from ContourToMesh import ContourToMesh
 from ElementsFromEdge import ElementsFromEdge
 import MatlabFuncs as m
-from ContourToMesh import ContourToMesh
 
 
 def meshprocessoutsiderifts(md, domainoutline):
-    """
-    MESHPROCESSOUTSIDERIFTS - process rifts when they touch the domain outline
+    """MESHPROCESSOUTSIDERIFTS - process rifts when they touch the domain outline
 
-       Usage:
-          md = meshprocessoutsiderifts(md, domain)
-
+    Usage:
+        md = meshprocessoutsiderifts(md, domain)
     """
 
@@ -53 +52 @@
                 elements = np.concatenate((elements, nextelement))
                 #new B:
-                B = md.mesh.elements[nextelement - 1, np.nonzero(np.logical_not(m.ismember(md.mesh.elements[nextelement - 1, :], np.array([A, B]))))]
+                B = md.mesh.elements[nextelement - 1, np.nonzero(np.logical_not(m.ismember(md.mesh.elements[nextelement - 1, :], np.array([A, B]))))[0]]
 
             #take the list of elements on one side of the rift that connect to the tip,
@@ -64 +63 @@
             #replace tip in elements
             newelements = md.mesh.elements[elements - 1, :]
-            pos = np.nonzero(newelements == tip)
+            pos = np.nonzero(newelements == tip)[0]
             newelements[pos] = num
             md.mesh.elements[elements - 1, :] = newelements
@@ -81 +80 @@
     md.mesh.numberofelements = np.size(md.mesh.elements, axis=0)
     md.mesh.numberofvertices = np.size(md.mesh.x)
-    md.mesh.vertexonboundary = np.zeros(np.size(md.mesh.x), bool)
-    md.mesh.vertexonboundary[md.mesh.segments[:, 0:2] - 1] = True
+    md.mesh.vertexonboundary = np.zeros(np.size(md.mesh.x), int)
+    md.mesh.vertexonboundary[md.mesh.segments[:, 0:2] - 1] = 1
     md.rifts.numrifts = np.length(md.rifts.riftstruct)
 
@@ -88 +87 @@
 
 
-def isconnected(elements, A, B):  # {{{
-    """
-    ISCONNECTED: are two nodes connected by a triangulation?
+def isconnected(elements, A, B):  #{{{
+    """ISCONNECTED: are two nodes connected by a triangulation?
 
-       Usage: flag = isconnected(elements, A, B)
-
+    Usage:
+        flag = isconnected(elements, A, B)
     """
 
@@ -103 +101 @@
 
     return flag
-    # }}}
+    #}}}