OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,508 Commits 18 Branches 75 Tags 73 MiB
0466effc93
Commit Graph

5508 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove
fdac0f576c Add input type UDA -> double 2019-04-01 18:32:06 +02:00
Joakim Hove
e6aecbd7ac ParserItem: differentiate between input type and internal data type 
Differentiate between the input type, as specified in the json configuration
file, and the internal native type used to store data. This is a many-to-one
mapping, where e.g. both the input types STRING and RAW_STRING map to the
internal datatype std::string.

Additional changes:

 - Have removed several ParserItem() constructors.
 - The size_type::SINGLE is default for a ParserItem, and not set explicitly in
   the generated ParserKeywords.cpp file.
 - Have removed a call to boost::lexical_cast<> - just use std::to_string()
 2019-04-01 18:32:06 +02:00
Jostein Alvestad
5083db3715 Has added name for integer shift values as requested 2019-04-01 16:09:30 +02:00
Jostein Alvestad
1247309b3f Corrections / improvments according to comments from maintaniners 2019-04-01 14:52:27 +02:00
Jostein Alvestad
a1365ffc99 Added test to account for inactive well connections 
That is handling of well connections that are defined by COMPDAT
and that become inactive of some reason.
 2019-04-01 14:52:27 +02:00
Jostein Alvestad
4b62303f36 Added unit tests for the writing of well connection data 
That is writing well connection data to eclipse compatible restart file
 2019-04-01 14:52:26 +02:00
Jostein Alvestad
d7249ea6e6 Initial work on unit tests for well connection data to restart file 
Establish framework and test data
 2019-04-01 14:52:25 +02:00
Joakim Hove
810aa6970b
Merge pull request #702 from joakim-hove/udq-summary-bug 
Section keyword 'SUMMARY' was incorrectly identified as UDQ a keyword
 2019-03-29 17:12:36 +01:00
Joakim Hove
598b5b1ff4 Section keyword 'SUMMARY' was incorrectly identified as UDQ a keyword 2019-03-29 15:40:37 +01:00
Joakim Hove
5734923b1e Add size() method to SummaryConfig class 2019-03-29 15:40:37 +01:00
Joakim Hove
4eb41c569e
Merge pull request #692 from andlaus/add_SWLPC_et_all 
add the S[WG]LPC and IS[WG]LPC keywords
 2019-03-28 14:32:51 +01:00
Arne Morten Kvarving
85f13c3e64
Merge pull request #698 from akva2/extra_cmake_params_jenkins 
added: array of extra cmake parameters for each module
 2019-03-28 14:22:38 +01:00
Joakim Hove
01090a8722
Merge pull request #693 from andlaus/add_THPRESFT 
add the THPRESFT keyword
 2019-03-28 12:57:43 +01:00
Andreas Lauser
2b4212bac0 add comment about the value of the SWLPC keywords being sometimes wrong 
This is a corner case that I don't think will matter in practice.
 2019-03-28 12:01:41 +01:00
Arne Morten Kvarving
4bee03be6f added: array of extra cmake parameters for each module 
use this to enable ebos extensions in opm-simulators
 2019-03-28 11:45:40 +01:00
Andreas Lauser
7360755c63 fix detection of mixed satfunc family usage 
We now simply complain if the deck features keywords from more than
one family.
 2019-03-28 09:37:25 +01:00
Andreas Lauser
f7cf50830d add the THPRESFT keyword 
it is like THPRES, but for faults instead of PVT regions.
 2019-03-28 09:37:00 +01:00
Joakim Hove
21dbd82bb9
Merge pull request #697 from jalvestad/restart_msw_fix 
Added a fix for an index error in writing of RSEG data to ECL Restart file
 2019-03-27 20:24:18 +01:00
Jostein Alvestad
0a730d949f Added correction to segment number index for RSEG 
Added correction to segment number index
for writing of RSEG data to eclipse compatible
restart file. AggregateMSWData.cpp
 2019-03-27 16:59:35 +01:00
Jostein Alvestad
ba1f9e882b Back to master equal to upstream 2019-03-27 16:56:57 +01:00
Jostein Alvestad
745720ef99 Added correction to writing MSW data to restart file 
Corrected segment number index for writing of
RSEG data to eclipse compatible restart file
in AggregateMSWData.cpp
 2019-03-27 16:52:49 +01:00
Tor Harald Sandve
3595eb7c82
Merge pull request #685 from totto82/refactorBC 
Combine BCRATE and FREEBC to BC
 2019-03-27 10:21:46 +01:00
Joakim Hove
75d28fc6ce
Merge pull request #691 from joakim-hove/wellproperties-constructor 
Wellproperties constructor
 2019-03-26 21:07:51 +01:00
Andreas Lauser
ade0cd059e add the S[WG]LPC and IS[WG]LPC keywords 
they are just like their non-PC postfixed counterparts, except that
they only apply to capillary pressures, not to the relperms and they
seem to overwrite the values specified via S[WG]L for the capillary
pressures but not for relperms.
 2019-03-25 11:36:02 +01:00
Joakim Hove
daf9337599 Extract phase dependent SI conversion to separate file 2019-03-25 10:36:40 +01:00
Joakim Hove
9bff0094f1 Extract WellInjectionProperties from Schedule.cpp 2019-03-25 10:36:16 +01:00
Joakim Hove
c3e992f996 Use constructor for WellProductionProperties 2019-03-25 10:23:13 +01:00
Joakim Hove
d9c81da18c
Merge pull request #690 from joakim-hove/use-wellnames 
Use wellnames
 2019-03-25 10:20:06 +01:00
Joakim Hove
94fae0da30 Remove Schedule::getWells(pattern) 2019-03-24 07:54:39 +01:00
Joakim Hove
6cd420ed9b All Schedule::handleWxxxx() functions go via well name 2019-03-24 07:54:33 +01:00
Joakim Hove
19dde5e6d3 Add Schedule::wellNames() overloads 2019-03-24 07:54:33 +01:00
Joakim Hove
5b1065df45 For a connection set with 0 connections is "OPEN" 2019-03-23 16:13:11 +01:00
Joakim Hove
e452058b4e
Merge pull request #686 from totto82/fix_units_fip 
Output FIP as surface volumes
 2019-03-21 17:54:14 +01:00
Joakim Hove
e84edae209
Merge pull request #688 from joakim-hove/remove-well-events 
Remove well events
 2019-03-21 14:51:58 +01:00
Joakim Hove
a3f08ca6ea Disable POLYMER related events 2019-03-21 13:08:25 +01:00
Joakim Hove
858e06044e Move well specific event logging from Well to Schedule 2019-03-21 13:08:25 +01:00
Joakim Hove
1812acccec
Merge pull request #684 from joakim-hove/update-testdata 
Add PERM values to testdata
 2019-03-20 15:38:43 +01:00
Joakim Hove
1d402bdca3 Add PERM values to testdata 2019-03-20 15:10:08 +01:00
Tor Harald Sandve
d24c327a90 Output FIP as surface volumes 2019-03-20 15:06:54 +01:00
Bård Skaflestad
fe12e48b5c
Merge pull request #683 from joakim-hove/udq-define-bug 
Fix bug with ouf of bounds access in UDQ parser

Fixes: #682
 2019-03-20 09:21:25 +01:00
Tor Harald Sandve
088f8ff9e0 Combine BCRATE and FREEBC to BC 2019-03-20 08:49:21 +01:00
Joakim Hove
57c1c2d984
Merge pull request #680 from joakim-hove/enable-welltest 
Add optional code for well testing
 2019-03-19 17:53:30 +01:00
Joakim Hove
7335d72e8b Fix bug with ouf of bounds access in UDQ parser 2019-03-19 17:05:59 +01:00
Joakim Hove
b741a73957
Merge pull request #679 from joakim-hove/remove-totno-conn 
Removed well property total number of connections
 2019-03-19 16:52:50 +01:00
Joakim Hove
bf971c0ede Pass -DENABLE_WELL_TEST when coniguring jenkins build 2019-03-19 16:51:46 +01:00
Joakim Hove
c910a51359 Add optional code for well testing 2019-03-19 16:51:46 +01:00
Joakim Hove
a73e82110c
Merge pull request #681 from joakim-hove/well-static-util 
Well static util
 2019-03-18 17:11:34 +01:00
Tor Harald Sandve
daa67dc8d6 Add parser support for water induced rock compaction (#676) 
Add support for water induced rock compaction
 2019-03-18 17:08:38 +01:00
Joakim Hove
eb15695ed0 Removed well property total number of connections 
For the output code the total number of connections entered in the input deck is
required, we therefor keep track of the number of connections filtered out due
to inactive cells - and return the total in WellConnection::inputSize()
 2019-03-18 15:44:18 +01:00
Joakim Hove
75e196cdd8 Add PERM values to testdata 2019-03-18 14:46:03 +01:00