fix: 🐛 faults where feature name given not fault_name were crashing

lachlangrose · lachlangrose · commit dae9e92f4b2f · 2022-05-05T09:39:26.000+10:00
diff --git a/LoopStructural/modelling/input/process_data.py b/LoopStructural/modelling/input/process_data.py
@@ -619,7 +619,10 @@ def fault_orientations(self, fault_orientations):
             fault_orientations[["gx", "gy", "gz"]] = strike_dip_vector(
                 fault_orientations["strike"], fault_orientations["dip"]
             )
-        fault_orientations["feature_name"] = fault_orientations["fault_name"]
+        if "feature_name" not in fault_orientations.columns and "fault_name" in fault_orientations.columns:
+            fault_orientations["feature_name"] = fault_orientations["fault_name"]
+        if "feature_name" not in fault_orientations.columns:
+            raise ValueError("Fault orientation data must contain feature_name or fault_name")
         self._fault_orientations = fault_orientations[
             ["X", "Y", "Z", "gx", "gy", "gz", "coord", "feature_name"]
         ]

Original file line number	Diff line number	Diff line change
`@@ -619,7 +619,10 @@ def fault_orientations(self, fault_orientations):`
`619`	`619`	`fault_orientations[["gx", "gy", "gz"]] = strike_dip_vector(`
`620`	`620`	`fault_orientations["strike"], fault_orientations["dip"]`
`621`	`621`	`)`
`622`		`- fault_orientations["feature_name"] = fault_orientations["fault_name"]`
	`622`	`+ if "feature_name" not in fault_orientations.columns and "fault_name" in fault_orientations.columns:`
	`623`	`+ fault_orientations["feature_name"] = fault_orientations["fault_name"]`
	`624`	`+ if "feature_name" not in fault_orientations.columns:`
	`625`	`+ raise ValueError("Fault orientation data must contain feature_name or fault_name")`
`623`	`626`	`self._fault_orientations = fault_orientations[`
`624`	`627`	`["X", "Y", "Z", "gx", "gy", "gz", "coord", "feature_name"]`
`625`	`628`	`]`