Commit Graph
100 Commits
Author SHA1 Message Date
Joakim Hove aca3b246ae Add empty() methods for updateEclWell and wellPI in ebos 2021-02-18 16:53:50 +01:00
Joakim Hove ff51c2d7ee Handle WELLPI keyword in ACTIONX
When an ACTIONX has evaluated to True we inspect the keyword payload and if it
contains WELPI we query the well model for current wellpi values and pass that
along as context to the Schedule::applyAction()
2021-02-18 16:53:50 +01:00
Joakim Hove fc398c8555 Merge pull request #3067 from joakim-hove/add-tran-parallel-test
Add parallel test of partial TRAN EDIT
2021-02-17 16:44:15 +01:00
Joakim Hove d65cb22e69 Merge pull request #3066 from joakim-hove/vfp-warnings
Use class based enums for VFP flow types
2021-02-16 13:37:57 +01:00
Joakim Hove 8bb4302bb6 Merge pull request #3068 from joakim-hove/remove-aq-mult
Remove multiplier in aquifer connected area
2021-02-16 11:16:14 +01:00
Joakim Hove abf48b0782 Remove multiplier in aquifer connected area 2021-02-16 10:02:36 +01:00
Joakim Hove 2df154017b Add parallel test of partial TRAN EDIT 2021-02-16 08:04:12 +01:00
Joakim Hove d2e6d80265 Improve warning when invalid values are encountered in VFP 2021-02-16 07:48:59 +01:00
Joakim Hove 471a19e851 Pass table argument to getGFR() and getWFR() 2021-02-15 22:36:51 +01:00
Joakim Hove fda1d65494 Pass table argument to VFP getFLo() 2021-02-15 22:21:56 +01:00
Joakim Hove 6383f3c1ac Use class based enums for VFP flow types 2021-02-15 19:17:39 +01:00
Joakim Hove 27b4dabd6a Merge pull request #3063 from joakim-hove/aquconn-default
Aquifer connected cell area - unconditional access to double
2021-02-15 09:20:10 +01:00
Joakim Hove ee79698802 Merge pull request #3065 from joakim-hove/haswell
Implement BlackoilWellModel::hasWell() method
2021-02-15 09:04:12 +01:00
Joakim Hove b7f3a07939 Aquifer connected cell area - unconditional access to double 2021-02-14 20:47:22 +01:00
Joakim Hove 99a61e120b Implement BlackoilWellModel::hasWell() method 2021-02-13 10:37:45 +01:00
Joakim Hove 591826ea4e Merge pull request #3060 from joakim-hove/wellpi-extract
Extract method wellPI() from existing lambda implementation
2021-02-13 08:55:35 +01:00
Joakim Hove 0299af26ed Extract method wellPI() from existing lambda implementation 2021-02-12 11:49:04 +01:00
Joakim Hove 0dc3d1f694 Merge pull request #3057 from joakim-hove/wellpi-scaling
Use Well::convertDeckPI()
2021-02-12 09:24:21 +01:00
Joakim Hove 648b0f6581 Use Well::updateDeckPI( ) 2021-02-11 13:47:27 +01:00
Joakim Hove 89eb6e5659 Extract functionality to update ecl wells to separate function 2021-02-10 15:17:36 +01:00
Joakim Hove 0056d4e9c1 Merge pull request #3054 from joakim-hove/apply-action-wellpi-api
Add wellpi argument to Schedule::applyAction()
2021-02-10 14:59:23 +01:00
Joakim Hove b15a336341 Add wellpi argument to Schedule::applyAction() 2021-02-10 12:39:25 +01:00
Joakim Hove d9f29945aa Pass unscaled newWellPI to Schedule::applyWellProdIndexScaling() 2021-02-05 12:53:00 +01:00
Joakim Hove ee86c9d991 Merge pull request #3047 from joakim-hove/action-simtime
Pass simulation time argument to applyAction
2021-02-05 12:06:35 +01:00
Joakim Hove 4f90eff8d5 Pass simulation time argument to applyAction 2021-02-05 09:39:35 +01:00
Joakim Hove 358620120e Merge pull request #3027 from joakim-hove/vfp-ref-wrapper
Use std::reference_wrapper<> instead of pointers for VFP tables
2021-01-26 11:07:42 +01:00
Joakim Hove e4789d4eb7 Use std::reference_wrapper for VFP tables 2021-01-26 07:56:59 +01:00
Joakim Hove 9552d0cc8a Merge pull request #3022 from joakim-hove/skip-schedulestate-testing
Don't test serialization for isolated ScheduleState
2021-01-21 08:05:39 +01:00
Joakim Hove 208209bd95 Don't test serialization for isolated ScheduleState 2021-01-20 09:00:30 +01:00
Joakim Hove aa38a2264d Merge pull request #3021 from joakim-hove/sched-action
Use ScheduleState to manage Actionx
2021-01-15 09:18:46 +01:00
Joakim Hove d025f39474 Use ScheduleState to manage Actionx 2021-01-15 07:57:27 +01:00
Joakim Hove 553c16774c Merge pull request #3020 from joakim-hove/vfp-refactor
Vfp refactor
2021-01-15 07:39:43 +01:00
Joakim Hove 17fcdfc87a Use ScheduleState to handle VFP propertes + simplifications 2021-01-14 19:22:34 +01:00
Joakim Hove 8607539c2a Merge pull request #3018 from joakim-hove/sched-network
Use ScheduleState to manage network properties
2021-01-13 08:04:35 +01:00
Joakim Hove 5b129a3304 Use ScheduleState to manage network properties 2021-01-13 00:58:03 +01:00
Joakim Hove c5ae6b7b9a Merge pull request #3016 from joakim-hove/sched-wlist
Sched wlist
2021-01-12 21:14:43 +01:00
Joakim Hove 5dd3e308f5 Use ScheduleState to manage well lists 2021-01-12 20:18:40 +01:00
Joakim Hove c2abcb188e Merge pull request #3015 from joakim-hove/sched-gcon
Manage GConSale and GConSump with ScheduleState object
2021-01-12 20:17:50 +01:00
Joakim Hove b32f3f7546 Manage GConSale and GConSump with ScheduleState object 2021-01-12 18:29:59 +01:00
Joakim Hove 6ca2d2c9e6 Merge pull request #3013 from joakim-hove/sched-wtest-config
Use ScheduleState to manage well test configuration
2021-01-12 17:50:38 +01:00
Joakim Hove 1308c0480a Merge pull request #3012 from joakim-hove/test-schedulestate-serialization
Enable serialization testing for ScheduleDeck / ScheduleState
2021-01-12 14:38:49 +01:00
Joakim Hove 31b2f597ac Enable serialization testing for ScheduleDeck / ScheduleState 2021-01-12 14:12:39 +01:00
Joakim Hove c1a1bf8683 Use ScheduleState to manage well test configuration 2021-01-12 14:08:41 +01:00
Joakim Hove 02fc2b9c53 Merge pull request #3011 from joakim-hove/sched-message-limits
Sched message limits
2021-01-12 09:00:52 +01:00
Joakim Hove 914bbeca82 Fetch messagelimits from ScheduleState 2021-01-12 07:44:10 +01:00
Joakim Hove 70214db62c Merge pull request #3010 from joakim-hove/sched-events
Fetch events from ScheduleState
2021-01-11 20:24:31 +01:00
Joakim Hove 237eb2b7ee Fetch events from ScheduleState 2021-01-11 17:42:30 +01:00
Joakim Hove 8983b8d532 Merge pull request #3009 from GitPaean/moving_aquifer_folder
adapting to the directory change in opm-common related to aquifer
2021-01-09 10:35:03 +01:00
Joakim Hove 673be5c604 Merge pull request #3007 from joakim-hove/oilvap
Oilvap
2021-01-08 09:21:59 +01:00
Joakim Hove 1b534dfad7 Use ScheduleState to extract oil vaporization properties 2021-01-07 15:50:31 +01:00
Joakim Hove c6f0ea3ae2 Merge pull request #3004 from joakim-hove/nupcol
Use ScheduleState to access nupcol
2021-01-07 15:48:49 +01:00
Joakim Hove a8be103173 Merge pull request #3005 from joakim-hove/sched-tuning
Access tuning class from ScheduleState
2021-01-07 07:49:29 +01:00
Joakim Hove ad9d6079b3 Merge pull request #3001 from joakim-hove/improve-error-message
Output typeid(T).name() for types without packing support
2021-01-06 19:12:25 +01:00
Joakim Hove fe788cdb05 Access tuning class from ScheduleState 2021-01-06 16:26:13 +01:00
Joakim Hove c1e10d81ba Use ScheduleState to access nupcol 2021-01-06 15:10:05 +01:00
Joakim Hove f5653af392 Output typeid(T).name() for types without packing support 2021-01-05 12:00:46 +01:00
Joakim Hove 6b1c6e7d9e Merge pull request #2999 from joakim-hove/serialize-chrono
Serialize std::chrono::system_clock::time_point through std::time_t
2021-01-05 09:23:07 +01:00
Joakim Hove fff19a2cf3 Serialize std::chrono::system_clock::time_point through std::time_t 2021-01-03 10:30:51 +01:00
Joakim Hove 36d679fc20 Merge pull request #2985 from joakim-hove/msw-shut-wells
Msw shut wells
2020-12-14 10:19:38 +01:00
Joakim Hove ab143d15c7 Make sure well is open before copying MSW well state from previous 2020-12-14 09:01:42 +01:00
Joakim Hove aa345a36f1 Fetch connpos and number of perforations from WellInfo for MSW wells 2020-12-14 09:01:37 +01:00
Joakim Hove cd19e987cf Merge pull request #2981 from joakim-hove/skip-prev-closed-well
Skip previously shut wells in WellState init
2020-12-11 17:01:46 +01:00
Joakim Hove 8c17172f08 Skip previously shut wells in WellState init 2020-12-10 16:41:10 +01:00
Joakim Hove f5f3d8a98e Introduce WellState::stopWell() 2020-12-10 09:54:37 +01:00
Joakim Hove bd3fa0af88 Use enum Well::Status for well status in WellState 2020-12-10 08:11:19 +01:00
Joakim Hove e4303c6784 Change access to connpos to use WellMap instead of index counting 2020-12-09 16:49:10 +01:00
Joakim Hove 66a532f33e Merge pull request #2957 from joakim-hove/wbp-collect
Wbp collect
2020-12-04 09:11:21 +01:00
Joakim Hove 7e8132b965 Merge pull request #2951 from GitPaean/wsegaicd
supporting WSEGAICD
2020-12-04 08:52:50 +01:00
Joakim Hove 72905f3e3b Gather WBP pressure data before summary eval 2020-12-03 09:40:40 +01:00
Joakim Hove ced3c99e09 Merge pull request #2953 from joakim-hove/udq-eval-off-by-one
Shift the report step argument used when calling UDQ eval
2020-12-02 08:34:43 +01:00
Joakim Hove 1d86e2dc97 Pass wbp index list to output module 2020-12-01 07:52:58 +01:00
Joakim Hove 1bb7b0d30f Use unique_ptr for outputmodule member in EclWriter 2020-11-30 13:31:04 +01:00
Joakim Hove 1fbc25979f Merge pull request #2940 from joakim-hove/pavg-calculators
WIP: Pavg calculators
2020-11-30 13:17:23 +01:00
Joakim Hove c0e3de3815 Pass WBP calculators to Summary::eval 2020-11-30 11:30:00 +01:00
Joakim Hove 11bbb33337 Shift the report step argument used when calling UDQ eval 2020-11-30 10:14:20 +01:00
Joakim Hove 62b119170d Pass Inplace argument to Summary::eval() 2020-11-24 12:33:05 +01:00
Joakim Hove df292baeea Use Inplace::Phase enums instead of string tags 2020-11-24 12:33:05 +01:00
Joakim Hove 26c3262a2a Merge pull request #2935 from joakim-hove/add-inplace
Pass the initial inplace values to Summary::eval()
2020-11-20 14:13:00 +01:00
Joakim Hove e962374856 Pass the initial inplace values to Summary::eval() 2020-11-20 10:02:16 +01:00
Joakim Hove b2896d09ff Merge pull request #2920 from joakim-hove/use-original-IP
Pass region in place values to the summary writer
2020-11-19 17:13:04 +01:00
Joakim Hove 6084f7c4d4 Use class Inplace to manage aggregated region properties in output 2020-11-19 11:38:18 +01:00
Joakim Hove 2043d792c1 Remove arguments 2020-11-18 15:40:22 +01:00
Joakim Hove 20f7503d67 Merge pull request #2913 from joakim-hove/add-parallel-test-pavg
Add packing test for class PAvg
2020-11-17 08:19:28 +01:00
Joakim Hove 2d137e706f Merge pull request #2918 from joakim-hove/summary-RRPV
Change output name of Region Pore Volume
2020-11-16 10:37:37 +01:00
Joakim Hove 582980627d Merge pull request #2907 from joakim-hove/nnc-error-message
Improve error message for problematic NNCEDIT
2020-11-13 08:27:07 +01:00
Joakim Hove cddc8044b3 Change output name of Region Pore Volume 2020-11-13 08:21:22 +01:00
Joakim Hove f4deebeb77 Add packing test for class PAvg 2020-11-11 15:17:34 +01:00
Joakim Hove da2bc2affd Refactor application of NNC / EDITNNC
- The edit manipulations from EDITNNC have already been applied to the NNC data
  from opm-common

- The NNC data structures are guaranteed to be ordered, both with cell1 <= cell2
  and the NNCs are in ascending order

- The NNC output to EGRID / INIT files is based on std::vector<NNCdata>
2020-11-10 16:59:30 +01:00
Joakim Hove 9e08e1324c Merge pull request #2900 from joakim-hove/ref-test-cmpl
Add regression test for summary + completion variables
2020-11-10 08:33:41 +01:00
Joakim Hove b46a98e6dc Add regression test for summary + completion variables 2020-11-09 16:06:58 +01:00
Joakim Hove e2909958c8 Merge pull request #2844 from hakonhagland/poro2
Implements access to the porosity from Python.
2020-11-05 11:15:12 +01:00
Joakim Hove a28bd3ab90 Merge pull request #2830 from hakonhagland/step_cleanup
Implements a Python step_cleanup() method.
2020-11-04 14:27:38 +01:00
Joakim Hove 68e8c4a900 Use python pushd 2020-11-04 14:24:39 +01:00
Joakim Hove a2148446e0 Merge pull request #2897 from alfbr/sched-restart
Switch default for restarting to read historic schedule
2020-11-03 21:10:31 +01:00
Joakim Hove 9fe6595a36 Merge pull request #2887 from joakim-hove/well-matcher
Add wellmatcher argument when evaluating UDQ expressions
2020-11-03 11:22:18 +01:00
Joakim Hove 082fed2d78 Add wellmatcher argument when evaluating UDQ expressions 2020-10-30 23:34:07 +01:00
Joakim Hove 67ae9c6cb8 Merge pull request #2870 from joakim-hove/add-reperf-test
Add integration test for reporforated norne model
2020-10-27 17:13:00 +01:00
Joakim Hove f46e7d998f Add integration test for reporforated norne model 2020-10-27 11:53:52 +01:00
Joakim Hove ea43f8fb0a Merge pull request #2873 from joakim-hove/udq-test-M3
Udq test m3
2020-10-27 11:52:00 +01:00
Joakim Hove ba25f35c57 Add regression testing for model UDQ_M3 2020-10-26 11:21:47 +01:00