Commit Graph

7393 Commits

Author SHA1 Message Date
Joakim Hove
691296f91a Remove old 3D property implementation 2020-01-19 23:04:46 +01:00
Bård Skaflestad
1132857324
Merge pull request #1407 from akva2/noecl_flush_schedule
More serialization effort
2020-01-17 15:35:51 +01:00
Arne Morten Kvarving
6986436073 make TimeStampUTC constructible from variables
also add accessor
2020-01-17 10:08:50 +01:00
Arne Morten Kvarving
df5baad233 fixed: return by const ref 2020-01-17 10:08:50 +01:00
Arne Morten Kvarving
13db196c5c fixed: missing CTFKind parameter in Connection 2020-01-17 10:08:50 +01:00
Arne Morten Kvarving
c4936d55e1 fixed: update UDAValue constructors for new dim member 2020-01-17 10:08:50 +01:00
Arne Morten Kvarving
7ac2febae2 changed: allow disabling sanity check in Dimension constructor
while this makes sense to do in general, it causes issues
when reconstructing after deserialization.
we have dimensions with '/' and '*' in the name that was
constructed through newComposite.
2020-01-17 10:08:50 +01:00
Arne Morten Kvarving
828cd2ee9a fixed: add missing initializer 2020-01-17 10:08:50 +01:00
Bård Skaflestad
33fdacea54
Merge pull request #1415 from berland/wconhist-fix
Clean up item names in json for WCONHIST
2020-01-16 16:56:50 +01:00
Bård Skaflestad
7fb66a589e
Merge pull request #1416 from akva2/janitoring
quell signed/unsigned comparison warnings
2020-01-16 15:48:25 +01:00
Arne Morten Kvarving
2951bf01d4 quell signed/unsigned comparison warnings 2020-01-16 14:54:48 +01:00
Håvard Berland
81701b72ba Clean up item names in json for WCONHIST
Consistency with other keywords
Change corresponding code that reads this.
2020-01-16 13:45:02 +01:00
Bård Skaflestad
a8d05385e6
Merge pull request #1387 from bska/dont-output-rft-unless-requested
Don't Output RFT Files Unless Specifically Requested
2020-01-15 12:45:40 +01:00
Bård Skaflestad
8440ac3bd1 Don't Output RFT Files Unless Specifically Requested
This commit ensures that we do not create RFT output files unless
the simulation model specifically requests such output (e.g.,
through keywords WRFT or WRFTPLT).  Notably, the OutputStream::RFT
constructor will also create the file so we must take care not to
form an object of this type unless actually needed.
2020-01-15 09:33:21 +01:00
Bård Skaflestad
3d94dc7e63
Merge pull request #1411 from joakim-hove/rst-connectin
Simple POD class for connection info loaded from restart file
2020-01-15 00:48:20 +01:00
Joakim Hove
66fd1d39e9 Small POD class for connections loaded from restart file 2020-01-14 23:04:57 +01:00
Joakim Hove
75b64025a3
Merge pull request #1412 from bska/first-rft-output-event
Rework RFT Config to Handle More Cases
2020-01-14 17:39:57 +01:00
Bård Skaflestad
8f182db27a Rework RFT Config to Handle More Cases
Generally, this commit captures more of the surrounding context of
calls to the updateRFT() and updatePLT() member functions.  We need
this additional context in order to handle the conflicting semantics
of output requests WRFT and WRFTPLT:FOPN.  The former generates RFT
output when the well opens if this event does not happen earlier in
the simulation schedule than the output request.  Otherwise no RFT
data is emitted.  The latter outputs RFT data at request time if
well opens no later than the request; otherwise at well-open time.

To this end, switch the well_open_rft_name data member from an
unordered_set of well names into an unordered_map from well names to
RFT output request times.  With this additional information we can
use well_open_rft_time to infer the appropriate response to whether
or not to activate RFT output at well open time.  Moreover, we now
guarantee that no RFT output is ever activated before the first RFT
output request.

Switching the type of the well_open_rft_name data member also begets
an API update to the serialization related RFTConfig constructor and
to the return type of RFTConfig::wellOpenRftName().

We furthermore switch to caching the first RFT output event in a new
scalar data member, first_rft_event.  This caching, coupled with the
additional calling context mentioned earlier, means we are now able
to report a high-fidelity, constant time answer to the

    RFTConfig::firstRFTOutput()

request.  This, in turn, is very useful for the RFT output code.
Finally, we also add a couple of new, private member functions to
simplify updating first_rft_event depending on context.

As part of this update, member function

    RFTConfig::setWellOpenRFT(report_step)

will now use the minimum of all 'report_step' values to support the
WRFT keyword being specified more than once.

Finally, add a set of unit tests to exercise the various RFT output
request combinations.

While here, also switch to using unordered_map::find() and emplace()
where possible to limit repeated look-up of the same keys.
2020-01-14 15:58:34 +01:00
Joakim Hove
ecb5fce19b
Only active cells (#1298)
Use FieldProps implementation for 3D properties
2020-01-13 15:46:06 +01:00
Joakim Hove
13b3d1e17b
Merge pull request #1395 from joakim-hove/use-pyaction
Use pyaction
2020-01-13 15:16:24 +01:00
Joakim Hove
a6ddce5d92 Add basic Python exec of PYACTION 2020-01-13 15:15:21 +01:00
Arne Morten Kvarving
e2719f02b6
Merge pull request #1409 from akva2/fix_python_superbuild
fixed: use PROJECT_XXX instead of CMAKE_XXX
2020-01-13 15:08:54 +01:00
Arne Morten Kvarving
8cf1497ccb fixed: use PROJECT_XXX instead of CMAKE_XXX
make it work fine with the 'super-build' CMakeLists.txt
2020-01-13 13:38:47 +01:00
Joakim Hove
b9c3df5f42 Add has_xxx and __contains__ to Python SummaryState 2020-01-13 11:43:58 +01:00
Joakim Hove
9ae007ddc9
Merge pull request #1405 from joakim-hove/well-warning
Add default: clause in switch
2020-01-13 11:42:23 +01:00
Joakim Hove
8bda586eee
Merge pull request #1406 from atgeirr/silence-warnings
Silence some warnings.
2020-01-13 11:42:09 +01:00
Atgeirr Flø Rasmussen
b3f8209542 Silence some warnings. 2020-01-13 10:07:33 +01:00
Joakim Hove
83966eb565 Add default: clause in switch 2020-01-13 08:41:21 +01:00
Joakim Hove
1985f094a3
Merge pull request #1394 from joakim-hove/schedule-update-well
Schedule update well
2020-01-11 17:03:56 +01:00
Bård Skaflestad
17815f7487
Merge pull request #1400 from joakim-hove/rst-header
Rst header
2020-01-11 09:17:33 +01:00
Joakim Hove
7d1d08d4a8
Merge pull request #1399 from joakim-hove/py-code-records
Py code records
2020-01-11 06:57:45 +01:00
Joakim Hove
35619721a3 Well::updateStatus can optionally update status of connections 2020-01-11 06:55:22 +01:00
Joakim Hove
67f95e8548 Add Schedule::xxx_well() for well status manipulations from Python 2020-01-11 06:54:25 +01:00
Joakim Hove
5fb03ec44f Make POD class RestartIO::Header which internalizes restart header 2020-01-11 06:54:01 +01:00
Joakim Hove
16f0869bc0 Expose more indices in the INTEHEAD vector publicly 2020-01-11 06:54:01 +01:00
Joakim Hove
aa9bab75d9
Merge pull request #1391 from totto82/trinemykk-smartwater
Rebased brine module
2020-01-11 06:50:29 +01:00
Joakim Hove
0f29249478
Merge pull request #1402 from bska/record-all-wellopen-events
Schedule: Record RFT Well Open Events on Status Changes
2020-01-10 19:57:39 +01:00
Bård Skaflestad
33ef89487b Schedule: Record RFT Well Open Events on Status Changes
This commit ensures that we record a "well open" event whenever

    Schedule::updateWellStatus

switches a well's status to OPEN.  We need this information in order
to correctly output RFT data configured with WRFT or the FOPN option
of keyword WRFTPLT.  Previously, we recorded such events only in the
context of the WELOPEN keyword.
2020-01-10 18:21:19 +01:00
Bård Skaflestad
8cb1d62f29
Merge pull request #1398 from joakim-hove/py-refactor
Use 'PYEND' instead of '<<<' to terminate PYACTION and PYINPUT
2020-01-09 17:01:51 +01:00
Joakim Hove
9c99c681c9 Add ParseRecord::end_string member 2020-01-09 16:35:22 +01:00
Joakim Hove
5ea70d256d Extract ParserKeyword and ParserRecord 2020-01-09 15:48:25 +01:00
Joakim Hove
c025754834 Add size() method to RawKeyword 2020-01-09 09:42:16 +01:00
Joakim Hove
f3797e8877 Python code must be properly terminated 2020-01-09 09:26:35 +01:00
Joakim Hove
6199b81e60 Use 'PYEND' instead of '<<<' to terminate PYACTION and PYINPUT 2020-01-09 08:21:59 +01:00
Arne Morten Kvarving
ff156fd53c make BrineDensityTable constructible from variables
also add equality operator
2020-01-08 15:31:35 +01:00
Arne Morten Kvarving
763c931726 add equality operator to WellBrineProperties 2020-01-08 15:31:35 +01:00
Arne Morten Kvarving
eb6159fceb make PvtwsaltTable constructible from variables
also add accessor and equality operator
2020-01-08 15:31:35 +01:00
Arne Morten Kvarving
bc67976cb3 update TableManager constructor, assignment and equality operator
due to brine additions
2020-01-08 15:31:35 +01:00
Arne Morten Kvarving
affbfe3bae update well constructor for BrineProperties addition 2020-01-08 15:31:35 +01:00
Tor Harald Sandve
c5e68b82e8 Fix rebase smartwater 2020-01-08 15:31:35 +01:00