Atgeirr Flø Rasmussen
dc0ccc010a
Merge pull request #607 from joakim-hove/errguard-dump-format
...
Format the ErrorGuard::dump() nicer
2019-01-14 09:20:00 +01:00
Joakim Hove
aa63d772d7
Merge pull request #593 from GitPaean/fixing_history_mode_part_2
...
fixing the BHP limit for the history matching wells
2019-01-11 18:04:45 +01:00
Joakim Hove
91afb0b656
Format the ErrorGuard::dump() nicer
2019-01-11 18:00:17 +01:00
Kai Bao
666cc9210b
fxing some reviewing comments.
2019-01-11 14:27:49 +01:00
Jostein Alvestad
bdd82445d2
changed name of function for calculation of potential rates
2019-01-11 09:56:41 +01:00
Jostein Alvestad
bf9a142b6d
Added corrections to tests/parser/SummaryConfigTests.cpp for list of ALL summary vectors
...
Removed comments from Summary.cpp
2019-01-11 09:56:39 +01:00
Jostein Alvestad
9bbacfe710
Final changes to add unit tests for the well, group and field production / injection potential rates
2019-01-11 09:56:38 +01:00
Jostein Alvestad
982b221753
Initial changes to add unit tests for well potential rates
2019-01-11 09:56:36 +01:00
Jostein Alvestad
a4d0bb685b
Additional changes to accomodate for loop over several wells beloning to
...
either a group or the field in generation of the group or field production or
injection potential rates
2019-01-11 09:56:35 +01:00
Jostein Alvestad
3429db8fc1
Initial changes to allow for writing group and field production / injection potential rates to
...
the summary file
2019-01-11 09:56:33 +01:00
Joakim Hove
fc0e61518b
Merge pull request #566 from joakim-hove/capture-wells
...
Add functionality to capture matching wells when evaluating ACTIONX
2019-01-09 18:05:56 +01:00
Andreas Lauser
b7eefe8b18
jenkins: allow modules to specify a pre-build check
...
this is purely optional. opm-material will use this to make sure that
auto-generated code does not get manually modified.
2019-01-09 15:09:12 +01:00
Joakim Hove
0d5b3a5285
Merge pull request #604 from atgeirr/silence-warnings
...
Silence various warnings discovered with new version of clang.
2019-01-09 07:51:42 +01:00
Joakim Hove
3eef43b904
Merge pull request #589 from totto82/sort_multregt
...
Make the ordering of MULTREGT arbitary
2019-01-08 21:55:44 +01:00
Atgeirr Flø Rasmussen
db90ecd88c
Silence various warnings discovered with new version of clang.
2019-01-08 14:51:20 +01:00
Tor Harald Sandve
68769e5b1d
Make the ordering of MULTREGT arbitary
...
With this fix
MULTREGT
1 2 1 /
2 1 2 /
/
will multiply transmissibilities between region 1 and 2 with 2.
2019-01-08 08:35:15 +01:00
Joakim Hove
85949d44ac
Merge pull request #602 from joakim-hove/error-list
...
Add small class ErrorGuard to store errors from parsing
2019-01-08 07:46:57 +01:00
Joakim Hove
690e00a079
Merge pull request #601 from joakim-hove/summary-state-wells
...
Add method wells() to the SummaryState class
2019-01-08 07:44:56 +01:00
Joakim Hove
cf42146d84
Add error mode DELAYED_EXIT1 to collect all errors
2019-01-07 12:38:05 +01:00
Joakim Hove
23cbe9035b
Add separate - non BOOST - test program to test exit(1)
2019-01-04 16:52:10 +01:00
Joakim Hove
2cd6fa2f49
Add overloads without ParseContext and ErrorGuard - update all tests
2019-01-04 13:59:28 +01:00
Kai Bao
1b1f7b807d
re-organizing the handleWCONINH from Schedule
2019-01-03 13:26:29 +01:00
Joakim Hove
bf52e6d123
Added ErrorGuard& arguments to library
2019-01-03 13:14:40 +01:00
Kai Bao
c6bbe5d24b
re-organizing the history() for WellProductionProperties
2019-01-03 12:21:25 +01:00
Joakim Hove
ad001df804
Add small class ErrorGuard to manage errors from parsing
2019-01-03 11:54:48 +01:00
Joakim Hove
69e921b33a
Merge pull request #603 from joakim-hove/rm-parsecontext
...
Rm parsecontext
2019-01-03 11:54:37 +01:00
Kai Bao
875626b738
handling the transition between injector and producer
2019-01-03 09:47:11 +01:00
Kai Bao
7e05d51e6f
handle the WELTARG with WCONINJH
2019-01-03 09:47:11 +01:00
Kai Bao
0dc80689c0
assigning BHP limit for WCONHIST and WCONINJH keywords
2019-01-03 09:47:11 +01:00
Joakim Hove
ae8b81c7ae
Changed EclipseState constructor to use const ParseContext&
2019-01-02 18:52:54 +01:00
Joakim Hove
ba0675997a
Remove unused ParseContext member in EclipseState
2019-01-02 18:52:54 +01:00
Joakim Hove
15c473e3bb
Implement support for well capture when evaluating ACTIONX
2019-01-02 14:03:25 +01:00
Joakim Hove
6465b5b23c
Add small class ActionValue to hold action eval result
2019-01-02 14:03:25 +01:00
Joakim Hove
9e93dc5af2
Add method wells() to ActionContext class
2019-01-02 11:30:56 +01:00
Joakim Hove
481123ed25
Add method wells() to the SummaryState class
2019-01-02 11:22:07 +01:00
Joakim Hove
4968c35ad8
Add method wells() to the SummaryState class
2019-01-02 11:13:49 +01:00
Joakim Hove
f6136e69fe
Merge pull request #599 from joakim-hove/parsecontext-RPT
...
Fix mismerge of broken formatting
2018-12-20 18:19:55 +01:00
Joakim Hove
6832788eef
Fix mismerge of broken formatting
2018-12-20 16:40:03 +01:00
Joakim Hove
4c0776e3d2
Merge pull request #598 from joakim-hove/parsecontext-RPT
...
Parsecontext rpt
2018-12-20 15:21:09 +01:00
Joakim Hove
00d1607347
Add error modes RPT_MIXED_STYLE and RPT_UNKNOWN_MNEONIC
2018-12-20 13:47:31 +01:00
Atgeirr Flø Rasmussen
142c0a12c3
Merge pull request #597 from atgeirr/workaround-liq
...
Workaround: LIQ preferred phase treated as OIL.
2018-12-20 13:25:59 +01:00
Joakim Hove
25fbff2632
Add ParseContext argument to the RPTxxx parsing
2018-12-20 12:27:49 +01:00
Atgeirr Flø Rasmussen
1833ee2c43
Workaround: LIQ preferred phase treated as OIL.
2018-12-20 12:10:14 +01:00
Atgeirr Flø Rasmussen
f5851bcb92
Merge pull request #596 from blattms/fix-pr-578
...
[bugfix] Fix influence of logging on return of getWriteRestartFile
2018-12-20 00:21:39 +01:00
Markus Blatt
5632fc6662
[bugfix] Fix influence of logging on return of getWriteRestartFile
...
In PR #578 a bool was introduced that should determine whether we log warnings
during RestartConfig::getWriteRestartFile. Unfortunately, it introduced a bug that
made a false value of log return false from the function. This is fixed by this commit.
2018-12-19 23:05:17 +01:00
Joakim Hove
8375516c82
Merge pull request #595 from joakim-hove/region2region
...
Region2region
2018-12-19 15:40:52 +01:00
Joakim Hove
bf6732559f
Add ParseContext error mode SUMMARY_UNHANDLED_KEWORD
2018-12-19 10:09:02 +01:00
Joakim Hove
3b951985ec
Initial support for region 2 region keywords
2018-12-19 10:01:38 +01:00
Joakim Hove
9c98b5ceb4
Merge pull request #590 from joakim-hove/rptrst-bug
...
Handle space in the 'BASIC = ?' RPT mnemonics
2018-12-18 14:00:28 +01:00
Joakim Hove
161f555bc0
Handle space in the 'BASIC = ?' RPT mnemonics
2018-12-18 08:48:59 +01:00