Commit Graph

7500 Commits

Author SHA1 Message Date
Arne Morten Kvarving
fb75bcd4e2 changed: use std::filesystem instead of boost::filesystem
since we still support g++-7, where filesystem is marked experimental,
we introduce a wrapper header and expose the namespace to use
as Opm::filesystem.

for gcc we unconditionally link with libstdc++fs in the python bindings.
the setup.py stuff links as c code, not c++ code, so it is not
automatically added on any gcc version. this might prove unportable
later.
2020-02-13 12:34:19 +01:00
Arne Morten Kvarving
679c7a2a5c remove locale workaround for older boost versions 2020-02-12 09:14:30 +01:00
Markus Blatt
c7eb410309 Merge pull request #1456 from akva2/bump_to_cxx17
changed: remove the CXX11Features module
2020-02-11 17:51:18 +01:00
Joakim Hove
425769712e Merge pull request #1459 from akva2/janitoring
changed: initialize members to avoid potential unused warnings downstream
2020-02-11 13:30:01 +01:00
Bård Skaflestad
978ab75d3a Merge pull request #1026 from akva2/use_cxx11
changed: use std::regex instead of boost::regex
2020-02-11 05:39:52 -06:00
Arne Morten Kvarving
8d3ded8eb3 changed: initialize members to avoid potential unused warnings downstream 2020-02-11 10:51:42 +01:00
Arne Morten Kvarving
0f31f83483 changed: simplify seqnumFromSeparateFilename by using a regex 2020-02-11 08:49:08 +01:00
Arne Morten Kvarving
7876f530a1 changed: use std::regex instead of boost::regex 2020-02-11 08:49:08 +01:00
Arne Morten Kvarving
44f2af0589 changed: do not mess with flags in config file
abi is ensured in other ways now
2020-02-10 11:45:06 +01:00
Arne Morten Kvarving
c272ebba62 fixed: build python bindings as c++17 2020-02-10 11:36:56 +01:00
Arne Morten Kvarving
d8aae55837 changed: remove the CXX11Features module
instead use standard CMake mechanism to set cxx standard to 17
move some of the tests to a OpmCompilerChecks.cmake file
2020-02-10 11:36:56 +01:00
Joakim Hove
01b0dcaedf Merge pull request #1454 from joakim-hove/fix-switch
Fix bug in switch default case
2020-02-07 17:32:42 +01:00
Arne Morten Kvarving
28c9db0dcd Merge pull request #1453 from tskille/compareECL
Disable checking of DOUBHEAD[1] with compareECL
2020-02-07 15:25:21 +01:00
Joakim Hove
a396b9004a Remove problematic test 2020-02-07 15:12:24 +01:00
Joakim Hove
2b0e06994d Fix bug in switch default case 2020-02-07 15:10:48 +01:00
Joakim Hove
07cb2fe0d6 Merge pull request #1451 from joakim-hove/eclstate-aquifer
Eclstate aquifer
2020-02-07 14:27:56 +01:00
Torbjørn Skille
bfca7c9fe8 Disable checking of DOUBHEAD[1] with compareECL 2020-02-07 12:53:45 +01:00
Joakim Hove
1a1b796cb6 Refactor Aquifetp class
- Make constructor and operator== for struct
- Make constructor and accessor for serialization
- Initial pressure stored in std::pair<bool, double>
- Add size() and begin() and end()
- Remove unused memmbers cell_id and inftableID
- Use ParserKeywords::AQUIFETP class instead of string lookup
2020-02-07 07:30:22 +01:00
Joakim Hove
140a1c0bf3 Add accessor and constructor for serialization 2020-02-07 07:30:22 +01:00
Joakim Hove
f91630a62d Add operator== to AQuiferCT
Initial pressure is stored as std::pair<bool, double> instead of
std::shared_ptr<double>.
2020-02-07 07:30:22 +01:00
Joakim Hove
f666ab0544 Refactored the AquiferCT class to construct AQUCT_data struct 2020-02-07 07:30:22 +01:00
Joakim Hove
a505f59096 Add begin(), end() and size() to AquiferCT class 2020-02-07 07:30:22 +01:00
Joakim Hove
ca4c10f810 Use TableManager in AquiferCT constructor 2020-02-07 07:30:22 +01:00
Joakim Hove
b57a4a39a3 Merge pull request #1448 from joakim-hove/rst-testing
Rst testing
2020-02-07 07:29:40 +01:00
Joakim Hove
9f18d86a5e Merge pull request #1446 from bska/currctrl-restart-support
Add Restart Infrastructure for Well's Active Control
2020-02-06 16:35:46 +01:00
Bård Skaflestad
38f458a672 Add Restart Infrastructure for Well's Active Control
This commit introduces a new protocol for communicating a well's
active constraint (i.e., its current target control mode) between
the running simulator and the restart file.  In particular, we add a
new type

    Opm::data::CurrentControl

whose data members indicate if the well is a producer or injector
and, depending on that state, carries information about the
pertinent active control mode.  The 'prod' member should be defined
for producing wells and the 'inj' member should be defined for
injectors.  Default-constructed objects of this type are 'invalid'
and not output to the restart file.  Add a CurrentControl member to
the Opm::data::Well type to enable communicating this information
using existing restart interfaces.

Expand existing unit tests to exercise the new data member.
2020-02-06 12:01:41 +01:00
Joakim Hove
112a0d1f2d Add test for testing of restart loaded well and connection 2020-02-06 11:59:10 +01:00
Joakim Hove
42fc0666be Rst connection - use proper enums for direction and state 2020-02-06 11:59:10 +01:00
Joakim Hove
b3dc5483f1 Rst connection insert_index has offset 0 2020-02-06 11:59:10 +01:00
Joakim Hove
de471c8244 Shift RstConnection::segment to offset 0 2020-02-06 11:59:10 +01:00
Joakim Hove
6afd05db1b Add group mamber to RstWell 2020-02-06 11:59:10 +01:00
Joakim Hove
6d3cb49c11 Add method get_well() to RstState 2020-02-06 11:59:10 +01:00
Joakim Hove
c69ff506d8 Merge pull request #1432 from joakim-hove/python-rpath
Pass RPATH to the python setup.py based build system
2020-02-06 10:54:10 +01:00
Joakim Hove
833933e954 Remove superfluous extra extension 2020-02-06 10:18:07 +01:00
Joakim Hove
22787eea61 Add boost_system to the list of libraries in setup.py 2020-02-06 10:16:43 +01:00
Joakim Hove
6b0073455b Pass RPATH to the python setup.py based build system 2020-02-06 10:15:40 +01:00
Bård Skaflestad
8225ea87d4 Merge pull request #1450 from joakim-hove/unitsystem-ecl-id
Add UnitSystem functionality to handle eclipse integer id
2020-02-05 20:42:51 +01:00
Joakim Hove
8f213b19d6 Merge pull request #1447 from akva2/simplify_tuning
changed: simplify Tuning handling
2020-02-05 07:50:41 +01:00
Joakim Hove
35a580f610 Add UnitSystem functionality to handle eclipse integer id
Writing of INTEHEAD keyword uses UnitSystem class instead of intermediate enum
UnitSystem.
2020-02-05 07:38:00 +01:00
Arne Morten Kvarving
dab3ba807a changed: simpify Tuning handling
make Tuning a simple struct, and store as a DynamicState<Tuning>.

in the process the unused setTuningInitialValue is removed. it was
only used in unit tests and seem like a leftover
2020-02-04 10:42:43 +01:00
Joakim Hove
378431024e Merge pull request #1445 from joakim-hove/addwell-refactor
Add Schedule::addWell() overload which does not take Deck arguments
2020-02-02 09:37:35 +01:00
Joakim Hove
3c5ae4bf44 Add Schedule::addWell() overload which does not take Deck arguments 2020-01-30 10:38:41 +01:00
Bård Skaflestad
b8386eb7bf Merge pull request #1444 from joakim-hove/rst-schedule-prep
Rst schedule prep
2020-01-30 10:26:43 +01:00
Joakim Hove
78f4e59fc8 Add output of missing date when TimeMap::TimeMap() fails 2020-01-30 10:20:01 +01:00
Joakim Hove
cdbccce62a Ensure base restart file is written before loading restarted case 2020-01-30 10:20:01 +01:00
Joakim Hove
9456d05ec4 Fix keyword inconsistency in test data 2020-01-30 10:20:01 +01:00
Joakim Hove
fc20150336 Use time points from Schedule in restart testing 2020-01-30 10:20:01 +01:00
Joakim Hove
993511e347 Merge pull request #1417 from bska/filleps
INIT File: Reenable FILLEPS for Two-Phase Systems
2020-01-29 21:25:17 +01:00
Bård Skaflestad
79a3ec6e84 INIT File: Reenable FILLEPS for Two-Phase Systems
This reverts commit c736e71e46.
2020-01-29 16:34:15 +01:00
Bård Skaflestad
19ecc3d30e Consider Active Phases When Initializing Satfunc Endpoints
This commit passes the run's notion of its active phases, an object
of type Opm::Phases, through to the initialisation layer for the
saturation functions' scaling properties.  In particular, this
allows us to discriminate between the phases and to not index into
tables or properties that would not be appropriate (e.g., maximum
gas saturation (SGU) in a simulation run without active gas).

Moreover, we now have enough information to know to look for SOF2 in
two-phase run using family II saturation function keywords.  These
changes are necessary in order to extend Flow's support for the
FILLEPS output request to two-phase runs.
2020-01-29 16:34:15 +01:00