Skip to content

Commit

Permalink
fix: formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
Lachlan Grose committed Nov 17, 2021
1 parent 06d7e32 commit a2f4fee
Showing 1 changed file with 13 additions and 6 deletions.
19 changes: 13 additions & 6 deletions LoopStructural/modelling/input/map2loop_processor.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ def __init__(self,m2l_directory,use_thickness=None):
fault_displacements = pd.read_csv(m2l_directory + '/output/fault_displacements3.csv')
fault_orientations = pd.read_csv(m2l_directory + '/output/fault_orientations.csv')
fault_locations = pd.read_csv(m2l_directory + '/output/faults.csv')
fault_dimensions = pd.read_csv(m2l_directory + '/output/fault_dimensions.csv',index_col='Fault')
fault_dimensions = pd.read_csv(m2l_directory + '/output/fault_dimensions.csv',
index_col='Fault')
fault_graph = networkx.read_gml(m2l_directory + '/tmp/fault_network.gml')
fault_orientations.rename(columns={'formation':'fault_name'},inplace=True)
bb = np.loadtxt(m2l_directory + '/tmp/bbox.csv',skiprows=1,delimiter=',')
Expand All @@ -37,7 +38,9 @@ def __init__(self,m2l_directory,use_thickness=None):
fault_dimensions.loc[fname,'dip_dir'] = fault_orientations.loc[
fault_orientations['fault_name']==fname,'DipDirection'].median()
fault_properties = fault_dimensions.rename(columns={'Fault':'fault_name',
'InfluenceDistance':'minor_axis','VerticalRadius':'intermediate_axis','HorizontalRadius':'major_axis'})
'InfluenceDistance':'minor_axis',
'VerticalRadius':'intermediate_axis',
'HorizontalRadius':'major_axis'})
self.process_downthrow_direction(fault_properties,fault_orientations)
fault_orientations['strike'] = fault_orientations['DipDirection'] + 90
fault_edge_properties = []
Expand Down Expand Up @@ -78,7 +81,8 @@ def __init__(self,m2l_directory,use_thickness=None):
stratigraphic_order.append((supergroup,tmp))

# stratigraphic_order = [list(groups['code'])]
thicknesses = dict(zip(list(formation_thickness['formation']),list(formation_thickness['thickness median'])))
thicknesses = dict(zip(list(formation_thickness['formation']),
list(formation_thickness['thickness median'])))
fault_properties['colour'] = 'black'
if np.sum(orientations['polarity']==0) >0 and np.sum(orientations['polarity']==-1)==0:
orientations.loc[orientations['polarity']==0,'polarity']=-1
Expand Down Expand Up @@ -108,15 +112,18 @@ def process_downthrow_direction(self,fault_properties,fault_orientations):
Parameters
----------
fault_properties : DataFrame
data frame with fault name as index and downthrow direction and average dip_dir as columns
data frame with fault name as index and downthrow direction
and average dip_dir as columns
fault_orientations : DataFrame
orientation data for the faults
"""
for fname in fault_properties.index:
if fault_properties.loc[fname,'downthrow_dir'] == 1.0:
logger.info("Estimating downthrow direction using fault intersections")
# fault_intersection_angles[f]
if np.abs(fault_properties.loc[fname,'downthrow_dir'] - fault_properties.loc[fname,'dip_dir']) > 90:
fault_orientations.loc[fault_orientations['fault_name'] == fname, 'DipDirection'] -= 180#displacements_numpy[
if np.abs(fault_properties.loc[fname,'downthrow_dir'] - fault_properties.loc[
fname,'dip_dir']) > 90:
fault_orientations.loc[fault_orientations['fault_name'] == fname,
'DipDirection'] -= 180
fault_properties.loc[fname,'dip_dir']-=180
#

0 comments on commit a2f4fee

Please sign in to comment.