Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: Run expreccs

on:
push:
branches:
- main
pull_request:

jobs:
Expand All @@ -12,17 +9,17 @@ jobs:
contents: read
pull-requests: write
timeout-minutes: 60
runs-on: ubuntu-latest
runs-on: ubuntu-26.04

steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Set up Python 3.12
- name: Set up Python 3.14
uses: actions/setup-python@v2
with:
python-version: 3.12
python-version: 3.14

- name: Install Flow Simulator
run: |
Expand Down
2 changes: 1 addition & 1 deletion docs/_sources/contributing.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Contribute to the software
#. **pushd docs & make html** (this generates the documentation, and might rise issues that need to be fixed before the pull request; if the build succeeds and if the contribution changes the documentation, then copy all content from the docs/_build/html/ folder and replace the files in the `docs <https://github.com/cssr-tools/expreccs/tree/main/docs>`_ folder)

.. tip::
See the `CI.yml <https://github.com/cssr-tools/expreccs/blob/main/.github/workflows/CI.yml>`_ script and the `Actions <https://github.com/cssr-tools/expreccs/actions>`_ for installation of expreccs, OPM Flow (binary packages), and dependencies, as well as the execution of the six previous steps in Ubuntu 24.04 using Python 3.12.
See the `CI.yml <https://github.com/cssr-tools/expreccs/blob/main/.github/workflows/CI.yml>`_ script and the `Actions <https://github.com/cssr-tools/expreccs/actions>`_ for installation of expreccs, OPM Flow (binary packages), and dependencies, as well as the execution of the six previous steps in Ubuntu 26.04 using Python 3.14.
For macOS users, see the `ci_pycopm_macos.yml <https://github.com/daavid00/OPM-Flow_macOS/blob/main/.github/workflows/ci_pycopm_macos.yml>`_ script and the `OPM-Flow_macOS Actions <https://github.com/cssr-tools/pycopm/actions>`_ for installation of pycopm (a related tool to expreccs), OPM Flow (source build), and dependencies in macOS 26 using Python 3.14.
In addition for macOS, you need to add the directory containing the OPM Flow executable to your system's PATH environment variable (e.g., export PATH=$PATH:/Users/yourname/pyopmspe11/build/opm-simulators/bin).

Expand Down
24 changes: 12 additions & 12 deletions docs/_sources/ecmor2026.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ The core tools for the preprocessing and postprocessings are `pycopm <https://gi
Method
======

Run `figure1.sh <https://github.com/cssr-tools/expreccs/blob/main/publications/method/figure1.sh>`_:
Run `figure1.sh <https://github.com/cssr-tools/expreccs/blob/main/publications/ecmor2026/method/figure1.sh>`_:

.. code-block:: bash

Expand All @@ -36,7 +36,7 @@ Results
2D synthetic model
------------------

Run `figure2.sh <https://github.com/cssr-tools/expreccs/blob/main/publications/results_2d_synthetic_model/figure2.sh>`_ and `figure3_table1.py <https://github.com/cssr-tools/expreccs/blob/main/publications/results_2d_synthetic_model/figure3_table1.py>`_:
Run `figure2.sh <https://github.com/cssr-tools/expreccs/blob/main/publications/ecmor2026/results_2d_synthetic_model/figure2.sh>`_ and `figure3_table1.py <https://github.com/cssr-tools/expreccs/blob/main/publications/ecmor2026/results_2d_synthetic_model/figure3_table1.py>`_:

.. code-block:: bash

Expand All @@ -50,7 +50,7 @@ Run `figure2.sh <https://github.com/cssr-tools/expreccs/blob/main/publications/r
3D synthetic model
------------------

Run `figure4_table2.py <https://github.com/cssr-tools/expreccs/blob/main/publications/results_3d_synthetic_model/figure4_table2.py>`_:
Run `figure4_table2.py <https://github.com/cssr-tools/expreccs/blob/main/publications/ecmor2026/results_3d_synthetic_model/figure4_table2.py>`_:

.. code-block:: bash

Expand All @@ -60,35 +60,35 @@ Run `figure4_table2.py <https://github.com/cssr-tools/expreccs/blob/main/publica

The graphics in Figure 4 are generated via screenshots using `ParaView <https://resinsight.org>`_.

Troll aqifer model
------------------
Troll aquifer model
-------------------

To this end, the decks `MODEL.DATA <https://github.com/cssr-tools/expreccs/blob/main/publications/results_troll/results/MODEL.DATA>`_ and
`FILLED_MODEL.DATA <https://github.com/cssr-tools/expreccs/blob/main/publications/results_troll/results/FILLED_MODEL>`_ have the
To this end, the decks `MODEL.DATA <https://github.com/cssr-tools/expreccs/blob/main/publications/ecmor2026/results_troll/results/MODEL.DATA>`_ and
`FILLED_MODEL.DATA <https://github.com/cssr-tools/expreccs/blob/main/publications/ecmor2026/results_troll/results/FILLED_MODEL.DATA>`_ have the
same dimensions and number of total cells (12,450,809) as the Troll aquifer model, and the rest of the properties are
set to common homogeneous values from literature, while the well locations match the ones described in the ecmor2026 paper.
Then, you could contact the `Norwegian Offshore Directorate <https://www.sodir.no/en/>`_ to get the actual Troll aquifer model,
and adapt those files to the ones in the `results_troll folder <https://github.com/cssr-tools/expreccs/blob/main/publications/results_troll/results>`_.
and adapt those files to the ones in the `results_troll folder <https://github.com/cssr-tools/expreccs/blob/main/publications/ecmor2026/results_troll/results>`_.
To get the FILLED_MODEL, using the petrel model provided by the Norwegian Offshore Directorate one can export the non-net cells IDs to FLUXNUM and set those
values to 0, then EQUALREG can be used to assign the PORO and PERMS in the non-net cells (see the `FILLED_MODEL.DATA <https://github.com/cssr-tools/expreccs/blob/main/publications/results_troll/results/FILLED_MODEL>`_).
values to 0, then EQUALREG can be used to assign the PORO and PERMS in the non-net cells (see the `FILLED_MODEL.DATA <https://github.com/cssr-tools/expreccs/blob/main/publications/ecmor2026/results_troll/results/FILLED_MODEL.DATA>`_).

.. warning::

You should not run the MODEL.DATA and FILLED_MODEL.DATA decks before adapting it with the actual Troll aquifer model, since they have a lot of active cells.

First, we generate the results by creating the dual models and running all simulations (`run_results.sh <https://github.com/cssr-tools/expreccs/blob/main/publications/results_troll/run_results.sh>`_):
First, we generate the results by creating the dual models and running all simulations (`run_results.sh <https://github.com/cssr-tools/expreccs/blob/main/publications/ecmor2026/results_troll/run_results.sh>`_):

.. code-block:: bash

. ./run_results.sh

Then, we can obtained Table 3 (`table3.py <https://github.com/cssr-tools/expreccs/blob/main/publications/results_troll/table3.py>`_):
Then, we can obtained Table 3 (`table3.py <https://github.com/cssr-tools/expreccs/blob/main/publications/ecmor2026/results_troll/table3.py>`_):

.. code-block:: bash

python3 table3.py

Finally, we generate figures 5 to 9 (`figure5-9.sh <https://github.com/cssr-tools/expreccs/blob/main/publications/results_troll/figure5-9.sh>`_):
Finally, we generate figures 5 to 9 (`figure5-9.sh <https://github.com/cssr-tools/expreccs/blob/main/publications/ecmor2026/results_troll/figure5-9.sh>`_):

.. code-block:: bash

Expand Down
2 changes: 1 addition & 1 deletion docs/_sources/installation.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ supported either via source builds or through running a virtual machine.
.. tip::

See the `CI.yml <https://github.com/cssr-tools/expreccs/blob/main/.github/workflows/CI.yml>`_ script
for installation of OPM Flow (binary packages), LaTeX (optional) libraries, and the expreccs package in Ubuntu 24.04 and Python 3.12.
for installation of OPM Flow (binary packages), LaTeX (optional) libraries, and the expreccs package in Ubuntu 26.04 and Python 3.14.

Source build in Linux/Windows
+++++++++++++++++++++++++++++
Expand Down
2 changes: 1 addition & 1 deletion docs/contributing.html
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ <h2>Contribute to the software<a class="headerlink" href="#contribute-to-the-sof
</ol>
<div class="admonition tip">
<p class="admonition-title">Tip</p>
<p>See the <a class="reference external" href="https://github.com/cssr-tools/expreccs/blob/main/.github/workflows/CI.yml">CI.yml</a> script and the <a class="reference external" href="https://github.com/cssr-tools/expreccs/actions">Actions</a> for installation of expreccs, OPM Flow (binary packages), and dependencies, as well as the execution of the six previous steps in Ubuntu 24.04 using Python 3.12.
<p>See the <a class="reference external" href="https://github.com/cssr-tools/expreccs/blob/main/.github/workflows/CI.yml">CI.yml</a> script and the <a class="reference external" href="https://github.com/cssr-tools/expreccs/actions">Actions</a> for installation of expreccs, OPM Flow (binary packages), and dependencies, as well as the execution of the six previous steps in Ubuntu 26.04 using Python 3.14.
For macOS users, see the <a class="reference external" href="https://github.com/daavid00/OPM-Flow_macOS/blob/main/.github/workflows/ci_pycopm_macos.yml">ci_pycopm_macos.yml</a> script and the <a class="reference external" href="https://github.com/cssr-tools/pycopm/actions">OPM-Flow_macOS Actions</a> for installation of pycopm (a related tool to expreccs), OPM Flow (source build), and dependencies in macOS 26 using Python 3.14.
In addition for macOS, you need to add the directory containing the OPM Flow executable to your system’s PATH environment variable (e.g., export PATH=$PATH:/Users/yourname/pyopmspe11/build/opm-simulators/bin).</p>
</div>
Expand Down
26 changes: 13 additions & 13 deletions docs/ecmor2026.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<li class="toctree-l2"><a class="reference internal" href="#results">Results</a><ul>
<li class="toctree-l3"><a class="reference internal" href="#d-synthetic-model">2D synthetic model</a></li>
<li class="toctree-l3"><a class="reference internal" href="#id1">3D synthetic model</a></li>
<li class="toctree-l3"><a class="reference internal" href="#troll-aqifer-model">Troll aqifer model</a></li>
<li class="toctree-l3"><a class="reference internal" href="#troll-aquifer-model">Troll aquifer model</a></li>
</ul>
</li>
</ul>
Expand Down Expand Up @@ -105,7 +105,7 @@ <h1>ECMOR2026<a class="headerlink" href="#ecmor2026" title="Link to this heading
</div>
<section id="method">
<h2>Method<a class="headerlink" href="#method" title="Link to this heading"></a></h2>
<p>Run <a class="reference external" href="https://github.com/cssr-tools/expreccs/blob/main/publications/method/figure1.sh">figure1.sh</a>:</p>
<p>Run <a class="reference external" href="https://github.com/cssr-tools/expreccs/blob/main/publications/ecmor2026/method/figure1.sh">figure1.sh</a>:</p>
<div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>.<span class="w"> </span>./figure1.sh
</pre></div>
</div>
Expand All @@ -118,7 +118,7 @@ <h2>Method<a class="headerlink" href="#method" title="Link to this heading"><
<h2>Results<a class="headerlink" href="#results" title="Link to this heading"></a></h2>
<section id="d-synthetic-model">
<h3>2D synthetic model<a class="headerlink" href="#d-synthetic-model" title="Link to this heading"></a></h3>
<p>Run <a class="reference external" href="https://github.com/cssr-tools/expreccs/blob/main/publications/results_2d_synthetic_model/figure2.sh">figure2.sh</a> and <a class="reference external" href="https://github.com/cssr-tools/expreccs/blob/main/publications/results_2d_synthetic_model/figure3_table1.py">figure3_table1.py</a>:</p>
<p>Run <a class="reference external" href="https://github.com/cssr-tools/expreccs/blob/main/publications/ecmor2026/results_2d_synthetic_model/figure2.sh">figure2.sh</a> and <a class="reference external" href="https://github.com/cssr-tools/expreccs/blob/main/publications/ecmor2026/results_2d_synthetic_model/figure3_table1.py">figure3_table1.py</a>:</p>
<div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>.<span class="w"> </span>./figure2.sh
python3<span class="w"> </span>figure3_table1.py
</pre></div>
Expand All @@ -130,7 +130,7 @@ <h3>2D synthetic model<a class="headerlink" href="#d-synthetic-model" title="Lin
</section>
<section id="id1">
<h3>3D synthetic model<a class="headerlink" href="#id1" title="Link to this heading"></a></h3>
<p>Run <a class="reference external" href="https://github.com/cssr-tools/expreccs/blob/main/publications/results_3d_synthetic_model/figure4_table2.py">figure4_table2.py</a>:</p>
<p>Run <a class="reference external" href="https://github.com/cssr-tools/expreccs/blob/main/publications/ecmor2026/results_3d_synthetic_model/figure4_table2.py">figure4_table2.py</a>:</p>
<div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>python3<span class="w"> </span>figure4_table2.py
</pre></div>
</div>
Expand All @@ -139,29 +139,29 @@ <h3>3D synthetic model<a class="headerlink" href="#id1" title="Link to this head
<p>The graphics in Figure 4 are generated via screenshots using <a class="reference external" href="https://resinsight.org">ParaView</a>.</p>
</div>
</section>
<section id="troll-aqifer-model">
<h3>Troll aqifer model<a class="headerlink" href="#troll-aqifer-model" title="Link to this heading"></a></h3>
<p>To this end, the decks <a class="reference external" href="https://github.com/cssr-tools/expreccs/blob/main/publications/results_troll/results/MODEL.DATA">MODEL.DATA</a> and
<a class="reference external" href="https://github.com/cssr-tools/expreccs/blob/main/publications/results_troll/results/FILLED_MODEL">FILLED_MODEL.DATA</a> have the
<section id="troll-aquifer-model">
<h3>Troll aquifer model<a class="headerlink" href="#troll-aquifer-model" title="Link to this heading"></a></h3>
<p>To this end, the decks <a class="reference external" href="https://github.com/cssr-tools/expreccs/blob/main/publications/ecmor2026/results_troll/results/MODEL.DATA">MODEL.DATA</a> and
<a class="reference external" href="https://github.com/cssr-tools/expreccs/blob/main/publications/ecmor2026/results_troll/results/FILLED_MODEL.DATA">FILLED_MODEL.DATA</a> have the
same dimensions and number of total cells (12,450,809) as the Troll aquifer model, and the rest of the properties are
set to common homogeneous values from literature, while the well locations match the ones described in the ecmor2026 paper.
Then, you could contact the <a class="reference external" href="https://www.sodir.no/en/">Norwegian Offshore Directorate</a> to get the actual Troll aquifer model,
and adapt those files to the ones in the <a class="reference external" href="https://github.com/cssr-tools/expreccs/blob/main/publications/results_troll/results">results_troll folder</a>.
and adapt those files to the ones in the <a class="reference external" href="https://github.com/cssr-tools/expreccs/blob/main/publications/ecmor2026/results_troll/results">results_troll folder</a>.
To get the FILLED_MODEL, using the petrel model provided by the Norwegian Offshore Directorate one can export the non-net cells IDs to FLUXNUM and set those
values to 0, then EQUALREG can be used to assign the PORO and PERMS in the non-net cells (see the <a class="reference external" href="https://github.com/cssr-tools/expreccs/blob/main/publications/results_troll/results/FILLED_MODEL">FILLED_MODEL.DATA</a>).</p>
values to 0, then EQUALREG can be used to assign the PORO and PERMS in the non-net cells (see the <a class="reference external" href="https://github.com/cssr-tools/expreccs/blob/main/publications/ecmor2026/results_troll/results/FILLED_MODEL.DATA">FILLED_MODEL.DATA</a>).</p>
<div class="admonition warning">
<p class="admonition-title">Warning</p>
<p>You should not run the MODEL.DATA and FILLED_MODEL.DATA decks before adapting it with the actual Troll aquifer model, since they have a lot of active cells.</p>
</div>
<p>First, we generate the results by creating the dual models and running all simulations (<a class="reference external" href="https://github.com/cssr-tools/expreccs/blob/main/publications/results_troll/run_results.sh">run_results.sh</a>):</p>
<p>First, we generate the results by creating the dual models and running all simulations (<a class="reference external" href="https://github.com/cssr-tools/expreccs/blob/main/publications/ecmor2026/results_troll/run_results.sh">run_results.sh</a>):</p>
<div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>.<span class="w"> </span>./run_results.sh
</pre></div>
</div>
<p>Then, we can obtained Table 3 (<a class="reference external" href="https://github.com/cssr-tools/expreccs/blob/main/publications/results_troll/table3.py">table3.py</a>):</p>
<p>Then, we can obtained Table 3 (<a class="reference external" href="https://github.com/cssr-tools/expreccs/blob/main/publications/ecmor2026/results_troll/table3.py">table3.py</a>):</p>
<div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>python3<span class="w"> </span>table3.py
</pre></div>
</div>
<p>Finally, we generate figures 5 to 9 (<a class="reference external" href="https://github.com/cssr-tools/expreccs/blob/main/publications/results_troll/figure5-9.sh">figure5-9.sh</a>):</p>
<p>Finally, we generate figures 5 to 9 (<a class="reference external" href="https://github.com/cssr-tools/expreccs/blob/main/publications/ecmor2026/results_troll/figure5-9.sh">figure5-9.sh</a>):</p>
<div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>.<span class="w"> </span>./figure5-9.sh
</pre></div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ <h1>Welcome to the expreccs’s documentation!<a class="headerlink" href="#welco
<li class="toctree-l2"><a class="reference internal" href="ecmor2026.html#results">Results</a><ul>
<li class="toctree-l3"><a class="reference internal" href="ecmor2026.html#d-synthetic-model">2D synthetic model</a></li>
<li class="toctree-l3"><a class="reference internal" href="ecmor2026.html#id1">3D synthetic model</a></li>
<li class="toctree-l3"><a class="reference internal" href="ecmor2026.html#troll-aqifer-model">Troll aqifer model</a></li>
<li class="toctree-l3"><a class="reference internal" href="ecmor2026.html#troll-aquifer-model">Troll aquifer model</a></li>
</ul>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion docs/installation.html
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ <h3>Binary packages<a class="headerlink" href="#binary-packages" title="Link to
<div class="admonition tip">
<p class="admonition-title">Tip</p>
<p>See the <a class="reference external" href="https://github.com/cssr-tools/expreccs/blob/main/.github/workflows/CI.yml">CI.yml</a> script
for installation of OPM Flow (binary packages), LaTeX (optional) libraries, and the expreccs package in Ubuntu 24.04 and Python 3.12.</p>
for installation of OPM Flow (binary packages), LaTeX (optional) libraries, and the expreccs package in Ubuntu 24.06 and Python 3.14.</p>
</div>
</section>
<section id="source-build-in-linux-windows">
Expand Down
2 changes: 1 addition & 1 deletion docs/searchindex.js

Large diffs are not rendered by default.

Loading
Loading