OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-09-05 04:40:19 -05:00
Code Issues Packages Projects Releases Wiki Activity
14,190 Commits 31 Branches 117 Tags
98d5450ca14159edae30ff64a770def6127837a0
Commit Graph
14190 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Cintia Goncalves Machado 98d5450ca1 Fix FOE definition 2022-06-13 15:34:19 +02:00
Markus Blatt 9f7de03a80 Merge pull request #3938 from hakonhagland/copy_python 
Only copy the necessary files from the source python folder to the build folder
 2022-06-10 15:37:27 +02:00
Markus Blatt 5a7029f53c Merge pull request #3933 from hakonhagland/python_nsp 
Make the Python `opm` package a namespace package
 2022-06-10 15:01:14 +02:00
Markus Blatt 4121be612b Merge pull request #3918 from hakonhagland/python_rates3 
Dynamically update Opm::Schedule from Python (part II)
 2022-06-10 14:56:24 +02:00
Håkon Hægland 8e3ce1aed9 Only copy necessary files from python folder 
Instead of copying the whole python folder, only copy the necessary files to
the build directory. This means the opm, test, and test_data directories.
 2022-06-10 12:19:24 +02:00
Håkon Hægland 8af152dcff Make Python opm package a namespace package 
Convert the Python opm package from a regular package to a namespace
package such that opm-simulators and opm-common can contribute to the
package from different filesystem paths. In this way, the two packages
opm.simulators and opm.io (in opm-common) can have a different parent
filesystem path.
 2022-06-10 11:37:15 +02:00
Håkon Hægland 19b074805d Use the new opm-common_PYTHON_COMMON_DIR 
Use the new opm-common_PYTHON_COMMON_DIR to locate the install.py
script if we are building against an installed opm-common.
 2022-06-10 11:31:48 +02:00
Håkon Hægland 9b0c63b325 Also use installed install.py for copy_python 
Also use the installed install.py when copying python files at build time
 2022-06-10 11:31:48 +02:00
Håkon Hægland 696f830eab Use installed install.py 
If we are building against an installed opm-common, use the installed
install.py script instead
 2022-06-10 11:31:48 +02:00
Håkon Hægland 063e336ec6 Remove SYSTEM argument for cmake >= 3.12 
Remove SYSTEM argument for pybind11_add_module() if cmake version is
greater than 3.12. It appears that this argument has been deprecated
and also removed by the new FindPython mode in the cmake tools for
pybind11.
 2022-06-10 11:31:48 +02:00
Håkon Hægland 101a5ada82 Also search for development artifacts 
We should also search for development artifacts when combining
FindPython3.cmake with find_package(pybind11)
 2022-06-10 11:31:48 +02:00
Håkon Hægland 3c0498e55f Dynamically update schedule from Python 
Adds some test cases that show how injection properties in Opm::Schedule
can be dynamically modified from Python.
 2022-06-10 11:31:48 +02:00
Markus Blatt 5e00a0ae59 Merge pull request #3928 from bska/make-jacobi-prec-opencl-only 
Temporarily Limit Block-Jacobi Partitioner to OpenCL Only
 2022-06-08 17:24:13 +02:00
Bård Skaflestad e6dff88eb7 Temporarily Limit Block-Jacobi Partitioner to OpenCL Only 
The block-Jacobi partitioner (commit e360c00b7) uses grid interfaces
that are only available in CpGrid and this blocks introducing other
grid managers such as ALUGrid.  Since the partitioner was only added
for OpenCL, guard special purposes accesses with HAVE_OPENCL.

This is a temporary measure and we will venture to restore the
partitioner later, although possibly restricted to CpGrid only.
 2022-06-08 16:14:39 +02:00
Bård Skaflestad 7537d7ab95 Split Grid Distribution Out to Helper Functions 
Mostly to reduce the number of nested scopes in doLoadBalance_() and
to make the data flow a little easier to track for human readers.
While here, also use down-casts to pointer instead of references.
Doing so replaces try/catch blocks with simpler if/else blocks.

Reimplement face transmissibility calculation/extraction loop in
terms of helper functions elements() and intersections().
 2022-06-08 16:14:39 +02:00
Bård Skaflestad 4e5745bf4a Make cellPartition() Return Reference To Const 
We don't need to copy this array on every call.
 2022-06-08 16:11:54 +02:00
Bård Skaflestad 0bb293aeb0 Merge pull request #3936 from atgeirr/use-gridview-argument 
Re-add grid view argument to doLoadBalance_().
 2022-06-08 16:10:22 +02:00
Bård Skaflestad b593baff2f Merge pull request #3926 from totto82/fix_operability 
Fix well operability
 2022-06-08 16:09:02 +02:00
Atgeirr Flø Rasmussen 1aed863956 Re-add grid view argument to doLoadBalance_(). 2022-06-08 15:33:32 +02:00
Tor Harald Sandve 46c8aa3306 fix hydrostatic correction for branched wells in IPR 2022-06-08 12:29:05 +02:00
Markus Blatt ac59429e01 Merge pull request #3935 from Tongdongq/fix-replace-zero-diagonal 
Fix: zeros were not replaced correctly in the diagonal for GPU
 2022-06-08 12:28:30 +02:00
Tong Dong Qiu 91a54645fb Fix: zeros were not replaced correctly in the diagonal 
And minor changes
 2022-06-08 10:00:22 +02:00
Tor Harald Sandve 3adaa1b987 fix component/phase mixup 2022-06-07 14:14:13 +02:00
Tor Harald Sandve e965dac3ee Only flag a bhp producer/injector operable if the sum of IPR are negative/positive 2022-06-07 10:47:22 +02:00
Tor Harald Sandve 147fe77779 Merge pull request #3934 from totto82/stopnocross 
stopped wells where cross flow is not allowed are not added to the container
 2022-06-07 10:36:07 +02:00
Tor Harald Sandve cec8e7c724 Merge pull request #3924 from totto82/steeringBHPtoHighestRate 
Steer bhp towards the solution with the highest production rate
 2022-06-07 10:35:53 +02:00
Tor Harald Sandve 6cc71375b4 stopped wells where cross flow is not allowed are not added to the container 2022-06-07 10:01:02 +02:00
Markus Blatt f225521680 Merge pull request #3929 from bska/remove-gridv-param 
Use Consistent Grid Views for Transmissibility Calculation
 2022-06-01 16:02:16 +02:00
Bård Skaflestad af94be5023 Use Consistent Grid Views for Transmissibility Calculation 
There was an implied assumption that the "gridv" parameter would
coincide with "grid_->leafGridView()".  Make this assumption
explicit.
 2022-06-01 14:34:28 +02:00
Kai Bao 26a9582ece Merge pull request #3911 from GitPaean/fixing_numerical_aquifer_equil 
Fixing equilibration when having numerical aquifers.
 2022-05-26 22:09:32 +02:00
Bård Skaflestad be4221ea92 Merge pull request #3869 from plgbrts/vapoilwat 
adding three-phase simulator including water evaporation and salt precipitation
 2022-05-25 15:33:53 +02:00
Tor Harald Sandve 6f410e7b03 Steer bhp towards the solution with the highest production rate 2022-05-25 15:30:36 +02:00
Tor Harald Sandve cce9e2d0b3 Merge pull request #3910 from hakonhagland/python_rates2 
Dynamically update Opm::Schedule from Python
 2022-05-25 08:42:13 +02:00
Markus Blatt ad74355aed Merge pull request #3886 from bska/bxip-smry-values 
Extract Block-Level Component-in-Place Summary Values
 2022-05-23 16:30:17 +02:00
Bård Skaflestad 9f22e125f9 Extract Block-Level Component-in-Place Summary Values 
This commit calculates the various BxIP* summary output values such
as BOIP (block-level oil-in-place) and BGIPL (block-level
gas-in-place in liquid phase).  While here, also extract the
block-level dissolved gas-oil-ratio (BRS) and vaporised
oil-gas-ratio (BRV).
 2022-05-20 23:13:27 +02:00
Markus Blatt 10b7f4fbc0 Merge pull request #3912 from bska/attribute-missing-kw-terminator 
Emit Actual Message on Input Failure
 2022-05-20 23:05:22 +02:00
Bård Skaflestad 252d0afe8e Emit Actual Message on Input Failure 
This gives more information to the user and hopefully aids them in
resolving the underlying issue.
 2022-05-20 16:30:19 +02:00
Markus Blatt 02aaec82f7 Merge pull request #3815 from Tongdongq/subdomain-matrix-for-opencl 
Subdomain matrix for opencl ILU preconditioner
 2022-05-20 16:05:14 +02:00
Markus Blatt 97ccaca239 Merge pull request #3917 from blattms/bump-version-2022.10 
Bump version to 2022.10-pre
 2022-05-19 16:53:09 +02:00
Markus Blatt b4d1fd5913 Bump version to 2022.10-pre 2022-05-19 16:46:35 +02:00
Bård Skaflestad 0d6f7f75b6 Merge pull request #3914 from GitPaean/removing_unused_well_state0 
removing unused well_state0 in iterateWellEqWithControl for MSW
 2022-05-18 10:40:17 +02:00
Kai Bao 15bf35ffe0 removing unused well_state0 in iterateWellEqWithControl 
for MSW.
 2022-05-18 10:18:35 +02:00
Paul Egberts a255613452 Merge branch 'master' into vapoilwat 2022-05-11 11:55:54 +02:00
Paul Egberts 6fe10a3e23 add throw for case msw is true and vapwat is true 2022-05-11 11:50:54 +02:00
Kai Bao ed1c65bb86 increasing abs_tol for parallel regression for 3D_2AQU case 
to make jenkins pass.
 2022-05-10 11:05:03 +02:00
Kai Bao 78bd95c593 also update cellZSpan_ and cellZMinMax 
when updating cell center depth due to numerical aquifer cells.
 2022-05-05 15:01:09 +02:00
Håkon Hægland 91ac3a2a32 Dynamically update schedule from Python 
Adds some methods that enables Opm::Schedule to be dynamically modified
from Python. A test case in test_schedule.py illustrates the use case.
 2022-05-05 13:10:39 +02:00
Tong Dong Qiu b00d31042c Check if memory for nnzs is contiguous 2022-05-04 16:15:57 +02:00
Tong Dong Qiu 2d270d5613 Update GPU tests 2022-05-04 14:51:32 +02:00
Tor Harald Sandve ea82bebb3a Merge pull request #3909 from totto82/fix_reg_msw 
reset regularize_ before starting the inner iterations
 2022-05-03 13:44:00 +02:00