Merge pull request #12 from OPM/development

Fix to issue with flow from release + gaswater + energy + diffusion
OPM · Dec 20, 2023 · 572be49 · 572be49
2 parents 798edd5 + d60ea2e
commit 572be49
Show file tree

Hide file tree

Showing 43 changed files with 189 additions and 139 deletions.
diff --git a/docs/_images/spe11b_performance.png b/docs/_images/spe11b_performance.png
diff --git a/docs/_images/spe11b_performance_finner.png b/docs/_images/spe11b_performance_finner.png
diff --git a/docs/_images/spe11b_sparse_data.png b/docs/_images/spe11b_sparse_data.png
diff --git a/docs/_images/spe11b_sparse_data_finner.png b/docs/_images/spe11b_sparse_data_finner.png
diff --git a/docs/_images/spe11b_temp_2Dmaps.png b/docs/_images/spe11b_temp_2Dmaps.png
diff --git a/docs/_images/spe11b_xco2_2Dmaps_finner.png b/docs/_images/spe11b_xco2_2Dmaps_finner.png
diff --git a/docs/_sources/examples.rst.txt b/docs/_sources/examples.rst.txt
@@ -22,7 +22,7 @@ Then we run the simulations and we save the results in a different output folder
 
 .. code-block:: bash
 
-    pyopmspe11 -i spe11b.txt -o stricter_mb -m all -g all -t 200 -r 50,1,20
+    pyopmspe11 -i spe11b.txt -o stricter_mb -m all -g all -t 5 -r 50,1,20
 
 Then, to visualize the comparison between both runs, this can be achived by executing:
 
@@ -68,6 +68,7 @@ the following are some of the generated figures:
 
 .. figure:: figs/spe11b_sparse_data_finner.png
 .. figure:: figs/spe11b_performance_finner.png
+.. figure:: figs/spe11b_xco2_2Dmaps_finner.png
 
 .. tip::
     By executing flow --help you get an overview of the available flags in the flow simulator to improve/fix convergence issues 

diff --git a/docs/about.html b/docs/about.html
@@ -1,14 +1,12 @@
 <!DOCTYPE html>
-<html class="writer-html5" lang="en" data-content_root="./">
+<html class="writer-html5" lang="en" >
 <head>
-  <meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />
+  <meta charset="utf-8" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>About pyopmspe11 &mdash; pyopmspe11  documentation</title>
-      <link rel="stylesheet" type="text/css" href="_static/pygments.css?v=80d5e7a1" />
-      <link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=19f00094" />
-
-
+      <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+      <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
   <!--[if lt IE 9]>
     <script src="_static/js/html5shiv.min.js"></script>
   <![endif]-->

diff --git a/docs/api.html b/docs/api.html
@@ -1,14 +1,12 @@
 <!DOCTYPE html>
-<html class="writer-html5" lang="en" data-content_root="./">
+<html class="writer-html5" lang="en" >
 <head>
-  <meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />
+  <meta charset="utf-8" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>pyopmspe11 Python API &mdash; pyopmspe11  documentation</title>
-      <link rel="stylesheet" type="text/css" href="_static/pygments.css?v=80d5e7a1" />
-      <link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=19f00094" />
-
-
+      <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+      <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
   <!--[if lt IE 9]>
     <script src="_static/js/html5shiv.min.js"></script>
   <![endif]-->

diff --git a/docs/configuration_file.html b/docs/configuration_file.html
@@ -1,14 +1,12 @@
 <!DOCTYPE html>
-<html class="writer-html5" lang="en" data-content_root="./">
+<html class="writer-html5" lang="en" >
 <head>
-  <meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />
+  <meta charset="utf-8" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>Configuration file &mdash; pyopmspe11  documentation</title>
-      <link rel="stylesheet" type="text/css" href="_static/pygments.css?v=80d5e7a1" />
-      <link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=19f00094" />
-
-
+      <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+      <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
   <!--[if lt IE 9]>
     <script src="_static/js/html5shiv.min.js"></script>
   <![endif]-->

diff --git a/docs/examples.html b/docs/examples.html
@@ -1,14 +1,12 @@
 <!DOCTYPE html>
-<html class="writer-html5" lang="en" data-content_root="./">
+<html class="writer-html5" lang="en" >
 <head>
-  <meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />
+  <meta charset="utf-8" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>Examples &mdash; pyopmspe11  documentation</title>
-      <link rel="stylesheet" type="text/css" href="_static/pygments.css?v=80d5e7a1" />
-      <link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=19f00094" />
-
-
+      <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+      <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
   <!--[if lt IE 9]>
     <script src="_static/js/html5shiv.min.js"></script>
   <![endif]-->
@@ -99,7 +97,7 @@ <h2>Hello world<a class="headerlink" href="#hello-world" title="Link to this hea
 </figure>
 <p>Let us now tight the mass balance tolerance by adding the flag --tolerance-mb=1e-7 in line 2 of the configuration file (1e-6 is the default one).
 Then we run the simulations and we save the results in a different output folder:</p>
-<div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>pyopmspe11<span class="w"> </span>-i<span class="w"> </span>spe11b.txt<span class="w"> </span>-o<span class="w"> </span>stricter_mb<span class="w"> </span>-m<span class="w"> </span>all<span class="w"> </span>-g<span class="w"> </span>all<span class="w"> </span>-t<span class="w"> </span><span class="m">200</span><span class="w"> </span>-r<span class="w"> </span><span class="m">50</span>,1,20
+<div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>pyopmspe11<span class="w"> </span>-i<span class="w"> </span>spe11b.txt<span class="w"> </span>-o<span class="w"> </span>stricter_mb<span class="w"> </span>-m<span class="w"> </span>all<span class="w"> </span>-g<span class="w"> </span>all<span class="w"> </span>-t<span class="w"> </span><span class="m">5</span><span class="w"> </span>-r<span class="w"> </span><span class="m">50</span>,1,20
 </pre></div>
 </div>
 <p>Then, to visualize the comparison between both runs, this can be achived by executing:</p>
@@ -143,6 +141,9 @@ <h2>Presentation<a class="headerlink" href="#presentation" title="Link to this h
 <figure class="align-default">
 <img alt="_images/spe11b_performance_finner.png" src="_images/spe11b_performance_finner.png" />
 </figure>
+<figure class="align-default">
+<img alt="_images/spe11b_xco2_2Dmaps_finner.png" src="_images/spe11b_xco2_2Dmaps_finner.png" />
+</figure>
 <div class="admonition tip">
 <p class="admonition-title">Tip</p>
 <p>By executing flow –help you get an overview of the available flags in the flow simulator to improve/fix convergence issues

diff --git a/docs/genindex.html b/docs/genindex.html
@@ -1,13 +1,11 @@
 <!DOCTYPE html>
-<html class="writer-html5" lang="en" data-content_root="./">
+<html class="writer-html5" lang="en" >
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>Index &mdash; pyopmspe11  documentation</title>
-      <link rel="stylesheet" type="text/css" href="_static/pygments.css?v=80d5e7a1" />
-      <link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=19f00094" />
-
-
+      <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+      <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
   <!--[if lt IE 9]>
     <script src="_static/js/html5shiv.min.js"></script>
   <![endif]-->
@@ -105,6 +103,8 @@ <h2 id="B">B</h2>
 <h2 id="C">C</h2>
 <table style="width: 100%" class="indextable genindextable"><tr>
   <td style="width: 33%; vertical-align: top;"><ul>
+      <li><a href="pyopmspe11.utils.inputvalues.html#pyopmspe11.utils.inputvalues.check_deck">check_deck() (in module pyopmspe11.utils.inputvalues)</a>
+</li>
       <li><a href="pyopmspe11.utils.mapproperties.html#pyopmspe11.utils.mapproperties.corner">corner() (in module pyopmspe11.utils.mapproperties)</a>
 </li>
   </ul></td>

diff --git a/docs/index.html b/docs/index.html
@@ -1,14 +1,12 @@
 <!DOCTYPE html>
-<html class="writer-html5" lang="en" data-content_root="./">
+<html class="writer-html5" lang="en" >
 <head>
-  <meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />
+  <meta charset="utf-8" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>Welcome to pyopmspe11’s documentation! &mdash; pyopmspe11  documentation</title>
-      <link rel="stylesheet" type="text/css" href="_static/pygments.css?v=80d5e7a1" />
-      <link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=19f00094" />
-
-
+      <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+      <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
   <!--[if lt IE 9]>
     <script src="_static/js/html5shiv.min.js"></script>
   <![endif]-->

diff --git a/docs/introduction.html b/docs/introduction.html
@@ -1,14 +1,12 @@
 <!DOCTYPE html>
-<html class="writer-html5" lang="en" data-content_root="./">
+<html class="writer-html5" lang="en" >
 <head>
-  <meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />
+  <meta charset="utf-8" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>Introduction &mdash; pyopmspe11  documentation</title>
-      <link rel="stylesheet" type="text/css" href="_static/pygments.css?v=80d5e7a1" />
-      <link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=19f00094" />
-
-
+      <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+      <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
   <!--[if lt IE 9]>
     <script src="_static/js/html5shiv.min.js"></script>
   <![endif]-->

diff --git a/docs/modules.html b/docs/modules.html
@@ -1,14 +1,12 @@
 <!DOCTYPE html>
-<html class="writer-html5" lang="en" data-content_root="./">
+<html class="writer-html5" lang="en" >
 <head>
-  <meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />
+  <meta charset="utf-8" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>pyopmspe11 &mdash; pyopmspe11  documentation</title>
-      <link rel="stylesheet" type="text/css" href="_static/pygments.css?v=80d5e7a1" />
-      <link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=19f00094" />
-
-
+      <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+      <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
   <!--[if lt IE 9]>
     <script src="_static/js/html5shiv.min.js"></script>
   <![endif]-->

diff --git a/docs/objects.inv b/docs/objects.inv
diff --git a/docs/output_folder.html b/docs/output_folder.html
@@ -1,14 +1,12 @@
 <!DOCTYPE html>
-<html class="writer-html5" lang="en" data-content_root="./">
+<html class="writer-html5" lang="en" >
 <head>
-  <meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />
+  <meta charset="utf-8" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>Output folder &mdash; pyopmspe11  documentation</title>
-      <link rel="stylesheet" type="text/css" href="_static/pygments.css?v=80d5e7a1" />
-      <link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=19f00094" />
-
-
+      <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+      <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
   <!--[if lt IE 9]>
     <script src="_static/js/html5shiv.min.js"></script>
   <![endif]-->

diff --git a/docs/py-modindex.html b/docs/py-modindex.html
@@ -1,13 +1,11 @@
 <!DOCTYPE html>
-<html class="writer-html5" lang="en" data-content_root="./">
+<html class="writer-html5" lang="en" >
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>Python Module Index &mdash; pyopmspe11  documentation</title>
-      <link rel="stylesheet" type="text/css" href="_static/pygments.css?v=80d5e7a1" />
-      <link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=19f00094" />
-
-
+      <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+      <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
   <!--[if lt IE 9]>
     <script src="_static/js/html5shiv.min.js"></script>
   <![endif]-->

diff --git a/docs/pyopmspe11.core.html b/docs/pyopmspe11.core.html
@@ -1,14 +1,12 @@
 <!DOCTYPE html>
-<html class="writer-html5" lang="en" data-content_root="./">
+<html class="writer-html5" lang="en" >
 <head>
-  <meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />
+  <meta charset="utf-8" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>pyopmspe11.core package &mdash; pyopmspe11  documentation</title>
-      <link rel="stylesheet" type="text/css" href="_static/pygments.css?v=80d5e7a1" />
-      <link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=19f00094" />
-
-
+      <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+      <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
   <!--[if lt IE 9]>
     <script src="_static/js/html5shiv.min.js"></script>
   <![endif]-->

diff --git a/docs/pyopmspe11.core.pyopmspe11.html b/docs/pyopmspe11.core.pyopmspe11.html
@@ -1,14 +1,12 @@
 <!DOCTYPE html>
-<html class="writer-html5" lang="en" data-content_root="./">
+<html class="writer-html5" lang="en" >
 <head>
-  <meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />
+  <meta charset="utf-8" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>pyopmspe11.core.pyopmspe11 module &mdash; pyopmspe11  documentation</title>
-      <link rel="stylesheet" type="text/css" href="_static/pygments.css?v=80d5e7a1" />
-      <link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=19f00094" />
-
-
+      <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+      <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
   <!--[if lt IE 9]>
     <script src="_static/js/html5shiv.min.js"></script>
   <![endif]-->

diff --git a/docs/pyopmspe11.html b/docs/pyopmspe11.html
@@ -1,14 +1,12 @@
 <!DOCTYPE html>
-<html class="writer-html5" lang="en" data-content_root="./">
+<html class="writer-html5" lang="en" >
 <head>
-  <meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />
+  <meta charset="utf-8" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>pyopmspe11 package &mdash; pyopmspe11  documentation</title>
-      <link rel="stylesheet" type="text/css" href="_static/pygments.css?v=80d5e7a1" />
-      <link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=19f00094" />
-
-
+      <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+      <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
   <!--[if lt IE 9]>
     <script src="_static/js/html5shiv.min.js"></script>
   <![endif]-->
@@ -102,6 +100,7 @@ <h2>Subpackages<a class="headerlink" href="#subpackages" title="Link to this hea
 <li class="toctree-l1"><a class="reference internal" href="pyopmspe11.utils.html">pyopmspe11.utils package</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="pyopmspe11.utils.html#submodules">Submodules</a><ul>
 <li class="toctree-l3"><a class="reference internal" href="pyopmspe11.utils.inputvalues.html">pyopmspe11.utils.inputvalues module</a><ul>
+<li class="toctree-l4"><a class="reference internal" href="pyopmspe11.utils.inputvalues.html#pyopmspe11.utils.inputvalues.check_deck"><code class="docutils literal notranslate"><span class="pre">check_deck()</span></code></a></li>
 <li class="toctree-l4"><a class="reference internal" href="pyopmspe11.utils.inputvalues.html#pyopmspe11.utils.inputvalues.process_input"><code class="docutils literal notranslate"><span class="pre">process_input()</span></code></a></li>
 <li class="toctree-l4"><a class="reference internal" href="pyopmspe11.utils.inputvalues.html#pyopmspe11.utils.inputvalues.readthefirstpart"><code class="docutils literal notranslate"><span class="pre">readthefirstpart()</span></code></a></li>
 <li class="toctree-l4"><a class="reference internal" href="pyopmspe11.utils.inputvalues.html#pyopmspe11.utils.inputvalues.readthesecondpart"><code class="docutils literal notranslate"><span class="pre">readthesecondpart()</span></code></a></li>

diff --git a/docs/pyopmspe11.utils.html b/docs/pyopmspe11.utils.html
@@ -1,14 +1,12 @@
 <!DOCTYPE html>
-<html class="writer-html5" lang="en" data-content_root="./">
+<html class="writer-html5" lang="en" >
 <head>
-  <meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />
+  <meta charset="utf-8" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>pyopmspe11.utils package &mdash; pyopmspe11  documentation</title>
-      <link rel="stylesheet" type="text/css" href="_static/pygments.css?v=80d5e7a1" />
-      <link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=19f00094" />
-
-
+      <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+      <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
   <!--[if lt IE 9]>
     <script src="_static/js/html5shiv.min.js"></script>
   <![endif]-->
@@ -89,6 +87,7 @@ <h2>Submodules<a class="headerlink" href="#submodules" title="Link to this headi
 <div class="toctree-wrapper compound">
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="pyopmspe11.utils.inputvalues.html">pyopmspe11.utils.inputvalues module</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="pyopmspe11.utils.inputvalues.html#pyopmspe11.utils.inputvalues.check_deck"><code class="docutils literal notranslate"><span class="pre">check_deck()</span></code></a></li>
 <li class="toctree-l2"><a class="reference internal" href="pyopmspe11.utils.inputvalues.html#pyopmspe11.utils.inputvalues.process_input"><code class="docutils literal notranslate"><span class="pre">process_input()</span></code></a></li>
 <li class="toctree-l2"><a class="reference internal" href="pyopmspe11.utils.inputvalues.html#pyopmspe11.utils.inputvalues.readthefirstpart"><code class="docutils literal notranslate"><span class="pre">readthefirstpart()</span></code></a></li>
 <li class="toctree-l2"><a class="reference internal" href="pyopmspe11.utils.inputvalues.html#pyopmspe11.utils.inputvalues.readthesecondpart"><code class="docutils literal notranslate"><span class="pre">readthesecondpart()</span></code></a></li>