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

7865 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove
32227236fa Refactor AQUANCON implementation 2020-02-18 07:33:05 +01:00
Arne Morten Kvarving
3f20edbfcb
Merge pull request #1482 from akva2/fix_brine 
fixed: add begin/end members to BrineDensityTable
 2020-02-17 16:08:56 +01:00
Arne Morten Kvarving
c2aca49a2a fixed: add begin/end members to BrineDensityTable 2020-02-17 15:13:36 +01:00
Joakim Hove
91c886465a
Merge pull request #1478 from akva2/vfp_boost_prune 
Drop use of boost::multi_array in VFP classes
 2020-02-17 13:57:32 +01:00
Arne Morten Kvarving
a43062ed7f go back to boost 1.48 on rhel6 and rhel7 2020-02-17 13:34:09 +01:00
Arne Morten Kvarving
a594483d02 bump to devtoolset-8 in redhat packaging 2020-02-17 13:34:04 +01:00
Joakim Hove
dd04b1d9df
Merge pull request #1467 from joakim-hove/rst-units 
Add units to rst classes
 2020-02-17 13:23:01 +01:00
Arne Morten Kvarving
fa572188fa changed: avoid use of boost::multi_array in VFPProdTable 2020-02-17 13:08:14 +01:00
Arne Morten Kvarving
143c8ec3bf changed: avoid use of boost::multi_array in VFPInjTable 2020-02-17 13:08:14 +01:00
Joakim Hove
dbf1929349
Merge pull request #1481 from akva2/remove_stale_flag 
remove stale cmake options from jenkins scripts
 2020-02-17 13:06:24 +01:00
Arne Morten Kvarving
f152ac1127 remove stale cmake options from jenkins scripts 2020-02-17 11:59:58 +01:00
Arne Morten Kvarving
de39bb5a7c
Merge pull request #1479 from akva2/fix_cxx17_rh6 
fixed: guess -std=c++17 flag if cmake version is too old
 2020-02-17 11:30:59 +01:00
Arne Morten Kvarving
2b5a21085c fixed: guess -std=c++17 flag if cmake version is too old 
to aid compilation on rhel6
 2020-02-17 11:30:26 +01:00
Joakim Hove
cad54feafb Internalize the existence of SKIPREST in the TimeMap 2020-02-16 17:53:27 +01:00
Bård Skaflestad
13fa36f63b
Merge pull request #1472 from akva2/fix_gcc_check 
fixed: wrong preprocessor check for gcc7
 2020-02-14 10:32:38 -06:00
Arne Morten Kvarving
e0939b69f1 fixed: gcc8+ filesystem will collapse the multiple slashes 2020-02-14 16:14:15 +01:00
Joakim Hove
1b0af2954d Add new Schedule::addWell() overload + update Well constructor args 2020-02-14 14:21:08 +01:00
Atgeirr Flø Rasmussen
fa5050f18a
Merge pull request #1474 from joakim-hove/schedule-add-rst-argument 
Schedule add rst argument
 2020-02-14 14:00:20 +01:00
Joakim Hove
15861f1dde
Merge pull request #1473 from joakim-hove/rm-rst-load-test 
Remove rst_load based test
 2020-02-14 12:51:52 +01:00
Joakim Hove
0b3f885b33 Started to add skeleton load_rst function 2020-02-14 12:51:26 +01:00
Joakim Hove
5399c4f37f Add optional RstState * argument to Schedule constructors 2020-02-14 12:05:24 +01:00
Joakim Hove
a50efdf7da Remove rst_load based test 2020-02-14 11:59:24 +01:00
Atgeirr Flø Rasmussen
4516b23a14
Merge pull request #1410 from joakim-hove/group-multiple-phases 
Support multiple phases in group injection
 2020-02-14 11:10:37 +01:00
Arne Morten Kvarving
a049cd5b03 fixed: wrong preprocessor check for gcc7 2020-02-14 09:42:31 +01:00
Tor Harald Sandve
e9318b1457 continue the work of allowing for phase dependent injection control 2020-02-14 09:30:58 +01:00
Joakim Hove
45dfd4ffe0 Change UDQ restart data for injection groups 
The code changes required to support multiple phases in a UDQ controlled
injection group is an educated guess.
 2020-02-14 09:30:58 +01:00
Joakim Hove
0b2dbf7fc2 GroupInjection is a map over phases + implement topup_phase 2020-02-14 09:30:58 +01:00
Joakim Hove
ecd8d98aab
Merge pull request #1469 from atgeirr/fix-fmap-comparison 
Fix operator==() of UDQFunctionTable.
 2020-02-14 09:06:39 +01:00
Joakim Hove
9ce0e6783d Add datum_depth as member to RstWell 2020-02-14 07:27:05 +01:00
Joakim Hove
e4955d3d94
Merge pull request #1468 from joakim-hove/connection-segment 
Connection segment
 2020-02-14 06:49:43 +01:00
Joakim Hove
9e72cd3c82 Restart well - store allow xlflow in bool 2020-02-14 06:43:25 +01:00
Joakim Hove
7da79ae532 Convert rst quantities to SI units 2020-02-14 06:43:25 +01:00
Joakim Hove
50d1108e61
Merge pull request #1455 from joakim-hove/boost-remove 
Boost remove
 2020-02-13 22:46:42 +01:00
Joakim Hove
36662b2734 Use internal string trim functions instead of boost algorithm 2020-02-13 18:25:37 +01:00
Joakim Hove
1205e8c03c Avoid use of raw pointer 2020-02-13 17:08:36 +01:00
Joakim Hove
1c07a8f251 Code to connect segment <-> connection in *one* function call 2020-02-13 16:02:21 +01:00
Joakim Hove
9ac9e53d68 Remove unused include 2020-02-13 15:29:52 +01:00
Atgeirr Flø Rasmussen
5ab15783e2 Fix operator==() of UDQFunctionTable. 2020-02-13 15:04:02 +01:00
Arne Morten Kvarving
4f63172dc9
Merge pull request #1461 from akva2/use_std_filesystem 
Replace boost::filesystem with std::filesystem
 2020-02-13 15:01:02 +01:00
Kai Bao
8ddf71a67f
Merge pull request #1460 from joakim-hove/wellsegments-state 
Wellsegments state
 2020-02-13 14:39:29 +01:00
Joakim Hove
349fb1f4f5 White space 2020-02-13 13:54:27 +01:00
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
Joakim Hove
9099c8a12a
Merge pull request #1466 from joakim-hove/segments-updates2 
Segments updates2
 2020-02-13 11:45:05 +01:00
Joakim Hove
899f698f73 Add message on stdout 2020-02-13 11:05:35 +01:00
Joakim Hove
ac2cac9f16 Remove member multiphase model from WellSegments 2020-02-13 11:03:14 +01:00
Joakim Hove
121386914b WellSegments - remove member length_depth 2020-02-13 11:03:14 +01:00
Joakim Hove
8657d59696 Remove name member from WellSegments class 2020-02-13 11:03:14 +01:00
Joakim Hove
b5d3af49e9 Remove variables: depth, length and volume from WellSegmentSet 2020-02-13 11:03:14 +01:00
Joakim Hove
185c715cff Remove WellSegments::operator<<() 2020-02-13 11:03:14 +01:00
Joakim Hove
bd688edfde Wellsegments are created with constructor 2020-02-13 11:03:14 +01:00