Compare commits

..

No commits in common. '28ad83405f5c2d2b56673097d89cc7d4f696a567' and 'c2d1e52fe6a592fffaae4a7b0a3fb2ca23ec0b2b' have entirely different histories.

@ -471,8 +471,7 @@ def process(beach_name, beach_scenario, n_runs, start_year, end_year,
pbar_year.set_description('Year: {}'.format(year)) pbar_year.set_description('Year: {}'.format(year))
# Create output dataframe # Create output dataframe
df_out = df_in[['beach', 'block', 'profile']].copy() df_out = df_in[['beach', 'block', 'profile']]
df_out['block'] = df_out['block'].astype(str)
# Add info on non-erodable sections # Add info on non-erodable sections
df_out = df_out.assign(min_chainage=np.nan) df_out = df_out.assign(min_chainage=np.nan)
@ -487,7 +486,7 @@ def process(beach_name, beach_scenario, n_runs, start_year, end_year,
df_out = df_out.assign(segment_gaps=False) df_out = df_out.assign(segment_gaps=False)
for b, p, in zip(segment_gaps['block'], for b, p, in zip(segment_gaps['block'],
segment_gaps['profile']): segment_gaps['profile']):
idx = (df_out['block'] == str(b)) & (df_out['profile'] idx = (str(df_out['block']) == str(b)) & (df_out['profile']
== p) == p)
df_out.loc[idx, 'segment_gaps'] = True df_out.loc[idx, 'segment_gaps'] = True

Loading…
Cancel
Save