OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
165 Commits 18 Branches 75 Tags 73 MiB
ef64026bce
Commit Graph

165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jørgen Kvalsvik
94f0dd92ed Replace SimulationTimer with time_t in writeInit 
Instead of passing a massive and complex instance around, reduce
dependencies by directly passing the interesting time values to
writeInit.
 2016-06-07 08:40:37 +02:00
Jørgen Kvalsvik
e913a0cb31 Output format for cell data. 2016-06-07 08:40:37 +02:00
Atgeirr Flø Rasmussen
3953869953 Use class scope (::) rather than access enum as member. 2016-05-25 11:36:44 +02:00
Jørgen Kvalsvik
210629aba0 Use UnitSystem::to/from_si over conversion_table 
Keep up with a change in opm-parser which moves this functionality into
UnitSystem.
 2016-05-24 14:26:36 +02:00
Joakim Hove
bcc4183236 Merge pull request #32 from jokva/summary-correct-inj-prod 
Write rates/totals correctly
 2016-05-24 11:50:33 +02:00
Jørgen Kvalsvik
289021d823 Grouped tests into fewer, more elaborate cases 
The tests requires some boilerplate setup and quickly became slow to
maintain and run. Rewrite so that the tests are grouped on topic instead
of immediate keyword family.
 2016-05-24 10:31:14 +02:00
Jørgen Kvalsvik
d27b3db9fd Injection rate tests 2016-05-24 10:31:14 +02:00
Jørgen Kvalsvik
6cfb52ae69 Summary: Production is negative injection. 
Represent simulator-provided data as production = negative injection,
and write rates accordingly. Tests updated.
 2016-05-24 10:31:07 +02:00
Joakim Hove
5ff1297b57 Merge pull request #31 from jokva/summary-without-boost 
Remove boost from Summary; use posixStartTime
 2016-05-24 09:03:40 +02:00
Joakim Hove
fe3bf63bd2 Merge pull request #27 from pgdr/nnc-structure 
Added support for writing NNC information
 2016-05-19 13:44:23 +02:00
Jørgen Kvalsvik
203557cb29 Remove boost from Summary; use posixStartTime 2016-05-19 12:22:22 +02:00
Jørgen Kvalsvik
40e48af625 Moved SI-to-metric/field to opm-parser 2016-05-10 13:55:57 +02:00
Pål Grønås Drange
9f3a5d3304 Added SI conversion for NNC output 2016-05-10 10:40:05 +02:00
Pål Grønås Drange
bd5df6a247 Added writing of NNC 
* Writer takes NNC argument
* Sets NNC info to ecl_self_add_nnc
* Writes TRANNNC to INIT
* Writes NNCHEAD, NNC1 and NNC2 to EGRID
 2016-05-09 16:55:10 +02:00
Joakim Hove
1db2c7c69c Merge pull request #21 from kjellkongsvik/remove_parameters_from_EclipseWriter 
Remove parameters from eclipse writer
 2016-05-02 15:00:16 +02:00
Kjell W. Kongsvik
929e470af0 Set basename so that there is a filename to create 2016-05-02 10:07:04 +02:00
Kjell W. Kongsvik
8cc923e2b4 Use tmp area for running EclipseWriterIntegration test 
Due to old files on disk test did not fail as it should have
 2016-04-29 15:45:40 +02:00
Kjell W. Kongsvik
d248ef304f Added missing test file 2016-04-29 14:15:20 +02:00
Kjell W. Kongsvik
e7454e69db Remove phaseUsage parameter, get it from eclipseState 2016-04-29 14:15:20 +02:00
Kjell W. Kongsvik
db87f24ebb Revert back code so that output grid is not recreated unsafely 
Readded necessary parameters for this
 2016-04-29 14:15:20 +02:00
Kjell W. Kongsvik
9c78c11972 Use getBaseName() not getDeckFileName 
The check of .DATA suffix is not needed
 2016-04-29 14:15:20 +02:00
Kjell W. Kongsvik
85caa436ee Cleanup of comparisons when restoring 2016-04-29 14:15:20 +02:00
Kjell W. Kongsvik
8aa3526f82 Improved refactoring of EclipseReadWriteWellStateData 2016-04-29 14:15:20 +02:00
Kjell W. Kongsvik
35e7507f3e Refactored tests 
Move 2 decks from strings to seperate files

Started to make test_writeReadRestartfile more simple
 2016-04-29 14:15:20 +02:00
Kjell W. Kongsvik
bd1d8dc576 Removed parameters to EclipseWriter 
Paramater::ParameterGroup& params and numCells and compressedToCartesianCellIndex
These are now stored in the IOconfig object
 2016-04-29 14:15:20 +02:00
Kjell W. Kongsvik
d622f6e04b Removed compressedToCartesianCellIdx parameter 
Noted that internal calculation of compressedToCartesianCellIdx should be done in EclipseGrid
 2016-04-29 14:15:20 +02:00
Kjell W. Kongsvik
c6bfcef5e6 Removed numCells parameter 2016-04-29 14:15:20 +02:00
Atgeirr Flø Rasmussen
1867e7199d Const has no effect in by-value return. 2016-04-29 13:58:19 +02:00
Jørgen Kvalsvik
8b5d067f64 Completions mapped on active_index 2016-04-29 09:28:13 +02:00
Jørgen Kvalsvik
dcdcf99758 Support and tests for history matching G-keywords 2016-04-28 16:20:03 +02:00
Jørgen Kvalsvik
d8b9c88164 Well Injection history matching unit tests 2016-04-28 15:42:28 +02:00
Jørgen Kvalsvik
e4c3bbd958 Fix oil/gas injection lookups being switched. 2016-04-28 15:41:41 +02:00
Jørgen Kvalsvik
715fd6ff78 Fix signature; pass vector ref to group_wells 2016-04-28 10:50:51 +02:00
Jørgen Kvalsvik
5266fa213a GWIT support 2016-04-28 10:49:19 +02:00
Jørgen Kvalsvik
d7c5a43226 WGLR+WGLRH support 2016-04-28 09:46:01 +02:00
Jørgen Kvalsvik
eb7f6afae6 Rename gor to glr 
This function doesn't care if the liquid is pure water, pure oil or a
mixture.
 2016-04-28 09:44:57 +02:00
Jørgen Kvalsvik
885ed13fa0 Precompute string-to-enum mapping of keywords 
By precomputing and storing the keyword-to-enum mapping, accessing and
writing to a node overhead changes from log(N) to constant, and should
behave better w.r.t. cache and memory access.
 2016-04-27 10:50:33 +02:00
Jørgen Kvalsvik
107015a57c Unsupported keywords write negative values 
This provides easier-to-identify behaviour than simply writing zero and
going on its merry way.
 2016-04-27 10:50:33 +02:00
Jørgen Kvalsvik
a0706a32af Replace silent wrong default with throw 
Not asking sum_rate/vol for wat/oil/gas is a programmer error in the
library and shouldn't happen, but is unfortunately unverifiable with the
current tooling. The fall-through now signals a runtime error instead of
silently returning the wrong value.
 2016-04-27 10:50:33 +02:00
Jørgen Kvalsvik
e84c888d72 Support for SUMMARY configured output G-keywords 
Add support for a set of G-family summary keywords; productions, rates
and ratios.
 2016-04-27 10:50:33 +02:00
Jørgen Kvalsvik
bf7217139d Rename wwct/wgor to wct/gor 
These functions don't care if the source is a well, group or region, so
they've been renamed to emphasise its generality and reusability.
 2016-04-27 09:54:21 +02:00
Jørgen Kvalsvik
0786ec0156 Well dispatcher use partial applications 
To clarify intent and the high-level formulas used to calculate the
requested values, a series of partial applications are introduced since
most parameters to the functions are fixed from the caller.

This increases signal-to-noise ratio in the switch dispatch, at the
expense of some boilerplate before the switch itself.
 2016-04-26 13:50:52 +02:00
Jørgen Kvalsvik
e7a6ae5068 RAII cleanup of test files; WRITE removed 
The WRITE test was a mere convenience to create and inspect a summary
file, but this should instead be moved to applications or examples, and
out of tests. The helper class setup now has a destructor that will
automatically attempt to clean up the files produced by ert.
 2016-04-26 12:24:30 +02:00
Jørgen Kvalsvik
e09e7fea1f Support for SUMMARY configured output W-keywords 
Support for the creation and output of ecl-compatible SUMMARY-section
configured files. Supports a set of Well keywords, with unit conversions
based on user request, and comes with a test suite.
 2016-04-25 15:35:46 +02:00
Jørgen Kvalsvik
bd4206c4b9 Add Deck for SUMMARY unit tests. 2016-04-25 11:59:11 +02:00
Jørgen Kvalsvik
74c54a7c06 Add thp field to data::Well. 2016-04-25 11:59:01 +02:00
Pål Grønås Drange
40d9a22a5f Using getInputGrid API from Parser 2016-04-19 16:52:40 +02:00
Jørgen Kvalsvik
7a75174c1e fixup! fixup! data::Wells format for simulator data exchange 2016-04-15 10:10:25 +02:00
Jørgen Kvalsvik
1e3ff7afa4 fixup! data::Wells format for simulator data exchange 2016-04-15 09:33:26 +02:00
Jørgen Kvalsvik
e2b548bfb0 data::Wells format for simulator data exchange 
Introduces a simple format for data exchange between the simulators and
the the output facilities. Output functions will expect these types, and
it is the simulator's responsibility to create and provide it.

This patch introduces aggregates for well-related information: well
rates, bottom hole pressures and completion rates. Uses a simple bitmask
scheme to differentiate between written values and random garbage.
 2016-04-13 13:23:42 +02:00