From a8b6f5c808371f6647f1b42e7b2771eec1e6931f Mon Sep 17 00:00:00 2001 From: "Oddvar Lia (ST MSU GEO)" Date: Tue, 19 Dec 2023 14:51:08 +0100 Subject: [PATCH] Removed some comments Added output of scaling factors when using SURFACE in ERT in test_integation.py --- semeio/workflows/localisation/local_script_lib.py | 2 -- tests/workflows/localisation/test_integration.py | 2 ++ tests/workflows/localisation/test_methods.py | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/semeio/workflows/localisation/local_script_lib.py b/semeio/workflows/localisation/local_script_lib.py index 0b27d1c9..c517ee29 100644 --- a/semeio/workflows/localisation/local_script_lib.py +++ b/semeio/workflows/localisation/local_script_lib.py @@ -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 @@ -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: diff --git a/tests/workflows/localisation/test_integration.py b/tests/workflows/localisation/test_integration.py index 4ec11a4f..f08d06be 100644 --- a/tests/workflows/localisation/test_integration.py +++ b/tests/workflows/localisation/test_integration.py @@ -106,6 +106,7 @@ def test_localisation_surf(): ert = LibresFacade.from_config_file("poly.ert") config = { + "write_scaling_factors": True, "log_level": 3, "correlations": [ { @@ -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": [ { diff --git a/tests/workflows/localisation/test_methods.py b/tests/workflows/localisation/test_methods.py index a8ef5ab9..241995d5 100644 --- a/tests/workflows/localisation/test_methods.py +++ b/tests/workflows/localisation/test_methods.py @@ -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")