Commit Graph

14249 Commits

Author SHA1 Message Date
Tor Harald Sandve
eef455106d regularize equation for std wells 2022-06-29 12:47:44 +02:00
Bård Skaflestad
5b2d1ca5ec
Merge pull request #3959 from blattms/warn-long-fault
Warn about fault names with more than 8 characters
2022-06-28 10:29:36 +02:00
Bård Skaflestad
28f08e5e68
Merge pull request #3961 from akva2/use_pragma_suppress_diagnostic
changed: use gcc pragma's to suppress strict-aliasing warning
2022-06-27 16:19:11 +02:00
Bård Skaflestad
c438a135f3
Merge pull request #3960 from akva2/janitoring
Some janitoring
2022-06-27 16:06:36 +02:00
Arne Morten Kvarving
c5fcbb8f3d changed: use gcc pragma's to suppress strict-aliasing warning
we don't care
2022-06-27 14:55:30 +02:00
Arne Morten Kvarving
133856b943 changed: avoid lambda capture
clang warns it's not necessary to use a capture for this.
i opted to make it constexpr and avoid the capture with gcc as well.
2022-06-27 14:47:56 +02:00
Arne Morten Kvarving
9751b78992 fixed: add virtual dtor to class with virtual members 2022-06-27 14:47:44 +02:00
Arne Morten Kvarving
1794934f0d anonymize unused parameters 2022-06-27 14:47:44 +02:00
Markus Blatt
6aea0fab37 Added instantiations of OrderedMap with truncated keys for parallel. 2022-06-27 13:09:09 +02:00
Markus Blatt
ebb8fc7aae Warn about about long fault -name 2022-06-27 13:09:08 +02:00
Markus Blatt
e14823c6d8
Merge pull request #3941 from akva2/remove_int_sim_config
Remove support for internal simulator configuration
2022-06-27 11:05:18 +02:00
Markus Blatt
25a92c2c2c
Merge pull request #3958 from Tongdongq/fix-gpu-well-apply
Fix stdwell apply on GPU
2022-06-24 16:02:34 +02:00
Arne Morten Kvarving
32eb467ead fix tests that relied on internal deck handling 2022-06-24 15:27:56 +02:00
Arne Morten Kvarving
a4d254b749 changed: introduce EclGenericVanguard::setParams
this is used transferring ownership of setup structures to the
simulator. drop all the flowEbosXXX set deck methods and use the
generic vanguard. also means various structs that were only passed
in the blackoil simulator are now passed in all simulators.
2022-06-24 15:06:13 +02:00
Arne Morten Kvarving
36ffb65525 remove parsecontext in generic vanguard
not used
2022-06-24 15:06:13 +02:00
Arne Morten Kvarving
4087fbff5b remove errorguard in generic vanguard
not used
2022-06-24 15:06:13 +02:00
Arne Morten Kvarving
00c374be5c changed: remove support for internal summaryconfig handling in simulators 2022-06-24 15:06:13 +02:00
Arne Morten Kvarving
4510f40b6d changed: remove support for internal schedule handling in simulators 2022-06-24 15:06:13 +02:00
Arne Morten Kvarving
1a35c5ac47 changed: remove support for internal eclstate handling in simulators 2022-06-24 15:06:13 +02:00
Arne Morten Kvarving
371c8058bc changed: remove support for internal deck handling in simulators 2022-06-24 15:06:13 +02:00
Arne Morten Kvarving
c793aff5d1 changed: rename externalSetupTime
external is (or will be) implied
2022-06-24 15:06:13 +02:00
Tong Dong Qiu
1f1fa10927 Fix stdwell apply on GPU 2022-06-24 13:48:59 +02:00
Markus Blatt
f3bf15ab2f
Merge pull request #3946 from Tongdongq/fix-gpu-verbose-timing
Fix: verbose timing for openclSolver
2022-06-22 16:13:57 +02:00
Arne Morten Kvarving
3a6abf7f5c
Merge pull request #3949 from akva2/fix_build_dune2.6
fixed: fix build with dune 2.6
2022-06-20 14:51:20 +02:00
Arne Morten Kvarving
da57e15271 fixed: fix build with dune 2.6 2022-06-20 14:16:43 +02:00
Tong Dong Qiu
4384872f8e Only use timers when printing their results,
and actually wait for kernels to finish when timing GPU
2022-06-17 16:02:56 +02:00
Atgeirr Flø Rasmussen
ffb09ee53e
Merge pull request #3937 from atgeirr/pressure-bhp-cpr
Pressure bhp cpr
2022-06-16 17:15:49 +02:00
Atgeirr Flø Rasmussen
c871e603f8 Do not insert unused options. 2022-06-16 16:24:41 +02:00
Atgeirr Flø Rasmussen
e8e915b9eb Use stricter CNV tolerance for test.
This makes the serial and parallel runs closer to each other.
2022-06-16 12:24:22 +02:00
Atgeirr Flø Rasmussen
66ff942b2f Move MatrixBlock specializations inside namespace.
This is necessary since the calls are ns-qualified in the
matrix market code.
2022-06-16 11:37:40 +02:00
Tor Harald Sandve
60d0fe0f87
Merge pull request #3879 from totto82/rsrvinj2
WIP implement rsrv item 10 WCONINJE
2022-06-16 08:30:31 +02:00
Bård Skaflestad
7512c0c247
Merge pull request #3906 from totto82/regMSW100
change default reg factor for MSW to 100
2022-06-13 20:15:33 +02:00
Bård Skaflestad
5df6af0eab
Merge pull request #3939 from goncalvesmachadoc/patch-6
Fix FOE definition
2022-06-13 20:14:39 +02:00
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