Merge pull request #70 from daavid00/dev

daavid00 · web-flow · commit db77d2e21181 · 2026-01-06T13:52:28.000+01:00
Retiring --warnings
diff --git a/.github/workflows/ci_pycopm_ubuntu.yml b/.github/workflows/ci_pycopm_ubuntu.yml
@@ -51,7 +51,7 @@ jobs:
       
     - name: Run tests
       run: |
-        pytest --cov=pycopm --cov-report term-missing tests/
+        pytest --cov=pycopm --exitfirst --cov-report term-missing tests/
 
     - name: Run hello world example
       run: |
diff --git a/docs/_sources/examples.rst.txt b/docs/_sources/examples.rst.txt
@@ -38,7 +38,7 @@ The following are the drogon model from `opm-tests <https://github.com/OPM/opm-t
 
     For Drogon, a scored is printed after the run to compared the error to the results available at 
     https://webviz-subsurface-example.azurewebsites.net/history-match. While `input.toml <https://github.com/cssr-tools/pycopm/blob/main/examples/configurations/drogon/input.toml>`_ 
-    only runs a single simulation that is used in testing **pycopm**, `hm.toml <https://github.com/cssr-tools/pycopm/blob/main/examples/configurations/drogon/hm.toml>`_ runs a history matching 
+    only runs one HM iteration with two ensemble members that is used in testing **pycopm**, `hm.toml <https://github.com/cssr-tools/pycopm/blob/main/examples/configurations/drogon/hm.toml>`_ runs a history matching 
     with a better score (i.e., less error compare to the observation data). This configuration file is also an example of how to use mpi to run Flow built from source 
     (set the flow path to your flow location; if you do not have mpi, you can remove it and still run the example).
 
diff --git a/docs/_sources/introduction.rst.txt b/docs/_sources/introduction.rst.txt
@@ -60,4 +60,3 @@ where
 -ijk        Given i,j,k indices in the input model, return the modified i,j,k corresponding positions ('' by default; if not empty, e.g., '1,2,3', then there will not be generation of modified files, only the i,j,k mapped indices in the terminal).
 -d          Options to transform the x,y,z coordinates: 'translate [10,-5,4]' adds the values in meters to the coordinates, 'scale [1,2,3]' multiplies the coordinates by the given values respectively, and 'rotatexy 45' applies a rotation in degrees in the xy plane (rotatexz and rotateyz applies a rotation around the y and x axis respectively) ('' by default).
 -explicit   Set to 1 to explicitly write the cell values in the SOLUTION section in the deck ('0' by default).
--warnings   Set to 1 to show Python warnings ('0' by default).
diff --git a/docs/examples.html b/docs/examples.html
@@ -123,7 +123,7 @@ <h2>Via configuration files<a class="headerlink" href="#via-configuration-files"
 <p class="admonition-title">Note</p>
 <p>For Drogon, a scored is printed after the run to compared the error to the results available at
 <a class="reference external" href="https://webviz-subsurface-example.azurewebsites.net/history-match">https://webviz-subsurface-example.azurewebsites.net/history-match</a>. While <a class="reference external" href="https://github.com/cssr-tools/pycopm/blob/main/examples/configurations/drogon/input.toml">input.toml</a>
-only runs a single simulation that is used in testing <strong>pycopm</strong>, <a class="reference external" href="https://github.com/cssr-tools/pycopm/blob/main/examples/configurations/drogon/hm.toml">hm.toml</a> runs a history matching
+only runs one HM iteration with two ensemble members that is used in testing <strong>pycopm</strong>, <a class="reference external" href="https://github.com/cssr-tools/pycopm/blob/main/examples/configurations/drogon/hm.toml">hm.toml</a> runs a history matching
 with a better score (i.e., less error compare to the observation data). This configuration file is also an example of how to use mpi to run Flow built from source
 (set the flow path to your flow location; if you do not have mpi, you can remove it and still run the example).</p>
 </div>
diff --git a/docs/introduction.html b/docs/introduction.html
@@ -193,9 +193,6 @@ <h2>Roadmap<a class="headerlink" href="#roadmap" title="Link to this heading">
 <dt><kbd><span class="option">-e<var>xplicit</var></span></kbd></dt>
 <dd><p>Set to 1 to explicitly write the cell values in the SOLUTION section in the deck (‘0’ by default).</p>
 </dd>
-<dt><kbd><span class="option">-w<var>arnings</var></span></kbd></dt>
-<dd><p>Set to 1 to show Python warnings (‘0’ by default).</p>
-</dd>
 </dl>
 </section>
 </section>
diff --git a/docs/searchindex.js b/docs/searchindex.js
diff --git a/docs/text/examples.rst b/docs/text/examples.rst
@@ -38,7 +38,7 @@ The following are the drogon model from `opm-tests <https://github.com/OPM/opm-t
 
     For Drogon, a scored is printed after the run to compared the error to the results available at 
     https://webviz-subsurface-example.azurewebsites.net/history-match. While `input.toml <https://github.com/cssr-tools/pycopm/blob/main/examples/configurations/drogon/input.toml>`_ 
-    only runs a single simulation that is used in testing **pycopm**, `hm.toml <https://github.com/cssr-tools/pycopm/blob/main/examples/configurations/drogon/hm.toml>`_ runs a history matching 
+    only runs one HM iteration with two ensemble members that is used in testing **pycopm**, `hm.toml <https://github.com/cssr-tools/pycopm/blob/main/examples/configurations/drogon/hm.toml>`_ runs a history matching 
     with a better score (i.e., less error compare to the observation data). This configuration file is also an example of how to use mpi to run Flow built from source 
     (set the flow path to your flow location; if you do not have mpi, you can remove it and still run the example).
 
diff --git a/docs/text/introduction.rst b/docs/text/introduction.rst
@@ -60,4 +60,3 @@ where
 -ijk        Given i,j,k indices in the input model, return the modified i,j,k corresponding positions ('' by default; if not empty, e.g., '1,2,3', then there will not be generation of modified files, only the i,j,k mapped indices in the terminal).
 -d          Options to transform the x,y,z coordinates: 'translate [10,-5,4]' adds the values in meters to the coordinates, 'scale [1,2,3]' multiplies the coordinates by the given values respectively, and 'rotatexy 45' applies a rotation in degrees in the xy plane (rotatexz and rotateyz applies a rotation around the y and x axis respectively) ('' by default).
 -explicit   Set to 1 to explicitly write the cell values in the SOLUTION section in the deck ('0' by default).
--warnings   Set to 1 to show Python warnings ('0' by default).
diff --git a/examples/configurations/drogon/input.toml b/examples/configurations/drogon/input.toml
@@ -3,7 +3,7 @@ flow = "flow"
 
 # Set the model parameters
 field = "drogon"  # Geological model (norne or drogon)
-mode = "single-run" # Mode to run (single-run, files, or ert)
+mode = "ert" # Mode to run (single-run, files, or ert)
 X = [0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0] # Array of x-coarsening 
 Y = [0,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0] # Array of y-coarsening 
 Z = [0,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0] # Array of z-coarsening
diff --git a/examples/configurations/norne/input.toml b/examples/configurations/norne/input.toml
@@ -3,7 +3,7 @@ flow = "flow --newton-min-iterations=1"
 
 # Set the model parameters
 field = "norne"  # Geological model (norne or drogon)
-mode = "ert" # Mode to run (single-run, files, or ert)
+mode = "single-run" # Mode to run (single-run, files, or ert)
 X = [0,2,0,2,2,0,2,0,2,0,2,0,2,2,0,2,0,2,2,0,2,0,2,2,0,2,0,2,2,0,2,0,2,0,2,0,2,2,0,2,2,0,2,2,2,2,0] # Array of x-coarsening 
 Y = [0,2,0,2,2,0,2,0,2,2,0,2,0,2,2,0,2,0,2,2,0,2,0,2,2,0,2,0,2,2,0,2,0,2,2,0,2,0,2,2,0,2,0,2,2,0,2,0,2,2,0,2,0,2,2,0,2,0,2,2,0,2,0,2,0,2,0,2,2,0,2,0,2,2,0,2,0,2,2,0,2,0,2,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,0,2,2,2,2,2,2,2,2,2,0] # Array of y-coarsening 
 Z = [0,0,2,0,0,2,2,2,2,2,0,2,2,2,2,2,0,0,2,0,2,2,0] # Array of z-coarsening
diff --git a/src/pycopm/core/pycopm.py b/src/pycopm/core/pycopm.py
@@ -8,7 +8,6 @@
 import time
 import sys
 import argparse
-import warnings
 from io import StringIO
 import subprocess
 import numpy as np
@@ -45,9 +44,6 @@ def pycopm():
     dic["vicinity"] = cmdargs["vicinity"].strip()  # Extract sub models
     dic["transform"] = cmdargs["displace"].strip()  # Apply affine transformations
     dic["explicit"] = int(cmdargs["explicit"]) == 1  # Write cell values in the SOLUTION
-    dic["warnings"] = int(cmdargs["warnings"]) == 1  # Show or hidde python warnings
-    if not dic["warnings"]:
-        warnings.warn = lambda *args, **kwargs: None
     for label, name, tag in zip(["", "r"], ["coarsening", "gridding"], ["coar", "ref"]):
         dic[f"{label}cijk"] = "yes"
         for i in ["x", "y", "z"]:
@@ -371,12 +367,6 @@ def load_parser():
         help="Set to 1 to explicitly write the cell values in the SOLUTION section in the "
         "deck ('0' by default).",
     )
-    parser.add_argument(
-        "-warnings",
-        "--warnings",
-        default=0,
-        help="Set to 1 to show Python warnings ('0' by default).",
-    )
     return vars(parser.parse_known_args()[0])
 
 
diff --git a/src/pycopm/template_scripts/common/let.mako b/src/pycopm/template_scripts/common/let.mako
@@ -1,3 +1,4 @@
+{
 % for j in range(dic["satnum_cmax"]-1):
 "${dic["LET"][i][0]}${j}": <${dic["LET"][i][0]}${j}>,
 % endfor
diff --git a/src/pycopm/template_scripts/common/plot_post.mako b/src/pycopm/template_scripts/common/plot_post.mako
@@ -10,7 +10,6 @@ after the hm
 import os
 import csv
 import numpy as np
-import warnings
 import datetime
 from opm.io.ecl import EGrid as OpmGrid
 from opm.io.ecl import EclFile as OpmFile
@@ -21,9 +20,6 @@ import matplotlib.pyplot as plt
 def visualizeData():
     """Visualize time series"""
 
-    % if not dic["warnings"]:
-    warnings.warn = lambda *args, **kwargs: None
-    % endif
     output_folder = '${dic['fol']}'
     pycopm_path = '${dic['pat']}'
     num_satn = ${dic['satnum_cmax']}
diff --git a/tests/test_0_main.py b/tests/test_0_main.py
@@ -12,8 +12,8 @@
 
 
 def test_main():
-    """See examples/configurations/drogon/input.toml"""
-    confi = f"{mainpth}/examples/configurations/drogon/input.toml"
+    """See examples/configurations/norne/input.toml"""
+    confi = f"{mainpth}/examples/configurations/norne/input.toml"
     if not os.path.exists(f"{testpth}/output"):
         os.system(f"mkdir {testpth}/output")
         os.system(f"mkdir {testpth}/output/main")
@@ -26,5 +26,5 @@ def test_main():
     os.chdir(f"{testpth}/output/main")
     main()
     assert os.path.exists(
-        f"{testpth}/output/main/postprocessing/wells/HISTO_DATA_WWPR_A4.png"
+        f"{testpth}/output/main/postprocessing/wells/HISTO_DATA_WWPR_E-1H.png"
     )
diff --git a/tests/test_1_ert.py b/tests/test_1_ert.py
@@ -12,12 +12,10 @@
 
 
 def test_ert(flow):
-    """See examples/configurations/norne/input.toml"""
+    """See examples/configurations/drogon/input.toml"""
     if not os.path.exists(f"{testpth}/output"):
         os.system(f"mkdir {testpth}/output")
     os.chdir(f"{testpth}/output")
-    confi = f"{mainpth}/examples/configurations/norne/input.toml"
-    subprocess.run(
-        ["pycopm", "-i", confi, "-o", "ert", "-warnings", "1", "-f", flow], check=True
-    )
+    confi = f"{mainpth}/examples/configurations/drogon/input.toml"
+    subprocess.run(["pycopm", "-i", confi, "-o", "ert", "-f", flow], check=True)
     assert os.path.exists(f"{testpth}/output/ert/postprocessing/hm_missmatch.png")
diff --git a/tests/test_2_coarsening.py b/tests/test_2_coarsening.py
@@ -30,8 +30,6 @@ def test_coarsening(flow):
             f"{mainpth}/examples/decks/HELLO_WORLD.DATA",
             "-o",
             f"{testpth}/output/coarser",
-            "-warnings",
-            "1",
             "-m",
             "prep",
         ],
@@ -63,8 +61,6 @@ def test_coarsening(flow):
                         ahow,
                         "-n",
                         nhow,
-                        "-warnings",
-                        "1",
                         "-s",
                         show,
                     ],
@@ -89,8 +85,6 @@ def test_coarsening(flow):
             "1",
             "-n",
             "mode",
-            "-warnings",
-            "1",
             "-x",
             "6:10",
             "-y",
@@ -117,8 +111,6 @@ def test_coarsening(flow):
             "deck_dry",
             "-t",
             "1",
-            "-warnings",
-            "1",
             "-w",
             f"TRANS{sub}",
         ],
@@ -143,8 +135,6 @@ def test_coarsening(flow):
             "2",
             "-w",
             f"TRANS2{sub}",
-            "-warnings",
-            "1",
         ],
         check=True,
     )
diff --git a/tests/test_3_refinement.py b/tests/test_3_refinement.py
@@ -36,8 +36,6 @@ def test_refinement(flow):
             sub,
             "-m",
             "all",
-            "-warnings",
-            "1",
         ],
         check=True,
     )
diff --git a/tests/test_4_submodel.py b/tests/test_4_submodel.py
@@ -32,8 +32,6 @@ def test_submodel(flow):
                 f"{testpth}/output/submodel",
                 "-g",
                 "4,4,3",
-                "-warnings",
-                "1",
                 "-m",
                 "all",
                 "-w",
@@ -64,8 +62,6 @@ def test_submodel(flow):
                     f"{sub}SUBMODEL",
                     "-l",
                     f"{sub}SUBMODEL",
-                    "-warnings",
-                    "1",
                     "-p",
                     f"{j}",
                 ],
diff --git a/tests/test_5_transform.py b/tests/test_5_transform.py
@@ -35,8 +35,6 @@ def test_transform(flow):
                 f"{flag} {val}",
                 "-m",
                 "all",
-                "-warnings",
-                "1",
                 "-w",
                 sub,
                 "-l",
diff --git a/tests/test_6_segwell_faults.py b/tests/test_6_segwell_faults.py
@@ -103,8 +103,6 @@ def test_complex(flow):
                 f"{testpth}/output/complex",
                 "-i",
                 f"{mainpth}/examples/decks/MODEL3.DATA",
-                "-warnings",
-                "1",
                 "-g",
                 "2,2,2",
                 "-w",
@@ -153,8 +151,6 @@ def test_complex(flow):
                 f"A4 {val}",
                 "-w",
                 f"SUBMODEL{i}",
-                "-warnings",
-                "1",
                 "-l",
                 f"S{i}",
                 "-p",
