Commit Graph

7588 Commits

Author SHA1 Message Date
Joakim Hove
aed8c78af5 Move RestartConfig from EclipseState to Schedule 2020-02-19 12:35:07 +01:00
Joakim Hove
269802ae48 Add comment about locating shared library while testing Python 2020-02-19 12:33:50 +01:00
Joakim Hove
59f6cc7c11 Remove moot test 2020-02-19 12:33:50 +01:00
Joakim Hove
89cf50e0d5 Remove hack for Python 3D testing 2020-02-19 12:33:50 +01:00
Joakim Hove
b3601c7357 Merge pull request #1489 from akva2/more_boost_prune
Continue replacing boost usage
2020-02-19 12:29:06 +01:00
Joakim Hove
36e40040a0 Merge pull request #1491 from atgeirr/accept-mixed-case-months
Use upper case to look up month numbers.
2020-02-19 11:38:46 +01:00
Arne Morten Kvarving
36d4fa2923 replace boost with std in comment 2020-02-19 09:53:01 +01:00
Arne Morten Kvarving
3d83512f09 get rid of usage of boost::join 2020-02-19 09:51:57 +01:00
Arne Morten Kvarving
26c9a1e3f1 changed: get rid of boost::lexical_cast
replace with std::strtoul. not as pretty, but boost is not popular in
here
2020-02-19 09:51:57 +01:00
Arne Morten Kvarving
83a7cd04c3 remove unused boost includes
and deal with missing include fallout
2020-02-19 09:51:46 +01:00
Atgeirr Flø Rasmussen
4a16f6022d Use upper case to look up month numbers.
This means we accept strings such as "Sep" and "oCT" as valid months,
not just "SEP" and "OCT".
2020-02-19 09:37:28 +01:00
Arne Morten Kvarving
2b6754151f add internal replacement for boost::split and use it 2020-02-19 09:29:25 +01:00
Joakim Hove
a4d745b895 Merge pull request #1484 from joakim-hove/brine-table-size
Add size() method to BrineDesityTable
2020-02-18 15:11:25 +01:00
Arne Morten Kvarving
57d88dea7e add a replacement for boost::replace_all and use it 2020-02-18 14:48:40 +01:00
Arne Morten Kvarving
82491aaf2e changed: use internal method to uppercase a string instead of boost 2020-02-18 14:31:41 +01:00
Arne Morten Kvarving
c8458049e8 changed: use internal trim methods instead of boost 2020-02-18 14:31:03 +01:00
Arne Morten Kvarving
ec1dabf80e Merge pull request #1488 from akva2/less_boost_debian
remove libboost-regex-dev, libboost-filesystem-dev from debian packaging
2020-02-18 12:03:04 +01:00
Arne Morten Kvarving
ee90d5f094 Merge pull request #1487 from akva2/redhat_dt8
Use devtoolset-8 in redhat packaging
2020-02-18 12:02:06 +01:00
Joakim Hove
fc82988c9c Merge pull request #1475 from joakim-hove/schedule-addwell-refactor
Add new Schedule::addWell() overload + update Well constructor args
2020-02-18 11:58:37 +01:00
Joakim Hove
084ff09e78 Merge pull request #1476 from joakim-hove/timemap-skiprest
Internalize the existence of SKIPREST in the TimeMap
2020-02-18 11:57:24 +01:00
Arne Morten Kvarving
14548852d7 remove libboost-regex-dev, libboost-filesystem-dev from debian packaging 2020-02-18 11:08:32 +01:00
Kai Bao
e2b4759b23 Merge pull request #1452 from joakim-hove/eclstate-aquifer-aquancon
Eclstate aquifer aquancon
2020-02-18 11:08:14 +01:00
Joakim Hove
c5e1826498 Add size() method to BrineDesityTable 2020-02-18 07:49:48 +01:00
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