diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 52832ca..065851a 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -9,23 +9,17 @@ on:
jobs:
run-expreccs-local:
timeout-minutes: 60
- strategy:
- fail-fast: false
- matrix:
- python-version: ['3.11']
- os: [ubuntu-latest]
-
- runs-on: ${{ matrix.os }}
+ runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- - name: Set up Python ${{ matrix.python-version }}
+ - name: Set up Python 3.11
uses: actions/setup-python@v2
with:
- python-version: ${{ matrix.python-version }}
+ python-version: 3.11
- name: Install Flow Simulator
run: |
@@ -57,7 +51,7 @@ jobs:
- name: Run the tests
run: |
- pytest --cov=expreccs --cov-report term-missing tests/
+ pytest -x --cov=expreccs --cov-report term-missing tests/
- name: Build documentation
run: |
diff --git a/.gitignore b/.gitignore
index bfe8441..700ca03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -161,23 +161,6 @@ results
cssr
# Extra files
+tests/output
regional_rpr-3.png
reference_sgas_i,j,1_t90.png
-/tests/regional/FIPNUM_EXPRECCS.INC
-/tests/regional/OPERNUM_EXPRECCS.INC
-/tests/regional/REGIONAL.DBG
-/tests/regional/REGIONAL.EGRID
-/tests/regional/REGIONAL.ESMRY
-/tests/regional/REGIONAL.INIT
-/tests/regional/REGIONAL.PRT
-/tests/regional/REGIONAL.SMSPEC
-/tests/regional/REGIONAL.UNRST
-/tests/regional/REGIONAL.UNSMRY
-/tests/site/SITE.DBG
-/tests/site/SITE.EGRID
-/tests/site/SITE.ESMRY
-/tests/site/SITE.INIT
-/tests/site/SITE.PRT
-/tests/site/SITE.SMSPEC
-/tests/site/SITE.UNRST
-/tests/site/SITE.UNSMRY
diff --git a/.pylintrc b/.pylintrc
new file mode 100644
index 0000000..a49521c
--- /dev/null
+++ b/.pylintrc
@@ -0,0 +1,2 @@
+[MASTER]
+disable=R0801
diff --git a/docs/_sources/installation.rst.txt b/docs/_sources/installation.rst.txt
index 783711c..545acd3 100644
--- a/docs/_sources/installation.rst.txt
+++ b/docs/_sources/installation.rst.txt
@@ -6,6 +6,18 @@ The following steps work installing the dependencies in Linux via apt-get or in
While using package managers such as Anaconda, Miniforge, or Mamba might work, these are not tested.
The supported Python versions are 3.11 to 3.14.
+`ResInsight © Copyright 2023-2025, NORCE Research AS. © Copyright 2023-2026, NORCE Research AS. © Copyright 2023-2025, NORCE Research AS. © Copyright 2023-2026, NORCE Research AS. © Copyright 2023-2025, NORCE Research AS. © Copyright 2023-2026, NORCE Research AS. © Copyright 2023-2025, NORCE Research AS. © Copyright 2023-2026, NORCE Research AS. © Copyright 2023-2025, NORCE Research AS. © Copyright 2023-2026, NORCE Research AS. © Copyright 2023-2025, NORCE Research AS. © Copyright 2023-2026, NORCE Research AS. © Copyright 2023-2025, NORCE Research AS. © Copyright 2023-2026, NORCE Research AS. © Copyright 2023-2025, NORCE Research AS. © Copyright 2023-2026, NORCE Research AS. © Copyright 2023-2025, NORCE Research AS. © Copyright 2023-2026, NORCE Research AS. © Copyright 2023-2025, NORCE Research AS. © Copyright 2023-2026, NORCE Research AS. © Copyright 2023-2025, NORCE Research AS. © Copyright 2023-2026, NORCE Research AS. © Copyright 2023-2025, NORCE Research AS. © Copyright 2023-2026, NORCE Research AS. © Copyright 2023-2025, NORCE Research AS. © Copyright 2023-2026, NORCE Research AS. © Copyright 2023-2025, NORCE Research AS. © Copyright 2023-2026, NORCE Research AS. © Copyright 2023-2025, NORCE Research AS. © Copyright 2023-2026, NORCE Research AS. © Copyright 2023-2025, NORCE Research AS. © Copyright 2023-2026, NORCE Research AS. © Copyright 2023-2025, NORCE Research AS. © Copyright 2023-2026, NORCE Research AS. © Copyright 2023-2025, NORCE Research AS. © Copyright 2023-2026, NORCE Research AS. © Copyright 2023-2025, NORCE Research AS. © Copyright 2023-2026, NORCE Research AS. © Copyright 2023-2025, NORCE Research AS. © Copyright 2023-2026, NORCE Research AS. © Copyright 2023-2025, NORCE Research AS. © Copyright 2023-2026, NORCE Research AS. © Copyright 2023-2025, NORCE Research AS. © Copyright 2023-2026, NORCE Research AS.About expreccs
-
expreccs
Simulation results
-
Seek support
-
Non-regular boundaries
Submodules
-
Subpackages
-
Submodules
-
Submodules
-
W
Welcome to the expreccs’s documentation!Installation
Indices and tables
-
InstallationResInsight and plopm can be used for the visualization of the results.
Note
+There are binary packages for Linux and Windows to install Resinsight, see the ResInsight Documentation. For macOS users, you could try to install it using brew by executing:
+brew install cssr-tools/opm/resinsight
+Then, you should be able to open resinsight by typing in the terminal resinsight.
+To install the expreccs executable from the development version in an existing Python environment:
@@ -124,6 +135,12 @@Typing git tag -l writes all available specific versions.
+Note
+For not macOS users, to install the (optional but recommended) dependencies used for the figure’s LaTeX formatting, execute
+sudo apt-get install texlive-fonts-recommended texlive-fonts-extra dvipng cm-super
+For macOS users, the LaTeX dependency can be installed from https://www.tug.org/mactex/.
+OPM Flow (https://opm-project.org, Release 2025.10 or current master branches)
See the downloading and installing OPM Flow online documentation for +instructions to install the binary packages in Ubuntu and Red Hat Enterprise Linux, and for other platforms which are +supported either via source builds or through running a virtual machine.
Tip
See the CI.yml script for installation of OPM Flow (binary packages), LaTeX (optional) libraries, and the expreccs package in Ubuntu 24.04 and Python 3.11.
If you are a Linux user (including the Windows subsystem for Linux, see this link @@ -164,25 +187,34 @@
For macOS, there are no available binary packages, so OPM Flow needs to be built from source. Recently, a formula to build flow using brew has +been added in https://github.com/cssr-tools/homebrew-opm. +Then, you can try to install flow (v2025.10) by simply typing:
+brew install cssr-tools/opm/opm-simulators
+You can check if the installation of OPM Flow succeded by typing in the terminal flow --help.
+Tip
+See the actions in the cssr-tools/homebrew-opm repository.
+For macOS, there are no available binary packages, so OPM Flow needs to be built from source, in addition to the dune libraries and the OPM Python -package (see the prerequisites, which can be installed using macports or brew). -For example, with brew the prerequisites can be installed by:
+If you would like to build the latest OPM Flow from the master branch, then you can first install the prerequisites using brew:
brew install boost openblas suite-sparse python@3.14 cmake
In addition, it is recommended to uprade and update your macOS to the latest available versions (the following steps have -worked for macOS Tahoe 26.1 with Apple clang version 17.0.0). -After the prerequisites are installed and the vexpreccs Python environment is created (see Python package), -then building OPM Flow can be achieved with the following bash lines:
+worked for macOS Tahoe 26.2.0 with Apple clang version 17.0.0). +After the prerequisites are installed, then building OPM Flow can be achieved with the following bash lines:CURRENT_DIRECTORY="$PWD"
-deactivate
-source vexpreccs/bin/activate
-
for module in common geometry grid istl
-do git clone https://gitlab.dune-project.org/core/dune-$module.git --branch v2.9.1
+do git clone https://gitlab.dune-project.org/core/dune-$module.git
+ cd dune-$module && git checkout v2.10.0 && cd ..
./dune-common/bin/dunecontrol --only=dune-$module cmake -DCMAKE_DISABLE_FIND_PACKAGE_MPI=1
./dune-common/bin/dunecontrol --only=dune-$module make -j5
done
@@ -191,8 +223,7 @@ Source build in Linux/Windowsfor repo in common grid simulators
do git clone https://github.com/OPM/opm-$repo.git
- mkdir build/opm-$repo
- cd build/opm-$repo
+ mkdir build/opm-$repo && cd build/opm-$repo
cmake -DUSE_MPI=0 -DWITH_NDEBUG=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$CURRENT_DIRECTORY/dune-common/build-cmake;$CURRENT_DIRECTORY/dune-grid/build-cmake;$CURRENT_DIRECTORY/dune-geometry/build-cmake;$CURRENT_DIRECTORY/dune-istl/build-cmake;$CURRENT_DIRECTORY/build/opm-common;$CURRENT_DIRECTORY/build/opm-grid" $CURRENT_DIRECTORY/opm-$repo
if [[ $repo == simulators ]]; then
make -j5 flow
@@ -202,14 +233,16 @@ Source build in Linux/Windows cd ../..
done
-echo "export PATH=\$PATH:$CURRENT_DIRECTORY/build/opm-simulators/bin" >> $CURRENT_DIRECTORY/vexpreccs/bin/activate
-
-deactivate
-source vexpreccs/bin/activate
+echo "export PATH=\$PATH:$CURRENT_DIRECTORY/build/opm-simulators/bin" >> ~/.zprofile
+source ~/.zprofile
This builds OPM Flow, and it exports the path to the flow executable (i.e., executing in the terminal which flow should print the path).
-For macOS, the (optional but recommended) LaTeX dependency can be installed from https://www.tug.org/mactex/.
+This builds OPM Flow, and it exports the path to the flow executable. You can check if the installation of OPM Flow succeded by typing in the terminal flow --help.
+Tip
+See this repository dedicated to build OPM Flow from source in the latest macOS (GitHub actions). +If you still face problems, raise an issue in the GitHub repository, or you could also send an email to the maintainers.
+© Copyright 2023-2025, NORCE Research AS.
+© Copyright 2023-2026, NORCE Research AS.
Built with Sphinx using a diff --git a/docs/introduction.html b/docs/introduction.html index 25a3cbf..4769cd9 100644 --- a/docs/introduction.html +++ b/docs/introduction.html @@ -138,9 +138,6 @@Exponential ‘a’ coefficient for the telescopic time-discretization for the given frequency ‘-f’. Write an array, e.g., ‘2.2,0,3.1’, to set the coefficient in each site report step (‘3.2’ by default, use 0 for an equidistance partition).
Set to 1 to print warnings (‘0’ by default).
-Set to 0 to write the pressure increase on the site bc from the regional values (‘1’ by default, i.e., the pressure values on the boundaries correspond to the explicit values on the regional simulations).
© Copyright 2023-2025, NORCE Research AS.
+© Copyright 2023-2026, NORCE Research AS.
© Copyright 2023-2025, NORCE Research AS.
+© Copyright 2023-2026, NORCE Research AS.
© Copyright 2023-2025, NORCE Research AS.
+© Copyright 2023-2026, NORCE Research AS.
Built with Sphinx using a diff --git a/docs/py-modindex.html b/docs/py-modindex.html index 3a3c267..2b108f0 100644 --- a/docs/py-modindex.html +++ b/docs/py-modindex.html @@ -177,7 +177,7 @@© Copyright 2023-2025, NORCE Research AS.
+© Copyright 2023-2026, NORCE Research AS.
© Copyright 2023-2025, NORCE Research AS.
+© Copyright 2023-2026, NORCE Research AS.
© Copyright 2023-2025, NORCE Research AS.
+© Copyright 2023-2026, NORCE Research AS.
© Copyright 2023-2025, NORCE Research AS.
+© Copyright 2023-2026, NORCE Research AS.