OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,106 Commits 18 Branches 75 Tags
c7d36031849fa9563cd1c91cfc6a60ac2d43f2e7
Commit Graph

8106 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
03efd5e589 Merge pull request #1635 from joakim-hove/internalize_tracers 
Internalize tracers
 2020-03-25 10:17:29 +01:00
Bård Skaflestad
9f0985850c Merge pull request #1614 from joakim-hove/wellrates-get-connection-rates 
Get connection rates from well rates object
 2020-03-25 08:09:10 +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
5c2a5898c0 Fetch connection rates using global_index 2020-03-25 07:43:10 +01:00
Joakim Hove
8b2e503602 Update incorrect test 2020-03-25 07:43:10 +01:00
Bård Skaflestad
c68be43301 Merge pull request #1629 from joakim-hove/load-restart 
Load restart XCON data
 2020-03-24 12:21:59 +01:00
Joakim Hove
d40ebe647a Merge pull request #1634 from joakim-hove/pyaction-fixup 
Pyaction fixup
 2020-03-24 10:58:05 +01:00
Joakim Hove
179b6ba9ff Use global index when assembling connection rates from XCON keyword 2020-03-24 10:55:49 +01:00
Joakim Hove
9498217e0a Merge pull request #1623 from joakim-hove/find-connection 
Find connection
 2020-03-24 10:06:34 +01:00
Joakim Hove
00faf6099a Merge pull request #1628 from joakim-hove/init-global-index 
Initialize global index when creating connections from rst file
 2020-03-24 10:05:10 +01:00
Joakim Hove
fad5346ec1 Merge pull request #1633 from atgeirr/fix-type-mismatch 
Fix type mismatch error for EclEntry.
 2020-03-24 09:27:52 +01:00
Joakim Hove
611b21beab Add serialization active member 2020-03-24 08:40:13 +01:00
Joakim Hove
9ce64d5aae Add copy constructor and assignment operator to PyAction 2020-03-24 08:07:21 +01:00
Atgeirr Flø Rasmussen
2d52268bf8 Fix type mismatch error for EclEntry. 2020-03-24 08:05:34 +01:00
Joakim Hove
a0ebb2091f Add method Actions::pending_python() to get active Python functions 2020-03-24 07:23:31 +01:00
Joakim Hove
4c25ce69c1 Add mutable bool active member to PyAction 2020-03-24 07:23:31 +01:00
Joakim Hove
4b687e3368 Fix bug in CMakeLists.txt - mock simulator tests were not built 2020-03-24 07:23:31 +01:00
Joakim Hove
1ac240a425 Merge pull request #1625 from tskille/replace_long_int_eclio 
replacing long int and unsigned long int
 2020-03-23 19:57:10 +01:00
Bård Skaflestad
d52180389b Merge pull request #1631 from atgeirr/add-missing-include 
Add missing header inclusion.
 2020-03-23 19:04:36 +01:00
Atgeirr Flø Rasmussen
4a88b87958 Merge pull request #1626 from totto82/fixGuideRat 
fix bug in guiderate model
 2020-03-23 17:51:10 +01:00
Atgeirr Flø Rasmussen
0b0fab781b Add missing header inclusion. 2020-03-23 17:49:43 +01:00
Torbjørn Skille
9d24f0dc34 replacing long int and unsigned long int 
- long int -> int64_t
  - unsigned long int -> uint64_t

All EclIO classes and associated tests has been updated.
 2020-03-23 17:12:56 +01:00
Bård Skaflestad
6cf4b7efc7 Merge pull request #1624 from atgeirr/fix-narrowing 
Compile-error fix: do not narrow double->bool in init list.
 2020-03-23 16:30:17 +01:00
Joakim Hove
1192830c60 Initialize global index when creating connections from rst file 2020-03-23 16:08:49 +01:00
Tor Harald Sandve
41ae6b0bc4 fix bug in guideratemodel 2020-03-23 15:30:51 +01:00
Arne Morten Kvarving
0a8a25d5df Merge pull request #1622 from joakim-hove/include-hpp 
Include hpp files and not cpp files
 2020-03-23 14:50:33 +01:00
Atgeirr Flø Rasmussen
2805f862db Compile-error fix: do not narrow double->bool in init list. 2020-03-23 14:34:27 +01:00
Joakim Hove
02a5501c0b Add method out::Well::find_connection(std::size_t global_index) 2020-03-23 13:43:50 +01:00
Joakim Hove
a61c48521a Include hpp files and not cpp files 2020-03-23 13:28:47 +01:00
Joakim Hove
f88d382172 Merge pull request #1615 from joakim-hove/connection-testing 
Connection testing
 2020-03-23 13:00:06 +01:00
Arne Morten Kvarving
0a9a0285dc Merge pull request #1621 from akva2/move_ser_object 
move data serialization objects close to the class code
 2020-03-23 12:40:30 +01:00
Arne Morten Kvarving
e9e69ca44f Merge pull request #1607 from tskille/latest_pybind_eclio 
Python bindings for EclIO classes
 2020-03-23 12:05:55 +01:00
Arne Morten Kvarving
e3bd1e6723 add static method to return a test object for serialization 
this allows killing the constructors taking member values
 2020-03-23 10:58:15 +01:00
Torbjørn Skille
c33372b8b4 Adding python bindings for C++ class EclOutput 2020-03-23 10:57:49 +01:00
Torbjørn Skille
1a39c07981 Adding python bindings for C++ class ERft 2020-03-23 10:57:49 +01:00
Torbjørn Skille
d258ce5a57 Updates of C++ class ERft to be used with python bindings 
-> Support for extracting data based on report index
  -> adding extra float (time) to RftReportList
 2020-03-23 10:57:49 +01:00
Torbjørn Skille
b992ff0e1c Adding python bindings for C++ class EGrid 2020-03-23 10:57:49 +01:00
Torbjørn Skille
f97dfda92e Adding python bindings for C++ class ESmry 2020-03-23 10:57:49 +01:00
Torbjørn Skille
931fa96a59 Updates of C++ class ESmry to be used with python bindings 
-> adding member function ESmry::get_startdat(), start of simulation from keyword STARTDAT in SMSPEC file
  -> adding member function ESmry::numberOfTimeSteps(), number of timesteps in run
 2020-03-23 10:57:49 +01:00
Torbjørn Skille
c1caf4738e Adding python bindings for C++ class ERst 
-> one additional C++ member function ERst::numberOfReportSteps()
 2020-03-23 10:57:44 +01:00
Bård Skaflestad
c3c6c93f65 Merge pull request #1619 from joakim-hove/use-reference 
Use reference
 2020-03-23 10:49:36 +01:00
Joakim Hove
d1527da245 Use reference when accessing Schedule actions 2020-03-23 08:52:02 +01:00
Joakim Hove
8a420d30e6 Remove trailing whitespace 2020-03-23 08:52:02 +01:00
Bård Skaflestad
3bc8f832d8 Merge pull request #1618 from bska/add-missing-header 
Parser.cpp: Include Missing Header
 2020-03-22 18:02:47 +01:00
Bård Skaflestad
e7324ccd95 Parser.cpp: Include Missing Header 
The implementation uses std::stack and therefore needs a declaration
of this type in scope.  This apparently built by accident earlier.
While here, also include a few other headers to make Parser.[hc]pp
more self-contained.
 2020-03-22 17:06:38 +01:00
Bård Skaflestad
01d6ad95e0 Merge pull request #1617 from bska/summary-wmctl 
Support Outputting Active Well Control to Summary File
 2020-03-21 14:30:25 +01:00
Bård Skaflestad
f2e848bb5d Restart File: Reimplement Active Well Control Output Code 
Switch to using the same backend that is also used for outputting
the equivalent value to the 'WMCTL' summary vector.
 2020-03-20 22:07:32 +01:00
Bård Skaflestad
2f8ad86afd Summary Output: Implement 'WMCTL' Keyword 
This outputs a numeric code, an integer value, for all configured
wells at all times and enables more visual inspection of how the
wells' active controls change over time--either in response to
explicit target modes in the input or as a result of limits becoming
active.

Note that due to the fall-back option of selecting the input value
if no dynamic value is available, we must ensure that the test code
does not specify well types (producer/injector) that conflict with
the keywords used in the backing data set.  Update the relevant
tests accordingly.
 2020-03-20 22:07:32 +01:00
Bård Skaflestad
45b501cb83 Summary Config: Recognize 'WMCTL' Keyword 
This would previously be interpreted as a completion keyword due to
matching the pattern 'W*L'.
 2020-03-20 22:07:32 +01:00