OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,620 Commits 18 Branches 75 Tags
85c8a9b4e7b00a4480919efeb492537a17cfafad
Commit Graph
9620 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad 893fcbb9fb Merge pull request #2100 from joakim-hove/intehead51 
Update INTEHEAD[51] value based on presence of GCONPROD / GCONINJE
 2020-11-11 23:44:09 +01:00
Joakim Hove 37b71e8be5 Skip NNCEDIT with multiplier = 1 2020-11-11 19:57:06 +01:00
Joakim Hove e61e7afcc8 Refactor the NNC input class 
- The NNC and EDITNNC keywords are internalized in the same class.
- The EDITNNC keyword operations are applied directly to the NNC keywords.
- The nnc vectors are ordered with cell1 < cell2 and ascending order.
- An api has been added to get the KeywordLocation from an NCC
- NNC/EDITNNC which is connected to inactive cell is ignored
 2020-11-11 19:57:06 +01:00
Joakim Hove 08f8a381b0 Update INTEHEAD[51] value based on presence of GCONPROD / GCONINJE 2020-11-11 19:56:28 +01:00
Joakim Hove 2374ae2127 Merge pull request #2102 from bska/cxl-support-dynamic-connections 
CxL: Account for Dynamically Changing Set of Connections
 2020-11-11 19:31:15 +01:00
Bård Skaflestad c157760ac7 CxL: Account for Dynamically Changing Set of Connections 
This commit adds a new helper function

    getCompletionNumberFromGlobalConnectionIndex

which returns an optional<int> containing the completion number of
the connection with the associated global cell index, or nullopt if
no such connection exists.  We then reimplement the CxL summary
keywords in terms of this function to handle connections being added
dynamically during the simulation.  The connections at the end of
the simulation, from which we configure all connection-related
summary nodes, might not accurately reflect the connections existing
at all times during the simulation.
 2020-11-11 16:04:08 +01:00
Joakim Hove 71b5dea35e Merge pull request #2096 from tskille/io_c0nn 
Update of EclIO classes.
 2020-11-11 08:18:26 +01:00
Torbjørn Skille 9fa90b2687 Update of EclIO classes. 
- Enables reading of output files generated by simulator IX
 - Adding support for EclFile data type C0nn (string with length > 8 characters)
 - Update of program summary, now supporting well names with more that 8 characters
 - Updates of program convertECL, possible to write output files with IX "format"
 - updates of python bindings (EclOutput and EclFile)
 2020-11-10 22:02:38 +01:00
Bård Skaflestad 3d928b8a7f Merge pull request #2099 from bska/fix-oob-indexing 
Summary: Don't Index Out-of-Bounds During Node Configuration
 2020-11-10 11:55:40 +01:00
Bård Skaflestad f5fb6bc047 Summary: Don't Index Out-of-Bounds During Node Configuration 
The 'schedule_wells' vector is guaranteed to be empty when we're
configuring the set of summary vectors to report.  Don't blindly
access the .front() element.
 2020-11-10 11:15:17 +01:00
Joakim Hove 3a1f5bd654 Merge pull request #2077 from joakim-hove/actionx-gliftopt 
Actionx gliftopt
 2020-11-10 09:36:21 +01:00
Joakim Hove f3d6c3abe4 Support GCONLIFT in ACTIONX 2020-11-09 17:15:17 +01:00
Joakim Hove 7dd50935d1 Refactor ACTIONX testing to use a make_schedule() setup function 2020-11-09 17:15:17 +01:00
Joakim Hove ada1f9d144 Add Schedule handler overload for GLIFTOPT - to support ACTIONX 2020-11-09 17:15:17 +01:00
Joakim Hove 6aefc2c17a Add reqiures: ["LIFTOPT"] to GLIFTOPT keyword 2020-11-09 17:14:15 +01:00
Joakim Hove cddfbb5217 Merge pull request #2075 from joakim-hove/actionx-gconprod 
Actionx gconprod
 2020-11-09 16:40:40 +01:00
Joakim Hove 22bf627d7b Merge pull request #2098 from joakim-hove/ijk-warning 
Fix shadow warning
 2020-11-09 15:39:48 +01:00
Joakim Hove f85884db71 Fix shadow warning 2020-11-09 14:41:16 +01:00
Joakim Hove d896b2ce15 Support GCONPROD in ACTIONX 2020-11-09 14:34:47 +01:00
Joakim Hove bb905eb545 Merge pull request #2059 from joakim-hove/summary-completion 
Summary completion
 2020-11-09 14:33:10 +01:00
Joakim Hove 5337306a55 Add summary evaluation for CxxxL connection completion keywords 2020-11-09 13:23:02 +01:00
Joakim Hove 523e099580 Add summary evaluation for WxxxL well completion keywords 2020-11-09 13:23:02 +01:00
Joakim Hove 2a6b623dcb Optionally strip off trailing __XX when looking for summary function 2020-11-09 13:23:02 +01:00
Joakim Hove 1dc6545bab Trivial white space 2020-11-09 13:23:02 +01:00
Joakim Hove b9b918defa Add summary configuration for WxxxL and CxxxL completion keywords 2020-11-09 13:23:02 +01:00
Joakim Hove e625623e49 Remove WGORL from WELL_PROBE configuration file 2020-11-09 12:47:25 +01:00
Joakim Hove 624ff50628 Merge pull request #2086 from joakim-hove/group-is-field 
Add method Group::is_field()
 2020-11-09 12:47:07 +01:00
Joakim Hove 84a2c3c209 Add method Group::is_field() 2020-11-09 12:46:30 +01:00
Joakim Hove 558cd2c1f7 Merge pull request #2088 from joakim-hove/welltype-injection-phase 
Add method WellType::injection_phase()
 2020-11-09 12:45:34 +01:00
Joakim Hove c414aa52a9 Merge pull request #2089 from joakim-hove/udq-minus-bugx 
Udq minus bugx
 2020-11-07 14:58:45 +01:00
Joakim Hove 315187b8d6 Merge pull request #2093 from akva2/fix_system_header 
workaround cmake issue
 2020-11-06 11:10:15 +01:00
Arne Morten Kvarving fac6695d15 workaround cmake issue 
cmake does not properly interpret the SYSTEM marker in lists of
include directories. this causes issues downstream when using
dunecontrol / the in-tree cmake config files.
 2020-11-06 10:16:02 +01:00
Joakim Hove 515a9ef258 Merge pull request #2090 from akva2/bump_version 
bump version to 2021.04-pre
 2020-11-06 09:11:29 +01:00
Arne Morten Kvarving a194c8a1fc bump version to 2021.04-pre 2020-11-06 08:57:04 +01:00
Joakim Hove 47543641ee Testing of negative prefix 2020-11-05 15:38:23 +01:00
Joakim Hove 2b24fba2c5 Merge pull request #2078 from joakim-hove/gliftopt-has 
Add methods GasLiftOpt::has_well() and GasLiftOpt::has_group()
 2020-11-05 12:41:21 +01:00
Joakim Hove f5631549bf Merge pull request #2074 from joakim-hove/handlercontext-units 
Make section and keyword index optional in Schedule handlerContext
 2020-11-05 12:40:53 +01:00
Joakim Hove 25dee84f81 Merge pull request #2073 from joakim-hove/summary-completion-commits 
Summary completion commits
 2020-11-05 12:40:06 +01:00
Joakim Hove ef39f6a817 Merge pull request #2071 from joakim-hove/WWIRT 
Add summary variable WWIRT
 2020-11-05 12:39:45 +01:00
Joakim Hove a383f55cf5 Add method WellType::injection_phase() 2020-11-05 12:32:24 +01:00
Joakim Hove c883e738f0 Merge pull request #2087 from OPM/revert-2082-igrp-prod 
Revert "Igrp prod"
 2020-11-05 12:27:02 +01:00
Joakim Hove 57566ad768 Revert "Igrp prod" 2020-11-05 11:15:20 +01:00
Joakim Hove f16375f5ee Merge pull request #2082 from joakim-hove/igrp-prod 
Igrp prod
 2020-11-04 15:41:35 +01:00
Joakim Hove 7c1b2ff6b4 Simplified initialization 2020-11-04 14:13:44 +01:00
Joakim Hove c392c5aaa2 Rename pctl_mode -> active_cmode 2020-11-04 14:13:44 +01:00
Joakim Hove 861be5d672 Rename prod_cmode -> deck_cmode 2020-11-04 14:13:44 +01:00
Joakim Hove 73f550ddb3 Store GroupProductionControls in local variable 2020-11-04 14:13:44 +01:00
Joakim Hove 6402ee098e Reactor function groupProductionControllable() 2020-11-04 14:13:44 +01:00
Joakim Hove f32a3badc2 Refactor function groupInjectionControllable() 2020-11-04 14:13:44 +01:00
Joakim Hove 5738e60432 Add method WellType::injection_phase() 2020-11-04 14:13:44 +01:00