Commit Graph

14616 Commits

Author SHA1 Message Date
Cintia Goncalves Machado
98d5450ca1
Fix FOE definition 2022-06-13 15:34:19 +02:00
Atgeirr Flø Rasmussen
2992ec25d8 Address issues raised in review. 2022-06-10 15:59:45 +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
Atgeirr Flø Rasmussen
7fe3839500 Use MatrixBlock consistently, also whitespace cleanup. 2022-06-10 11:08:24 +02:00
Atgeirr Flø Rasmussen
16b1756339 Add necessary include statements. 2022-06-09 10:38:47 +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
hnil
98acda0977 - change FieldMatrix to MatrixBlock in Tracer model to not need extra initializations in linear solver 2022-06-08 17:03:27 +02:00
Atgeirr Flø Rasmussen
a0f16089f7 Re-add explicit instantiation of FlexibleSolver to reduce compile time. 2022-06-08 17:03:27 +02:00
Atgeirr Flø Rasmussen
6c5988f011 Instantiate test program with MatrixBlock not FieldMatrix.
Cuts down on the necessary instantiation combinations for FlexibleSolver.
2022-06-08 17:03:27 +02:00
hnil
06a8b0ee3d fixed bug after changing duneD to invDuneD 2022-06-08 17:03:27 +02:00
hnil
4ead854b69 - taking pullrequest information into account
- Moving transfere level to be template of OwningTwolevelPrecontitioner
2022-06-08 17:03:27 +02:00
hnil
8f4cf8a952 removed compiler warnings 2022-06-08 17:03:27 +02:00
hnil
66c4a8c862 made resue interval separate paramter 2022-06-08 17:03:27 +02:00
hnil
3bed1ebbdb fixed bug in default options for cprw 2022-06-08 17:03:27 +02:00
hnil
541edeaf67 - add default for CPRW
- cleanded code
2022-06-08 17:03:27 +02:00
hnil
8a757a4935 removed comments 2022-06-08 17:03:27 +02:00
hnil
6c407506a9 cleaning code 2022-06-08 17:03:27 +02:00
hnil
5a917dd11e changed diagonal elements for cprw on multiscale wells 2022-06-08 17:03:27 +02:00
hnil
a8acd40f4a Changes to make ms wells work with cprw 2022-06-08 17:03:27 +02:00
hnil
141a816e5d new restart options 2022-06-08 17:03:25 +02:00
hnil
12fba38d99 Added maximum sparsity pattern which made full reuse possible. May degrade som of the performance fore not full reuse(not tested). 2022-06-08 17:02:02 +02:00
hnil
aba1d5047d working with no resue on norne 2022-06-08 17:02:02 +02:00
hnil
c697e70a69 changed definition of extra equations. made norne go to step 27. HACK 2022-06-08 17:02:02 +02:00
hnil
4975d5d9e7 - fixed extended communicator
- fixed scaling of well cpr
2022-06-08 17:02:02 +02:00
hnil
da572d1f60 -Fixed buges related to cpr with wells.
- change interfaces to have access to pressureVarIndex
- added option in cmake files to propagate checking in dune-istl
2022-06-08 17:02:02 +02:00
Atgeirr Flø Rasmussen
fef06a77af Updated for upstream changes. 2022-06-08 17:02:02 +02:00
hnil
f3acfcde0b Adding functions for pressure system manipulation to well models.
Also add well-aware operator and transfer policy.
This will be used for CPR with custom operators.
2022-06-08 17:01:33 +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
1f876d1800 implement rsrv item 10 WCONINJE
MSW not supported yet
2022-06-08 13:55:29 +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