Commit Graph

335 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
61bc977d27 Suppress boost warnings. 2016-06-15 09:40:18 +02:00
Jørgen Kvalsvik
e0721786c4 Replace boost-filesystem with ert
Ert is a hard dependency that provides much of the core functionality of
opm-output, whereas boost::filesystem only provided create-directory
features. Since Ert conveniently provides the same features with a
near-identical interface and is used for file-writing anyway, the
responsibility for interacting with the file system has been put on ert.

Boost is now only used for testing in opm-output.
2016-06-13 14:46:20 +02:00
Joakim Hove
c45fcc5e50 Merge pull request #37 from joakim-hove/travis-reorg
Using travis build-all configuration.
2016-06-11 07:28:01 +02:00
Jørgen Kvalsvik
64ea598240 Remove unused message 2016-06-10 14:00:18 +02:00
Joakim Hove
7b4ed3cd63 Using travis build-all configuration. 2016-06-10 13:46:59 +02:00
Jørgen Kvalsvik
d65cf1d657 Only write positive values to Summary file
Since production is seen as negative injection, and production rates
often are zero, negative zeros would be returned. Likewise, occasionally
numerical noise gives slightly-below-zero values which are now rounded
to be plain zeros.
2016-06-10 10:04:00 +02:00
Jørgen Kvalsvik
87e24b91b6 Look up history rates at correct timestep
The input format and parser interacts non-intuitively, as the observed
rates for timestep N are written for timestep N-1.
2016-06-10 10:03:49 +02:00
Jørgen Kvalsvik
ac0ed1447c Don't crash when a Well is not in data::Wells
It's perfectly legitimate for clients to "default" a well result, e.g.
when it hasn't started up yet, in which case most output will default to
0. Avoid crashing when this happens, and instead calculate based on a
dummy well.
2016-06-07 08:42:30 +02:00
Jørgen Kvalsvik
c87ffb1608 Base Summary test durations on days
Basing the dest durations on days over seconds make them less noisy,
more readable and closer to actual idiomatic use. Removes some subtle
complexities from the tests.
2016-06-07 08:42:30 +02:00
Jørgen Kvalsvik
c5397488a8 Correctly calculate totals 2016-06-07 08:42:30 +02:00
Jørgen Kvalsvik
54fdaadff9 Use basename for filename, not title 2016-06-07 08:41:39 +02:00
Jørgen Kvalsvik
bb53a74763 Use alias for UnitSystem::measure 2016-06-07 08:41:38 +02:00
Jørgen Kvalsvik
c1ea13a550 Use grid-provided index calculations. 2016-06-07 08:40:41 +02:00
Jørgen Kvalsvik
800b214462 Relace ad-hoc keyword-struct with EclKW_ref 2016-06-07 08:40:41 +02:00
Jørgen Kvalsvik
b238762731 Replace ert_unique_ptr with FortIO 2016-06-07 08:40:41 +02:00
Jørgen Kvalsvik
e73475db80 Renaming: 'handle' names made more descriptive 2016-06-07 08:40:41 +02:00
Jørgen Kvalsvik
9e39b92c99 Keyword replaced with ERT::EclKW
Use library-provided ecl_kw abstraction rather than rolling our own RAII
wrapper.
2016-06-07 08:40:41 +02:00
Jørgen Kvalsvik
0f1a1d7ede NNC variable not defaulted in writeInit 2016-06-07 08:40:41 +02:00
Jørgen Kvalsvik
99e2a55204 Replace raw conversion_table with UnitSystem
The to_si/from_si functions were moved into UnitSystem which now manages
table lookup for clients, rather than having to store the raw
conversion tables.
2016-06-07 08:40:41 +02:00
Jørgen Kvalsvik
bed743c763 Travis: don't build material and core 2016-06-07 08:40:41 +02:00
Jørgen Kvalsvik
e2a5c01a8b Read sim start time from EclipseState
Reading the start time from EclipseState means it's no longer required
as a parameter to every method, and that the current time can be
calculated as start time + time elapsed.
2016-06-07 08:40:41 +02:00
Jørgen Kvalsvik
91d5cad61e Remove unused argument from writeInit 2016-06-07 08:40:41 +02:00
Jørgen Kvalsvik
ecbbec3aad Remove the OutputWriter-Eclipse inheritance
This is-a relationship is never used, and the vtable is never leveraged.
The augmented output writers already use uniquely named output writers
anyway, so there is no reason to go via the hurdle of inheritance.

This gives a lot of flexibility when it comes to interface, since
Eclipse output can make Eclipse-specific assumptions.
2016-06-07 08:40:40 +02:00
Jørgen Kvalsvik
6efe691629 Replace boost::posix_time with time_t
The boost object was only used to calculate elapsed posix time anyway,
which is required (and already managed) by the callers. This makes the
interface slightly less complicated and removes an otherwise pointless
dependency.
2016-06-07 08:40:40 +02:00
Jørgen Kvalsvik
a1d8ec4c09 Remove boost::to_upper_copy 2016-06-07 08:40:40 +02:00
Jørgen Kvalsvik
add5c6ba37 Use throw over OPM_THROW 2016-06-07 08:40:40 +02:00
Jørgen Kvalsvik
c1775bc1f1 Implement EclipseWriter as private; hide RFT
Hides all the EclipseWriter details and helper classes using pimpl,
which now enforces the non-copyability of EclipseWriter (which relies on
open and stateful file handles).
2016-06-07 08:40:40 +02:00
Jørgen Kvalsvik
ed6b884a9e Rewrite internal Init helper 2016-06-07 08:40:40 +02:00
Jørgen Kvalsvik
f50bbb1ac3 Rewrite internal Restart-Solution helper 2016-06-07 08:40:40 +02:00
Jørgen Kvalsvik
c3a9495c1a Rewrite internal Restart helper 2016-06-07 08:40:40 +02:00
Jørgen Kvalsvik
cc79b998af Rewrite internal FileName helper 2016-06-07 08:40:40 +02:00
Jørgen Kvalsvik
19324207dc Rewrite internal Keyword helper class 2016-06-07 08:40:40 +02:00
Jørgen Kvalsvik
ff6bcf713f Remove details namespace; introduce anon namespace
There is no reason for these symbols to be externally visible, so
they're now instead contained in an anonymous namespace.
2016-06-07 08:40:40 +02:00
Jørgen Kvalsvik
6f90959d42 Remove opm-core dependency in writenumwells test 2016-06-07 08:40:40 +02:00
Jørgen Kvalsvik
0e9238a175 Remove opm-core dependency in Restart test; rename
Removes the opm-core dependency in the restart test, and renames the
file to be more in style with the new test set.
2016-06-07 08:40:40 +02:00
Jørgen Kvalsvik
038007b431 Remove opm-core dependency in EclipseWriter test 2016-06-07 08:40:39 +02:00
Jørgen Kvalsvik
d1c0575f47 Remove opm-core dependency in RFT test; rename
Rewrites the RFT test to be independent of opm-core data types and
functions, and renames it to test_RFT since the class now represents the
full file, not some open-closing handle.
2016-06-07 08:40:39 +02:00
Jørgen Kvalsvik
913da19a14 Replace OPM_THROW with throw. 2016-06-07 08:40:39 +02:00
Jørgen Kvalsvik
6944ac69a2 Remove core/WellType from EclipseWriter 2016-06-07 08:40:39 +02:00
Jørgen Kvalsvik
0926f1a003 Disable UnstructuredGrid VTK output.
UnstructuredGrid is deeply tied to core, and is disabled for now.
writeVtk should be rewritten to use EclipseGrid as input or something
similar, but support is dropped in its current state.
2016-06-07 08:40:39 +02:00
Jørgen Kvalsvik
57ae14cfc7 Replace DataMap with std::map in writeVTK 2016-06-07 08:40:39 +02:00
Jørgen Kvalsvik
8adf7a2517 Removed deprecated VAG support. 2016-06-07 08:40:39 +02:00
Jørgen Kvalsvik
29f64a1a85 Remove ParameterGroup include from CornerpointChopper 2016-06-07 08:40:39 +02:00
Jørgen Kvalsvik
59480757d9 String fixup: core -> output 2016-06-07 08:40:39 +02:00
Jørgen Kvalsvik
ccb961c66c Remove opm-core from writeECLData 2016-06-07 08:40:39 +02:00
Jørgen Kvalsvik
1ab914e98a Simplify writing procedure 2016-06-07 08:40:39 +02:00
Jørgen Kvalsvik
9ea5e52144 Replace core/grid arg with dimensions in WriteECL
The grid structure was only used to read static size-related properties,
meaning the instance itself was rather uninteresting. Replace the grid
argument with raw ints.
2016-06-07 08:40:39 +02:00
Jørgen Kvalsvik
530407a3ad EclipseWriter header cleanup
Remove the unnecessary or unused includes. Consequence is well enum
conversions being no longer public static. To not break the tests the
functions have been implemented in writenumwells.
2016-06-07 08:40:39 +02:00
Jørgen Kvalsvik
5af3fb84fe Refactor RTFWriter
Remove the opm-core dependency and re-implement the RFT writer. The
approach has been changed in the sense that we now store and keep alive
a file instance for the RFT file, instead of re-opening the file at
every time step.
2016-06-07 08:40:38 +02:00
Jørgen Kvalsvik
dac3ef8bb6 Reorder fields in EclipseWriter 2016-06-07 08:40:38 +02:00