Pa to MPa conversion fix, fix outline plot, fix BEMEngine.process call

Author: hvasbath

beat/bem/base.py

@@ -139,7 +139,7 @@ def clear_target_cache(self):
         self._obs_points = None
         self._ncoords_targets = None
 
-    def process(self, sources: list, targets: list, debug=False) -> num.ndarray:
+    def process(self, sources: list, targets: list, debug=False, nthreads=1) -> num.ndarray:
         mesh_size = self.config.mesh_size * km
 
         if self.config.check_mesh_intersection:

beat/bem/sources.py

@@ -426,21 +426,19 @@ def __init__(self, **kwargs):
         EllipseBEMSource.__init__(self, **kwargs)
 
     def outline(self, cs="xy", npoints=50):
-        return num.flipud(
-            get_ellipse_points(
-                self.lon,
-                self.lat,
-                self.east_shift,
-                self.north_shift,
-                self.a_half_axis,
-                self.b_half_axis,
-                self.dip,
-                self.plunge,
-                self.strike,
-                cs=cs,
-                npoints=npoints,
+        return get_ellipse_points(
+            self.lon,
+            self.lat,
+            self.east_shift,
+            self.north_shift,
+            self.a_half_axis,
+            self.b_half_axis,
+            self.dip,
+            self.plunge,
+            self.strike,
+            cs=cs,
+            npoints=npoints,
             )
-        )
 
     def get_source_surface(self, geom, mesh_size):
         self._init_points_geometry(
@@ -948,10 +946,10 @@ def get_ellipse_points(
 
     ring = num.linspace(0, 2 * num.pi, npoints)
     ellipse = num.array(
-        [b_half_axis_rot * num.cos(ring), a_half_axis_rot * num.sin(ring)]
-    )
+        [a_half_axis_rot * num.sin(ring), b_half_axis_rot * num.cos(ring)]
+    )   # y, x | lat, lon
 
-    strike_rad = -strike * DEG2RAD
+    strike_rad = -(strike + 90) * DEG2RAD
     rot_strike = num.array(
         [
             [num.cos(strike_rad), -num.sin(strike_rad)],
@@ -961,9 +959,10 @@ def get_ellipse_points(
     ellipse_rot = rot_strike.dot(ellipse)
 
     points = num.atleast_2d(num.zeros([npoints, 2]))
-    points[:, 0] += ellipse_rot[1, :] + north_shift
-    points[:, 1] += ellipse_rot[0, :] + east_shift
+    points[:, 0] += ellipse_rot[0, :] + north_shift
+    points[:, 1] += ellipse_rot[1, :] + east_shift
 
+   # breakpoint()
     if cs == "xy":
         return points
     elif cs in ("latlon", "lonlat"):

beat/utility.py

@@ -51,7 +51,7 @@
 nucleationtypes = {"nucleation_x", "nucleation_y"}
 patch_anchor_points = {"center", "bottom_depth", "bottom_left"}
 
-patypes = {"traction", "strike_traction", "dip_traction", "tensile_traction"}
+patypes = {"traction", "strike_traction", "dip_traction", "normal_traction"}
 kmtypes = set.union(locationtypes, dimensiontypes, patch_anchor_points)
 grouped_vars = set.union(kmtypes, mttypes, degtypes, nucleationtypes)