Commit Graph

822 Commits

Author SHA1 Message Date
Joakim Hove
50fb51d56e Add Python arg to Schedule constructor 2020-03-27 12:43:18 +01:00
Joakim Hove
687887939d Make sure PythonInterpreter can be safely disabled 2020-03-27 12:11:40 +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
Atgeirr Flø Rasmussen
4c5b03b83e Use braces to force correct parsing.
Without this, clang thinks it is a declaration, not a function call.
2020-03-27 10:11:12 +01:00
Joakim Hove
3e2160af28 Merge pull request #1608 from joakim-hove/connections-sort-item
Connections sort item
2020-03-26 17:52:54 +01:00
Joakim Hove
cce2bc0686 Temporarily protect against deref when python is disabled 2020-03-26 15:38:18 +01:00
Joakim Hove
eca0589fe1 Merge pull request #1641 from joakim-hove/python-enable-enum
Enable fine grained control of Python ON | OFF
2020-03-26 14:21:24 +01:00
Joakim Hove
a8f0ebb183 Enable fine grained control of Python ON | OFF 2020-03-26 12:00:59 +01:00
Bård Skaflestad
5a701a2ee8 Merge pull request #1609 from wito/new-summarynode
New SummaryNode implementation
2020-03-26 11:34:21 +01:00
Joakim Hove
39eb327551 Remove stale boost includes 2020-03-25 18:18:25 +01:00
Joakim Hove
9ad8465609 Replace connection segIndex and compSeqIndex with sort_value member 2020-03-25 18:02:40 +01:00
Joakim Hove
c7d3603184 Changes in WellConnection ordering
1. If the well is MSW the connections in the WellConnection class is sorted in
   output order in the ::order() method, and retained that way.

2. Add method WellConnection::output() which return a vector of connection
   pointers sorted in output order.
2020-03-25 10:54:21 +01:00
Joakim Hove
9411af4dfc Implement TracerConfig in EclipseState
Co-authored-by: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
2020-03-25 07:53:08 +01:00
Joakim Hove
a0ebb2091f Add method Actions::pending_python() to get active Python functions 2020-03-24 07:23:31 +01:00
Bård Skaflestad
8d2cc14ad0 Active Well Control Output: Place Duplicate Implementation in Well
Will become shared backend for output to restart and summary files.
Add unit tests to exercise the new functions.
2020-03-20 22:07:04 +01:00
Joakim Hove
c7f6b22bdf Add static method bool Python::enabled() 2020-03-20 16:59:50 +01:00
Joakim Hove
d06a5a78e0 Moved PyAction class into Action:: namespace 2020-03-20 16:59:50 +01:00
Joakim Hove
7852203d39 PYACTION: The actual python code is in an external file
With this commit the PYACTION keyword is changed, instead of embedding the
Python code directly in the .DATA file the keyword now points to an external
file which is loaded verbatim into the PyAction keyword.

In addition the PYACTION keyword has now got a name and a string indicating how
many times it should run.
2020-03-20 16:59:50 +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
Joakim Hove
f87369713b Add global_index to Connections 2020-03-19 22:14:06 +01:00
Joakim Hove
acd73b76ea Remove unused method WellConnections::inputSize() 2020-03-18 15:36:17 +01:00
Joakim Hove
96d2cd59b3 Move Connection::Order member from Well to WellConnections 2020-03-18 14:28:53 +01:00
Williham Williham Totland
fb7d4315c9 Renames Opm::SummaryNode to Opm::SummaryConfigNode. 2020-03-13 15:40:41 +01:00
Joakim Hove
4433731079 Merge pull request #1566 from wito/rsm-testing
Adding support for the RUNSUM keyword in Opm::SummaryConfig
2020-03-13 11:16:30 +01:00
Williham Williham Totland
67f3d31254 Makes RPTONLY a processing instruction. 2020-03-13 10:02:48 +01:00
Williham Williham Totland
d5c4487808 Implements support for RUNSUM-related keywords NARROW and SEPARATE 2020-03-13 09:15:46 +01:00
Joakim Hove
03be91a951 Add members cf_kind, cf, skin_factor and r0 to rst::connection 2020-03-12 18:11:25 +01:00
Williham Totland
a270964846 Adds tests for swallowing RUNSUM keyword. 2020-03-12 14:59:31 +01:00
Williham Totland
6f83c4198c Review Action: Renames SummaryConfig::doRunSummary to SummaryConfig::createRunSummary 2020-03-12 12:23:09 +01:00
Williham Totland
c5af3afebd Corrects test after discussion. 2020-03-12 11:35:38 +01:00
Williham Totland
fcc2e32d66 Renames runsum to doRunSummary, adds accessor. 2020-03-12 10:52:10 +01:00
Joakim Hove
7a9c0171d1 Add test to check whether RSM output has been requested 2020-03-12 09:28:48 +01:00
Arne Morten Kvarving
9b22cab024 changed: relocate and rename StoneType enum
unfortunate naming, unfortunate location
2020-03-10 11:09:49 +01:00
Joakim Hove
327625b713 Use the WellType class in Well and Schedule 2020-03-09 13:30:18 +01:00
Joakim Hove
6e8b4a6c12 Add WellType class for ecl interop 2020-03-09 13:29:11 +01:00
Joakim Hove
51a593de39 Merge pull request #1532 from joakim-hove/uda-value-dim-constructor
Uda value dim constructor
2020-03-09 13:28:22 +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
8501a7ead4 Construct UDA values in WellInjectionProperties with correct unit 2020-03-05 13:08:00 +01:00
Joakim Hove
17ec37ae4e WellProductionProperties - init with correct UDA dimensions 2020-03-05 13:08:00 +01:00
Joakim Hove
4b0ee9d0bb Remove method Dimension::newComposite() 2020-03-05 13:08:00 +01:00
Joakim Hove
874c734628 Remove name property from UnitSystem dimension 2020-03-05 13:08:00 +01:00
Joakim Hove
f8c250be34 UDAValue: change from ::reset() to ::operator=() 2020-03-05 13:08:00 +01:00
Joakim Hove
37d31aeac0 Remove UDAValue copy and modify constructor 2020-03-05 13:08:00 +01:00
Joakim Hove
1b2fadcdc4 Move enum Well:InjectorType to new file ScheduleTypes 2020-03-03 09:09:11 +01:00
Arne Morten Kvarving
710a94709e changed: simplify OilVaporizationProperties
there is no vappars per pvt region. do not store it as such either.
2020-03-02 09:32:40 +01:00
Atgeirr Flø Rasmussen
1a0f47f274 Add Group::isAvailableForGroupControl() method.
The method has very similar intended usage as the method of the
same name in the Well class.
2020-02-27 14:56:31 +01:00
Joakim Hove
8cb65a77a6 Merge pull request #1507 from joakim-hove/dent-keywords
Add simple POD class to internalize keywords xxxDENT
2020-02-26 09:55:58 +01:00
Joakim Hove
24528ea607 Add simple POD class to internalize keywords xxxDENT 2020-02-25 15:06:34 +01:00
Arne Morten Kvarving
aceb3b443a remove unused enum entry OpmFIL 2020-02-24 11:41:50 +01:00
Joakim Hove
ae504bcb45 Merge pull request #1499 from totto82/addControlWELTARG
Add production control from WELTARG
2020-02-21 13:25:20 +01:00