Commit Graph

7607 Commits

Author SHA1 Message Date
Bård Skaflestad
561a594365 Merge pull request #1501 from goncalvesmachadoc/patch-2
Add SALTVD table to CMake List
2020-02-21 11:44:21 -06:00
Joakim Hove
95d1cc29ff Merge pull request #1500 from goncalvesmachadoc/goncalvesmachadoc-addSaltKeywords
add Keywords for Salt
2020-02-21 18:44:13 +01:00
Cintia Goncalves Machado
80da943b36 Add SALTVD table to CMake 2020-02-21 16:45:07 +01:00
Cintia Goncalves Machado
452a49d56f add Keywords for Salt 2020-02-21 13:47:10 +01:00
Joakim Hove
ae504bcb45 Merge pull request #1499 from totto82/addControlWELTARG
Add production control from WELTARG
2020-02-21 13:25:20 +01:00
Tor Harald Sandve
83a8a9f4fe add test for production control from WELTARG 2020-02-21 12:39:58 +01:00
Joakim Hove
9d1cf2482f Merge pull request #1498 from atgeirr/silence-warnings
Silence warnings.
2020-02-21 11:57:04 +01:00
Tor Harald Sandve
df14e0d66a Add production control from WELTARG 2020-02-21 11:15:18 +01:00
Atgeirr Flø Rasmussen
f35529d7ff Silence warnings.
- One class vs struct declaration.
 - Unused variables in a test.
2020-02-21 10:49:41 +01:00
Joakim Hove
7b145e360f Merge pull request #1497 from joakim-hove/use-size_t
Use std::size_t instead of int for size
2020-02-21 09:30:58 +01:00
Joakim Hove
c11d0bb4cc Use std::size_t instead of int for size 2020-02-21 07:43:25 +01:00
Joakim Hove
4816777700 Merge pull request #1494 from joakim-hove/use-size_t
Use std::size_t instead of int for size
2020-02-20 13:57:16 +01:00
Joakim Hove
412909fa3a Use std::size_t instead of int for size 2020-02-20 11:54:40 +01:00
Joakim Hove
a3c634b1f8 Merge pull request #1458 from joakim-hove/eclstate-aquifer-config
Eclstate aquifer config
2020-02-20 08:25:25 +01:00
Joakim Hove
6a87be8512 Merge pull request #1490 from joakim-hove/use-complnum
Store complnum value directly without taking std::abs()
2020-02-20 08:24:28 +01:00
Joakim Hove
6a0785b172 Merge pull request #1477 from joakim-hove/move-restart-config
Move RestartConfig to Schedule
2020-02-20 07:06:58 +01:00
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
20afa1ed31 Store complnum value directly without taking std::abs() 2020-02-19 07:16:03 +01:00
Joakim Hove
01aa3692fa Add AquiferConfig to EclipseState 2020-02-18 18:07:02 +01:00
Joakim Hove
7daf77ef59 Added AquiferConfig class 2020-02-18 15:30:09 +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