Commit Graph
6748 Commits
Author SHA1 Message Date
Joakim Hove d94943a741 Serialize new member TableManager::gas_comp_index 2020-02-25 08:04:28 +01:00
Joakim Hove 2ce7b35e69 Serialize density-temparture class DenT 2020-02-25 06:50:31 +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 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
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 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 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
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
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
Joakim Hove e366b4c9f4 Remove serialization support for UDQFunctionTable and UDQFunction 2020-02-13 17:19:12 +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 f886fdd128 Update enum used in ICD status 2020-02-12 14:48:26 +01: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
Tor Harald Sandve 2d2ec82640 fix MPI 2020-02-11 09:33:58 +01:00
Tor Harald Sandve e39e327451 fix 2p 2020-02-11 09:33:58 +01:00
Tor Harald Sandve 469ffa2cbe allow for multiple group injection phases 2020-02-11 09:30:19 +01:00
Tor Harald Sandve a840c4f418 Merge pull request #2325 from dr-robertk/PR/async-output
Async output.
2020-02-11 09:07:06 +01:00
Arne Morten Kvarving 22a291a3af Merge pull request #2331 from akva2/janitoring
changed: rename local typedef to avoid shadowing warning
2020-02-10 15:24:15 +01:00
Arne Morten Kvarving 96b2e97b15 changed: rename local typedef to avoid shadowing warning 2020-02-10 12:30:14 +01:00
Robert Kloefkorn 526f1f9bb1 [bugfix][AsyncOutput] Restore asynchronicity for output and make sure
that all output is written before the simulator is finalized.
2020-02-10 12:11:30 +01:00
Markus Blatt 11c1574405 Merge pull request #2316 from akva2/fix_bda_onephase
fixed: add explicit template instantation for blocksize 1
2020-02-10 11:23:06 +01:00
Joakim Hove d17b21089f Use member variable in Aquifer code 2020-02-09 10:13:15 +01:00
Arne Morten Kvarving cfa0904321 fixed: quell deprecation warnings with dune 2.7 2020-02-07 15:19:44 +01:00
Arne Morten Kvarving d28ed77036 fixed: add explicit template instantation for blocksize 1
fixes linking of flow_onephase with bda/cuda enabled
2020-02-07 15:18:40 +01:00
Atgeirr Flø Rasmussen d4419fedfb Merge pull request #2283 from totto82/conditionalCheck
make group constrain check conditional
2020-02-07 15:02:04 +01:00
Joakim Hove 0e1a210ef2 Use std::pair<bool, double> for initial aquifer pressure 2020-02-07 12:32:09 +01:00
Joakim Hove cb8a76d098 Use [i] instead of at(i) when accessing Aquifer container 2020-02-07 07:31:25 +01:00