LoopStructural 1.6.6__tar.gz → 1.6.7__tar.gz

{loopstructural-1.6.6 → loopstructural-1.6.7}/LoopStructural/modelling/input/process_data.py

@@ -78,7 +78,7 @@ class ProcessInputData:
         self.contacts = contacts
         self._contact_orientations = None
         self.contact_orientations = contact_orientations
-        self._fault_orientations = None
+        self._fault_orientations = pd.DataFrame(columns=["X", "Y", "Z", "gx", "gy", "gz", "coord", "feature_name"])
         self.fault_orientations = fault_orientations
         self._fault_locations = None
         self.fault_locations = fault_locations
@@ -313,10 +313,11 @@ class ProcessInputData:
                 pts = self.fault_orientations.loc[
                     self.fault_orientations["feature_name"] == fname, ["gx", "gy", "gz"]
                 ]
-                fault_properties.loc[
-                    fname,
-                    ["avgNormalEasting", "avgNormalNorthing", "avgNormalAltitude"],
-                ] = np.nanmean(pts, axis=0)
+                if len(pts)>0:
+                    fault_properties.loc[
+                        fname,
+                        ["avgNormalEasting", "avgNormalNorthing", "avgNormalAltitude"],
+                    ] = np.nanmean(pts, axis=0)
         if (
             "avgSlipDirEasting" not in fault_properties.columns
             or "avgSlipDirNorthing" not in fault_properties.columns
@@ -399,7 +400,7 @@ class ProcessInputData:
             dataframes.append(self.contacts)
         if self.contact_orientations is not None:
             dataframes.append(self.contact_orientations)
-        if self.fault_orientations is not None:
+        if len(self.fault_orientations) > 0:
             dataframes.append(self.fault_orientations)
         if self.fault_locations is not None:
             dataframes.append(self.fault_locations)

{loopstructural-1.6.6 → loopstructural-1.6.7}/LoopStructural/utils/colours.py

@@ -17,8 +17,7 @@ def random_colour(n: int = 1, cmap='tab20'):
     list
         List of colours in the form of (r,g,b,a) tuples
     """
-    import matplotlib.cm as cm
-
+    from matplotlib import colormaps as cm
     colours = []
     for _i in range(n):
         colours.append(cm.get_cmap(cmap)(rng.random()))
@@ -41,7 +40,7 @@ def random_hex_colour(n: int = 1, cmap='tab20'):
     list
         List of colours in the form of hex strings
     """
-    import matplotlib.cm as cm
+    from matplotlib import colormaps as cm
 
     colours = []
     for _i in range(n):

loopstructural-1.6.7/LoopStructural/version.py

@@ -0,0 +1 @@
+__version__ = "1.6.7"

{loopstructural-1.6.6 → loopstructural-1.6.7/LoopStructural.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: LoopStructural
-Version: 1.6.6
+Version: 1.6.7
 Summary: 3D geological modelling
 Author-email: Lachlan Grose <lachlan.grose@monash.edu>
 License: MIT

{loopstructural-1.6.6/LoopStructural.egg-info → loopstructural-1.6.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: LoopStructural
-Version: 1.6.6
+Version: 1.6.7
 Summary: 3D geological modelling
 Author-email: Lachlan Grose <lachlan.grose@monash.edu>
 License: MIT

loopstructural-1.6.6/LoopStructural/version.py

@@ -1 +0,0 @@
-__version__ = "1.6.6"