Skip to content

Commit

Permalink
Removed some comments
Browse files Browse the repository at this point in the history
Added output of scaling factors when using SURFACE in ERT in  test_integation.py
  • Loading branch information
oddvarlia committed Dec 20, 2023
1 parent 9df1cbd commit a8b6f5c
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 0 additions & 2 deletions semeio/workflows/localisation/local_script_lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,6 @@ def smooth_parameter(
dj = smooth_range_list[1]
scaling_values_smooth = np.ma.zeros(nx * ny * nz, dtype=np.float32)
for k, j0, i0 in itertools.product(range(nz), range(ny), range(nx)):
# index0 = i0 + j0 * nx + k * nx * ny
index0 = k + j0 * nz + i0 * nz * ny
if active_region_values_used[index0] is not ma.masked:
sumv = 0.0
Expand Down Expand Up @@ -819,7 +818,6 @@ def read_region_files_for_all_correlation_groups(user_config, grid):
for k, j, i in itertools.product(range(nz), range(ny), range(nx)):
# c-index order
index = k + j * nz + i * nz * ny
# index = i + j * nx + k * nx * ny
v = region_parameter_read[i, j, k]
region_parameter[index] = v
if grid.get_active_index(ijk=(i, j, k)) == -1:
Expand Down
2 changes: 2 additions & 0 deletions tests/workflows/localisation/test_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ def test_localisation_surf():

ert = LibresFacade.from_config_file("poly.ert")
config = {
"write_scaling_factors": True,
"log_level": 3,
"correlations": [
{
Expand Down Expand Up @@ -179,6 +180,7 @@ def test_localisation_surf_const():

ert = LibresFacade.from_config_file("poly.ert")
config = {
"write_scaling_factors": True,
"log_level": 3,
"correlations": [
{
Expand Down
1 change: 0 additions & 1 deletion tests/workflows/localisation/test_methods.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ def create_region_parameter(
mask_used = np.isin(region_param, used_regions, invert=True)
region_param[np.logical_and(mask_used, ~inactive)] = ma.masked

# return region_param.ravel(order="F"), scaling_param.ravel(order="F")
return region_param.ravel(order="C"), scaling_param.ravel(order="C")


Expand Down

0 comments on commit a8b6f5c

Please sign in to comment.