OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,044 Commits 18 Branches 75 Tags
8c6755d0f83d98062afc6acf960d66c38bc2bc81
Commit Graph

7044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove
8c6755d0f8 Merge pull request #1308 from stefoss23/parserkeyword_alternating_records 
introducing keywords using alternating records.
 2019-12-08 13:39:58 +01:00
Steinar Foss
52d69ca167 alernating records: not limited to 2 records. 2019-12-08 05:03:07 +01:00
Joakim Hove
709373086d Merge pull request #1311 from joakim-hove/fp-tran 
Add default init for TRAN keywords + dimension
 2019-12-07 15:40:03 +01:00
Joakim Hove
fa939f585f Add default init for TRAN keywords + dimension 2019-12-07 15:07:22 +01:00
Joakim Hove
eb9856f9e2 Merge pull request #1310 from joakim-hove/fp-late-get-satfunc 
Add autocreation of saturation functions from get<T>(keyword)
 2019-12-07 15:01:37 +01:00
Joakim Hove
b7f8d72bbe Add autocreation of saturation functions from get<T>(keyword) 2019-12-07 13:37:58 +01:00
Steinar Foss
6ee678048e alternating_keyword may repeat over more than 2 records. 2019-12-07 13:31:17 +01:00
Bård Skaflestad
c9b277446a Merge pull request #1309 from akva2/janitoring 
Janitoring
 2019-12-07 01:25:08 +01:00
Arne Morten Kvarving
606c4146c1 remove unused functions 2019-12-06 22:24:27 +01:00
Arne Morten Kvarving
88516218e7 fix initializer list order 2019-12-06 22:24:25 +01:00
Bård Skaflestad
0cc6ab250c Merge pull request #1307 from bska/sicd-strength-unit 
Add Dedicated Units of Measurement for SICD Strength Parameter
 2019-12-06 17:01:13 +01:00
Steinar Foss
8f8d45532e introducing keywords using alternating records. 
added function parseRecords.

introducing alternating keywords.

parserkw: added member isAlternatingKeyword.

kw alternating_records conditions.

...

added keyword STOG.

alternating keyword: created generatortest.

alternating keyword sets bool to true by codegenerator.

alternating_records_kw returns that.

...
 2019-12-06 15:51:42 +01:00
Bård Skaflestad
bce49165ba WSEGSICD: Use New 'GeometricVolume' Parser Dimension 
Slightly simplifies specifying the unit of measure for the strength
parameter.
 2019-12-06 14:32:07 +01:00
Bård Skaflestad
3f2b143b30 Unit System: Add New ICD-Related Units 
This commit introduces a couple of new units of measure for
ICD-related quantities, especially AICD and SICD strength
parameters.  Add base unit "GeomVolume" ([Length]**3) and 'measure'
entities

    geometric_volume      (= GeomVolume)
    geometric_volume_rate (= GeomVolume / Time)
    icd_strength          (= Pressure / (GeomVolume / Time)**2)

Add conversion factor unit tests for these, and also complete the
set of unit tests for FIELD, LAB, and PVT_M to cover measures that
were not already there.

Also add a parser Dimension ("GeometricVolume") to play the role of
[Length]**3 in .json files.
 2019-12-06 14:32:07 +01:00
Bård Skaflestad
8fe4691639 addDimension(): Don't Risk Reading from Moved-From Object 
We don't control which side of the assignment is evaluated first, so
get a copy of the name and use that for indexing purposes.
 2019-12-06 14:32:07 +01:00
Joakim Hove
273c512c2a Merge pull request #1306 from joakim-hove/fp-global-porv 
Add optional global flag to FieldPropsManager::porv()
 2019-12-06 14:22:06 +01:00
Joakim Hove
f4882522cb Add optional global flag to FieldPropsManager::porv() 2019-12-06 08:47:08 +01:00
Joakim Hove
1534570b3d Merge pull request #1305 from joakim-hove/allow-init-reorder 
Regression testing: Detect reordering of keywords in the INIT file
 2019-12-05 17:12:20 +01:00
Joakim Hove
dda295f23f Merge pull request #1221 from joakim-hove/fp-fluid 
Fp fluid
 2019-12-05 16:37:23 +01:00
Joakim Hove
fc6f77e50a Merge pull request #1207 from stefoss23/parse_pyinput 
Parse PYINPUT
 2019-12-05 15:17:01 +01:00
Joakim Hove
d990932d0c Special case reordering of keywords in the INIT file regression test 2019-12-05 14:25:14 +01:00
Joakim Hove
26773359a4 compareECL: Set throwOnError to false together with analysis=true 2019-12-05 14:25:14 +01:00
Steinar Foss
04895d3728 Python.cpp using macro for conditional Python instance. 2019-12-05 13:02:57 +01:00
Atgeirr Flø Rasmussen
3645151309 Merge pull request #1251 from GitPaean/support_wsegsicd_rebase 
Support WSEGSICD rebase
 2019-12-05 12:43:32 +01:00
Kai Bao
254cee34bd addingress reviewing comments for PR#1251 2019-12-05 11:48:59 +01:00
Kai Bao
973fe9823b adapting and fix the code after rebasing for WSEGSICD 2019-12-05 11:48:59 +01:00
Kai Bao
fea4c4c8fa adding support for WSEGSICD 2019-12-05 11:48:59 +01:00
Joakim Hove
1c29829dae Merge pull request #1238 from joakim-hove/enable-3d-testing-jenkins 
Enable 3D property testing in opm-material on jenkins
 2019-12-05 10:53:16 +01:00
Joakim Hove
27da0024af Merge pull request #1288 from joakim-hove/flowing 
Determine that wells are flowing from nonzero rates
 2019-12-05 10:09:39 +01:00
Steinar Foss
d348f170f2 PYBIND11_EMBEDDED_MODULE replaced by OPM_EMBEDDED_MODULE. 
python.cpp: PythonInterp created within contr. brackets.

PYBIND11_EMBEDDED_MODULE commented out.

opm_python: added file Embed.hpp.

introduced macro OPM_EMBEDDED_MODULE.

added opm_embedded_module.

using opm_embedded_module.

opm_embedded_module: commented out PyInstance check.

added namespace Opm::embed.

Embed.hpp -> EmbedModule.hpp.

Python.cpp: added exception if PyIsinstance.

parserstate: python is a unique_ptr.

Parser.cpp: exception if no Opm::python obj.
 2019-12-05 09:19:43 +01:00
Steinar Foss
f3701c3f93 Parser: handles PYINPUT. Python code in eclipse .Data files now possible!!! 
test EmbeddedPython: now with actual python code.

parser.cpp: parsing python code.

introduced RawConst::pyinput.

EmbeddedPython: tests with data keyword.
 2019-12-05 09:19:43 +01:00
Steinar Foss
277ec850a7 PYINPUT: name -> PYINPUT. 2019-12-05 09:19:43 +01:00
Joakim Hove
ee2850e8cc Merge pull request #1304 from joakim-hove/satfunc-refactor 
Reorganize satfunc initializers
 2019-12-05 08:57:54 +01:00
Joakim Hove
4d3567bffd Initialize saturation functions in FieldProps 2019-12-05 08:49:47 +01:00
Joakim Hove
b3c14b1d12 Merge pull request #1250 from stefoss23/action_token_func 
added enum class FuncType for ASTNode.
 2019-12-05 08:18:08 +01:00
Joakim Hove
18f5e1a9b9 Reorganize satfunc initializers 2019-12-05 08:08:55 +01:00
Joakim Hove
04234ec625 Merge pull request #1301 from joakim-hove/deck-diff-default 
Differentiate between valid and invalid default values while parsing
 2019-12-05 08:04:22 +01:00
Bård Skaflestad
58eac1c338 Merge pull request #1277 from bska/load-aquifer-data 
Load Restart: Support Basic Quantities from Analytic Aquifers
 2019-12-04 22:55:18 +01:00
Joakim Hove
08dd12f644 Merge pull request #1300 from totto82/fixGconsumpSale 
FIX avoid double conversion
 2019-12-04 22:40:17 +01:00
Joakim Hove
1599cc5698 Differentiate between valid and invalid default values while parsing 2019-12-04 22:36:28 +01:00
Steinar Foss
3d37551ef9 checks for FuncType::time. 2019-12-04 21:10:11 +01:00
Bård Skaflestad
25931145e0 Aquifer Restart: Load Values Pertinent to Fetkovich Model 
This commit expands the basic aquifer restart support to also
include essential values for the Fetkovich analtic model.  In
particular, we now also load the initial aquifer pressure and the
initial aquifer volume directly from the SAAQ restart vector, but
only if we know that the aquifer in question is of Fetkovich type.
 2019-12-04 19:57:14 +01:00
Steinar Foss
4ae8b4a5fe Removes FuncType in ParserNode. 
removed FuncType from ParserNode.
 2019-12-04 18:13:44 +01:00
Bård Skaflestad
7b3de57e92 Load Restart: Support Basic Quantities from Analytic Aquifers 
This adds a basic protocol for retrieving simple scalar data for
each analytic aquifer, specifically from XAAQ.  At the moment we
only support retrieving the aquifer pressure and the total produced
liquid volume from the aquifer and into the reservoir model.
 2019-12-04 17:43:27 +01:00
Joakim Hove
3deef64d19 Use numerical flow rates to determine Well::flowing() 2019-12-04 17:15:30 +01:00
Joakim Hove
e0e371291d Merge pull request #1297 from joakim-hove/dont-write-ACTNUM 
Make sure the ACTNUM field is not output to the INIT file
 2019-12-04 17:06:42 +01:00
Steinar Foss
dc0ab8a8ad Action::Parser:get_func: returns multiple types. 2019-12-04 16:24:58 +01:00
Steinar Foss
4b5ef93293 added enum class FuncType for ASTNode. 
ActionParserNode takes functype arg.

ActionParser getfunc.

ASTNode constr take func_type-arg.

ASTNode: throws exception if not FunctionType well.

FuncType: expanded list.

ActionParser: gettype distnguishes types.

ACTIONX.cpp: added test with group*.

parseKeywordCategory made public.

ActionParser: uses parseCategory.
 2019-12-04 16:24:58 +01:00
Tor Harald Sandve
996f844ac7 FIX avoid double conversion 2019-12-04 12:02:28 +01:00
Joakim Hove
206e0b3b25 Merge pull request #1299 from joakim-hove/transmult-fp 
Use std::vector<double> instead of GridProperty<double> in TransMult
 2019-12-04 10:22:32 +01:00