Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
# Conflicts:
#	subsurface/reader/wells/DEP/_welly_reader.py
#	subsurface/reader/wells/DEP/test_wells/test_welly_to_subsurface.py
  • Loading branch information
Leguark committed Apr 29, 2024
2 parents c78c35c + 67d04a3 commit d25dd4a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions subsurface/reader/wells/DEP/_welly_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def welly_to_subsurface(
if table is None: table = wts.lith_component_table
w.data['lith_log'] = striplog_to_curve_log(n_vertex_per_well, table, w, wts)
else:
w.data["lith_log"] = Curve(-1 * np.ones(n_vertex_per_well - 1, dtype=int), mnemonic='lith_log')
w.data["lith_log"] = welly.Curve(-1 * np.ones(n_vertex_per_well - 1, dtype=int))

if w.data["lith_log"].shape[0] != n_vertex_per_well - 1:
raise ValueError("Cell_attr does not match cells")
Expand All @@ -82,7 +82,7 @@ def welly_to_subsurface(
def striplog_to_curve_log(n_vertex_per_well, table, w: welly.Well, wts: WellyToSubsurfaceHelper) -> welly.Curve:
start, stop, step_size = wts._calculate_basis_parameters(w, n_vertex_per_well - 1)
s_log, basis, _table = w.data['lith'].to_log(step_size, start, stop, table=table, return_meta=True)
return Curve(s_log, basis=basis, mnemonic='lith_log')
return welly.Curve(s_log, basis)


def change_curve_basis_to_n_vertex_per_well_inplace(n_points, w, wts):
Expand Down

0 comments on commit d25dd4a

Please sign in to comment.