Commit Graph

6489 Commits

Author SHA1 Message Date
Joakim Hove
3229c343f7 Merge pull request #1010 from joakim-hove/python-context
Python context
2019-09-23 22:04:24 +02:00
Joakim Hove
69ddffc966 Expose C++ objects to Python runtime 2019-09-23 21:31:45 +02:00
Bård Skaflestad
604c476554 Merge pull request #1041 from bska/fix-build-gcc49
Construct tuple<> Objects Explicitly
2019-09-23 19:01:34 +02:00
Bård Skaflestad
060fb59c57 Merge pull request #1040 from bska/index-out-of-bounds
Ensure ACTNUM Has Expect Number of Elements
2019-09-23 19:00:58 +02:00
Bård Skaflestad
d4ab231124 Construct tuple<> Objects Explicitly
Needed in GCC 4.9 due to incomplete standard library implementation
of class template tuple<>--especially its conditionally implicit
constructors.
2019-09-23 17:38:40 +02:00
Bård Skaflestad
c429a8a800 Ensure ACTNUM Has Expect Number of Elements 2019-09-23 17:32:52 +02:00
Joakim Hove
40570f1aba Merge pull request #1019 from joakim-hove/opmlog-python
Add Python wrapping for OpmLog
2019-09-23 16:54:18 +02:00
Atgeirr Flø Rasmussen
a5e897bdc7 Merge pull request #1039 from akva2/janitoring
fixed: remove unused variable
2019-09-23 15:59:32 +02:00
Atgeirr Flø Rasmussen
6100a90e49 Merge pull request #1009 from tskille/EclipseGrid2
ERT/libecl routines used in the EclipseGrid class has been replace by…
2019-09-23 15:55:28 +02:00
Arne Morten Kvarving
b41865d268 fixed: remove unused variable 2019-09-23 15:36:45 +02:00
Joakim Hove
a4c9b05000 Merge pull request #1032 from joakim-hove/deckitem-value-return
Misc small items
2019-09-23 15:03:48 +02:00
Joakim Hove
230c4494ed Add Python wrapping for OpmLog 2019-09-23 14:35:25 +02:00
Joakim Hove
883fb1a337 Merge pull request #1034 from stefoss23/python_replace_schedule
Python replace schedule
2019-09-23 14:22:35 +02:00
Joakim Hove
ca744afa27 Renamed the default dimension to "Dimensionless" 2019-09-21 20:47:46 +02:00
Joakim Hove
9eb0a01c7b Simplify ParserItem::dimensions() api 2019-09-21 20:47:46 +02:00
Joakim Hove
17c6d7dbad Remove unused DeckItem size hint 2019-09-21 19:24:05 +02:00
Joakim Hove
622a093315 Remove unused DeckItem constructor 2019-09-21 19:24:05 +02:00
Joakim Hove
388d0e99c3 The DeckItem::get() method returns a value 2019-09-21 19:24:05 +02:00
Joakim Hove
f3c065a899 Merge pull request #1033 from joakim-hove/dont-import-parserkeyword
Do not import ParserKeyword in Python
2019-09-21 18:13:39 +02:00
Steinar Foss
dd4cce4e9a python: removed group_tree. 2019-09-21 11:52:44 +02:00
Steinar Foss
0bc150794d python: Schedule bound directly by pybind11.
python: exposes Schedule.

python: added constructor for Schedule.

test_schedule: reintroduced most tests.

python test_schedule: all test works.

python test_wells. opened up some tests.

test_wells: opened up most.

test_wells.py ok.
2019-09-21 11:53:29 +02:00
Joakim Hove
f7a434f274 Do not import ParserKeyword in Python 2019-09-21 07:31:03 +02:00
Torbjørn Skille
34410cbe41 ERT/libecl routines used in the EclipseGrid class has been replace by new member functions. Grid properties are
calculated and stored as private data members in EclipseGrid.

The API for the class is unchanged except for some minor changes for exportACTNUM, exportZCORN and exportCOORD.

These changes have triggered some very few modifications in the opm-grid and opm-simulators repo.
2019-09-20 14:21:23 +02:00
Bård Skaflestad
c3b0dab6e5 Merge pull request #1030 from joakim-hove/summary-state-time
Add std::time start_time argument to SummaryState
2019-09-20 13:32:26 +02:00
Joakim Hove
b5ba3405af Merge pull request #1031 from bska/has-group-time-predicate
Schedule: Add Query For Particular Group at Particular Time
2019-09-20 10:33:18 +02:00
Bård Skaflestad
882ce83e91 Schedule: Add Query For Particular Group at Particular Time
This commit adds a new query method,

    bool Schedule::hasGroup(groupName, timeStep)

which report whether or not a particular named group exists at a
particular time step (zero-based report step index).  If this
function returns 'true', then it is always safe to call

    Schedule::getGroup2(groupName, timeStep)

with the same arguments.  Otherwise, the latter will throw an exception.

The new 'hasGroup' overload thus enables the same query types as the
existing 'hasWell' overload set.  The immediate use case for this
new overload is a reworking of the system for evaluating derived
summary parameters (e.g., FOPT or GGLR).

Add a new unit test to exercise the new overload.
2019-09-20 08:29:36 +02:00
Joakim Hove
a91c755194 Merge pull request #977 from bska/hookup-rft-writer
Hook New RFT File Writer up to Central ECLIPSE I/O Facility
2019-09-20 07:21:35 +02:00
Joakim Hove
727abd0907 Update DAY, MNTH and YEAR fields in SummaryState 2019-09-20 00:34:36 +02:00
Bård Skaflestad
f214c2cf0f Eclipse IO: Hook Up New RFT File Writer
This commit replaces the existing RFT file output defined in terms
of private class 'RFT' with the function RftIO::write().  While
here, also explicitly add requisite headers that were included only
transitively.
2019-09-19 22:31:45 +02:00
Joakim Hove
ff69737b99 Add start_time argument to SummaryState 2019-09-19 22:09:15 +02:00
Joakim Hove
ed5b8d0620 Merge pull request #1028 from stefoss23/py_install
setup.py: package_data: readjusted target and origin of libopmcommon.so
2019-09-19 22:07:40 +02:00
Steinar Foss
b1974db82c setup.py: package_data: readjusted target and origin of libopmcommon_python.so. 2019-09-19 14:14:55 +02:00
Joakim Hove
ae75aa3255 Merge pull request #1027 from stefoss23/add_keywords_F1
added keywords beginning w/ F and G.
2019-09-19 11:50:48 +02:00
Joakim Hove
4f276b896c Merge pull request #976 from bska/rft-through-eclio
Add New RFT File Writer
2019-09-18 21:59:17 +02:00
Bård Skaflestad
6c47cdb22f Add New RFT File Writer
This commit implements a new file writing function

    void Opm::RftIO::write()

that is intended to replace the current RFT output functionality
defined in terms of private class 'RFT' in EclipseIO.cpp.  We
support the basic RFT output consisting of

    - Timestamp (elapsed and date)
    - WELLETC metadata including all unit conventions
    - Connection cell (I,J,K), connection cell hostgrid (blank for
      main grid only), connection cell centre depth, connection cell
      pressure, and connection cell water and gas saturations

Connections in inactive cells are omitted.  Note that unit of
measure strings aren't implemented in terms of UnitSystem::name()
due to the strings being padded on the left for centering effect.

Add unit tests to exercise the new writer.
2019-09-18 16:48:53 +02:00
Bård Skaflestad
a281a3c6f4 Add RFT Output Stream
This commit introduces a new output stream, 'RFT', that is intended
as a new backend for writing RFT files.  At present this supports
integer, float, and PaddedOutputString<8> element types since those
are the types needed for basic RFT data.  We will extend the element
support if needed for PLT and/or Segment data.

We support formatted and unformatted output streams and distinguish
between opening a new stream and opening an existing output stream
(essentially between open modes ios_base::out and ios_base::app).

Add unit tests to exercise the possible combinations.
2019-09-18 16:48:53 +02:00
Joakim Hove
4388c9d72f Merge pull request #1015 from joakim-hove/actionx-restart
Actionx restart
2019-09-18 16:45:24 +02:00
Steinar Foss
897edca773 added keywords beginning w/ F and G.
added keywords FOAMFSO, FOAMFST, FOAMFSW.

added keywords FOAMMOBP.

added keywords FOAMOBS, FORMFEED.

added keywords GASBEGIN, GASCONC.

added keywords GASEND, GASFCOMP.

added keywords GASFDECR, GASFDELC.

added keywords GASFIELD, GASFTARG.

added keywords GASMONTH, GASPERIO.

added keywords GASSATC, GASYEAR.

added keyword GCALECON.

added keywords GCONCAL, GCONENG.

added keyword GCONCAL.

keywords GASFCOMP, GCALECON: L*L*L -> GasSurfaceVolume.

FOAMFST: Density -> FoamDensity.
2019-09-18 15:49:58 +02:00
Joakim Hove
7d32890d99 Merge pull request #1025 from atgeirr/add-clang-format-spec
Add .clang-format specification.
2019-09-18 15:34:39 +02:00
Joakim Hove
4bed60df0f Merge pull request #1024 from akva2/janitoring
Some janitoring
2019-09-18 15:28:30 +02:00
Atgeirr Flø Rasmussen
93e4c2ffec Add .clang-format specification. 2019-09-18 14:15:21 +02:00
Arne Morten Kvarving
6bbf1fcde2 remove unused UDQParams member in UDQContext 2019-09-18 13:21:00 +02:00
Arne Morten Kvarving
93439cf41e quell shadowing warnings 2019-09-18 13:21:00 +02:00
Arne Morten Kvarving
8c874bf741 fixed: move file into correct directory 2019-09-18 13:21:00 +02:00
Arne Morten Kvarving
0e108311e3 changed: disable unused function
kept around as it is handy for debugging
2019-09-18 13:20:43 +02:00
Arne Morten Kvarving
d2aaff46e0 Merge pull request #1018 from tskille/convertECL
convertECL update, fixed bug with file extensions
2019-09-18 10:33:26 +02:00
Joakim Hove
8a88d64bd1 Merge pull request #1023 from joakim-hove/guiderate-warnings
Fix GuideRate warnings
2019-09-17 19:37:51 +02:00
Joakim Hove
d1fd6359af Merge pull request #1022 from joakim-hove/check-CC-env-variable
Check CC environment variable
2019-09-17 16:56:47 +02:00
Joakim Hove
2b75ff1c19 Fix GuideRate warnings 2019-09-17 16:52:34 +02:00
Joakim Hove
b7459231d2 Check CC environment variable 2019-09-17 14:18:36 +02:00