OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,868 Commits 18 Branches 75 Tags 73 MiB
ac40c65f64
Commit Graph

8868 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Blatt
d5388ba653 Fix compile check for dune-geometry from DUNE>2.7 
Dune::Geometry::makeQuadrilateral() is deprecated since 2.6 and has recently
been removed. We are using now using Dune::GeometryTypes::quadrilateral
 2020-08-11 00:25:23 +02:00
Joakim Hove
a0e20e8d3e
Merge pull request #1647 from joakim-hove/json 
Add build and write functionality to JsonObject
 2020-08-10 15:40:56 +02:00
Joakim Hove
747fd8f897 Add build and write functionality to Json object 2020-08-10 09:41:51 +02:00
Joakim Hove
3b352a5d3b
Merge pull request #1866 from joakim-hove/use-std-stringview 
Use std stringview
 2020-08-05 13:10:28 +02:00
Joakim Hove
3e1411bf87 Replace opm implementation of string_view with std::string_view 2020-08-04 11:40:41 +02:00
Joakim Hove
ffe86d361b
Merge pull request #1868 from bska/transport-guiderate-values 
Output: Transport Guiderate Values to Output Layer
 2020-07-31 08:08:40 +02:00
Bård Skaflestad
f55d0fa57c Output: Transport Guiderate Values to Output Layer 
This commit introduces datamembers of type

    Opm::data::GuideRateValue

to the Opm::data::Well and Opm::data::GroupData structures.
Collectively, these datamembers enable transporting guiderate values
calculated elsewhere--e.g., in the opm-simulators module--to the
output layer for final processing and output to the summary and/or
the restart files.

We support outputting both production and injection guiderate values
at the group level.  Guiderate values at the well level are
interpreted as production or injection according to the well type.
 2020-07-19 19:07:23 +02:00
Joakim Hove
bdd74b33b2
Merge pull request #1867 from joakim-hove/enable-python 
Update PYTHONPATH in enable-python.sh
 2020-07-15 13:06:32 +02:00
Joakim Hove
52d69dfd0d Update PYTHONPATH in enable-python.sh 2020-07-15 10:16:21 +02:00
Joakim Hove
349e964586
Merge pull request #1865 from bska/add-copyright 
GuideRateValue: Insert Copyright Notice
 2020-07-10 18:55:39 +02:00
Bård Skaflestad
32fa286f8e GuideRateValue: Insert Copyright Notice 
Missed in commit 4f7d41ee1.

Pointy Hat: [at]bska.
 2020-07-10 17:52:38 +02:00
Joakim Hove
52801f1e57
Merge pull request #1859 from bska/add-guiderate-value 
Output: Add Container for Transporting Guiderate Values
 2020-07-10 13:24:02 +02:00
Bård Skaflestad
4f7d41ee10 Output: Add Container for Transporting Guiderate Values 
This commit introduces a container

    Opm::data::GuideRateValue

that packages a 'std::array' and 'std::bitset' into that array.
This container is intended as the main vehicle for transporting
per-phase guiderate values (Oil, Gas, Water, and Resvoir Voidage
Volume supported initially) calculated by the simulator to the
output layer.  We support the serialization operations read and
write in order to plug into the collective communications layer used
in the simulator.

Add unit tests to exercise the new container.
 2020-07-09 16:44:15 +02:00
Bård Skaflestad
dc3dd89e09
Merge pull request #1864 from joakim-hove/actionx-wlist 
Actionx wlist
 2020-07-09 15:57:54 +02:00
Joakim Hove
f500adba24 ACTIONX will handle WLIST well arguments 2020-07-09 15:16:33 +02:00
Joakim Hove
f4f993586a Add method WListManager::wells() which can do WLIST wildcards 2020-07-09 15:12:54 +02:00
Joakim Hove
17c61e1853 Add missing compile guards 2020-07-09 15:12:54 +02:00
Bård Skaflestad
3eab28f9b0
Merge pull request #1863 from joakim-hove/WLIST-updates 
Update WLIST to handle WLIST and well pattern arguments
 2020-07-09 14:58:31 +02:00
Joakim Hove
d096a5fda6 Update WLIST to handle WLIST and well pattern arguments 2020-07-08 08:12:28 +02:00
Bård Skaflestad
643ff6e777
Merge pull request #1857 from joakim-hove/accept-long-keywords 
Fix handling of too long 8 characters keywords like GUIDERATE
 2020-07-05 19:58:44 +02:00
Bård Skaflestad
1c92fb3fea
Merge pull request #1860 from joakim-hove/add-groupvalues-member 
Add data::GroupValues member to RestartValue
 2020-07-05 19:26:41 +02:00
Joakim Hove
305b2a166a Add data::GroupValues member to RestartValue 2020-07-03 16:40:42 +02:00
Joakim Hove
1019187a4e
Merge pull request #1858 from joakim-hove/igrp-fix-refactor 
Igrp fix refactor
 2020-07-03 09:08:46 +02:00
Joakim Hove
0321c003eb
Merge pull request #1853 from bska/prepare-guiderate-smry 
Make Structure for Per-Group Summary Data from Simulator
 2020-07-02 21:37:33 +02:00
Joakim Hove
4e223eae4a Fix handling of too long 8 characters keywords like GUIDERATE 2020-07-02 14:23:45 +02:00
Joakim Hove
012c1a2b40 Use named constants to look up in INTEHEAD 2020-07-02 11:40:30 +02:00
Bård Skaflestad
68b4f38464 Make Structure for Per-Group Summary Data from Simulator 
This commit adds a level of indirection to the current per-group
summary quantities that is directly assigned by the simulator.  In
particular, introduce a new structure named

    GroupData

that contains a 'GroupConstraints' object and make the per-group
values into 'map<string, GroupData>' rather than the current
'map<string, GroupConstraints>'.  This is in preparation of adding
support for reporting group-level production/injection guiderates
(Gx[IP]GR) to the summary file.

Update tests and APIs accordingly.
 2020-07-02 10:57:46 +02:00
Joakim Hove
c7b93797b6
Merge pull request #1852 from joakim-hove/python-wellnames 
Add python wrapper for Schedule::wellNames( const std::string& )
 2020-07-02 09:50:57 +02:00
Joakim Hove
34bc004171
Merge pull request #1854 from bska/remove-unused-variable 
UDQDefine: Suppress 'Unused Variable' Warning
 2020-07-02 00:55:22 +02:00
Bård Skaflestad
adf90e3410 UDQDefine: Suppress 'Unused Variable' Warning 
Assign 'stod' result to a 'std::ignore' object to maintain the
'token_size' side effect without creating an otherwise unused value
of type 'double'.  While here, also put the 'next_token' helper into
an anonymous namespace to avoid generating warnings of the form

    no previous declaration for ...
 2020-07-01 22:49:49 +02:00
Joakim Hove
d6a3cdb986
Merge pull request #1832 from CeetronSolutions/python-pypi-cleanup 
Python pypi package work
 2020-07-01 13:34:26 +02:00
Joakim Hove
ab821b90a5 Add python wrapper for Schedule::wellNames( const std::string& ) 2020-07-01 11:01:12 +02:00
Joakim Hove
29a946eb9a
Merge pull request #1846 from joakim-hove/udq-sign-bug 
Udq sign bug
 2020-07-01 10:47:04 +02:00
Gaute Lindkvist
f7b080b7b6 Fix remaining double use of python/python and opm/opm folders in Python package generation 2020-07-01 03:25:11 -04:00
Bård Skaflestad
0ad97351c6
Merge pull request #1849 from totto82/addBrineOutput 
add brine output
 2020-06-30 17:08:07 +02:00
Gaute Lindkvist
c24d7f7798 Remove static python flags from generate-pypi script 2020-06-30 10:55:23 -04:00
Tor Harald Sandve
42e55ec342 Add brine output 2020-06-30 16:19:16 +02:00
Joakim Hove
9fd29db2de Add case with literal in scientific form 2020-06-30 13:04:49 +02:00
Joakim Hove
f09b534e1d Hack around UDQ parser which does not accept leading '-' 2020-06-30 13:01:00 +02:00
Joakim Hove
fc4511d365 Fix UDQParsing code to handle numerical values on scientific form 2020-06-30 12:51:59 +02:00
Bård Skaflestad
89cbb9ae24
Merge pull request #1847 from joakim-hove/use-sumstate-group-function 
Use SummaryState::has_group_var() / SummaryState::get_group_var()
 2020-06-30 11:46:05 +02:00
Joakim Hove
962b6f8150 Use SummaryState::get_group_var() / SummaryState::has_group_var() II 2020-06-30 11:26:08 +02:00
Joakim Hove
c663805694 Refactored UDQ token split code 2020-06-30 10:35:23 +02:00
Joakim Hove
d30b63508d Quote item in error message 2020-06-30 09:48:23 +02:00
Joakim Hove
8ad0c99c1d Make sure UDQ quote_split does not append empty string 2020-06-30 09:37:42 +02:00
Joakim Hove
7fce7a2c9c Bug in UDQ tokenizer 2020-06-30 08:40:06 +02:00
Bård Skaflestad
0c35431a2f
Merge pull request #1844 from joakim-hove/use-sumstate-group-function 
Use SumState::has_group_var() / SumState::get_group_var()
 2020-06-29 21:09:34 +02:00
Bård Skaflestad
64ae1a8dea
Merge pull request #1834 from totto82/addPolymerOutput 
Add output for polymer production
 2020-06-29 17:06:53 +02:00
Joakim Hove
3e828e8578 Use SummaryState::has_group_var() / SummaryState::get_group_var() 2020-06-29 16:18:37 +02:00
Joakim Hove
eb48fb709a Add SummaryState::get_xxx() overloads with a default argument 2020-06-29 14:14:49 +02:00