From 8b69440b30009ebcf9fe446f4d2c354dfb6ea663 Mon Sep 17 00:00:00 2001 From: "Oddvar Lia (ST MSU GEO)" Date: Wed, 20 Dec 2023 12:01:55 +0100 Subject: [PATCH] moved test files to new directory --- semeio/workflows/localisation/local_script_lib.py | 2 -- tests/{jobs => workflows}/localisation/__init__.py | 0 tests/{jobs => workflows}/localisation/example_case/README | 0 .../init_files/FieldParam_real5_iter0_A2_local.grdecl | 0 .../init_files/FieldParam_real5_iter0_A_local.grdecl | 0 .../init_files/FieldParam_real5_iter0_B_local.grdecl | 0 .../init_files/FieldParam_real5_iter0_C_local.grdecl | 0 .../example_case/init_files/FieldParam_real5_iter0_D.grdecl | 0 .../init_files/FieldParam_real5_iter0_E_local.grdecl | 0 .../init_files/FieldParam_real5_iter0_F_local.grdecl | 0 .../init_files/FieldParam_real5_iter0_G_local.grdecl | 0 .../init_files/FieldParam_real5_iter1_A2_local.grdecl | 0 .../init_files/FieldParam_real5_iter1_A_local.grdecl | 0 .../init_files/FieldParam_real5_iter1_B_local.grdecl | 0 .../init_files/FieldParam_real5_iter1_C_local.grdecl | 0 .../example_case/init_files/FieldParam_real5_iter1_D.grdecl | 0 .../init_files/FieldParam_real5_iter1_E_local.grdecl | 0 .../init_files/FieldParam_real5_iter1_F_local.grdecl | 0 .../init_files/FieldParam_real5_iter1_G_local.grdecl | 0 .../localisation/example_case/init_files/README | 0 .../localisation/example_case/init_files/polygons.txt | 0 .../localisation/example_case/init_files/region_polygons.txt | 0 .../localisation/example_case/init_files/scaling_factor.grdecl | 0 .../example_case/init_files/scaling_factor_rms_origo.grdecl | 0 .../localisation/example_case/init_files/sim_field_template.ert | 0 .../localisation/example_case/localisation.wf | 0 .../localisation/example_case/scripts/FM_SIM_FIELD | 0 .../localisation/example_case/scripts/README | 0 .../localisation/example_case/scripts/__init__.py | 0 .../localisation/example_case/scripts/common_functions.py | 0 .../localisation/example_case/scripts/init_test_case.py | 0 .../localisation/example_case/scripts/make_reference_data.py | 0 .../localisation/example_case/scripts/roff_to_grdecl.py | 0 .../localisation/example_case/scripts/sim_fields.py | 0 .../{jobs => workflows}/localisation/example_case/test_full.py | 0 .../obs_group_add0-param_group_add0/localisation_configuration | 0 .../testdata_scaling.txt | 0 .../testdata_scaling_decay_method1.txt | 0 .../testdata_scaling_decay_method2.txt | 0 .../testdata_scaling_decay_method3.txt | 0 .../testdata_scaling_decay_method4.txt | 0 .../testdata_scaling_decay_method5.txt | 0 .../test_smooth_parameter/testdata_scaling_smooth.txt | 0 tests/{jobs => workflows}/localisation/test_configs/__init__.py | 0 .../localisation/test_configs/test_config.py | 0 .../localisation/test_configs/test_field_config.py | 0 .../localisation/test_configs/test_obs_config.py | 0 .../localisation/test_configs/test_parameters.py | 0 tests/{jobs => workflows}/localisation/test_integration.py | 2 ++ tests/{jobs => workflows}/localisation/test_methods.py | 1 - tests/{jobs => workflows}/localisation/test_valid_rst.py | 0 51 files changed, 2 insertions(+), 3 deletions(-) rename tests/{jobs => workflows}/localisation/__init__.py (100%) rename tests/{jobs => workflows}/localisation/example_case/README (100%) rename tests/{jobs => workflows}/localisation/example_case/init_files/FieldParam_real5_iter0_A2_local.grdecl (100%) rename tests/{jobs => workflows}/localisation/example_case/init_files/FieldParam_real5_iter0_A_local.grdecl (100%) rename tests/{jobs => workflows}/localisation/example_case/init_files/FieldParam_real5_iter0_B_local.grdecl (100%) rename tests/{jobs => workflows}/localisation/example_case/init_files/FieldParam_real5_iter0_C_local.grdecl (100%) rename tests/{jobs => workflows}/localisation/example_case/init_files/FieldParam_real5_iter0_D.grdecl (100%) rename tests/{jobs => workflows}/localisation/example_case/init_files/FieldParam_real5_iter0_E_local.grdecl (100%) rename tests/{jobs => workflows}/localisation/example_case/init_files/FieldParam_real5_iter0_F_local.grdecl (100%) rename tests/{jobs => workflows}/localisation/example_case/init_files/FieldParam_real5_iter0_G_local.grdecl (100%) rename tests/{jobs => workflows}/localisation/example_case/init_files/FieldParam_real5_iter1_A2_local.grdecl (100%) rename tests/{jobs => workflows}/localisation/example_case/init_files/FieldParam_real5_iter1_A_local.grdecl (100%) rename tests/{jobs => workflows}/localisation/example_case/init_files/FieldParam_real5_iter1_B_local.grdecl (100%) rename tests/{jobs => workflows}/localisation/example_case/init_files/FieldParam_real5_iter1_C_local.grdecl (100%) rename tests/{jobs => workflows}/localisation/example_case/init_files/FieldParam_real5_iter1_D.grdecl (100%) rename tests/{jobs => workflows}/localisation/example_case/init_files/FieldParam_real5_iter1_E_local.grdecl (100%) rename tests/{jobs => workflows}/localisation/example_case/init_files/FieldParam_real5_iter1_F_local.grdecl (100%) rename tests/{jobs => workflows}/localisation/example_case/init_files/FieldParam_real5_iter1_G_local.grdecl (100%) rename tests/{jobs => workflows}/localisation/example_case/init_files/README (100%) rename tests/{jobs => workflows}/localisation/example_case/init_files/polygons.txt (100%) rename tests/{jobs => workflows}/localisation/example_case/init_files/region_polygons.txt (100%) rename tests/{jobs => workflows}/localisation/example_case/init_files/scaling_factor.grdecl (100%) rename tests/{jobs => workflows}/localisation/example_case/init_files/scaling_factor_rms_origo.grdecl (100%) rename tests/{jobs => workflows}/localisation/example_case/init_files/sim_field_template.ert (100%) rename tests/{jobs => workflows}/localisation/example_case/localisation.wf (100%) rename tests/{jobs => workflows}/localisation/example_case/scripts/FM_SIM_FIELD (100%) rename tests/{jobs => workflows}/localisation/example_case/scripts/README (100%) rename tests/{jobs => workflows}/localisation/example_case/scripts/__init__.py (100%) rename tests/{jobs => workflows}/localisation/example_case/scripts/common_functions.py (100%) rename tests/{jobs => workflows}/localisation/example_case/scripts/init_test_case.py (100%) rename tests/{jobs => workflows}/localisation/example_case/scripts/make_reference_data.py (100%) rename tests/{jobs => workflows}/localisation/example_case/scripts/roff_to_grdecl.py (100%) rename tests/{jobs => workflows}/localisation/example_case/scripts/sim_fields.py (100%) rename tests/{jobs => workflows}/localisation/example_case/test_full.py (100%) rename tests/{jobs => workflows}/localisation/snapshots/test_integration/test_localisation/obs_group_add0-param_group_add0/localisation_configuration (100%) rename tests/{jobs => workflows}/localisation/snapshots/test_methods/test_calculate_scaling_factors_in_regions/testdata_scaling.txt (100%) rename tests/{jobs => workflows}/localisation/snapshots/test_methods/test_decay_function_with_new_options/testdata_scaling_decay_method1.txt (100%) rename tests/{jobs => workflows}/localisation/snapshots/test_methods/test_decay_function_with_new_options/testdata_scaling_decay_method2.txt (100%) rename tests/{jobs => workflows}/localisation/snapshots/test_methods/test_decay_function_with_new_options/testdata_scaling_decay_method3.txt (100%) rename tests/{jobs => workflows}/localisation/snapshots/test_methods/test_decay_function_with_new_options/testdata_scaling_decay_method4.txt (100%) rename tests/{jobs => workflows}/localisation/snapshots/test_methods/test_decay_function_with_new_options/testdata_scaling_decay_method5.txt (100%) rename tests/{jobs => workflows}/localisation/snapshots/test_methods/test_smooth_parameter/testdata_scaling_smooth.txt (100%) rename tests/{jobs => workflows}/localisation/test_configs/__init__.py (100%) rename tests/{jobs => workflows}/localisation/test_configs/test_config.py (100%) rename tests/{jobs => workflows}/localisation/test_configs/test_field_config.py (100%) rename tests/{jobs => workflows}/localisation/test_configs/test_obs_config.py (100%) rename tests/{jobs => workflows}/localisation/test_configs/test_parameters.py (100%) rename tests/{jobs => workflows}/localisation/test_integration.py (99%) rename tests/{jobs => workflows}/localisation/test_methods.py (99%) rename tests/{jobs => workflows}/localisation/test_valid_rst.py (100%) 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/jobs/localisation/__init__.py b/tests/workflows/localisation/__init__.py similarity index 100% rename from tests/jobs/localisation/__init__.py rename to tests/workflows/localisation/__init__.py diff --git a/tests/jobs/localisation/example_case/README b/tests/workflows/localisation/example_case/README similarity index 100% rename from tests/jobs/localisation/example_case/README rename to tests/workflows/localisation/example_case/README diff --git a/tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter0_A2_local.grdecl b/tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter0_A2_local.grdecl similarity index 100% rename from tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter0_A2_local.grdecl rename to tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter0_A2_local.grdecl diff --git a/tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter0_A_local.grdecl b/tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter0_A_local.grdecl similarity index 100% rename from tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter0_A_local.grdecl rename to tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter0_A_local.grdecl diff --git a/tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter0_B_local.grdecl b/tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter0_B_local.grdecl similarity index 100% rename from tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter0_B_local.grdecl rename to tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter0_B_local.grdecl diff --git a/tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter0_C_local.grdecl b/tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter0_C_local.grdecl similarity index 100% rename from tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter0_C_local.grdecl rename to tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter0_C_local.grdecl diff --git a/tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter0_D.grdecl b/tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter0_D.grdecl similarity index 100% rename from tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter0_D.grdecl rename to tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter0_D.grdecl diff --git a/tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter0_E_local.grdecl b/tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter0_E_local.grdecl similarity index 100% rename from tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter0_E_local.grdecl rename to tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter0_E_local.grdecl diff --git a/tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter0_F_local.grdecl b/tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter0_F_local.grdecl similarity index 100% rename from tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter0_F_local.grdecl rename to tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter0_F_local.grdecl diff --git a/tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter0_G_local.grdecl b/tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter0_G_local.grdecl similarity index 100% rename from tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter0_G_local.grdecl rename to tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter0_G_local.grdecl diff --git a/tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter1_A2_local.grdecl b/tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter1_A2_local.grdecl similarity index 100% rename from tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter1_A2_local.grdecl rename to tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter1_A2_local.grdecl diff --git a/tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter1_A_local.grdecl b/tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter1_A_local.grdecl similarity index 100% rename from tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter1_A_local.grdecl rename to tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter1_A_local.grdecl diff --git a/tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter1_B_local.grdecl b/tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter1_B_local.grdecl similarity index 100% rename from tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter1_B_local.grdecl rename to tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter1_B_local.grdecl diff --git a/tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter1_C_local.grdecl b/tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter1_C_local.grdecl similarity index 100% rename from tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter1_C_local.grdecl rename to tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter1_C_local.grdecl diff --git a/tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter1_D.grdecl b/tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter1_D.grdecl similarity index 100% rename from tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter1_D.grdecl rename to tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter1_D.grdecl diff --git a/tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter1_E_local.grdecl b/tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter1_E_local.grdecl similarity index 100% rename from tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter1_E_local.grdecl rename to tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter1_E_local.grdecl diff --git a/tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter1_F_local.grdecl b/tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter1_F_local.grdecl similarity index 100% rename from tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter1_F_local.grdecl rename to tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter1_F_local.grdecl diff --git a/tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter1_G_local.grdecl b/tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter1_G_local.grdecl similarity index 100% rename from tests/jobs/localisation/example_case/init_files/FieldParam_real5_iter1_G_local.grdecl rename to tests/workflows/localisation/example_case/init_files/FieldParam_real5_iter1_G_local.grdecl diff --git a/tests/jobs/localisation/example_case/init_files/README b/tests/workflows/localisation/example_case/init_files/README similarity index 100% rename from tests/jobs/localisation/example_case/init_files/README rename to tests/workflows/localisation/example_case/init_files/README diff --git a/tests/jobs/localisation/example_case/init_files/polygons.txt b/tests/workflows/localisation/example_case/init_files/polygons.txt similarity index 100% rename from tests/jobs/localisation/example_case/init_files/polygons.txt rename to tests/workflows/localisation/example_case/init_files/polygons.txt diff --git a/tests/jobs/localisation/example_case/init_files/region_polygons.txt b/tests/workflows/localisation/example_case/init_files/region_polygons.txt similarity index 100% rename from tests/jobs/localisation/example_case/init_files/region_polygons.txt rename to tests/workflows/localisation/example_case/init_files/region_polygons.txt diff --git a/tests/jobs/localisation/example_case/init_files/scaling_factor.grdecl b/tests/workflows/localisation/example_case/init_files/scaling_factor.grdecl similarity index 100% rename from tests/jobs/localisation/example_case/init_files/scaling_factor.grdecl rename to tests/workflows/localisation/example_case/init_files/scaling_factor.grdecl diff --git a/tests/jobs/localisation/example_case/init_files/scaling_factor_rms_origo.grdecl b/tests/workflows/localisation/example_case/init_files/scaling_factor_rms_origo.grdecl similarity index 100% rename from tests/jobs/localisation/example_case/init_files/scaling_factor_rms_origo.grdecl rename to tests/workflows/localisation/example_case/init_files/scaling_factor_rms_origo.grdecl diff --git a/tests/jobs/localisation/example_case/init_files/sim_field_template.ert b/tests/workflows/localisation/example_case/init_files/sim_field_template.ert similarity index 100% rename from tests/jobs/localisation/example_case/init_files/sim_field_template.ert rename to tests/workflows/localisation/example_case/init_files/sim_field_template.ert diff --git a/tests/jobs/localisation/example_case/localisation.wf b/tests/workflows/localisation/example_case/localisation.wf similarity index 100% rename from tests/jobs/localisation/example_case/localisation.wf rename to tests/workflows/localisation/example_case/localisation.wf diff --git a/tests/jobs/localisation/example_case/scripts/FM_SIM_FIELD b/tests/workflows/localisation/example_case/scripts/FM_SIM_FIELD similarity index 100% rename from tests/jobs/localisation/example_case/scripts/FM_SIM_FIELD rename to tests/workflows/localisation/example_case/scripts/FM_SIM_FIELD diff --git a/tests/jobs/localisation/example_case/scripts/README b/tests/workflows/localisation/example_case/scripts/README similarity index 100% rename from tests/jobs/localisation/example_case/scripts/README rename to tests/workflows/localisation/example_case/scripts/README diff --git a/tests/jobs/localisation/example_case/scripts/__init__.py b/tests/workflows/localisation/example_case/scripts/__init__.py similarity index 100% rename from tests/jobs/localisation/example_case/scripts/__init__.py rename to tests/workflows/localisation/example_case/scripts/__init__.py diff --git a/tests/jobs/localisation/example_case/scripts/common_functions.py b/tests/workflows/localisation/example_case/scripts/common_functions.py similarity index 100% rename from tests/jobs/localisation/example_case/scripts/common_functions.py rename to tests/workflows/localisation/example_case/scripts/common_functions.py diff --git a/tests/jobs/localisation/example_case/scripts/init_test_case.py b/tests/workflows/localisation/example_case/scripts/init_test_case.py similarity index 100% rename from tests/jobs/localisation/example_case/scripts/init_test_case.py rename to tests/workflows/localisation/example_case/scripts/init_test_case.py diff --git a/tests/jobs/localisation/example_case/scripts/make_reference_data.py b/tests/workflows/localisation/example_case/scripts/make_reference_data.py similarity index 100% rename from tests/jobs/localisation/example_case/scripts/make_reference_data.py rename to tests/workflows/localisation/example_case/scripts/make_reference_data.py diff --git a/tests/jobs/localisation/example_case/scripts/roff_to_grdecl.py b/tests/workflows/localisation/example_case/scripts/roff_to_grdecl.py similarity index 100% rename from tests/jobs/localisation/example_case/scripts/roff_to_grdecl.py rename to tests/workflows/localisation/example_case/scripts/roff_to_grdecl.py diff --git a/tests/jobs/localisation/example_case/scripts/sim_fields.py b/tests/workflows/localisation/example_case/scripts/sim_fields.py similarity index 100% rename from tests/jobs/localisation/example_case/scripts/sim_fields.py rename to tests/workflows/localisation/example_case/scripts/sim_fields.py diff --git a/tests/jobs/localisation/example_case/test_full.py b/tests/workflows/localisation/example_case/test_full.py similarity index 100% rename from tests/jobs/localisation/example_case/test_full.py rename to tests/workflows/localisation/example_case/test_full.py diff --git a/tests/jobs/localisation/snapshots/test_integration/test_localisation/obs_group_add0-param_group_add0/localisation_configuration b/tests/workflows/localisation/snapshots/test_integration/test_localisation/obs_group_add0-param_group_add0/localisation_configuration similarity index 100% rename from tests/jobs/localisation/snapshots/test_integration/test_localisation/obs_group_add0-param_group_add0/localisation_configuration rename to tests/workflows/localisation/snapshots/test_integration/test_localisation/obs_group_add0-param_group_add0/localisation_configuration diff --git a/tests/jobs/localisation/snapshots/test_methods/test_calculate_scaling_factors_in_regions/testdata_scaling.txt b/tests/workflows/localisation/snapshots/test_methods/test_calculate_scaling_factors_in_regions/testdata_scaling.txt similarity index 100% rename from tests/jobs/localisation/snapshots/test_methods/test_calculate_scaling_factors_in_regions/testdata_scaling.txt rename to tests/workflows/localisation/snapshots/test_methods/test_calculate_scaling_factors_in_regions/testdata_scaling.txt diff --git a/tests/jobs/localisation/snapshots/test_methods/test_decay_function_with_new_options/testdata_scaling_decay_method1.txt b/tests/workflows/localisation/snapshots/test_methods/test_decay_function_with_new_options/testdata_scaling_decay_method1.txt similarity index 100% rename from tests/jobs/localisation/snapshots/test_methods/test_decay_function_with_new_options/testdata_scaling_decay_method1.txt rename to tests/workflows/localisation/snapshots/test_methods/test_decay_function_with_new_options/testdata_scaling_decay_method1.txt diff --git a/tests/jobs/localisation/snapshots/test_methods/test_decay_function_with_new_options/testdata_scaling_decay_method2.txt b/tests/workflows/localisation/snapshots/test_methods/test_decay_function_with_new_options/testdata_scaling_decay_method2.txt similarity index 100% rename from tests/jobs/localisation/snapshots/test_methods/test_decay_function_with_new_options/testdata_scaling_decay_method2.txt rename to tests/workflows/localisation/snapshots/test_methods/test_decay_function_with_new_options/testdata_scaling_decay_method2.txt diff --git a/tests/jobs/localisation/snapshots/test_methods/test_decay_function_with_new_options/testdata_scaling_decay_method3.txt b/tests/workflows/localisation/snapshots/test_methods/test_decay_function_with_new_options/testdata_scaling_decay_method3.txt similarity index 100% rename from tests/jobs/localisation/snapshots/test_methods/test_decay_function_with_new_options/testdata_scaling_decay_method3.txt rename to tests/workflows/localisation/snapshots/test_methods/test_decay_function_with_new_options/testdata_scaling_decay_method3.txt diff --git a/tests/jobs/localisation/snapshots/test_methods/test_decay_function_with_new_options/testdata_scaling_decay_method4.txt b/tests/workflows/localisation/snapshots/test_methods/test_decay_function_with_new_options/testdata_scaling_decay_method4.txt similarity index 100% rename from tests/jobs/localisation/snapshots/test_methods/test_decay_function_with_new_options/testdata_scaling_decay_method4.txt rename to tests/workflows/localisation/snapshots/test_methods/test_decay_function_with_new_options/testdata_scaling_decay_method4.txt diff --git a/tests/jobs/localisation/snapshots/test_methods/test_decay_function_with_new_options/testdata_scaling_decay_method5.txt b/tests/workflows/localisation/snapshots/test_methods/test_decay_function_with_new_options/testdata_scaling_decay_method5.txt similarity index 100% rename from tests/jobs/localisation/snapshots/test_methods/test_decay_function_with_new_options/testdata_scaling_decay_method5.txt rename to tests/workflows/localisation/snapshots/test_methods/test_decay_function_with_new_options/testdata_scaling_decay_method5.txt diff --git a/tests/jobs/localisation/snapshots/test_methods/test_smooth_parameter/testdata_scaling_smooth.txt b/tests/workflows/localisation/snapshots/test_methods/test_smooth_parameter/testdata_scaling_smooth.txt similarity index 100% rename from tests/jobs/localisation/snapshots/test_methods/test_smooth_parameter/testdata_scaling_smooth.txt rename to tests/workflows/localisation/snapshots/test_methods/test_smooth_parameter/testdata_scaling_smooth.txt diff --git a/tests/jobs/localisation/test_configs/__init__.py b/tests/workflows/localisation/test_configs/__init__.py similarity index 100% rename from tests/jobs/localisation/test_configs/__init__.py rename to tests/workflows/localisation/test_configs/__init__.py diff --git a/tests/jobs/localisation/test_configs/test_config.py b/tests/workflows/localisation/test_configs/test_config.py similarity index 100% rename from tests/jobs/localisation/test_configs/test_config.py rename to tests/workflows/localisation/test_configs/test_config.py diff --git a/tests/jobs/localisation/test_configs/test_field_config.py b/tests/workflows/localisation/test_configs/test_field_config.py similarity index 100% rename from tests/jobs/localisation/test_configs/test_field_config.py rename to tests/workflows/localisation/test_configs/test_field_config.py diff --git a/tests/jobs/localisation/test_configs/test_obs_config.py b/tests/workflows/localisation/test_configs/test_obs_config.py similarity index 100% rename from tests/jobs/localisation/test_configs/test_obs_config.py rename to tests/workflows/localisation/test_configs/test_obs_config.py diff --git a/tests/jobs/localisation/test_configs/test_parameters.py b/tests/workflows/localisation/test_configs/test_parameters.py similarity index 100% rename from tests/jobs/localisation/test_configs/test_parameters.py rename to tests/workflows/localisation/test_configs/test_parameters.py diff --git a/tests/jobs/localisation/test_integration.py b/tests/workflows/localisation/test_integration.py similarity index 99% rename from tests/jobs/localisation/test_integration.py rename to tests/workflows/localisation/test_integration.py index 4ec11a4f..f08d06be 100644 --- a/tests/jobs/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/jobs/localisation/test_methods.py b/tests/workflows/localisation/test_methods.py similarity index 99% rename from tests/jobs/localisation/test_methods.py rename to tests/workflows/localisation/test_methods.py index a8ef5ab9..241995d5 100644 --- a/tests/jobs/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") diff --git a/tests/jobs/localisation/test_valid_rst.py b/tests/workflows/localisation/test_valid_rst.py similarity index 100% rename from tests/jobs/localisation/test_valid_rst.py rename to tests/workflows/localisation/test_valid_rst.py