Atgeirr Flø Rasmussen
8cd9da0d83
Merge pull request #2361 from akva2/removeNTGfill
...
remove minpvFillNtg a temporary solution while not supporting standard minpv
2020-02-24 13:34:43 +01:00
Tor Harald Sandve
06df233055
remove minpvFillNtg a temporary solution while not supporting standard minpv
2020-02-24 11:43:07 +01:00
Markus Blatt
22d4e784d3
Merge pull request #2356 from akva2/boost_prune
...
Lessen boost usage
2020-02-21 13:15:03 +01:00
Joakim Hove
c239529565
Merge pull request #2353 from joakim-hove/aquifer-config
...
Add serialization for AquiferConfig
2020-02-20 08:25:20 +01:00
Joakim Hove
d3bfa83c7c
Merge pull request #2343 from joakim-hove/move-rstconfig
...
RestartConfig has moved from EclipseState to Schedule
2020-02-20 07:07:37 +01:00
Arne Morten Kvarving
8b7e65bf8c
Merge pull request #2355 from akva2/janitoring
...
quell warning about unused local typedef
2020-02-19 11:35:39 +01:00
Arne Morten Kvarving
c73c7bef55
avoid use of boost::lexical_cast
2020-02-19 11:20:16 +01:00
Arne Morten Kvarving
bea2459c65
replace boost::optional with std::optional
2020-02-19 11:20:16 +01:00
Arne Morten Kvarving
e262cf8d51
changed: use internal function to uppercase string
2020-02-19 11:20:16 +01:00
Arne Morten Kvarving
4ba7d3a7bc
changed: replace boost::any with std::any
2020-02-19 11:20:16 +01:00
Arne Morten Kvarving
39f5e49289
remove unused boost include
2020-02-19 11:20:16 +01:00
Arne Morten Kvarving
d56b7e338d
quell warning about unused local typedef
...
strictly speaking the gcc diagnostics are wrong, the typedef is actually
used once templates are invoked on the structs.
simply use the typedef in the structs itself to avoid the warning
like is done for other variants.
2020-02-19 10:15:07 +01:00
Joakim Hove
9c8d5946b4
Add POC for AquiferConfig can be used
2020-02-18 16:19:25 +01:00
Joakim Hove
86972dc494
Add serialization for AquiferConfig
2020-02-18 16:12:00 +01:00
Arne Morten Kvarving
ff3c634924
Merge pull request #2352 from akva2/less_boost_debian
...
remove libboost-filesystem-dev from debian packaging
2020-02-18 12:03:37 +01:00
Arne Morten Kvarving
c66aa90d11
Merge pull request #2351 from akva2/redhat_dt8
...
use devtoolset-8 and boost 1.48 on rhel 6 and rhel 7
2020-02-18 12:02:44 +01:00
Arne Morten Kvarving
c88364d7a8
remove libboost-filesystem-dev from debian packaging
2020-02-18 11:24:11 +01:00
Kai Bao
5568c73d2c
Merge pull request #2320 from joakim-hove/aquifer-refactor-aquancon
...
Aquifer refactor aquancon
2020-02-18 11:08:28 +01:00
Atgeirr Flø Rasmussen
3f2ca3283c
Merge pull request #2347 from akva2/disable_json_boost_1.48
...
disable json input for boost 1.48
2020-02-18 10:58:13 +01:00
Arne Morten Kvarving
b5828b624a
Merge pull request #2349 from akva2/more_std_filesystem
...
remove last usage of boost::filesystem
2020-02-18 10:40:48 +01:00
Arne Morten Kvarving
abc439d336
remove last usage of boost::filesystem
2020-02-18 08:54:37 +01:00
Joakim Hove
980f6488b0
Serialize Aquifer datastructures
2020-02-18 07:13:30 +01:00
Joakim Hove
3a7f5799af
Refactor Aquifer datastructures to follow opm-common
...
- Replace use of Base:: with this-> in derived classes
- Add AquiferInterface::size() utility functions
- Remove AquiferInterface::cell_idx_ member
2020-02-18 07:13:30 +01:00
Joakim Hove
5ad4936025
RestartConfig has moved from EclipseState to Schedule
2020-02-17 21:48:12 +01:00
Arne Morten Kvarving
e2f31e94bf
use devtoolset-8 and boost 1.48 on rhel 6 and rhel 7
2020-02-17 15:58:02 +01:00
Arne Morten Kvarving
226a6cb434
disable json input for boost 1.48
2020-02-17 15:21:07 +01:00
Tor Harald Sandve
76682497e8
Merge pull request #2318 from akva2/fix_brine_module_init
...
fixed: call initFromDeck for Brine module
2020-02-17 14:17:17 +01:00
Joakim Hove
4bdc7d391d
Merge pull request #2344 from akva2/vfp_boost_prune
...
Drop use of boost::multi_array in VFP classes
2020-02-17 13:57:39 +01:00
Arne Morten Kvarving
99c019a6bb
adjust serialization of VFPProdTable
2020-02-17 10:50:55 +01:00
Arne Morten Kvarving
649818730c
adjust serialization for VFPInjTable
2020-02-17 10:50:55 +01:00
Arne Morten Kvarving
11e0e5b549
Merge pull request #2326 from akva2/fix_dune_fem
...
fixed: build with dune-fem enabled
2020-02-17 09:03:04 +01:00
Joakim Hove
150dc54e79
Merge pull request #2298 from totto82/muliple-group-inj-phases
...
Allow for multiple group injection phases
2020-02-14 10:31:45 +01:00
Atgeirr Flø Rasmussen
47e6b0d87d
Merge pull request #2340 from joakim-hove/remove-UDQFunctionTable-serialization
...
Remove serialization support for UDQFunctionTable and UDQFunction
2020-02-14 10:26:12 +01:00
Arne Morten Kvarving
301aa7a7cd
Merge pull request #2339 from atgeirr/fix-binary-op
...
Remove std::pointer_to_binary_function and silence a warning.
2020-02-14 10:26:03 +01:00
Tor Harald Sandve
7ed2bbed3f
Merge pull request #2313 from totto82/lab_bc
...
Lab bc
2020-02-14 09:24:02 +01:00
Joakim Hove
e366b4c9f4
Remove serialization support for UDQFunctionTable and UDQFunction
2020-02-13 17:19:12 +01:00
Arne Morten Kvarving
0449e08c65
Merge pull request #2334 from akva2/use_std_filesystem
...
remove boost::filesystem as dependency
2020-02-13 15:01:27 +01:00
Kai Bao
53e118c31c
Merge pull request #2333 from joakim-hove/segment-remove-flag
...
Remove members from WellSegment class
2020-02-13 14:39:49 +01:00
Atgeirr Flø Rasmussen
2cbeff2aca
Silence warnings.
2020-02-13 11:04:02 +01:00
Atgeirr Flø Rasmussen
83a5cf1f91
Do not use std::pointer_to_binary_function.
...
Removed from C++17.
2020-02-13 11:03:05 +01:00
Joakim Hove
3ff6279eea
Remove unused members when serializing WellSegments
2020-02-13 08:47:24 +01:00
Joakim Hove
388a44f1ad
Merge pull request #2335 from joakim-hove/icd-status
...
Update enum used in ICD status
2020-02-13 07:47:33 +01:00
Arne Morten Kvarving
04812f32fb
remove boost::filesystem as dependency
2020-02-12 15:03:18 +01:00
Joakim Hove
f886fdd128
Update enum used in ICD status
2020-02-12 14:48:26 +01:00
Markus Blatt
0e45f0827c
Merge pull request #2330 from akva2/bump_to_cxx17
...
remove usage of CXX11Features module
2020-02-11 17:50:01 +01:00
Bård Skaflestad
f0fb6b0f89
Merge pull request #2014 from akva2/use_cxx11
...
changed: use std::regex instead of boost::regex
2020-02-11 05:46:01 -06:00
Tor Harald Sandve
a784ccc47d
fix rebase
2020-02-11 11:18:21 +01:00
Arne Morten Kvarving
ac93e8e110
changed: use std::regex instead of boost::regex
2020-02-11 09:47:22 +01:00
Atgeirr Flø Rasmussen
5fe48dab8b
Merge pull request #2327 from akva2/bump_dune
...
Bump required dune version to 2.6
2020-02-11 09:41:44 +01:00
Tor Harald Sandve
052f25636c
adding blank lines
2020-02-11 09:33:58 +01:00