OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,998 Commits 18 Branches 75 Tags 73 MiB
acc1a5145a
Commit Graph

13998 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arne Morten Kvarving
acc1a5145a bump version to 2023.04-rc2 2023-04-27 13:38:25 +02:00
Arne Morten Kvarving
e892d17f74
Merge pull request #3492 from akva2/backport_PR_3489 
Backport #3489: Python: avoid searching from Development.Embed unless required
 2023-04-27 13:36:30 +02:00
Arne Morten Kvarving
7cd35f4477 fixed: setuptools are no longer required to build the python bindings 
only required if building packages for pypi, which is done separately
from the main buildsystem.
 2023-04-27 13:35:42 +02:00
Arne Morten Kvarving
fb5f40339b changed: only search for Development.Module if not building embedded python 
the embedding headers are not available on the manylinux2014 containers
used to build the pypi packages. since this is anyways more correct
fix it this way
 2023-04-27 13:35:35 +02:00
Arne Morten Kvarving
0f25bb7386
Merge pull request #3491 from akva2/backport_PR_3490 
Backport #3490: changed: build python wheels using skbuild
 2023-04-27 13:31:01 +02:00
Arne Morten Kvarving
4952be6990 changed: build python wheels using skbuild 
the vanilla setup-tools doesn't get the triplet correctly for some
reason. also use cmake from pip as cmake 3.16 in the image has a bug
in the python find rule
 2023-04-27 13:30:23 +02:00
Arne Morten Kvarving
3f3a0c307d
Merge pull request #3486 from akva2/backport_PR_3484 
Backport #3484: fixed: missing serialization of tokens in UDQDefine
 2023-04-26 12:57:13 +02:00
Arne Morten Kvarving
63002dd1a5 fixed: missing serialization of tokens in UDQDefine 
this went unnoticed since there are no UDQDefines in the pre-simulation
Schedule broadcast for parallel. however it causes issues for serialized
restarts
 2023-04-26 12:56:19 +02:00
Arne Morten Kvarving
95f62fbf58
Merge pull request #3483 from akva2/backport_PR_3478 
Backport #3478: Always search for Development component of Python.
 2023-04-24 08:47:30 +02:00
Markus Blatt
f28b6ed05d Always search for Development component of Python. 
It is needed as we will call pybind11_add_module which calls
python3_add_library (in recent pybind11 versions). That
function is only there if the development component is searched for
and found.
 2023-04-24 08:46:38 +02:00
Arne Morten Kvarving
c0616be20e bump version to 2023.04-rc1 2023-04-13 14:30:31 +02:00
Arne Morten Kvarving
19c819074f
Merge pull request #3473 from blattms/fix-grid-indep-well 
Added missing file for grid independent well specification.
 2023-04-13 14:20:17 +02:00
Markus Blatt
8a21a8a23f Added missing file for grid independent well specification. 2023-04-13 12:55:30 +02:00
Bård Skaflestad
93a2f71545
Merge pull request #3463 from GitPaean/open_wellopen_zerorate_nocrossflow_wells 
not forbidding WELOPEN wells with zero rate and disallowing crossflow
 2023-04-13 10:34:41 +02:00
Bård Skaflestad
134a4dbef4
Merge pull request #3459 from blattms/internalize-editnncr 
Internalize EDITNNCR keyword and make it available with the other NNC information.
 2023-04-13 10:33:49 +02:00
Markus Blatt
f0da305684 Use erase just to make reviewer happy. 2023-04-13 08:05:23 +02:00
Markus Blatt
0ca91f5498 Fixed wrong data file comment. 2023-04-12 17:02:07 +02:00
Markus Blatt
87a961246f Updated copyright. 2023-04-12 16:57:33 +02:00
Markus Blatt
f3767d0f24 Added explicit include of algorithm. 2023-04-12 16:57:11 +02:00
Markus Blatt
e16fd02498 Use deque::assign instead of relying on smart compilers. 2023-04-12 16:50:23 +02:00
Markus Blatt
7187d03f0c Use stable_sort to keep reverse insertion order for same cell pairs 2023-04-12 16:49:29 +02:00
Markus Blatt
83e05e7ba3 Effort to make the code documentation better. 2023-04-12 16:48:48 +02:00
Bård Skaflestad
8473d9b8ec
Merge pull request #3469 from GitPaean/reverting_aquct_commit 
checking all the instances of AQUCT and AQUFETP keywords
 2023-04-12 14:26:15 +02:00
Bård Skaflestad
9bf9f65f63
Merge pull request #3466 from blattms/fix-compiler-warnings 
Fix compiler warnings
 2023-04-12 14:03:20 +02:00
Kai Bao
32e4384109 checking all the instances of AQUCT and AQUFETP keywords 
with master branch, only the last instance will be caught for these two
keywords.
 2023-04-12 13:37:18 +02:00
Bård Skaflestad
b9c1b39a61
Merge pull request #3468 from GitPaean/reverting_aquct_commit 
Revert "only using the AQUCT and AQUFETP in SOLUTION section"
 2023-04-12 13:24:34 +02:00
Kai Bao
0eea937f3f Revert "only using the AQUCT and AQUFETP in SOLUTION section" 
This reverts commit a89136f1f2.
 2023-04-12 12:39:24 +02:00
Markus Blatt
1bb2cbd646 Addressed review comments. 2023-04-12 12:26:39 +02:00
Markus Blatt
9f6122938d Keep all NNCs when processing EDITNNCR. 
Those might still be needed to correctly construct the connections
between cells in the grid. Skipping them will produce wrong grids.
 2023-04-12 10:22:35 +02:00
Markus Blatt
1ff9100bdc Fixed NNCTests. 2023-04-12 10:22:35 +02:00
Markus Blatt
5a19bcc4d0 Remove NNC entries that correcpond to EDITNNCR 
No need to keep those as they will be overwritten anyway.
 2023-04-12 10:22:35 +02:00
Markus Blatt
55a0078b3e Simplify code by keeping track of insertion order of EDITNNCR imlicitly. 
std::unique will keep the first occurrence and std::sort will keep
the order of equal elements. Hence we use a deque with the EDITNNCR
entries in reverse order (last one specified comes first). The we sort
this and make unique it unique.
 2023-04-12 10:22:34 +02:00
Markus Blatt
f2ffebc814 Internalize EDITNNCR and make it available with the NNC information. 
If there is an EDITNNCR entry and a NNC entry for the same cell pair
then the EDITNNCR entry is not be represented inernally but we simply
overwrite the transmissibility of the corresponding NNC entry.

If there is an EDITNNC entry and an EDITNNCR entry for the same cell
pair then the EDITNNC entry is removed while internalizing EDITNNCR.

Order matters for EDITNNCR entries in the sense that later specified
values will overwrite previous entries when we internalize.

Note that similar to EDITNNC only the first 7 options are represented
and the rest is ignored by OPM flow.

Note that EDITNNCR entries for neighboring cells are ignored (like for
EDITNNC).
 2023-04-12 10:22:34 +02:00
Markus Blatt
fb3c2ab5a1 Removed unimplemented declaration of NNC::update_nnc. 2023-04-12 10:22:34 +02:00
Markus Blatt
c24aeceb96 Fixed EDITNNCR specification. 
Item 7 is of dimension transmissibility.
Also added item numbers to all and comments about being unused where
it seemed appropriate.
 2023-04-12 10:22:34 +02:00
Arne Morten Kvarving
dcd5ecf0d1
Merge pull request #3414 from akva2/require_dune_2.7 
minimum dune version required is now 2.7
 2023-04-12 09:19:14 +02:00
Markus Blatt
888f3644f7 Fixed warning about muliline comment. 2023-04-11 17:42:17 +02:00
Markus Blatt
adc11caf99 Fixes warning about set but unused variable. 2023-04-11 17:42:17 +02:00
Markus Blatt
db1c823cbb Fixes warnings about initialization order. 2023-04-11 17:42:17 +02:00
Markus Blatt
580bb30f8e Fixes shadowed variable warning. 2023-04-11 17:35:13 +02:00
Markus Blatt
24d25f7be7
Merge pull request #3384 from plgbrts/well-traj 
Grid independent well specification
 2023-04-10 07:40:08 +02:00
Paul Egberts
694bb016a7 Two more small fixes 2023-04-05 15:58:17 +02:00
Kai Bao
9fdcfa3751 not forbidding WELOPEN wells with zero rate and disallowing crossflow 
other keywords might change the control to make it openable.
 2023-04-04 22:19:52 +02:00
Paul Egberts
e781a99ce4 update of license to only gplv3 2023-04-04 22:02:18 +02:00
Paul Egberts
a6d39275c7 code improvements following suggestions of Markus 2023-04-04 21:49:03 +02:00
Markus Blatt
df4c92a8d7
Merge pull request #3461 from blattms/MINPVFIL 
Minpvfi
 2023-04-03 17:45:46 +02:00
Markus Blatt
9d995a40e3 Fix ConstructorMINPV. 
Exception is now already thrown in createMinpvDefaultCPDeck.
 2023-04-03 17:41:22 +02:00
OPMUSER
699f7ad695 Update ConstructorMINPV Test 
Update ConstructorMINPV Test for MINPV/MINPORV
 2023-04-03 16:37:33 +02:00
OPMUSER
f99e7dbc29 Update keyword_list.cmake 
Remove MINPVFIL from keyword_list.cmake.
 2023-04-03 16:37:33 +02:00
OPMUSER
1fac541b6e Remove MINPVFIL - WIP 
MINPVFIL is an OPM Flow specific keyword that is not used by the simulator,  and thus it should be deleted.

Previously, we moved the checks that only allow either the MINPV or MINPORV keywords to be used in the input deck to the JSON keyword files.  This was done to avoid confusion over which global limits are being applied.

Note that if the MINPVV keyword is also in the input deck then these limits are applied post processing the global limits defined by the MINPV/MINPORV keywords. This behavior is unchanged by this PR.

The PR is marked as WIP to give developers time to object for the removal of MINPVFIL keyword.
 2023-04-03 16:37:33 +02:00