OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,169 Commits 18 Branches 75 Tags 73 MiB
9d3ec9be61
Commit Graph

8169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove
9d3ec9be61
Merge pull request #1646 from joakim-hove/python-fixup2 
Make sure PythonInterpreter can be safely disabled
 2020-03-27 12:42: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
Joakim Hove
7fc75ce61c
Merge pull request #1650 from atgeirr/fix-embedded-python-test 
Use braces to force correct parsing.
 2020-03-27 10:49:34 +01:00
Joakim Hove
413a45ec21
Merge pull request #1648 from berland/jq 
Reformat all json keyword files through jq
 2020-03-27 10:48:59 +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
Williham Williham Totland
3e29350e94
Integrate SummaryNode in ESmry (#1642) 2020-03-27 08:07:52 +01:00
Håvard Berland
54b714f361 Reformat all json keyword files through jq 
Ensures similar pretty-printing everywhere.

Includes a bugfix for 000_Eclipse100/O/OVERBURD which had
a } too much
 2020-03-26 23:16:17 +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
c41f375e00
Merge pull request #1645 from akva2/janitoring 
quell compiler warnings
 2020-03-26 17:33:25 +01:00
Joakim Hove
6d8154823a
Merge pull request #1643 from joakim-hove/python-fixup 
Temporarily protect against deref when python is disabled
 2020-03-26 16:20:04 +01:00
Arne Morten Kvarving
c07a839f15 quell compiler warnings 2020-03-26 16:07:49 +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
6ffb5883d4
Merge pull request #1639 from wito/add-aquifer-category 
Add Aquifer Category
 2020-03-26 12:39:11 +01:00
Joakim Hove
cda315ce41
Merge pull request #1640 from atgeirr/fix-field-unavailable 
Make the FIELD group unavailable for higher level control.
 2020-03-26 12:37:44 +01:00
Atgeirr Flø Rasmussen
fce6eeca1b Make the FIELD group unavailable for higher level control. 2020-03-26 12:07:06 +01:00
Joakim Hove
a8f0ebb183 Enable fine grained control of Python ON | OFF 2020-03-26 12:00:59 +01:00
Williham Williham Totland
4e08ff7f6d Adds ::Aquifer to Opm::EclIO::SummaryNode::Category. 2020-03-26 11:36:13 +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
52855cce1e
Merge pull request #1637 from bska/restore-all-injlimits 
Simulation Restart: Restore All Available Injection Control Modes
 2020-03-26 09:14:21 +01:00
Williham Williham Totland
06d317d119 Review Actions: Un-consts SummaryNode members and un-statics some data vectors. 2020-03-26 08:20:50 +01:00
Bård Skaflestad
c2bd04edcb Simulation Restart: Restore All Possible Injection Control Modes 
In particular, declare that the well supports RATE, RESV, and THP
limits/targets if such values are available in the SWEL array.
 2020-03-25 18:54:28 +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
91841a99e1
Merge pull request #1606 from joakim-hove/wellconnections-output 
Changes in WellConnection ordering
 2020-03-25 18:01:51 +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
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