Removed use of global settings object

oddvarlia · Nov 17, 2023 · 59cf0b8 · 59cf0b8
1 parent 693127e
commit 59cf0b8
Show file tree

Hide file tree

Showing 11 changed files with 370 additions and 247 deletions.
diff --git a/tests/jobs/localisation/example_case/README b/tests/jobs/localisation/example_case/README
@@ -25,14 +25,14 @@
 
 ### Typical Workflow:
 
-1. **Preparation:** Prepare ERT config input by running `scripts/init_test_case.py`.
-2. Directories for observations are created automatically according to the default settings.
+1. **Preparation:** Prepare ERT config input by running `scripts/init_test_case.py` with a config file in yaml format as input.
+2. Directories for observations are created automatically according to the default settings or settings in config file..
 3. Activate or deactivate localisation in ERT config file (`HOOK_WORKFLOW LOAD_WORKFLOW` for localisation).
 4. Now ready to run ERT.
 
 ### What the Script `sim_fields.py` Does:
-
-1. Get iteration and realisation number from ERT using ERT environment variables `_ERT_ITERATION_NUMBER` and `_ERT_REALIZATION_NUMBER`. If running with an old Komodo version, the script will require iteration and realisation_number as command line input.
+1. Require 3 input arguments: iteration number, realization_number, config file.
+1. Get iteration and realisation number from ERT.
 2. If iteration = 0, then:
      - Simulate field and export to file to be used in `FIELD` keyword in ERT config file.
      - Upscale field and optionally export to file for QC purpose.

diff --git a/tests/jobs/localisation/example_case/example_test_config_A.yml b/tests/jobs/localisation/example_case/example_test_config_A.yml
@@ -1,9 +1,7 @@
 # ROFF format standard Eclipse origo
 settings:
-  grid_size:
-    xsize: 7500.0
-    ysize: 12500.0
-    zsize: 50.0
+  model_size:
+    size: [ 7500.0,  12500.0, 50.0 ]
     use_eclipse_grid_index_origo: True
 
   field:

diff --git a/tests/jobs/localisation/example_case/example_test_config_A_with_actnum.yml b/tests/jobs/localisation/example_case/example_test_config_A_with_actnum.yml
@@ -1,9 +1,7 @@
 # ROFF format standard Eclipse origo
 settings:
-  grid_size:
-    xsize: 7500.0
-    ysize: 12500.0
-    zsize: 50.0
+  model_size:
+    size: [ 7500.0,  12500.0, 50.0 ]
     use_eclipse_grid_index_origo: True
     polygon_file: "Polygons.txt"
 

diff --git a/tests/jobs/localisation/example_case/example_test_config_B.yml b/tests/jobs/localisation/example_case/example_test_config_B.yml
@@ -1,9 +1,7 @@
 # GRDECL format standard Eclipse origo
 settings:
-  grid_size:
-    xsize: 7500.0
-    ysize: 12500.0
-    zsize: 50.0
+  model_size:
+    size: [ 7500.0,  12500.0, 50.0 ]
     use_eclipse_grid_index_origo: True
 
   field:

diff --git a/tests/jobs/localisation/example_case/example_test_config_C.yml b/tests/jobs/localisation/example_case/example_test_config_C.yml
@@ -1,9 +1,7 @@
 # ROFF format standard RMS origo
 settings:
-  grid_size:
-    xsize: 7500.0
-    ysize: 12500.0
-    zsize: 50.0
+  model_size:
+    size: [ 7500.0,  12500.0, 50.0 ]
     use_eclipse_grid_index_origo: False
 
   field:

diff --git a/tests/jobs/localisation/example_case/example_test_config_D.yml b/tests/jobs/localisation/example_case/example_test_config_D.yml
@@ -1,9 +1,7 @@
 # GRDECL format standard RMS origo
 settings:
-  grid_size:
-    xsize: 7500.0
-    ysize: 12500.0
-    zsize: 50.0
+  model_size:
+    size: [ 7500.0,  12500.0, 50.0 ]
     use_eclipse_grid_index_origo: False
 
   field: