OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,766 Commits 18 Branches 75 Tags
54af290cc0d5db4de4c28ce51b50c4ba14970a71
Commit Graph

5766 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove
54af290cc0 Extend UDQ eval code 
With this commit the code to evaluate UDQ values has been extended/refactored in
many ways:

 - There is an increased awarenwss of variable type, i.e. a well related UDQ
   versus a field related UDQ. The variable type flows through the AST, and it
   is verified that the expression to evaluate and the target variable are of
   compatible types.

 - Have added support for UDQ field variables and UDQ group variables.

 - The UDQSet type and the UDQDefine::eval() have been refactored to multiplex
   on all the UDQ types, and the specialized UDQWellSet has been removed.
 2019-05-27 16:43:22 +02:00
Joakim Hove
c8b0988191 Add size() and num_wells() methods to SummaryState 2019-05-27 16:43:22 +02:00
Joakim Hove
e6b8e53d0a Merge pull request #786 from joakim-hove/summarystate-group-var 
Add group awareness to SummaryState
 2019-05-27 16:43:00 +02:00
Joakim Hove
779a2b8d89 Add group awareness to SummaryState 2019-05-27 14:38:13 +02:00
Joakim Hove
0c23aafc34 Merge pull request #784 from joakim-hove/UDQ-test-only-one 
UDQ error test - use correct well variablec
 2019-05-27 12:32:01 +02:00
Joakim Hove
4439882402 UDQ error test - use correct well variablec 2019-05-27 09:44:14 +02:00
Joakim Hove
8e87ffc7da Merge pull request #781 from akva2/janitoring 
Remove unused variables and reduce scope
 2019-05-24 15:44:48 +02:00
Arne Morten Kvarving
9dacc42c8a reduce scope of variables 2019-05-24 14:31:26 +02:00
Arne Morten Kvarving
8fdb08b0ad remove unused variables 2019-05-24 14:31:21 +02:00
Joakim Hove
0942e2dce1 Merge pull request #720 from GitPaean/throw_for_problem_in_compsegs 
throw when end distance not bigger than start distance in COMPSEGS
 2019-05-24 13:34:45 +02:00
Kai Bao
01c0820d4c addressing reviewing comments from PR#720 
and adding more tests
 2019-05-24 10:19:50 +02:00
Kai Bao
d11d26a2f1 adding test WrongDistanceCOMPSEGS 2019-05-24 10:19:50 +02:00
Kai Bao
584defebe0 ParseContext is used to handle the exceptions when parsing COMPSEGS 2019-05-24 10:19:50 +02:00
Kai Bao
43c5d3509a throw when end distance not bigger than start distance in COMPSEGS 2019-05-24 10:19:50 +02:00
Joakim Hove
1caf9ecff0 Merge pull request #761 from joakim-hove/sunbeam 
Sunbeam import
 2019-05-24 09:44:12 +02:00
Bård Skaflestad
51c805d280 Merge pull request #763 from bska/import-eclio-into-common 
Import New ECLIPSE I/O Classes Into Main OPM Common Library
 2019-05-23 15:07:30 +02:00
Bård Skaflestad
eb24f72e5e Ecl Output: Consume Facilities from 'std' Namespace 
No functional changes.
 2019-05-23 10:23:02 +02:00
Bård Skaflestad
e654915069 Move ECLIPSE I/O Into Main OPM Common Library 
This makes the facility usable for the restart read/write code.

Specifically, import the I/O classes into namespace Opm::ecl, and
place the files in physical location opm/io/eclipse, and move the
test utilities to new top-level directory 'test_util/'.  While here,
discontinue the 'testutil' static library since most of its features
are now available in the main 'opmcommon' library.  This does entail
compiling a few of the test_util/ CPP files multiple times, and
adding the objects to each executable independently.
 2019-05-23 10:23:01 +02:00
Joakim Hove
464bc4b795 Merge pull request #731 from joakim-hove/remove-old-well 
Remove old well
 2019-05-22 23:15:58 +02:00
Joakim Hove
94b160258e Remove old well implementation 2019-05-22 21:44:50 +02:00
Bård Skaflestad
1d31de03c7 Merge pull request #765 from tskille/compareECL 
update of compareECL, failes test if output file present for reference
 2019-05-22 13:32:10 +02:00
Joakim Hove
ad9cc20258 Merge pull request #779 from joakim-hove/new-keywords 
New keywords
 2019-05-22 11:52:47 +02:00
Joakim Hove
c0ccd06250 Add keyword GCONSALE 2019-05-22 07:13:57 +02:00
Joakim Hove
eb2c0b7441 Add keyword BRANPROP 2019-05-22 07:13:57 +02:00
Joakim Hove
c986c49113 Add keyword NODEPROP 2019-05-22 07:13:57 +02:00
Joakim Hove
5a31ae874b Add keyword GUIDERAT 2019-05-22 07:13:57 +02:00
Joakim Hove
cd55d69ef7 Add keyword GCONSUMP 2019-05-22 07:13:57 +02:00
Joakim Hove
76acb98c67 Add keyword GPMAINT 2019-05-22 07:13:57 +02:00
Joakim Hove
30a1a0b26e Improve error message for invalid json 2019-05-22 07:13:57 +02:00
Joakim Hove
16dabd5dc4 Merge pull request #777 from joakim-hove/well2-prediction-mode 
Add method bool Well2::predictionMode()
 2019-05-21 06:52:59 +02:00
Joakim Hove
272d0fc9a1 Merge pull request #776 from joakim-hove/parse-WOPRL 
Parse WOPRL
 2019-05-20 16:31:35 +02:00
Joakim Hove
8231b84a11 Add method bool Well2::predictionMode() 2019-05-20 16:13:20 +02:00
Joakim Hove
c1f60b769c Split summary keywords WxxxL in separate config 2019-05-20 12:52:05 +02:00
Joakim Hove
d42e86426f Remove extra whitespace 2019-05-20 12:34:37 +02:00
Bård Skaflestad
4010399f08 Merge pull request #773 from tskille/convertECL 
Fix issue with missing STARTSOL and ENDSOL headers when converting un…
testing/2019.05/rc5 		2019-05-15 16:01:43 +02:00
Bård Skaflestad
5f43a18050 Merge pull request #758 from jalvestad/pvt-type-eclrst 
Generalize eclipse compatible restart to a broad set of PVT-options
 2019-05-15 13:44:33 +02:00
Torbjørn Skille
cf970df48f Fix issue with missing STARTSOL and ENDSOL headers when converting unified restart files 2019-05-15 10:25:55 +02:00
Atgeirr Flø Rasmussen
c1f4c69c30 Merge pull request #772 from blattms/alternative-clang-fix 
Fixes clang linking error when using std::vector<bool>::const_reference.
 2019-05-15 09:20:07 +02:00
Joakim Hove
0c70d71df8 Merge pull request #766 from joakim-hove/summary-eval 
Split Summary::add_timestep in eval()
 2019-05-15 07:02:57 +02:00
Joakim Hove
07b02ed151 Factor out eval() method from Summary::add_timestep() 2019-05-15 06:58:10 +02:00
Bård Skaflestad
2c7eb20726 Merge pull request #724 from jalvestad/cell-summary-props 
Changes to provide Summary output of more Block properties
 2019-05-14 18:30:36 +02:00
Markus Blatt
255ffc5bba Fixes clang linking error when using std::vector<bool>::const_reference. 
Turns out that for clang this is no a bool and therefore a template
specialization is missing. We workaround this by some template (black) magic
that does the explicit instantiation for clang and for others adds another
unused instantiation for char.
 2019-05-14 14:12:42 +02:00
Jostein Alvestad
d7e41a5ac0 Remove two tests for initalisation in conflict with more general model 2019-05-14 09:40:13 +02:00
Bård Skaflestad
d554334316 Merge pull request #768 from joakim-hove/summary-state-update 
Summary state update
 2019-05-13 18:22:02 +02:00
Jostein Alvestad
4989c6cfec Added change to improve code quality 
Make sure that the changes made in PVTModel is not overwritten by
variousParam
 2019-05-13 15:36:20 +02:00
Jostein Alvestad
c92d74107f Initial changes for allowing all pvt-type data for eclipse restart file 2019-05-13 15:36:19 +02:00
Jostein Alvestad
8126e8cb66 Added initial change to account for different PVT-types in ECL Restart file 
Copied changes already made for INIT-file export to restart file export
for eclipse compatible restart file export. The changes apply to
LOGIHEAD and account for whether live oil or wet gas is present
 2019-05-13 15:36:18 +02:00
Jostein Alvestad
ba1c30fd4a Added unit tests for grid block summary data variables 2019-05-13 15:29:57 +02:00
Jostein Alvestad
25f25d15bf Added unit tests to new grid block summary properties 2019-05-13 15:29:56 +02:00
Jostein Alvestad
bd58468930 changes to allow Summary output of additional block variables 
Allow output of:
BOSAT
BWKR
BOKR
BKRO
BGKR
BKRG
BKRW
BWPC
BGPC
BVWAT
BWVIS
BVGAS
BGVIS
BVOIL
BOVIS

For this to work, appropriate changes to opm-simulators in
ecloutputblackoilmodule.hh needs to be included. This is
made in a separate branch since it belongs to a different repo.
 2019-05-13 15:29:56 +02:00