mostly white spaces

Author: lachlangrose

LoopStructural/datatypes/_bounding_box.py

@@ -156,6 +156,7 @@ def volume(self):
     def bb(self):
         return np.array([self.origin, self.maximum])
 
+     
     @nelements.setter
     def nelements(self, nelements: Union[int, float]):
         """Update the number of elements in the associated grid

LoopStructural/modelling/core/geological_model.py

@@ -188,36 +188,6 @@ def prepare_data(self, data: pd.DataFrame) -> pd.DataFrame:
         ].astype(float)
         return data
 
-        if "type" in data:
-            logger.warning("'type' is deprecated replace with 'feature_name' \n")
-            data.rename(columns={"type": "feature_name"}, inplace=True)
-        if "feature_name" not in data:
-            logger.error("Data does not contain 'feature_name' column")
-            raise BaseException("Cannot load data")
-        for h in all_heading():
-            if h not in data:
-                data[h] = np.nan
-                if h == "w":
-                    data[h] = 1.0
-                if h == "coord":
-                    data[h] = 0
-                if h == "polarity":
-                    data[h] = 1.0
-        # LS wants polarity as -1 or 1, change 0  to -1
-        data.loc[data["polarity"] == 0, "polarity"] = -1.0
-        data.loc[np.isnan(data["w"]), "w"] = 1.0
-        if "strike" in data and "dip" in data:
-            logger.info("Converting strike and dip to vectors")
-            mask = np.all(~np.isnan(data.loc[:, ["strike", "dip"]]), axis=1)
-            data.loc[mask, gradient_vec_names()] = (
-                strikedip2vector(data.loc[mask, "strike"], data.loc[mask, "dip"])
-                * data.loc[mask, "polarity"].to_numpy()[:, None]
-            )
-            data.drop(["strike", "dip"], axis=1, inplace=True)
-        data[['X', 'Y', 'Z', 'val', 'nx', 'ny', 'nz', 'gx', 'gy', 'gz', 'tx', 'ty', 'tz']] = data[
-            ['X', 'Y', 'Z', 'val', 'nx', 'ny', 'nz', 'gx', 'gy', 'gz', 'tx', 'ty', 'tz']
-        ].astype(float)
-        return data
     @classmethod
     def from_processor(cls, processor):
         """Builds a model from a :class:`LoopStructural.modelling.input.ProcessInputData` object

LoopStructural/modelling/features/_lambda_geological_feature.py

@@ -69,7 +69,6 @@ def evaluate_value(self, pos: np.ndarray, ignore_regions=False) -> np.ndarray:
         mask = self._calculate_mask(pos, ignore_regions=ignore_regions)
         pos = self._apply_faults(pos)
         if self.function is not None:
-
             v[mask] = self.function(pos[mask,:])
         return v
 
@@ -159,3 +158,7 @@ def copy(self, name: Optional[str] = None):
             self.faults,
             self.builder,
         )
+    def is_valid(self):
+        if self.function is None and self.gradient_function is None:
+            return False
+        return True

LoopStructural/modelling/features/fold/_foldframe.py

@@ -74,7 +74,7 @@ def calculate_fold_axis_rotation(self, feature_builder, fold_axis=None):
         s1gyg /= np.linalg.norm(s1gyg, axis=1)[:, None]
         l1 = points[:, 3:]
         l1 /= np.linalg.norm(l1, axis=1)[:, None]
-        fad = self.features[1].evaluate_value(points[:, :3])
+        fad = self.features[1].evaluate_value(points[:, :3])    
         # Turn the faults back on
         # self.features[0].faults_enabled = True
         # self.features[1].faults_enabled = True