@@ -280,7 +280,8 @@ def process_map2loop(m2l_directory, flags={}):
280280 max_displacement [f ] = displacements_numpy [index , 0 ]
281281 downthrow_dir [f ] = displacements_numpy [index , [1 , 3 , 4 ]]
282282 if displacements_numpy [index , 1 ] == 1.0 :
283- logger .info ("Estimating downthrow direction using fault intersections" )
283+ pass
284+ # raise ValueError('Downthrow direction is not defined for fault {}'.format(f))
284285 # fault_intersection_angles[f]
285286 if np .abs (displacements_numpy [index , 1 ] - displacements_numpy [index , 2 ]) > 90 :
286287 # fault_orientations.loc[fault_orientations['formation'] == f, ['gx','gy','gy']]=-fault_orientations.loc[fault_orientations['formation'] == f, ['gx','gy','gy']]
@@ -339,28 +340,13 @@ def process_map2loop(m2l_directory, flags={}):
339340 fault_edges [1 , :] = fault_centers [:3 ] - normal_vector * fault_centers [4 ]
340341 fault_tips [0 , :] = fault_centers [:3 ] + strike_vector * fault_centers [5 ]
341342 fault_tips [1 , :] = fault_centers [:3 ] - strike_vector * fault_centers [5 ]
342- # fault_depth[0,:] = fault_centers[:3]+slip_vector*fault_centers[5]
343- # fault_depth[1,:] = fault_centers[:3]-slip_vector*fault_centers[5]
344- # fault_locations.loc[len(fault_locations),['X','Y','Z','formation','val','coord']] = [fault_edges[0,0],fault_edges[0,1],fault_edges[0,2],f,1,0]
345- # fault_locations.loc[len(fault_locations),['X','Y','Z','formation','val','coord']] = [fault_edges[1,0],fault_edges[1,1],fault_edges[1,2],f,-1,0]
346- # fault_locations.loc[len(fault_locations),['X','Y','Z','formation','val','coord']] = [fault_tips[0,0],fault_tips[0,1],fault_tips[0,2],f,1,2]
347- # fault_locations.loc[len(fault_locations),['X','Y','Z','formation','val','coord']] = [fault_tips[1,0],fault_tips[1,1],fault_tips[1,2],f,-1,2]
348- # # add strike vector to constraint fault extent
349- # fault_orientations.loc[len(fault_orientations),['X','Y','Z','formation','DipDirection','coord']] = [fault_centers[0],fault_centers[1],fault_centers[2],f, fault_centers[3]-90,2]
350- # fault_orientations.loc[len(fault_orientations),['X','Y','Z','formation','dip','coord']] = [fault_centers[0],fault_centers[1],fault_centers[2],f, 0,2]
351-
352- # print('downthro',displacements_numpy[index, 1])
353343
354344 fault_orientations ["strike" ] = fault_orientations ["DipDirection" ] - 90
355345 fault_orientations [["gx" , "gy" , "gz" ]] = strike_dip_vector (
356346 fault_orientations ["strike" ], fault_orientations ["dip" ]
357347 )
358348 for g in groups ["group" ].unique ():
359349 groups .loc [groups ["group" ] == g , "group" ] = supergroups [g ]
360- # fault_orientations['strike'] = fault_orientations['DipDirection'] - 90
361- # fault_orientations['gx'] = np.nan
362- # fault_orientations['gy'] = np.nan
363- # fault_orientations['gz'] = np.nan
364350
365351 fault_orientations .drop (
366352 ["strike" , "DipDirection" , "dip" , "DipPolarity" ], inplace = True , axis = 1
0 commit comments