Commit Graph
111 Commits
Author SHA1 Message Date
Bård Skaflestad 33d09936c3 Merge pull request #1719 from GitPaean/aquifer_keywords
adding aquifer summary keywords
2020-10-05 22:49:32 +02:00
Williham Williham Totland c43600337b Throws exception with nesting, and generalises tests to account for same. 2020-10-05 11:06:19 +02:00
Kai Bao 6093a80dff fixing the compilation due to interface change 2020-10-02 14:09:01 +02:00
Joakim Hove 0512ab88b4 ParseContext will throw OpmInputError 2020-09-29 15:37:14 +02:00
Joakim Hove 5444eade2f Use std::shared_ptr<Python> for Python argument in Schedule 2020-03-31 10:26:55 +02:00
Joakim Hove 50fb51d56e Add Python arg to Schedule constructor 2020-03-27 12:43:18 +01:00
Joakim Hove 562136772a Merge pull request #1638 from joakim-hove/remove-stale-boost-include
Remove stale boost includes
2020-03-27 10:49:52 +01:00
Joakim Hove 39eb327551 Remove stale boost includes 2020-03-25 18:18:25 +01:00
Williham Williham Totland 6970158f7f Makes the return value of Opm::Group::flow_group/::control_group optional. 2020-03-20 14:08:03 +01:00
Williham Totland 13e838d171 Separates Opm::Group::parent() for the extended network model
In order to support the extended network model going forwards, the method Opm::Group::parent() is split in the API into two new methods, Opm::Group::control_group() and Opm::Group::flow_group(). These methods give the names of the parent node in the group control hierarchy and network structure, respectively.

While for the standard network model these two values will be the same (and the same as ::parent()), code that presently calls ::parent() should be revisited with an eye to the question of which parent group is desired.
2020-03-06 14:38:38 +01:00
Joakim Hove aed8c78af5 Move RestartConfig from EclipseState to Schedule 2020-02-19 12:35:07 +01:00
Arne Morten Kvarving 83a7cd04c3 remove unused boost includes
and deal with missing include fallout
2020-02-19 09:51:46 +01:00
Atgeirr Flø Rasmussen 4516b23a14 Merge pull request #1410 from joakim-hove/group-multiple-phases
Support multiple phases in group injection
2020-02-14 11:10:37 +01:00
Joakim Hove 0b2dbf7fc2 GroupInjection is a map over phases + implement topup_phase 2020-02-14 09:30:58 +01:00
Arne Morten Kvarving fb75bcd4e2 changed: use std::filesystem instead of boost::filesystem
since we still support g++-7, where filesystem is marked experimental,
we introduce a wrapper header and expose the namespace to use
as Opm::filesystem.

for gcc we unconditionally link with libstdc++fs in the python bindings.
the setup.py stuff links as c code, not c++ code, so it is not
automatically added on any gcc version. this might prove unportable
later.
2020-02-13 12:34:19 +01:00
Bård Skaflestad 19ecc3d30e Consider Active Phases When Initializing Satfunc Endpoints
This commit passes the run's notion of its active phases, an object
of type Opm::Phases, through to the initialisation layer for the
saturation functions' scaling properties.  In particular, this
allows us to discriminate between the phases and to not index into
tables or properties that would not be appropriate (e.g., maximum
gas saturation (SGU) in a simulation run without active gas).

Moreover, we now have enough information to know to look for SOF2 in
two-phase run using family II saturation function keywords.  These
changes are necessary in order to extend Flow's support for the
FILLEPS output request to two-phase runs.
2020-01-29 16:34:15 +01:00
Arne Morten Kvarving ae10af208f changed: hide the templated 'has' and 'get' interfaces in FieldPropsManager
motivation: an upcoming parallel frontend to the field props manager.
templated functions cannot be virtualized, and thus having these exposed
would give a great chance of confusing the users in the downstream
code, where properties would be caught from the (potentially) empty
backend instead of from the frontend.
2020-01-28 14:31:25 +01:00
Joakim Hove 691296f91a Remove old 3D property implementation 2020-01-19 23:04:46 +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 b65e5547aa Merge pull request #1386 from joakim-hove/uda-raw-data
Uda raw data
2020-01-07 15:04:29 +01:00
Joakim Hove 6f330a7482 Fixup of alternating records special case 2020-01-06 15:50:36 +01:00
Joakim Hove b7cebb1907 Refactored the handling of BHP / THP 2020-01-06 15:28:04 +01:00
Joakim Hove 8f6c2c70f6 UDAalue::get<double>() will return raw value - not SI.
Add new function UDAValue::getSI() which will return SI value of numerical
input, and throw an exception if internal state is not numeric.
2020-01-06 12:05:51 +01:00
Joakim Hove 90d30e3bc9 Rename class Section -> DeckSection 2020-01-02 15:27:22 +01:00
Joakim Hove 05b93e7ea1 Add #ifdef for ENABLE_3D_TESTING 2019-12-11 13:20:04 +01:00
Joakim Hove 0f609083c3 Add support for OPERATE in FieldProps 2019-12-10 11:43:05 +01:00
Kai Bao 973fe9823b adapting and fix the code after rebasing for WSEGSICD 2019-12-05 11:48:59 +01:00
Kai Bao fea4c4c8fa adding support for WSEGSICD 2019-12-05 11:48:59 +01:00
Joakim Hove 198b208258 Test use of FieldPropsManager in WellConnections 2019-11-29 16:42:29 +01:00
Joakim Hove e5b40870b6 Remove unused testdata 2019-11-28 20:06:39 +01:00
Tor Harald Sandve 7b41397f6f Merge pull request #1252 from totto82/gprodEvent
add group events
2019-11-28 08:23:18 +01:00
Tor Harald Sandve 5d28ff7d24 store well and group event in same map 2019-11-27 08:58:57 +01:00
Arne Morten Kvarving 0d6ed7cfb6 changed: rename accessor to data()
the two classes EDITNNC and NNC are very similar, which makes templating
useful. this small difference makes it hard to do. unify them.
2019-11-26 13:20:17 +01:00
Joakim Hove 6dbbc8c037 Remove / rename DeckItem::size() 2019-11-16 18:31:12 +01:00
Joakim Hove feec9c150d Merge pull request #1219 from joakim-hove/box-keyword-constructor
Simplify the BOX implementation - prepare to drop the manager
2019-11-14 12:15:53 +01:00
Joakim Hove 613ec70dab Rename Well2 -> Well and Group2 -> Group 2019-11-13 23:19:26 +01:00
Joakim Hove 3f1cf0bc8a Changed box implementation 2019-11-13 20:19:47 +01:00
Tor Harald Sandve 64f4919085 Add support for item 11 and 12 in GCONINJE 2019-11-01 13:15:52 +01:00
Joakim Hove a47ffcc349 Remove index access to GridProperty<T> 2019-10-14 12:23:18 +02:00
Joakim Hove 6c34aee00e Use only one double vector in DeckItem 2019-09-30 18:51:35 +02:00
Torbjørn Skille 34410cbe41 ERT/libecl routines used in the EclipseGrid class has been replace by new member functions. Grid properties are
calculated and stored as private data members in EclipseGrid.

The API for the class is unchanged except for some minor changes for exportACTNUM, exportZCORN and exportCOORD.

These changes have triggered some very few modifications in the opm-grid and opm-simulators repo.
2019-09-20 14:21:23 +02:00
Joakim Hove ff69737b99 Add start_time argument to SummaryState 2019-09-19 22:09:15 +02:00
Joakim Hove f3bd813f46 Use ParserKeyword values in Parser instead std::unique_ptr<> 2019-09-13 16:21:31 +02:00
Joakim Hove 8553bbf326 Remove ScheduleEnum files 2019-09-04 14:49:12 +02:00
Joakim Hove 7bdd294ec5 Refactor Well GuideRateTarget enum 2019-09-04 14:49:12 +02:00
Joakim Hove e026660c80 Move / refactor Group production control enum 2019-09-04 14:49:12 +02:00
Joakim Hove 9d442d3d4f Refactor Group injection enum 2019-09-04 14:49:12 +02:00
Joakim Hove 9690588dd4 Refactor enums for Segments 2019-09-04 14:49:12 +02:00
Joakim Hove a449636dde Enum refactor EconLimits 2019-09-04 14:49:12 +02:00
Joakim Hove 9e6f8bd1c1 Move well production control enum to Well2 2019-09-04 14:49:12 +02:00