Commit Graph
100 Commits
Author SHA1 Message Date
Joakim Hove 969fc20154 Merge pull request #3373 from verveerpj/improve_validation
Add keyword validation using a predicate function
2021-06-15 07:47:37 +02:00
Joakim Hove 2a990f7465 Merge pull request #3382 from GitPaean/fixing_compilation
not comparing guideRate_ with nullptr
2021-06-15 07:46:00 +02:00
Joakim Hove 0cf158cd15 Merge pull request #3379 from joakim-hove/wellrates-rename-X
Rename data::WellRates -> data::Wells
2021-06-14 18:21:39 +02:00
Joakim Hove f9618faceb Merge pull request #3377 from joakim-hove/perf-data-injector
PerfData maintains producre / injector status
2021-06-14 15:53:15 +02:00
Joakim Hove 166907c45d Merge pull request #3380 from joakim-hove/guiderate-value
Use GuideRate value instead of std::unique_ptr<GuideRate>
2021-06-14 15:52:08 +02:00
Joakim Hove b1600b904f Rename data::WellRates -> data::Wells 2021-06-14 15:27:56 +02:00
Joakim Hove 193657fee1 Use GuideRate value instead of std::unique_ptr<GuideRate> 2021-06-14 14:35:55 +02:00
Joakim Hove 2030237299 Merge pull request #3378 from akva2/janitoring
Quell some warnings in static analyzers
2021-06-14 12:47:54 +02:00
Joakim Hove a22b836b82 PerfData maintains producre / injector status 2021-06-14 09:03:02 +02:00
Joakim Hove f401f17132 Merge pull request #3375 from joakim-hove/rename-wellrates2
Rename data::WellRates -> data::Wells
2021-06-14 08:00:37 +02:00
Joakim Hove 3442af12a2 Rename data::WellRates -> data::Wells 2021-06-13 22:00:59 +02:00
Joakim Hove 7c133bb0eb Merge pull request #3374 from joakim-hove/rename-wellrates
Rename data::WellRates -> data::Wells in opm-common
2021-06-13 13:14:03 +02:00
Joakim Hove b0d4aedb2a Merge pull request #3372 from joakim-hove/wellstate-report
Minor renames++ in WellState report
2021-06-13 08:39:27 +02:00
Joakim Hove 454220b9e7 Rename data::WellRates -> data::Wells in opm-common 2021-06-13 08:37:56 +02:00
Joakim Hove fe5e4a9ac3 Minor renames++ in WellState report 2021-06-11 16:01:25 +02:00
Joakim Hove 2dae87fb74 Merge pull request #3370 from totto82/bugMaxInnerIter
change get param from bool to int
2021-06-11 12:39:45 +02:00
Joakim Hove 2966a52a0f Merge pull request #3361 from joakim-hove/simplify-conn-check
Suggestion: Simplify check for number of perforations
2021-06-11 11:04:21 +02:00
Joakim Hove 7a1f71feaa Simplify check for number of perforations 2021-06-10 23:26:51 +02:00
Joakim Hove 86125d9721 Merge pull request #3352 from joakim-hove/perf-data
Perf data
2021-06-10 16:14:25 +02:00
Joakim Hove 308e191ad5 Remove unused #include <TimeMap> 2021-06-10 14:38:14 +02:00
Joakim Hove 3c3a4afcfc Use PerfData for connection productivity index 2021-06-10 14:32:45 +02:00
Joakim Hove 81c5ce8843 Use PerfData for water throughput, water velocity and skin pressure 2021-06-10 14:32:45 +02:00
Joakim Hove db02b9f112 Use PerfData for solvent perforation rates 2021-06-10 14:27:37 +02:00
Joakim Hove 49e9b51269 Use PerfData for polymer rates 2021-06-10 07:19:21 +02:00
Joakim Hove 3010b96611 Use PerfData for perforation rates 2021-06-10 07:19:21 +02:00
Joakim Hove 76838cd8a4 Use PerfData for perforation pressure 2021-06-10 07:19:21 +02:00
Joakim Hove 4b69d12335 Use PerfData for perforation rates 2021-06-10 07:18:46 +02:00
Joakim Hove b6318ac017 Add WellContainer<PerfData> to WellState 2021-06-10 07:18:46 +02:00
Joakim Hove 34481e48c3 Add data container PerfData to use in WellState 2021-06-10 07:18:46 +02:00
Joakim Hove 1a7c514879 Merge pull request #3359 from joakim-hove/rm-mpi-sum
Use ecl well for total number of connections
2021-06-09 17:13:25 +02:00
Joakim Hove fc5e2be4e2 Merge pull request #3365 from akva2/wrap_property_tree
Add Opm::PropertyTree
2021-06-09 17:12:38 +02:00
Joakim Hove b868f87420 Use ecl well for total number of connections 2021-06-08 21:14:16 +02:00
Joakim Hove 023edc67e5 Remove first perf member from Well classes 2021-06-08 14:24:26 +02:00
Joakim Hove ce3d2b17dd Merge pull request #3357 from bska/restore-debug-build
Restore Debug Build
2021-06-06 19:28:28 +02:00
Joakim Hove e83d4d0dbd Merge pull request #3336 from joakim-hove/wellpotential_wellcontainer
Manage well potentials with WellContainer<>
2021-06-06 08:33:26 +02:00
Joakim Hove 32a6f32660 Use WellContainer to manage perf phase rate 2021-06-05 07:50:56 +02:00
Joakim Hove f28ff9e450 Merge pull request #3344 from joakim-hove/perf-wellcontainer
Perf wellcontainer
2021-06-04 20:12:17 +02:00
Joakim Hove 6a21371b59 Use WellContainer to manage perf phase rates 2021-06-04 18:23:20 +02:00
Joakim Hove 76292552ec Use WellContainer for perf rate of polymer/solvent/brine 2021-06-04 18:23:20 +02:00
Joakim Hove 104036d4b8 Use WellContainer for perf water velocity 2021-06-04 18:23:20 +02:00
Joakim Hove a2009b1189 Use WellContainer for perforation throughput 2021-06-04 18:23:20 +02:00
Joakim Hove b0fd14a597 Use WellContainer<> for perforation skin pressure 2021-06-04 18:23:20 +02:00
Joakim Hove fcc4970337 Merge pull request #3318 from akva2/eclwellmodel_no_default
changed: do not set the ebos well model as default type
2021-06-04 09:58:46 +02:00
Joakim Hove 1285d02873 Merge pull request #3339 from joakim-hove/perf-well-access
Perf well access
2021-06-04 08:41:47 +02:00
Joakim Hove cb800abd05 Merge pull request #3345 from atgeirr/silence-warnings
Silence warnings
2021-06-03 17:25:47 +02:00
Joakim Hove 1a6737aff3 Use well index for perforation rates 2021-06-03 13:29:45 +02:00
Joakim Hove 739f6ad28a Use well index for solvent perf rates 2021-06-03 13:21:23 +02:00
Joakim Hove a2195f367d Use well index for brine perf rates 2021-06-03 13:21:23 +02:00
Joakim Hove fa829cce7a Use well index for polymer perforation rates 2021-06-03 13:21:23 +02:00
Joakim Hove f62b0a5d1e Use well index for well water perf velocity 2021-06-03 13:21:23 +02:00
Joakim Hove 8f9a3f0140 Use Well index for perf skin pressure 2021-06-03 13:21:23 +02:00
Joakim Hove 89ae75b46c Use well index to access WellState::perfThroughput() 2021-06-03 13:21:23 +02:00
Joakim Hove 42d1b4c4a8 Merge pull request #3335 from joakim-hove/segment-state2
Segment state2
2021-06-03 11:49:49 +02:00
Joakim Hove 59f36eacc0 Remove WellState::top_segment_index 2021-06-03 10:46:26 +02:00
Joakim Hove 5d8a4c5751 Remove WellState member nseg_ 2021-06-03 10:46:26 +02:00
Joakim Hove f7b1f90c12 Add method SegmentState::size() 2021-06-03 10:46:26 +02:00
Joakim Hove 19ba223c2a Use SegmentState for segment_number() 2021-06-03 10:46:26 +02:00
Joakim Hove d3e019fbce Add private member segment_number to SegmentState class 2021-06-03 10:46:26 +02:00
Joakim Hove ac12c8b3a4 Use SegmentState for rates 2021-06-03 10:46:26 +02:00
Joakim Hove 357cb11667 Use SegmentState::scale_pressure() 2021-06-03 10:46:04 +02:00
Joakim Hove eac69061c2 Use SegmentState when copying pressure 2021-06-03 10:46:04 +02:00
Joakim Hove eb937e8ba2 Use SegmentState as backing store for segment pressure 2021-06-03 10:46:04 +02:00
Joakim Hove fc185afc02 Initialize pressure in top segment for non MSW well to zero 2021-06-03 10:46:04 +02:00
Joakim Hove df7d96494b Add small method SegmentState::scale_pressure() 2021-06-03 10:46:04 +02:00
Joakim Hove 7d89c6e09c Add std::string overload for WellState::segments() 2021-06-03 10:46:04 +02:00
Joakim Hove 3fd6d7781b Remove WellState::segPressDrop() 2021-06-03 10:46:04 +02:00
Joakim Hove 6a859c0664 Segmentstate for accelarition pressure drop 2021-06-03 10:46:04 +02:00
Joakim Hove 33f18279d7 Use segmentstate for hydrostatic pressure drop 2021-06-03 10:46:04 +02:00
Joakim Hove 9801469488 Use segmentstate for friction pressure 2021-06-03 10:46:04 +02:00
Joakim Hove bccb4f36e4 Don't test pressure & rates for top segment in non MSW well 2021-06-03 10:46:04 +02:00
Joakim Hove 45e7c8c982 Add WellContainer<SegmentState> member 2021-06-03 10:46:04 +02:00
Joakim Hove 5dc267c6f5 Add class SegmentState 2021-06-03 10:46:04 +02:00
Joakim Hove 702dc3a924 Merge pull request #3338 from joakim-hove/remove-unused
Use perfrates.size() instead of storing num_perf explicitly
2021-06-03 07:58:56 +02:00
Joakim Hove f733e33d70 Explicitly zero vectors at the start of report step 2021-06-02 14:21:36 +02:00
Joakim Hove c5a7b49c3d Use perfrates.size() instead of storing num_perf explicitly 2021-06-02 10:21:02 +02:00
Joakim Hove d57a8514a2 Merge pull request #3323 from joakim-hove/remove-segment-pressure-drop
Remove segment pressure drop as separate variable
2021-05-31 14:08:38 +02:00
Joakim Hove 2d67d085ef Remove segment pressure drop as separate variable 2021-05-31 09:10:33 +02:00
Joakim Hove db49c8aeef Merge pull request #3309 from joakim-hove/wellrates-at
Make sure all wells are added to the well_rates map
2021-05-29 07:53:45 +02:00
Joakim Hove 95583df955 Merge pull request #3252 from bska/pack-unpack-aqudata
Prepare to Save/Restore Richer Set of Aquifer Values
2021-05-29 07:47:42 +02:00
Joakim Hove 953de0c6b9 Remove unused variable 2021-05-28 11:14:19 +02:00
Joakim Hove 3fae970e7e Merge pull request #3316 from joakim-hove/segment-use-well-index2
Segment use well index2
2021-05-28 10:48:13 +02:00
Joakim Hove d2510714e0 Check that stdout is attached to terminal before applying color 2021-05-28 10:20:10 +02:00
Joakim Hove a1b45b06e4 Use well index for segment acceleration pressure loss 2021-05-28 07:32:30 +02:00
Joakim Hove 960de96d75 Use well index for segment hydrostatic pressure drop 2021-05-28 07:32:30 +02:00
Joakim Hove ee1a1c6afc Use well index for segment friction pressure drop 2021-05-28 07:32:29 +02:00
Joakim Hove 92e31b4ee3 Use well index for segment pressure drop 2021-05-28 07:32:29 +02:00
Joakim Hove 045f43bd20 Merge pull request #3296 from joakim-hove/segment-use-well-index
Segment use well index
2021-05-27 16:18:47 +02:00
Joakim Hove dac62bbab3 WellState::well_rates is only updated by well owner 2021-05-27 15:03:24 +02:00
Joakim Hove 509fe67ff5 Make sure all wells are added to the well_rates map 2021-05-27 15:03:24 +02:00
Joakim Hove abadb7aba5 Fix access to segment pressure drop vectors 2021-05-27 11:40:29 +02:00
Joakim Hove 5ac53f8106 Use well index for segment rates 2021-05-27 10:45:33 +02:00
Joakim Hove 34ef516472 Use well index for segment pressure 2021-05-27 10:45:33 +02:00
Joakim Hove 3025bf3280 Use std::nullopt instead of {} 2021-05-27 10:45:33 +02:00
Joakim Hove d83b06c74b Merge pull request #3301 from joakim-hove/simplify-comm
Communicate well rates by directly iterating over container
2021-05-26 10:16:47 +02:00
Joakim Hove 86c75ee4fe Merge pull request #3298 from akva2/no_opm_in_opm
fixed: do not use Opm:: prefix when inside namespace Opm
2021-05-26 10:15:46 +02:00
Joakim Hove 122a6ec7b3 Communicate well rates by driectly iterating over container 2021-05-26 07:27:41 +02:00
Joakim Hove 9b2de5bbf9 Merge pull request #3293 from joakim-hove/wellcontainer-bhp
Use WellContainer<double> for bhp/thp/temperature
2021-05-26 07:26:41 +02:00
Joakim Hove c400b6eeef Merge pull request #3290 from joakim-hove/wellcontainer-rsrv
Use WellContainer<double> for RS / RV
2021-05-26 07:22:51 +02:00
Joakim Hove 96d180d79c Merge pull request #3287 from joakim-hove/wellcontainer-perf
Wellcontainer perf
2021-05-26 07:22:20 +02:00
Joakim Hove 987fcc3b61 Use WellContainer<double> for bhp/thp/temperature 2021-05-25 11:25:07 +02:00