Commit Graph

29 Commits

Author SHA1 Message Date
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
Pål Grønås Drange
526bee2a6f Using API get3DProperties() 2016-04-12 14:50:15 +02:00
Andreas Lauser
27efc6d295 only update a summary file once per report step
this fixes the problem that well totals are off by a factor of
two. Note that the better solution would be to continue to write once
per substep but skipping report step writes if the adaptive time
stepper is used. since I've got no idea how to find this out I propose
this patch.
2016-04-05 18:58:28 +02:00
Andreas Lauser
01af172599 copy the configure wrapper from opm-autodiff
this enables to build opm-output using an unpatched `dunecontrol` from
Dune 2.3 (and Dune 2.4 if USE_CMAKE is set to "no").

In the medium term the build system needs to become compatible with
Dune's cmake based build system since I think I read somewhere that
the Dune devs intend to remove the autotools based build system before
their next release.
2016-04-04 15:38:26 +02:00
Joakim Hove
769f2dee17 Merge pull request #8 from joakim-hove/refactor-rft-output
Refactor RFT output
2016-04-04 11:22:52 +02:00
Joakim Hove
484fe89308 Refactor RFT output
With this patch the RFT output writer will write a new RFT file for
every simulation, not update in place which was the case previously.
2016-04-01 15:37:43 +02:00
Atgeirr Flø Rasmussen
e6d66c3de2 Remove unused function argument. 2016-03-31 16:11:10 +02:00
Kjell W. Kongsvik
e4df4dd48d Updated with changes from opm-core master 2016-03-29 14:45:48 +02:00
Kjell W. Kongsvik
68b5c38f3a Copy changes from opm-core
Ref 81f6c2dd8e
2016-03-17 12:45:29 +01:00
Kjell W. Kongsvik
bbd526d348 fix travis: opm-material is dependant on dune 2016-03-17 09:37:42 +01:00
Kjell W. Kongsvik
c8b9745fc9 Also include opm-material in travis build 2016-03-16 14:27:18 +01:00
Kjell W. Kongsvik
a4904a88c7 travis build must include opm-core 2016-03-16 14:06:42 +01:00
Kjell W. Kongsvik
51c8416e28 Moved OutputWriter to opm-output
Moved opm/core/io/* in opm-core to opm-output opm/output along with tests.
Is still dependant on opm-core.
2016-03-16 10:47:35 +01:00
Jørgen Kvalsvik
39b3c32d3e Fix broken travis script. 2016-03-08 16:09:13 +01:00
Jørgen Kvalsvik
aa43346053 Rewrite cmake files to use opm infrastructure
Borrows macros and common infrastructure from the rest of the opm
project instead of half-implementing its own (as parser must do).
Largely a build system simplification.
2016-03-08 16:00:35 +01:00
Jørgen Kvalsvik
0881fece8b Initial commit. Travis, dune and cmake support. 2016-02-22 16:17:32 +01:00