Commit Graph

11000 Commits

Author SHA1 Message Date
Bård Skaflestad
75ee817fed Add Means of Pruning Deactivated Aquifer Connections
This commit adds operation pruneDeactivatedAquiferConnections at
the EclipseState and AquiferConfig levels.  This is intended as a
stop-gap solution to a sequencing problem that arises from MINPV
processing.  In general we must not form connections to analytic
aquifers until the set of active grid cells is fully established.

Pruning cells that become deactivated as part of MINPV handling
nevertheless covers the common case of connection boxes applying
only to the outer shell.  Solving the problem in general will
however require delaying forming the analytic aquifer connections
until after the active cells are fully known.
2021-10-07 12:31:08 +02:00
Arne Morten Kvarving
0c7dc81814
Merge pull request #2740 from akva2/janitoring
anonymize parameter to quell compiler warning
2021-10-07 12:27:18 +02:00
Feda Curic
c2e8eabc2f Use built in FindBoost 2021-10-07 12:11:54 +02:00
Arne Morten Kvarving
c240581785 anonymize parameter to quell compiler warning 2021-10-07 11:10:29 +02:00
Joakim Hove
d2b221da64
Merge pull request #2736 from joakim-hove/welltest-state-wells-size
WellTestState: will only count actually closed wells
2021-10-07 09:27:34 +02:00
Joakim Hove
d78cdfbe7f WellTestState: will only count actually closed wells 2021-10-06 17:51:15 +02:00
Joakim Hove
d4baf44e1b
Merge pull request #2727 from joakim-hove/netbalan-units
Handle NETBALAN keyword in Schedule section
2021-10-06 08:00:38 +02:00
Joakim Hove
d05f152100
Merge pull request #2722 from joakim-hove/add-wtest-state-argument
2: Add WellTestState argument to IO routines
2021-10-05 07:31:31 +02:00
Joakim Hove
75d05312b7 Add WellTestState argument to IO routines 2021-10-04 20:42:39 +02:00
Joakim Hove
2e6daf088b
Merge pull request #2724 from joakim-hove/wtest-state-serialize
1: Wtest state serialize
2021-10-04 20:40:41 +02:00
Joakim Hove
e1b9602a25 Handle NETBALAN keyword in Schedule 2021-10-04 13:43:19 +02:00
Joakim Hove
0074364560
Merge pull request #2729 from joakim-hove/netbalan-commits
Netbalan commits
2021-10-04 13:42:58 +02:00
Joakim Hove
72ba5b8d36
Merge pull request #2728 from joakim-hove/cmp-network
Add network member to ScheduleState::operator==()
2021-10-04 13:11:24 +02:00
Joakim Hove
c6dc9277c5 Add units to JSON specification for NETBALAN keyword 2021-10-04 12:27:03 +02:00
Joakim Hove
a1f924baec Fix typo in json file 2021-10-04 12:27:03 +02:00
Joakim Hove
0e0c72edd5 Remove stale comments 2021-10-04 12:27:03 +02:00
Joakim Hove
4aea8cd584 Add network member to ScheduleState::operator==() 2021-10-04 12:23:42 +02:00
Joakim Hove
3ca639e2dd Add serialization support for WellTestState 2021-10-01 14:14:05 +02:00
Joakim Hove
bffa3a3768 Extracted buffer test class to separate compilation unit for reuse 2021-10-01 14:14:05 +02:00
Joakim Hove
cd1c40dbcb
Merge pull request #2726 from totto82/fixUnitWECON
fix unit item 5 and item 6 WECON
2021-10-01 14:08:50 +02:00
Tor Harald Sandve
fad9305cdc fix unit item 5 and item 6 WECON 2021-10-01 12:55:43 +02:00
Joakim Hove
27ec5e0ea5
Merge pull request #2725 from joakim-hove/strip-actionx-cond-quotes
Strip the quotes when creating Actionx::Condition instance
2021-10-01 11:09:25 +02:00
Joakim Hove
21c53158ad Strip the quotes when creating Actionx::Condition instance 2021-09-30 17:17:50 +02:00
Joakim Hove
bd4386c79b
Merge pull request #2723 from totto82/openComp
add method that open all completions
2021-09-30 16:43:29 +02:00
Tor Harald Sandve
cc24920ff9 add method that open all completions 2021-09-30 11:46:19 +02:00
Joakim Hove
9a2a4036de
Merge pull request #2720 from joakim-hove/wtest-overwrite
WTEST - consecutive keywords overwrite instead of updating
2021-09-30 10:31:23 +02:00
Bård Skaflestad
05bac5f59a
Merge pull request #2719 from OPMUSER/master
Add WTEST to Allowed ACTIONX Keywords
2021-09-29 18:41:28 +02:00
Bård Skaflestad
53dcb5c8a0
Merge pull request #2721 from blattms/fix-fs-proximare-gcc7
Fix compilation with g++-7 lacking fs::proximate
2021-09-29 18:40:00 +02:00
Bård Skaflestad
7ecbf4725a
Merge pull request #2714 from jalvestad/rstfieldctrl-r
Improve Eclipse-compatible restart file. Output correct Guiderate control and FIELD level control
2021-09-29 17:07:08 +02:00
Markus Blatt
49bfad1779 Fix compilation with g++-7 lacking fs::proximate
Use Opm::prximate instead of fs::proximate. Fixes
compilation issue like
```
opm-common/src/opm/parser/eclipse/Deck/FileDeck.cpp: In member function ‘void Opm::FileDeck::dump_shared(std::ostream&, const string&) const’:
opm-common/src/opm/parser/eclipse/Deck/FileDeck.cpp:331:44: error: ‘proximate’ is not a member of ‘fs’
             std::string include_file = fs::proximate(block.fname, output_dir);
```
2021-09-29 16:36:03 +02:00
Joakim Hove
05c6fb3cbd WTEST - consecutive keywords overwrite instead of updating 2021-09-29 14:00:04 +02:00
OPMUSER
491275cfc7 Update SummaryConfigTests.cpp 2021-09-29 19:57:24 +08:00
OPMUSER
7d0bf1adde Remove FSIP from ALL keyword Vector List
FSIP (Field Salt In-Place) is not part of the SUMMARY ALL keyword vector list.
2021-09-29 19:08:06 +08:00
OPMUSER
97dd24c7ee Add WTEST to Allowed ACTIONX Keywords
Add WTEST to allowed ACTIONX Keywords
2021-09-29 18:54:03 +08:00
Joakim Hove
3369785c7d
Merge pull request #2715 from bska/restore-bhp-hist-limit
Set Appropriate Restart BHP Limit for History Wells
2021-09-28 21:52:43 +02:00
Bård Skaflestad
b97819a121 Set Appropriate Restart BHP Limit for History Wells
Without this we would end up with very wrong BHP limits for this
case--e.g., upper BHP limit of 1 ATM for injectors--and this would
obviously mean that restarted runs do not converge.
2021-09-28 12:01:59 +02:00
Bård Skaflestad
88b6cebb19 Fix Spelling 2021-09-28 12:01:59 +02:00
Joakim Hove
1db095c69b
Merge pull request #2717 from OPMUSER/master
Add WECON to Allowed ACTIONX Keywords
2021-09-28 11:57:26 +02:00
Bård Skaflestad
3c23f90cfe
Merge pull request #2711 from totto82/wtest_ref
return unique vector of names and not a map with wells and reason
2021-09-28 11:30:36 +02:00
OPMUSER
a0b6e7533b Add WECON to Allowed ACTIONX Keywords 2021-09-28 16:18:35 +08:00
Tor Harald Sandve
cb6db86afe return unique vector of names and not a map with wells and reason 2021-09-28 10:07:45 +02:00
Joakim Hove
caacf4e047
Merge pull request #2716 from joakim-hove/fix-udqstate-serialize-object
Fix serializeObject in UDQState
2021-09-28 09:54:02 +02:00
Joakim Hove
2edfbc42e1 Fix serializeObject in UDQState 2021-09-28 09:01:06 +02:00
Joakim Hove
b39e32a221
Merge pull request #2712 from joakim-hove/serialize-action-state
Serialize Action::State
2021-09-27 13:47:22 +02:00
Jostein Alvestad
77b86dfd3b final changes for corretions to IGRP[nwgmax+WInjActiveCMode] and IGRP[nwgmax+GConInjeWInjCMode] plus similar gas inj 2021-09-27 12:24:34 +02:00
Jostein Alvestad
b97931ddd5 first changes to improve guiderate output to restart file - enums mapping 2021-09-27 12:24:32 +02:00
Arne Morten Kvarving
94d15ca921
Merge pull request #2713 from akva2/fix_rh_rst_deck
fix redhat packaging
2021-09-27 08:14:54 +02:00
Arne Morten Kvarving
e8a8688a48 fix redhat packaging
due to new man page
2021-09-27 08:14:26 +02:00
Joakim Hove
f05fbe281a Add serializer support for UDQState 2021-09-25 11:51:34 +02:00
Joakim Hove
cb5eef07a6 Serialize Action::State 2021-09-25 08:29:27 +02:00