Commit Graph

335 Commits

Author SHA1 Message Date
jokva
a77a9646a1 Merge pull request #74 from pgdr/ioconf-usecase
Minor cfg() api use case
2016-08-09 11:42:41 +02:00
Pål Grønås Drange
e4a2da1b7b Minor usecase of state.cfg().io() instead of ioconfig shared_ptr 2016-08-09 09:37:46 +02:00
Pål Grønås Drange
7d2de9117c InitConfig is reference, use ref EclipseState constructor 2016-08-08 10:03:58 +02:00
Atgeirr Flø Rasmussen
dd6a364043 Add missing include directives.
These are required for std::accumulate (numeric) and
std::abs (cmath).
2016-08-01 15:47:23 +02:00
Joakim Hove
b883e011db Merge pull request #66 from jokva/simpler-dsl-fwcth-keyword
Write units to Summary file.
2016-07-27 23:37:30 +02:00
Petter Taule
163f5a5cf5 Added applications using the regression test libraries
Added restartRegressionTest.cpp, initRegressionTest.cpp, rftRegressionTest.cpp, summaryRegressionTest.cpp, and modifying CMakeLists_files.cmake to include these.
2016-07-22 09:19:46 +02:00
Petter Taule
51c7a97af5 Added regression test libraries
Added EclFilesComparator.cpp, summaryComparator.cpp and summaryRegressionTest.cpp and corresponding header files. Also including these files in CMakeLists_files.cmake, and adding boost tests in the tests directory.
2016-07-22 09:19:46 +02:00
jokva
6ef249b9a7 Revert "C++ regression test of eclipse files (initial, unified restart and summary)" 2016-07-21 16:37:18 +02:00
Petter Taule
2f69ec7e23 Added applications using the regression test libraries
Added restartRegressionTest.cpp, initRegressionTest.cpp, rftRegressionTest.cpp, summaryRegressionTest.cpp, and modifying CMakeLists_files.cmake to include these.
2016-07-21 16:02:41 +02:00
Petter Taule
23a1171d6d Added regression test libraries
Added EclFilesComparator.cpp, summaryComparator.cpp and summaryRegressionTest.cpp and corresponding header files. Also including these files in CMakeLists_files.cmake, and adding boost tests in the tests directory.
2016-07-21 16:01:50 +02:00
Jørgen Kvalsvik
f84fb39d69 Summary keywords from model2 to be supported
Additional Summary keywords from model2 that we wish to support has been
added to the test summary deck.
2016-07-20 15:07:03 +02:00
Jørgen Kvalsvik
2158ea92bf FWCTH support 2016-07-19 14:44:35 +02:00
Jørgen Kvalsvik
9fc3fcfc38 Simplify DSL; unit conversion to quantity maths
By moving the unit conversion to the low-level arithmetic rather than
the high level functions, the DSL is simplified by inferring result
types rather than requiring explicit conversions. This means the
formulae are more lisp-like and more natural, since there is no more
need for liq_vol and fiends.

An added benefit is that multiplication now is commutative also with
respect to units, so the wonky left-hand-side-converts semantics are
gone.
2016-07-19 14:42:11 +02:00
Jørgen Kvalsvik
1ae6508f7f Write textual representation of unit in Summary
Write the corresponding unit type (as a string) to the values written in
the Summary file.

Accomplished by running every registered function as the ert entry is
created and obtaining the string representation of the result. The
computation is called with empty, dummy structures.
2016-07-19 14:39:40 +02:00
Joakim Hove
08bd6dbcdb Merge pull request #65 from jokva/completion-summary-keywords
Completion production/injection rates/totals; Field keywords
2016-07-19 10:52:10 +02:00
Jørgen Kvalsvik
ca5023c26f Completion rate function over unit, not list
There are no such thing as sum-over-completions or over multiple wells.
Treat them as such to communicate this, rather than sum-over-list.
2016-07-19 09:45:50 +02:00
Jørgen Kvalsvik
223d9e55c5 Rename ecl_wells -> schedule_wells 2016-07-19 09:39:14 +02:00
Jørgen Kvalsvik
fcb3cb1bf8 Explanations in the Summary test deck
A few short lines to make the summary test deck more understandable.
2016-07-18 13:06:38 +02:00
Jørgen Kvalsvik
fa7656bedf [Summary] Rate and rate-derived F-keyword
Support for rate or rate-derived keywords (i.e. sans pressure, sales
etc.) from the Field family of keywords.
2016-07-18 12:57:06 +02:00
Jørgen Kvalsvik
ef64026bce Cuts/ratios only apply to production
In line with Eclipse water cuts, gas-oil ratio etc. only applies to
production values, rather than all rates. This sparked some other
refactoring that moves the negative-else-zero logic into the rate
calculation.
2016-07-18 12:02:29 +02:00
Jørgen Kvalsvik
01ae50ba20 Completion production/injection rates/totals
A small set of the completion family of keywords, water/oil/gas
production and injection. The tests and example data file are updated
accordingly, with edge cases.
2016-07-15 15:20:56 +02:00
Joakim Hove
ec0978f00e Writing INT properties to INIT file.
Refactor: Made helper functions templates functions.
2016-07-14 11:46:46 +02:00
Joakim Hove
53625baf26 Write DEPTH and DX,DY,DZ keywords to INIT file. 2016-07-12 13:56:35 +02:00
Joakim Hove
b8ae72b8c5 Cleanup: Will remove test area. 2016-07-12 13:56:28 +02:00
Joakim Hove
55f482b202 Add ParseContext argument to SummaryConfig. 2016-07-01 13:59:18 +02:00
Joakim Hove
e40e731b2c Merge pull request #51 from joakim-hove/rename-writeInit
Rename write init
2016-07-01 13:56:47 +02:00
Joakim Hove
a40dc3c1c1 Fixed bug with global/active mapping for output. 2016-07-01 13:03:51 +02:00
Jørgen Kvalsvik
0c0a548219 New private Summary implementation
A rewritten Summary.cpp with some minor header modifications. Synposis
of the new implementation:

* Uses unordered_map< string, std::function > for dispatch, instead of
  multiple functions and a switch
* Some poor man's function composition support has been added
  (privately) to avoid a lot of reptition in the post processing.
* Functions assume they work over lists of wells instead of single wells
  being special cased - this means groups of well etc. can share
  implementation with single wells and field keywords.
* Unsupported keywords are not written in the Summary file.

Furthermore, some comments on special cases and overall approach and
a generally more declarative implementation. This change is invisible to
downstream developers. Users will obviously see no more garbage
keywords.
2016-06-30 09:54:40 +02:00
Joakim Hove
2333191908 Unrelated: Using C++ TestArea. 2016-06-29 13:10:35 +02:00
Joakim Hove
031306735a Unrelated: using EclipseGrid.getCartesianSize() 2016-06-29 13:10:35 +02:00
Joakim Hove
c0b56afb13 Removed NNC argument to EclipseWriter constructor. 2016-06-29 13:10:35 +02:00
Joakim Hove
4b11d9a059 Rename wrietInit -> writeInitAndEgrid() 2016-06-29 13:10:35 +02:00
Joakim Hove
12e36f6cff Moved NNC argument to writeInit() method. 2016-06-29 13:10:35 +02:00
Joakim Hove
28add15c71 Filename overload without report step argument. 2016-06-29 13:10:35 +02:00
Joakim Hove
6a1888af14 Refactored writeInit:
- Removed class Init completely - writeint an init file is handled by
   the method EclipseWriter::writeINITFile( )

 - Seperated writing of INIT file and EGRID file better.
2016-06-29 13:10:35 +02:00
Joakim Hove
7a64bf579e Renamed Filename::ertHandle() -> Filename::get() 2016-06-29 13:10:35 +02:00
Joakim Hove
b232c568af writeInit() - can optionally take properties. 2016-06-29 13:10:35 +02:00
Joakim Hove
9b1d0d3cee Added small struct data::CellData. 2016-06-29 13:10:35 +02:00
Joakim Hove
978bd9e857 Some reformatting. 2016-06-29 13:10:35 +02:00
Joakim Hove
3d460f16a5 Moved 'INIT' keyword in testdata. 2016-06-29 13:10:35 +02:00
Joakim Hove
791da336fe Removed unchecked calls to writeInit(). 2016-06-29 13:10:35 +02:00
Joakim Hove
66103cd2a0 Respect outputdir: using IOConfig::getOutputBase() 2016-06-27 11:57:49 +02:00
Joakim Hove
0f238d6552 Explicitly created output in subdirectory. 2016-06-24 19:39:46 +02:00
Joakim Hove
299b453b56 Using ERT::TestArea. 2016-06-24 19:39:17 +02:00
Pål Grønås Drange
e7461ccfea Added DX/DY/DZ to summary_deck.DATA 2016-06-21 16:03:23 +02:00
Joakim Hove
b1920ef251 Merge pull request #43 from jokva/well-shared_ptr-deprecated
Well shared_ptr alias deprecated
2016-06-20 14:56:53 +02:00
Jørgen Kvalsvik
7c82e69a00 Copy and save a Grid copy in Writer; apply actnum
Simulators might modify the grid post EclipseState creation, so the Grid
fetched from there is unreliable. Copy the Deck-provided grid and apply
the manipulations at EclipseWriter construction time to ensure it uses
the same dimensions and has the same properties as the simulator.
2016-06-16 14:30:27 +02:00
Jørgen Kvalsvik
04ea6c90a8 Well shared_ptr alias deprecated
The shared_ptr aliasing is deprecated, and in the Well case this has
been removed upstream.
2016-06-16 10:12:39 +02:00
Atgeirr Flø Rasmussen
6f531033be Use namespace rather than member syntax. 2016-06-15 09:42:02 +02:00
Atgeirr Flø Rasmussen
8c538ce60e Avoid shadowing. 2016-06-15 09:41:43 +02:00