moved test files to new directory

oddvarlia · Dec 20, 2023 · 8b69440 · 8b69440
1 parent d84dc08
commit 8b69440
Show file tree

Hide file tree

Showing 51 changed files with 2 additions and 3 deletions.
diff --git 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 → tests/workflows/localisation/__init__.py b/tests/jobs/localisation/__init__.py → tests/workflows/localisation/__init__.py
diff --git a/tests/jobs/localisation/example_case/README → ...orkflows/localisation/example_case/README b/tests/jobs/localisation/example_case/README → ...orkflows/localisation/example_case/README
diff --git a/...es/FieldParam_real5_iter0_A2_local.grdecl → ...es/FieldParam_real5_iter0_A2_local.grdecl b/...es/FieldParam_real5_iter0_A2_local.grdecl → ...es/FieldParam_real5_iter0_A2_local.grdecl
diff --git a/...les/FieldParam_real5_iter0_A_local.grdecl → ...les/FieldParam_real5_iter0_A_local.grdecl b/...les/FieldParam_real5_iter0_A_local.grdecl → ...les/FieldParam_real5_iter0_A_local.grdecl
diff --git a/...les/FieldParam_real5_iter0_B_local.grdecl → ...les/FieldParam_real5_iter0_B_local.grdecl b/...les/FieldParam_real5_iter0_B_local.grdecl → ...les/FieldParam_real5_iter0_B_local.grdecl
diff --git a/...les/FieldParam_real5_iter0_C_local.grdecl → ...les/FieldParam_real5_iter0_C_local.grdecl b/...les/FieldParam_real5_iter0_C_local.grdecl → ...les/FieldParam_real5_iter0_C_local.grdecl
diff --git a/...nit_files/FieldParam_real5_iter0_D.grdecl → ...nit_files/FieldParam_real5_iter0_D.grdecl b/...nit_files/FieldParam_real5_iter0_D.grdecl → ...nit_files/FieldParam_real5_iter0_D.grdecl
diff --git a/...les/FieldParam_real5_iter0_E_local.grdecl → ...les/FieldParam_real5_iter0_E_local.grdecl b/...les/FieldParam_real5_iter0_E_local.grdecl → ...les/FieldParam_real5_iter0_E_local.grdecl
diff --git a/...les/FieldParam_real5_iter0_F_local.grdecl → ...les/FieldParam_real5_iter0_F_local.grdecl b/...les/FieldParam_real5_iter0_F_local.grdecl → ...les/FieldParam_real5_iter0_F_local.grdecl
diff --git a/...les/FieldParam_real5_iter0_G_local.grdecl → ...les/FieldParam_real5_iter0_G_local.grdecl b/...les/FieldParam_real5_iter0_G_local.grdecl → ...les/FieldParam_real5_iter0_G_local.grdecl
diff --git a/...es/FieldParam_real5_iter1_A2_local.grdecl → ...es/FieldParam_real5_iter1_A2_local.grdecl b/...es/FieldParam_real5_iter1_A2_local.grdecl → ...es/FieldParam_real5_iter1_A2_local.grdecl
diff --git a/...les/FieldParam_real5_iter1_A_local.grdecl → ...les/FieldParam_real5_iter1_A_local.grdecl b/...les/FieldParam_real5_iter1_A_local.grdecl → ...les/FieldParam_real5_iter1_A_local.grdecl
diff --git a/...les/FieldParam_real5_iter1_B_local.grdecl → ...les/FieldParam_real5_iter1_B_local.grdecl b/...les/FieldParam_real5_iter1_B_local.grdecl → ...les/FieldParam_real5_iter1_B_local.grdecl
diff --git a/...les/FieldParam_real5_iter1_C_local.grdecl → ...les/FieldParam_real5_iter1_C_local.grdecl b/...les/FieldParam_real5_iter1_C_local.grdecl → ...les/FieldParam_real5_iter1_C_local.grdecl
diff --git a/...nit_files/FieldParam_real5_iter1_D.grdecl → ...nit_files/FieldParam_real5_iter1_D.grdecl b/...nit_files/FieldParam_real5_iter1_D.grdecl → ...nit_files/FieldParam_real5_iter1_D.grdecl
diff --git a/...les/FieldParam_real5_iter1_E_local.grdecl → ...les/FieldParam_real5_iter1_E_local.grdecl b/...les/FieldParam_real5_iter1_E_local.grdecl → ...les/FieldParam_real5_iter1_E_local.grdecl
diff --git a/...les/FieldParam_real5_iter1_F_local.grdecl → ...les/FieldParam_real5_iter1_F_local.grdecl b/...les/FieldParam_real5_iter1_F_local.grdecl → ...les/FieldParam_real5_iter1_F_local.grdecl
diff --git a/...les/FieldParam_real5_iter1_G_local.grdecl → ...les/FieldParam_real5_iter1_G_local.grdecl b/...les/FieldParam_real5_iter1_G_local.grdecl → ...les/FieldParam_real5_iter1_G_local.grdecl
diff --git a/...calisation/example_case/init_files/README → ...calisation/example_case/init_files/README b/...calisation/example_case/init_files/README → ...calisation/example_case/init_files/README
diff --git a/...tion/example_case/init_files/polygons.txt → ...tion/example_case/init_files/polygons.txt b/...tion/example_case/init_files/polygons.txt → ...tion/example_case/init_files/polygons.txt
diff --git a/...ample_case/init_files/region_polygons.txt → ...ample_case/init_files/region_polygons.txt b/...ample_case/init_files/region_polygons.txt → ...ample_case/init_files/region_polygons.txt
diff --git a/...ple_case/init_files/scaling_factor.grdecl → ...ple_case/init_files/scaling_factor.grdecl b/...ple_case/init_files/scaling_factor.grdecl → ...ple_case/init_files/scaling_factor.grdecl
diff --git a/...nit_files/scaling_factor_rms_origo.grdecl → ...nit_files/scaling_factor_rms_origo.grdecl b/...nit_files/scaling_factor_rms_origo.grdecl → ...nit_files/scaling_factor_rms_origo.grdecl
diff --git a/...le_case/init_files/sim_field_template.ert → ...le_case/init_files/sim_field_template.ert b/...le_case/init_files/sim_field_template.ert → ...le_case/init_files/sim_field_template.ert
diff --git a/...localisation/example_case/localisation.wf → ...localisation/example_case/localisation.wf b/...localisation/example_case/localisation.wf → ...localisation/example_case/localisation.wf
diff --git a/...isation/example_case/scripts/FM_SIM_FIELD → ...isation/example_case/scripts/FM_SIM_FIELD b/...isation/example_case/scripts/FM_SIM_FIELD → ...isation/example_case/scripts/FM_SIM_FIELD
diff --git a/.../localisation/example_case/scripts/README → .../localisation/example_case/scripts/README b/.../localisation/example_case/scripts/README → .../localisation/example_case/scripts/README
diff --git a/...lisation/example_case/scripts/__init__.py → ...lisation/example_case/scripts/__init__.py b/...lisation/example_case/scripts/__init__.py → ...lisation/example_case/scripts/__init__.py
diff --git a/.../example_case/scripts/common_functions.py → .../example_case/scripts/common_functions.py b/.../example_case/scripts/common_functions.py → .../example_case/scripts/common_functions.py
diff --git a/...on/example_case/scripts/init_test_case.py → ...on/example_case/scripts/init_test_case.py b/...on/example_case/scripts/init_test_case.py → ...on/example_case/scripts/init_test_case.py
diff --git a/...ample_case/scripts/make_reference_data.py → ...ample_case/scripts/make_reference_data.py b/...ample_case/scripts/make_reference_data.py → ...ample_case/scripts/make_reference_data.py
diff --git a/...on/example_case/scripts/roff_to_grdecl.py → ...on/example_case/scripts/roff_to_grdecl.py b/...on/example_case/scripts/roff_to_grdecl.py → ...on/example_case/scripts/roff_to_grdecl.py
diff --git a/...sation/example_case/scripts/sim_fields.py → ...sation/example_case/scripts/sim_fields.py b/...sation/example_case/scripts/sim_fields.py → ...sation/example_case/scripts/sim_fields.py
diff --git a/...bs/localisation/example_case/test_full.py → ...ws/localisation/example_case/test_full.py b/...bs/localisation/example_case/test_full.py → ...ws/localisation/example_case/test_full.py
diff --git a/...ram_group_add0/localisation_configuration → ...ram_group_add0/localisation_configuration b/...ram_group_add0/localisation_configuration → ...ram_group_add0/localisation_configuration
diff --git a/...g_factors_in_regions/testdata_scaling.txt → ...g_factors_in_regions/testdata_scaling.txt b/...g_factors_in_regions/testdata_scaling.txt → ...g_factors_in_regions/testdata_scaling.txt
diff --git a/...ptions/testdata_scaling_decay_method1.txt → ...ptions/testdata_scaling_decay_method1.txt b/...ptions/testdata_scaling_decay_method1.txt → ...ptions/testdata_scaling_decay_method1.txt
diff --git a/...ptions/testdata_scaling_decay_method2.txt → ...ptions/testdata_scaling_decay_method2.txt b/...ptions/testdata_scaling_decay_method2.txt → ...ptions/testdata_scaling_decay_method2.txt
diff --git a/...ptions/testdata_scaling_decay_method3.txt → ...ptions/testdata_scaling_decay_method3.txt b/...ptions/testdata_scaling_decay_method3.txt → ...ptions/testdata_scaling_decay_method3.txt
diff --git a/...ptions/testdata_scaling_decay_method4.txt → ...ptions/testdata_scaling_decay_method4.txt b/...ptions/testdata_scaling_decay_method4.txt → ...ptions/testdata_scaling_decay_method4.txt
diff --git a/...ptions/testdata_scaling_decay_method5.txt → ...ptions/testdata_scaling_decay_method5.txt b/...ptions/testdata_scaling_decay_method5.txt → ...ptions/testdata_scaling_decay_method5.txt
diff --git a/...oth_parameter/testdata_scaling_smooth.txt → ...oth_parameter/testdata_scaling_smooth.txt b/...oth_parameter/testdata_scaling_smooth.txt → ...oth_parameter/testdata_scaling_smooth.txt
diff --git a/...obs/localisation/test_configs/__init__.py → ...ows/localisation/test_configs/__init__.py b/...obs/localisation/test_configs/__init__.py → ...ows/localisation/test_configs/__init__.py
diff --git a/.../localisation/test_configs/test_config.py → .../localisation/test_configs/test_config.py b/.../localisation/test_configs/test_config.py → .../localisation/test_configs/test_config.py
diff --git a/...isation/test_configs/test_field_config.py → ...isation/test_configs/test_field_config.py b/...isation/test_configs/test_field_config.py → ...isation/test_configs/test_field_config.py
diff --git a/...alisation/test_configs/test_obs_config.py → ...alisation/test_configs/test_obs_config.py b/...alisation/test_configs/test_obs_config.py → ...alisation/test_configs/test_obs_config.py
diff --git a/...alisation/test_configs/test_parameters.py → ...alisation/test_configs/test_parameters.py b/...alisation/test_configs/test_parameters.py → ...alisation/test_configs/test_parameters.py
diff --git a/tests/jobs/localisation/test_integration.py → ...orkflows/localisation/test_integration.py b/tests/jobs/localisation/test_integration.py → ...orkflows/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 → tests/workflows/localisation/test_methods.py b/tests/jobs/localisation/test_methods.py → 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 → .../workflows/localisation/test_valid_rst.py b/tests/jobs/localisation/test_valid_rst.py → .../workflows/localisation/test_valid_rst.py