Commit Graph

2772 Commits

Author SHA1 Message Date
Pål Grønås Drange
9fe350e094 Made production group and injection group pure values 2016-09-28 07:39:24 +02:00
Kai Bao
7f49f5e53d fixing the group test. 2016-09-23 13:17:26 +02:00
Kai Bao
a70b1799c7 A well group can be both injection and production group. 2016-09-23 12:55:44 +02:00
Pål Grønås Drange
36ab19bc73 Merge pull request #923 from joakim-hove/summary-config-query
Added simple test for hasKeyword.
2016-09-21 14:37:08 +02:00
Kai Bao
a4c2c5bec3 adding FLD to the ControlEnum of GroupProduction 2016-09-20 13:37:07 +02:00
Joakim Hove
09499a7c79 Merge pull request #916 from joakim-hove/python-schedule
Remove Grid from Schedule object + Python wrap Schedule and EclipseGrid
2016-09-20 09:22:16 +02:00
Joakim Hove
c42d2a7022 Added simple test for hasKeyword. 2016-09-19 20:18:51 +02:00
Arne Morten Kvarving
afedca7b18 quell signed/unsigned comparison warning
switch to using std::iota
2016-09-14 11:04:23 +02:00
Joakim Hove
7c0b4733d5 Added Python wrapper for Schedule class. 2016-09-12 21:42:34 +02:00
Joakim Hove
ae31249245 Added micro Python wrapper of EclipseGrid. 2016-09-12 21:42:34 +02:00
Joakim Hove
8100b6cb0d Completed rename parse_mode -> parse_context. 2016-09-12 21:42:34 +02:00
Joakim Hove
5636fd8aa1 Fixed to self bugs in Python bindings. 2016-09-12 21:42:34 +02:00
Joakim Hove
55756f944e Moved some python tests. 2016-09-12 21:42:34 +02:00
Joakim Hove
8ee057eca5 Added method Schedule::posixEndTime() 2016-09-12 21:42:34 +02:00
Joakim Hove
81b71d5d08 Removed EclipseGrid member from Schedule class. 2016-09-12 21:42:34 +02:00
Joakim Hove
8f3ebe23ee Removed grid argument from Well construction. 2016-09-12 21:42:34 +02:00
Joakim Hove
b47e7579d0 Completion: Internalize cell depth immediately. 2016-09-12 21:42:34 +02:00
Joakim Hove
9a1a1e2f00 Removed EclipseGrid dependency from CompletionSet. 2016-09-12 21:42:34 +02:00
Jørgen Kvalsvik
9aee6e7708 Return identity when compressing active-only cells. 2016-09-12 21:14:07 +02:00
Joakim Hove
74e1aff9dc Compress std::vector<T> and GridPropery. 2016-09-08 09:14:30 +02:00
Joakim Hove
56077998e0 Added EclipseGrid::getGlobalIndex( activeIndex ) 2016-09-08 09:14:29 +02:00
Joakim Hove
15588fe7ca Added EclipseGrid::allActive() convenience method. 2016-09-08 09:14:28 +02:00
Joakim Hove
489602c51c EclipseGrid: default copy and move constructors. 2016-09-08 09:14:27 +02:00
Joakim Hove
516f0927da Merge pull request #905 from joakim-hove/eclipsgrid-processed-copy
WIP: Added EclipseGrid processed copy.
2016-09-07 11:10:52 +02:00
Joakim Hove
c2b4ee687f Added class ZcornMapper. 2016-09-07 11:08:31 +02:00
Joakim Hove
4af4c40dc6 Added EclipseGrid processed copy. 2016-09-07 11:07:51 +02:00
babrodtk
4d9bd066a3 Added inverse formation volume factors 2016-09-06 14:17:46 +02:00
babrodtk
863ce30a94 Merge branch 'master' of github.com:OPM/opm-parser into output_writer_celldata 2016-09-06 10:34:54 +02:00
Joakim Hove
c8d77dff99 Expand ALLPROPS in SOLUTION section RPTRST. 2016-09-06 00:25:07 +02:00
Joakim Hove
ba6e2a0eb1 Merge pull request #909 from andlaus/implement_multregp
Implement support for MULTREGP
2016-09-05 18:11:18 +02:00
Joakim Hove
2fa5ee628b Merge pull request #910 from joakim-hove/store-mapaxes
Do not apply the MAPAXES transform.
2016-09-05 17:31:39 +02:00
babrodtk
6097ebb1eb Added units required for formation volume factors 2016-09-05 16:05:47 +02:00
Joakim Hove
569f450f82 Merge pull request #912 from joakim-hove/debug-ALLPROPS
Added some tests to verify ALLPROPS handling.
2016-09-05 14:56:50 +02:00
Joakim Hove
bcb4f51a4d Added some tests to verify ALLPROPS handling. 2016-09-05 13:11:41 +02:00
babrodtk
71133c15a0 Deleted UnitSystem.cpp from Parser (has been moved to Units previously) 2016-09-05 08:27:29 +02:00
Joakim Hove
37c1418876 Do not apply the MAPAXES transform. 2016-09-02 14:35:14 +02:00
Andreas Lauser
cf8c957968 add a unit test for the MULTREGP keyword 2016-09-02 11:16:34 +02:00
Andreas Lauser
f9b3a42598 implement support for the MULTREGP keyword
Note that this keyword is pretty quirky. Depending on whether
E100/E300 considers it for MINPV handling or not, this patch is also
not going to cut it. (After this patch, OPM will consider MULTREGP for
the MINPV handling. Could somebody with access to E check?)
2016-09-02 11:16:34 +02:00
Joakim Hove
7e99d07144 Merge pull request #908 from jokva/lab-hr
Lab's unit for time is "HR"
2016-09-02 09:15:44 +02:00
Joakim Hove
10b36320c0 Merge pull request #903 from jokva/boost-spirit
Replace number parser with boost::spirit::qi
2016-09-02 08:47:16 +02:00
Jørgen Kvalsvik
0d44cd5ee1 Lab's unit for time is "HR" 2016-09-01 14:38:10 +02:00
Bård Skaflestad
7d67ddc099 UnitSystem: Add skeleton implementation of LAB conventions
This commit adds conversion factors for the ECL LAB unit
conventions--notably Atmospheres for pressures, Hours for time,
Grams for mass, and cubic centimetres for volumes.
2016-09-01 12:21:53 +02:00
Joakim Hove
aa99e3e39c Merge pull request #904 from qilicun/fix-msg-order-issues
Argument of warning() method is msg, filename, linenumber.
2016-08-29 10:02:52 +02:00
Liu Ming
756b4d1edd argument of warning() method is msg, filename, linenumber. 2016-08-29 14:01:14 +08:00
Jørgen Kvalsvik
d9443c7355 Replace number parser with boost::spirit::qi
The hand-written number parser functions implemented using strtod and
friends were rather slow (profiling indicates that typically 30% of the
program is spent inside of strtod internals). By using
boost::spirit::qi, which we already depend on through boost-filesystem
and others this portion typically seem to be reduced to 20% (via
instruction count) and with somewhat better cache performance.
Rudimentary measuring indicates ~15% speedup overall.

Additionally, the intention is a lot clearer this way, so readability
received a boost. Compilation time of StarToken goes through the roof.
2016-08-28 11:08:30 +02:00
Joakim Hove
b6c4043f20 Merge pull request #902 from joakim-hove/gridproperty-cells
Scan a property and return cells equal to a value.
2016-08-26 11:04:42 +02:00
Joakim Hove
bea47dc06d Scan a property and return cells equal to a value. 2016-08-25 17:27:36 +02:00
Joakim Hove
949b955d37 Merge pull request #901 from jokva/grid-export-compressed-map
Active cell cache with automatic storage
2016-08-25 15:15:49 +02:00
Jørgen Kvalsvik
bb2d0c5324 Active cell cache with automatic storage
Simplify slightly by using automatic memory management, rather than
heap-alloc.
2016-08-25 13:51:46 +02:00
Joakim Hove
aa9f43686d Merge pull request #900 from joakim-hove/grid-export-compressed-map
EclipseGrid::activeMap( ) will cache the results.
2016-08-25 13:46:35 +02:00