Updating to flow 2024.04

cssr-tools · May 21, 2024 · 4adbd1d · 4adbd1d
1 parent 43946e5
commit 4adbd1d
Show file tree

Hide file tree

Showing 11 changed files with 1,500 additions and 463 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -30,20 +30,17 @@ jobs:
     - name: Install Flow Simulator
       run: |
         sudo apt-get update
-        sudo apt-get install texlive-fonts-recommended texlive-fonts-extra dvipng cm-super
         sudo apt-get install software-properties-common
-        sudo apt-get install -y build-essential gfortran pkg-config cmake
-        sudo apt-get install -y mpi-default-dev
-        sudo apt-get install -y libblas-dev libboost-all-dev libsuitesparse-dev libtrilinos-zoltan-dev
-        sudo apt-get install libdune-common-dev libdune-geometry-dev libdune-istl-dev libdune-grid-dev
-        chmod u+x build_opm-flow_mpi.bash
-        ./build_opm-flow_mpi.bash
+        sudo apt-add-repository ppa:opm/ppa
+        sudo apt-get update
+        sudo apt-get install mpi-default-bin
+        sudo apt-get install libopm-simulators-bin
+        sudo apt-get install texlive-fonts-recommended texlive-fonts-extra dvipng cm-super
         
     - name: Install test dependecies
       run: |
         pip install --upgrade pip setuptools wheel
         pip install -r dev-requirements.txt
-        pip install opm
         
     - name: Install expreccs
       run: |

diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ This repository contains scripts to set up a workflow to run site and regional r
 
 ## Installation
 You will first need to install
-* Flow (https://opm-project.org) (current master branches)
+* Flow (https://opm-project.org,  Release 2024.04 or current master branches)
 
 You can install the Python requirements in a virtual environment with the following commands:
 

diff --git a/build_opm-flow_mpi.bash b/build_opm-flow_mpi.bash
@@ -23,5 +23,5 @@ done
 mkdir build/opm-simulators
 cd build/opm-simulators
 cmake -DUSE_MPI=1 -DNDEBUG=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$CURRENT_DIRECTORY/build/opm-common;$CURRENT_DIRECTORY/build/opm-grid;$CURRENT_DIRECTORY/build/opm-models" $CURRENT_DIRECTORY/opm-simulators
-make -j5 flow_gaswater_dissolution
+make -j5 flow
 cd ../..
diff --git a/examples/newcases/Locations_figures/Case_4_site.ipe b/examples/newcases/Locations_figures/Case_4_site.ipe
diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
 
 setup(
     name="expreccs",
-    version="2023.10",
+    version="2024.04",
     install_requires=install_requires,
     extras_require={"dev": dev_requires},
     setup_requires=["setuptools_scm"],
@@ -37,7 +37,7 @@
     package_dir={"": "src"},
     packages=find_packages(where="src"),
     license="GPL-3.0",
-    python_requires=">=3.8, <3.11",
+    python_requires=">=3.8, <4",
     entry_points={
         "console_scripts": [
             "expreccs=expreccs.core.expreccs:main",

diff --git a/src/expreccs/utils/mapproperties.py b/src/expreccs/utils/mapproperties.py
@@ -98,6 +98,7 @@ def positions_regional(dic):
     dic["site_corners"] = [[0, 0, 0], [0, 0, 0]]
     indx = 0
     indc = 0
+    lasti = 0
     for _, z_c in enumerate(dic["regional_zmz_mid"]):
         for j, y_c in enumerate(dic["regional_ymy_mid"]):
             for i, x_c in enumerate(dic["regional_xmx_mid"]):

diff --git a/tests/configs/back-coupling.txt b/tests/configs/back-coupling.txt
@@ -1,5 +1,5 @@
 """Set the full path to the flow executable and flags"""
-/home/runner/work/expreccs/expreccs/build/opm-simulators/bin/flow_gaswater_dissolution --tolerance-mb=1e-7 --enable-opm-rst-file=true  --linear-solver=cprw --enable-tuning=true
+flow --tolerance-mb=1e-7 --enable-opm-rst-file=true  --linear-solver=cprw --enable-tuning=true
 
 """Set the model parameters"""
 15000 15000 5               #Reginonal aquifer length, width, and depth [m]

diff --git a/tests/configs/flux.txt b/tests/configs/flux.txt
@@ -1,5 +1,5 @@
 """Set the full path to the flow executable and flags"""
-/home/runner/work/expreccs/expreccs/build/opm-simulators/bin/flow_gaswater_dissolution --tolerance-mb=1e-7 --enable-opm-rst-file=true  --linear-solver=cprw --enable-tuning=true
+flow --tolerance-mb=1e-7 --enable-opm-rst-file=true  --linear-solver=cprw --enable-tuning=true
 
 """Set the model parameters"""
 15000 15000 27              #Reginonal aquifer length, width, and depth [m]

diff --git a/tests/configs/input.txt b/tests/configs/input.txt
@@ -1,5 +1,5 @@
 """Set the full path to the flow executable and flags"""
-/home/runner/work/expreccs/expreccs/build/opm-simulators/bin/flow_gaswater_dissolution --tolerance-mb=1e-7 --enable-opm-rst-file=true  --linear-solver=cprw --enable-tuning=true
+flow --tolerance-mb=1e-7 --enable-opm-rst-file=true  --linear-solver=cprw --enable-tuning=true
 
 """Set the model parameters"""
 15000 15000 27              #Reginonal aquifer length, width, and depth [m]

diff --git a/tests/configs/interp.txt b/tests/configs/interp.txt
@@ -1,5 +1,5 @@
 """Set the full path to the flow executable and flags"""
-/home/runner/work/expreccs/expreccs/build/opm-simulators/bin/flow_gaswater_dissolution --tolerance-mb=1e-7 --enable-opm-rst-file=true  --linear-solver=cprw --enable-tuning=true
+flow --tolerance-mb=1e-7 --enable-opm-rst-file=true  --linear-solver=cprw --enable-tuning=true
 
 """Set the model parameters"""
 15000 15000 27              #Reginonal aquifer length, width, and depth [m]

diff --git a/tests/configs/wells.txt b/tests/configs/wells.txt
@@ -1,5 +1,5 @@
 """Set the full path to the flow executable and flags"""
-/home/runner/work/expreccs/expreccs/build/opm-simulators/bin/flow_gaswater_dissolution --tolerance-mb=1e-7 --enable-opm-rst-file=true  --linear-solver=cprw --enable-tuning=true
+flow --tolerance-mb=1e-7 --enable-opm-rst-file=true  --linear-solver=cprw --enable-tuning=true
 
 """Set the model parameters"""
 15000 15000 27              #Reginonal aquifer length, width, and depth [m]