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

8756 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tor Harald Sandve
32a47bf79a Fix unit for salt concentration in WSALT 2020-09-14 08:22:21 +02:00
Joakim Hove
24b66d8bb4 Merge pull request #1889 from joakim-hove/udq-state 
Udq state
 2020-08-31 07:35:14 +02:00
Bård Skaflestad
bb8c1f192f Merge pull request #1894 from GitPaean/code_compatibility 
rewriting a for loop for intel compilers
 2020-08-28 12:29:48 +02:00
Kai Bao
1927e305ed rewriting a for loop for intel compilers 2020-08-28 11:37:04 +02:00
Joakim Hove
0161f50255 Add UDQState 2020-08-27 17:25:51 +02:00
Joakim Hove
8b2363b940 Merge pull request #1885 from joakim-hove/udq-uadd 
Correctly parse and handle UADD / UMUL / UMIN / UMAX set operations
 2020-08-27 17:11:25 +02:00
Joakim Hove
7894a21749 Merge pull request #1892 from joakim-hove/fp-fipxxx 
Allow FIPxxx keywords in FieldProps manager
 2020-08-27 17:11:05 +02:00
Joakim Hove
8b718ef0e1 Merge pull request #1890 from joakim-hove/extract-udq-eval 
Remove call to udq::eval() from Summary::eval()
 2020-08-27 17:09:28 +02:00
Joakim Hove
168aa5602d Make sure DEFINE statements are evaluated in input order 2020-08-27 15:24:32 +02:00
Joakim Hove
718e00ca1f Correctly parse and handle UADD / UMUL / UMIN / UMAX set operations 2020-08-27 15:24:32 +02:00
Joakim Hove
1cf069c837 Merge pull request #1886 from joakim-hove/udq-tokens 
Fix UDQ parsing for mix of '*' and *
 2020-08-27 15:22:25 +02:00
Joakim Hove
76e8805d92 Merge pull request #1893 from joakim-hove/remove-require-fipnum 
Remove function SummaryConfig::requireFIPNUM
 2020-08-27 13:56:36 +02:00
Joakim Hove
dee69e78c3 Remove function SummaryConfig::requireFIPNUM 2020-08-27 11:55:17 +02:00
Joakim Hove
e00516842c Allow FIPxxx keywords in FieldProps manager 2020-08-26 08:52:12 +02:00
Joakim Hove
b9ca9c3d47 Remove call to udq::eval() from Summary::eval() 2020-08-25 16:27:46 +02:00
Bård Skaflestad
98c9ce7abd Merge pull request #1888 from joakim-hove/udq-scalar-optional 
Use std::optional<double> in UDQScalar
 2020-08-24 09:35:13 +02:00
Joakim Hove
9ccc9a72e4 Use std::optional<double> in UDQScalar 2020-08-24 06:59:11 +02:00
Joakim Hove
6c2563c5a5 Fix tokenizer bug with mix of '*' and * 
The token '*' should be interpreted as all wells/groups for a variable like WOPR
or GGPR, whereas the naked * is a multiplication sign. This commit fixes a bug
where the all wells/groups token '*' would be incorrectly interpreted as a
multiplication sign.
 2020-08-23 08:31:15 +02:00
Joakim Hove
f608487772 Merge pull request #1883 from bska/use-wmctl-rstval 
Restart Wells: Use IWEL WMCTL Values as Switch Cases
 2020-08-20 15:30:57 +02:00
Bård Skaflestad
af362fa4cf Restart Wells: Use IWEL WMCTL Values as Switch Cases 
These are (marginally) easier to understand than their raw integer
values.  While here, also insert the missing 'GRUP' case for
producers.
 2020-08-20 13:43:12 +02:00
Bård Skaflestad
a92c8ca6e0 Merge pull request #1870 from jalvestad/group-udq-actx_ph2 
Corrections and improvements to Eclipse compatible restart file output
 2020-08-19 12:30:01 +02:00
Bård Skaflestad
501db1003d Merge pull request #1876 from joakim-hove/rptrst-solution 
Correctly handle RPTRST in SOLUTION section
 2020-08-18 11:08:31 +02:00
Jostein Alvestad
b624facaf2 minor corrections of comments 2020-08-18 11:07:57 +02:00
Jostein Alvestad
156c934993 minor comment corrections 2020-08-18 11:07:54 +02:00
Jostein Alvestad
c525546489 correct some logical tests determining IGRP 2020-08-18 11:07:52 +02:00
Joakim Hove
106c0881ee Correctly handle RPTRST in SOLUTION section 2020-08-18 10:48:50 +02:00
Joakim Hove
effe70876f Merge pull request #1879 from berland/weconcmf 
Add support for parsing E300 kw WECONCMF
 2020-08-18 00:10:34 +02:00
Bård Skaflestad
8e1f8099b2 Merge pull request #1878 from berland/wcutback-fix 
Add GLR_LIMIT to WCUTBACK

Fixes #1878
 2020-08-17 12:56:45 +02:00
Håvard Berland
b1b04d3dec Add GLR_LIMIT to WCUTBACK, solving bug #1877 
Also add dimensions to all relevant fields.
 2020-08-17 11:41:19 +02:00
Håvard Berland
ab047eca6a Add support for parsing E300 kw WECONCMF 2020-08-17 11:05:09 +02:00
Joakim Hove
c84b95ed85 Merge pull request #1875 from joakim-hove/tlmixpar 
Implement TLMIXPAR as dedicated vector of struct - not table
 2020-08-14 12:56:39 +02:00
Joakim Hove
d358d94f58 Merge pull request #1806 from goncalvesmachadoc/salt 
finalizeSaltTables
 2020-08-14 12:55:49 +02:00
Cintia Goncalves Machado
f8c53e0f9b Merge pull request #2 from joakim-hove/salt 
Salt
 2020-08-14 09:51:33 +02:00
Joakim Hove
748c3975fb Fix salt table tests 2020-08-13 18:44:04 +02:00
Joakim Hove
66ddbd7842 Remove trailing whitespace 2020-08-13 18:44:04 +02:00
Joakim Hove
1b851f03cb Implement TLMIXPAR as dedicated vector of struct - not table 2020-08-12 14:47:21 +02:00
Markus Blatt
c438c58af3 Merge pull request #1873 from blattms/require-compiled-source 
Require test source code to compile and fix test for dune-geometry (>2.7)
 2020-08-11 10:34:09 +02:00
Markus Blatt
7c30586fde Only compile code if non-empty code was submitted for DUNE/OPM. 
Also make the search fail if the compilation fails.
 2020-08-11 00:53:45 +02:00
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