Commit Graph

10049 Commits

Author SHA1 Message Date
Joakim Hove
7aa8d0565b Remove class DynamicVector<T> 2021-02-18 16:50:23 +01:00
Joakim Hove
5f95d2622c Remove unused #include <.../DynamicState> and <.../DynamicVector> 2021-02-18 16:45:56 +01:00
Joakim Hove
803e993e91 Convert GuideRateTarget::RAT to preferred phase for injectors 2021-02-18 10:23:01 +01:00
Bård Skaflestad
17fb887398
Merge pull request #2295 from jalvestad/rst-network
Add restart data output for Network option data (keywords NETWORK, BRANPROP NODEPROP)
2021-02-17 14:35:49 +01:00
Jostein Alvestad
dafd605eaa various code improvements based on Joakims review 2021-02-17 08:59:03 +01:00
Jostein Alvestad
b403e2ae48 corrections to handle the use of network or not and degenrate case 2021-02-17 08:59:01 +01:00
Jostein Alvestad
cece11c727 some corrections and completed unit tests 2021-02-17 08:58:59 +01:00
Jostein Alvestad
895b8af837 first complete version of restart output - no unit tests
code improvement plus initial changes on test dataset

removed changes to test-dataset

changes to adapt to changes of Schedule object

Added test data set

changed test data - all in one DATA-file, changed serielizer - vector string

added unit test of INode data
2021-02-17 08:58:55 +01:00
Jostein Alvestad
e3be265625 initial changes to output network data to ECL-compatible restart file
first code that runs and outputs the INODE array

Added INODE and parts of IBRAN

added contributions for IBRAN and INOBR

added changes for output of RNODE

initial changes for RBRAN
2021-02-17 08:58:52 +01:00
Bård Skaflestad
ec742e302f
Merge pull request #2303 from joakim-hove/group-and-network
Network variables are stored with SummaryState::update_group_var
2021-02-17 00:01:00 +01:00
Joakim Hove
a2061972bc
Merge pull request #2302 from joakim-hove/sched-state-rft-config
Use std::optional<>
2021-02-16 22:55:56 +01:00
Joakim Hove
be1de22974 Node variables are stored with SummaryState::update_group_var 2021-02-16 22:28:19 +01:00
Joakim Hove
a43d9245e8
Merge pull request #2301 from joakim-hove/rm-commented-code
Remove commented out code
2021-02-16 15:30:47 +01:00
Joakim Hove
e029731197 Use std::optional<> instead of homemade std::pair() 2021-02-16 13:50:27 +01:00
Joakim Hove
b70cdb78da Remove commented out code 2021-02-16 13:39:29 +01:00
Joakim Hove
261f63503d
Merge pull request #2298 from joakim-hove/vfp-warnings
VFP Table updates
2021-02-16 13:37:47 +01:00
Joakim Hove
315c80eedc
Merge pull request #2300 from joakim-hove/remove-aqucon-mult
Remove aqucon mult
2021-02-16 13:36:33 +01:00
Joakim Hove
a5f32420f5 Improve error message for reused aquifer cell 2021-02-16 10:45:13 +01:00
Joakim Hove
4535b69e0d Remove multiplier from aquifer cell 2021-02-16 09:58:51 +01:00
Joakim Hove
84809e8d31
Merge pull request #2297 from joakim-hove/aquconn-combine
Implement add and multiply semantics for repeated AQUANCON keywords
2021-02-16 09:47:49 +01:00
Joakim Hove
45bfe8da9f VFP Table updates
- Add member KeywordLocation to vfp tables
 - Improve error messages
 - Remove array_type typedef - use std::vector<double>
 - Use class based enums
 - Replace assert(x) -> if (!x) throw
2021-02-16 09:14:43 +01:00
Joakim Hove
18cf79ff8a
Merge pull request #2299 from joakim-hove/fp-allow-invalid
FieldProps can return invalid data if allow_unsupported is true
2021-02-16 09:08:32 +01:00
Joakim Hove
e20be57d8b FieldProps can return invalid data if allow_unsupported is true 2021-02-16 08:34:15 +01:00
Joakim Hove
3032df0739 Implement add and multiply semantics for repeated AQUANCON keywords 2021-02-15 13:11:06 +01:00
Alf Birger Rustad
51d2a90386 Do not print debug message to LOG/PRT file 2021-02-15 10:37:02 +01:00
Joakim Hove
154b8727e1
Merge pull request #2294 from joakim-hove/aquconn
Aquconn
2021-02-15 09:19:34 +01:00
Joakim Hove
79375ecc9c Use face area as default influx coefficient for aquifer connection 2021-02-14 20:55:28 +01:00
Joakim Hove
6b9eea3919
Merge pull request #2293 from joakim-hove/handlercontext-add-wellpi
Handle WELPI + ACTIONX
2021-02-14 19:50:28 +01:00
Joakim Hove
36159d8512 Handle WELPI as ACTIONX keyword 2021-02-14 18:57:51 +01:00
Joakim Hove
6ad537fb20
Merge pull request #2292 from joakim-hove/tran-distribute-keys
Unconditionally include TRAN? keywords in FieldProps::keys<double>()
2021-02-12 16:58:49 +01:00
Joakim Hove
6fcd31850c Unconditionally include TRAN? keywords in FieldProps::keys<double>() 2021-02-12 09:59:14 +01:00
Joakim Hove
aa7b619fc7
Merge pull request #2287 from joakim-hove/target-wellpi
Store target_wellpi in simple map member of ScheduleState
2021-02-12 09:24:27 +01:00
Joakim Hove
579890177e Remove prod_index member from Well class 2021-02-11 15:57:42 +01:00
Bård Skaflestad
7c67eccb93
Merge pull request #2288 from tskille/wct_unit
change units for water cut vectors
2021-02-11 00:01:35 +01:00
Torbjørn Skille
1256f93f63 change units for water cut vectors
using same as for commercial simulator
2021-02-10 21:09:55 +01:00
Joakim Hove
35761f31c1 Store target_wellpi in simple map member of ScheduleState 2021-02-10 21:03:26 +01:00
Joakim Hove
5b195311ee
Merge pull request #2286 from joakim-hove/well-get-index-forward
Use template predicate and perfect forwarding
2021-02-10 15:37:50 +01:00
Joakim Hove
20b2531f95
Merge pull request #2285 from joakim-hove/apply-action-wellpi-arg
Update Schedulle::applyAction() api with wellpi argument
2021-02-10 14:59:17 +01:00
Joakim Hove
cbf18f3a89 Use template predicate and perfect forwarding 2021-02-10 13:19:32 +01:00
Joakim Hove
6d02754260 Update Schedulle::applyAction() api with wellpi argument 2021-02-10 12:30:49 +01:00
Joakim Hove
df563c0776
Merge pull request #2284 from joakim-hove/well-get-by-insert-index
Well get by insert index
2021-02-10 11:06:25 +01:00
Joakim Hove
23c1b15a46
Merge pull request #2283 from joakim-hove/unused-arg-warning
Remove unused arguments
2021-02-10 11:01:24 +01:00
Joakim Hove
7a40f31823 Add operator[] to NameOrder class 2021-02-10 09:45:01 +01:00
Joakim Hove
0e3839a6f1 Remove unused arguments 2021-02-10 09:19:39 +01:00
Joakim Hove
b45d40e722 Add Schedule::getWell( well_index, report_step) method 2021-02-10 09:09:53 +01:00
Joakim Hove
aea7de2c29 Add size() method to NameOrder class 2021-02-10 09:09:53 +01:00
Joakim Hove
994703e9db
Merge pull request #2269 from joakim-hove/well-sched-state2
Well use SchedState
2021-02-10 09:08:16 +01:00
Joakim Hove
bcffaefa7a Use ScheduleState for wells++
Use SchedueleState for wells, in addition to the members UDQConfig, GasLiftOpt
and GuideRateConfig.
2021-02-10 07:22:46 +01:00
Joakim Hove
0a6bbffea9
Merge pull request #2281 from joakim-hove/use-summarystate-optional-get
Use SummaryState::get_well_var(, default) instead of manual check
2021-02-10 07:21:51 +01:00
Joakim Hove
564c207a05 Use SummaryState::get_well_var() 2021-02-09 21:51:26 +01:00