From 329fef758ec3a35441460fdfffaaec26a9cfff3a Mon Sep 17 00:00:00 2001 From: "Oddvar Lia (ST MSU GEO)" Date: Mon, 18 Dec 2023 19:51:37 +0100 Subject: [PATCH] Update snapshot data for test_methods.py Minor edits in local_script_lib.py --- .../localisation/local_script_lib.py | 3 - .../testdata_scaling.txt | 34 +++--- .../testdata_scaling_smooth.txt | 100 +++++++++--------- 3 files changed, 67 insertions(+), 70 deletions(-) diff --git a/semeio/workflows/localisation/local_script_lib.py b/semeio/workflows/localisation/local_script_lib.py index 8c3f52675..0b27d1c98 100644 --- a/semeio/workflows/localisation/local_script_lib.py +++ b/semeio/workflows/localisation/local_script_lib.py @@ -224,7 +224,6 @@ def write_qc_parameter_field( log_level=LogLevel.OFF, ): # pylint: disable=too-many-arguments - if param_for_field is None or field_scale is None: return @@ -309,7 +308,6 @@ def write_qc_parameter_surface( cls.scaling_param_number = cls.scaling_param_number + 1 - def get_param_from_ert(ens_config): new_params = Parameters() for key in ens_config.parameters: @@ -1130,4 +1128,3 @@ def check_if_ref_point_in_grid(ref_point, grid, log_level): LogLevel.LEVEL3, log_level, ) - diff --git a/tests/jobs/localisation/snapshots/test_methods/test_calculate_scaling_factors_in_regions/testdata_scaling.txt b/tests/jobs/localisation/snapshots/test_methods/test_calculate_scaling_factors_in_regions/testdata_scaling.txt index c5fe26f21..b1212419e 100644 --- a/tests/jobs/localisation/snapshots/test_methods/test_calculate_scaling_factors_in_regions/testdata_scaling.txt +++ b/tests/jobs/localisation/snapshots/test_methods/test_calculate_scaling_factors_in_regions/testdata_scaling.txt @@ -1,17 +1,17 @@ -[0. 0. 1. 1. 1. 0. 0. 0. 0. 0. 0. 0. 1. 1. 1. 0. 0. 0. - 0. 0. 0. 0. 1. 1. 1. 0. 0. 0. 0. 0. 0. 0. 1. 1. 1. 0. - 0. 0. 0. 0. 0. 0. 1. 1. 1. 0.2 0.2 0.2 0.2 0.2 0.5 0.5 0.5 0.5 - 0.5 0.2 0.2 0.2 0.2 0.2 0.5 0.5 0.5 0.5 0.5 0.2 0.2 0.2 0.2 0.2 0.5 0.5 - 0.5 0.5 0.5 0. 0. 0. 0. 0. 0.5 0.5 0.5 0.5 0.5 0. 0. 0. 0. 0. - 0.5 0.5 0.5 0.5 0.5 0. 0. 0. 0. 0. 0. 0. 1. 1. 1. 0. 0. 0. - 0. 0. 0. 0. 1. 1. 1. 0. 0. 0. 0. 0. 0. 0. 1. 1. 1. 0. - 0. 0. 0. 0. 0. 0. 1. 1. 1. 0. 0. 0. 0. 0. 0. 0. 1. 1. - 1. 0.2 0.2 0.2 0.2 0.2 0.5 0.5 0.5 0.5 0.5 0.2 0.2 0.2 0.2 0.2 0.5 0.5 - 0.5 0.5 0.5 0.2 0.2 0.2 0.2 0.2 0.5 0.5 0.5 0.5 0.5 0. 0. 0. 0. 0. - 0.5 0.5 0.5 0.5 0.5 0. 0. 0. 0. 0. 0.5 0.5 0.5 0.5 0.5 0. 0. 0. - 0. 0. 0. 0. 1. 1. 1. 0. 0. 0. 0. 0. 0. 0. 1. 1. 1. 0. - 0. 0. 0. 0. 0. 0. 1. 1. 1. 0. 0. 0. 0. 0. 0. 0. 1. 1. - 1. 0. 0. 0. 0. 0. 0. 0. 1. 1. 1. 0.2 0.2 0.2 0.2 0.2 0.5 0.5 - 0.5 0.5 0.5 0.2 0.2 0.2 0.2 0.2 0.5 0.5 0.5 0.5 0.5 0.2 0.2 0.2 0.2 0.2 - 0.5 0.5 0.5 0.5 0.5 0. 0. 0. 0. 0. 0.5 0.5 0.5 0.5 0.5 0. 0. 0. - 0. 0. 0.5 0.5 0.5 0.5 0.5 0. 0. 0. 0. 0. ] \ No newline at end of file +[0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0.5 0.5 0.5 + 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0. 0. 0. 0. 0. 0. + 0. 0. 0. 0. 0. 0. 0. 0. 0. 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 + 0.5 0.5 0.5 0.5 0.5 0.5 1. 1. 1. 1. 1. 1. 1. 1. 1. 1. 1. 1. + 1. 1. 1. 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 + 1. 1. 1. 1. 1. 1. 1. 1. 1. 1. 1. 1. 1. 1. 1. 0.5 0.5 0.5 + 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 1. 1. 1. 1. 1. 1. + 1. 1. 1. 1. 1. 1. 1. 1. 1. 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 + 0.5 0.5 0.5 0.5 0.5 0.5 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. + 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0. 0. 0. 0. 0. 0. 0. 0. 0. + 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0.2 0.2 0.2 0.2 0.2 0.2 + 0.2 0.2 0.2 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. + 0. 0. 0. 0. 0. 0. 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0. 0. 0. + 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. + 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0. 0. 0. 0. 0. 0. 0. 0. 0. + 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0.2 0.2 0.2 0.2 0.2 0.2 + 0.2 0.2 0.2 0. 0. 0. 0. 0. 0. 0. 0. 0. ] \ No newline at end of file diff --git a/tests/jobs/localisation/snapshots/test_methods/test_smooth_parameter/testdata_scaling_smooth.txt b/tests/jobs/localisation/snapshots/test_methods/test_smooth_parameter/testdata_scaling_smooth.txt index c9451213d..b441b630c 100644 --- a/tests/jobs/localisation/snapshots/test_methods/test_smooth_parameter/testdata_scaling_smooth.txt +++ b/tests/jobs/localisation/snapshots/test_methods/test_smooth_parameter/testdata_scaling_smooth.txt @@ -1,50 +1,50 @@ -[0. 0. 1. 1. 1. 0. - 0. 0. 0. 0. 0. 0. - 1. 1. 1. 0. 0. 0. - 0. 0. 0. 0. 1. 1. - 1. 0. 0. 0. 0. 0. - 0. 0. 1. 1. 0.8857143 0. - 0. 0. 0. 0. 0. 0. - 0.78571427 0.8333333 0.675 0.47142857 0.2 0.2 - 0.2 0.2 0.5 0.5714286 0.625 0.6666667 - 0.51111114 0.35555556 0.2 0.2 0.2 0.2 - 0.5 0.5 0.5 0.5 0.425 0.32857144 - 0.2 0.2 0.2 0.2 0.5 0.5 - 0.5 0.5 0.45714286 0. 0. 0. - 0. 0. 0.5 0.5 0.5 0.5 - 0.5 0. 0. 0. 0. 0. - 0.5 0.5 0.5 0.5 0.5 0. - 0. 0. 0. 0. 0. 0. - 1. 1. 1. 0. 0. 0. - 0. 0. 0. 0. 1. 1. - 1. 0. 0. 0. 0. 0. - 0. 0. 1. 1. 1. 0. - 0. 0. 0. 0. 0. 0. - 1. 1. 0.8857143 0. 0. 0. - 0. 0. 0. 0. 0.78571427 0.8333333 - 0.675 0.47142857 0.2 0.2 0.2 0.2 - 0.5 0.5714286 0.625 0.6666667 0.51111114 0.35555556 - 0.2 0.2 0.2 0.2 0.5 0.5 - 0.5 0.5 0.425 0.32857144 0.2 0.2 - 0.2 0.2 0.5 0.5 0.5 0.5 - 0.45714286 0. 0. 0. 0. 0. - 0.5 0.5 0.5 0.5 0.5 0. - 0. 0. 0. 0. 0.5 0.5 - 0.5 0.5 0.5 0. 0. 0. - 0. 0. 0. 0. 1. 1. - 1. 0. 0. 0. 0. 0. - 0. 0. 1. 1. 1. 0. - 0. 0. 0. 0. 0. 0. - 1. 1. 1. 0. 0. 0. - 0. 0. 0. 0. 1. 1. - 0.8857143 0. 0. 0. 0. 0. - 0. 0. 0.78571427 0.8333333 0.675 0.47142857 - 0.2 0.2 0.2 0.2 0.5 0.5714286 - 0.625 0.6666667 0.51111114 0.35555556 0.2 0.2 - 0.2 0.2 0.5 0.5 0.5 0.5 - 0.425 0.32857144 0.2 0.2 0.2 0.2 - 0.5 0.5 0.5 0.5 0.45714286 0. - 0. 0. 0. 0. 0.5 0.5 - 0.5 0.5 0.5 0. 0. 0. - 0. 0. 0.5 0.5 0.5 0.5 - 0.5 0. 0. 0. 0. 0. ] \ No newline at end of file +[0. 0. 0. 0. 0. 0. + 0. 0. 0. 0. 0. 0. + 0. 0. 0. 0.5 0.5 0.5 + 0.5 0.5 0.5 0.5 0.5 0.5 + 0.5 0.5 0.5 0.5 0.5 0.5 + 0. 0. 0. 0. 0. 0. + 0. 0. 0. 0. 0. 0. + 0. 0. 0. 0.5714286 0.5714286 0.5714286 + 0.5 0.5 0.5 0.5 0.5 0.5 + 0.5 0.5 0.5 0.5 0.5 0.5 + 1. 1. 1. 1. 1. 1. + 1. 1. 1. 1. 1. 1. + 0.78571427 0.78571427 0.78571427 0.625 0.625 0.625 + 0.5 0.5 0.5 0.5 0.5 0.5 + 0.5 0.5 0.5 0.5 0.5 0.5 + 1. 1. 1. 1. 1. 1. + 1. 1. 1. 1. 1. 1. + 0.8333333 0.8333333 0.8333333 0.6666667 0.6666667 0.6666667 + 0.5 0.5 0.5 0.5 0.5 0.5 + 0.5 0.5 0.5 0.5 0.5 0.5 + 1. 1. 1. 1. 1. 1. + 1. 1. 1. 0.8857143 0.8857143 0.8857143 + 0.675 0.675 0.675 0.51111114 0.51111114 0.51111114 + 0.425 0.425 0.425 0.45714286 0.45714286 0.45714286 + 0.5 0.5 0.5 0.5 0.5 0.5 + 0. 0. 0. 0. 0. 0. + 0. 0. 0. 0. 0. 0. + 0.47142857 0.47142857 0.47142857 0.35555556 0.35555556 0.35555556 + 0.32857144 0.32857144 0.32857144 0. 0. 0. + 0. 0. 0. 0. 0. 0. + 0. 0. 0. 0. 0. 0. + 0. 0. 0. 0. 0. 0. + 0.2 0.2 0.2 0.2 0.2 0.2 + 0.2 0.2 0.2 0. 0. 0. + 0. 0. 0. 0. 0. 0. + 0. 0. 0. 0. 0. 0. + 0. 0. 0. 0. 0. 0. + 0.2 0.2 0.2 0.2 0.2 0.2 + 0.2 0.2 0.2 0. 0. 0. + 0. 0. 0. 0. 0. 0. + 0. 0. 0. 0. 0. 0. + 0. 0. 0. 0. 0. 0. + 0.2 0.2 0.2 0.2 0.2 0.2 + 0.2 0.2 0.2 0. 0. 0. + 0. 0. 0. 0. 0. 0. + 0. 0. 0. 0. 0. 0. + 0. 0. 0. 0. 0. 0. + 0.2 0.2 0.2 0.2 0.2 0.2 + 0.2 0.2 0.2 0. 0. 0. + 0. 0. 0. 0. 0. 0. ] \ No newline at end of file