@@ -555,7 +555,7 @@ def data_for_feature(self, feature_name: str) -> pd.DataFrame:
555555 return self .data .loc [self .data ["feature_name" ] == feature_name , :]
556556
557557 @property
558- def data (self ):
558+ def data (self ) -> pd . DataFrame :
559559 return self ._data
560560
561561 @data .setter
@@ -614,7 +614,7 @@ def data(self, data):
614614 self ._data [h ] = 1.0
615615 # LS wants polarity as -1 or 1, change 0 to -1
616616 self ._data .loc [self ._data ["polarity" ] == 0 , "polarity" ] = - 1.0
617- self .data .loc [np .isnan (self .data ["w" ]), "w" ] = 1.0
617+ self ._data .loc [np .isnan (self ._data ["w" ]), "w" ] = 1.0
618618 if "strike" in self ._data and "dip" in self ._data :
619619 logger .info ("Converting strike and dip to vectors" )
620620 mask = np .all (~ np .isnan (self ._data .loc [:, ["strike" , "dip" ]]), axis = 1 )
@@ -1527,6 +1527,7 @@ def create_and_add_fault(
15271527 minor_axis = None ,
15281528 intermediate_axis = None ,
15291529 faultfunction = "BaseFault" ,
1530+ faults = [],
15301531 ** kwargs ,
15311532 ):
15321533 """
@@ -1602,10 +1603,11 @@ def create_and_add_fault(
16021603 fault_frame_builder = FaultBuilder (
16031604 interpolator , name = fault_surface_data , model = self , ** kwargs
16041605 )
1606+ self ._add_faults (fault_frame_builder )
16051607 # add data
1606- fault_frame_data = self .data [
1608+ fault_frame_data = self .data . loc [
16071609 self .data ["feature_name" ] == fault_surface_data
1608- ]. copy ()
1610+ ]
16091611 trace_mask = np .logical_and (
16101612 fault_frame_data ["coord" ] == 0 , fault_frame_data ["val" ] == 0
16111613 )
0 commit comments