Commit Graph

5999 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
13bd564edf Add WFOAM support to Schedule and Well2. 2019-07-03 12:39:35 +02:00
Atgeirr Flø Rasmussen
0aaf9823c1 Merge pull request #879 from atgeirr/add-foammob
Add FOAMMOB and friends
2019-07-03 12:38:33 +02:00
Atgeirr Flø Rasmussen
f48462841f Add table support for FOAMMOB. 2019-07-03 11:12:12 +02:00
Atgeirr Flø Rasmussen
89acca0fd7 Add FOAMMOB, FOAMOPTS and WFOAM keywords. 2019-07-03 11:12:12 +02:00
Atgeirr Flø Rasmussen
1cd6ebb403 Merge pull request #877 from atgeirr/add-foamrock
Add FOAMROCK including FoamConfig support and test.
2019-07-02 17:53:51 +02:00
Atgeirr Flø Rasmussen
522db6d093 Address issues from review. 2019-07-02 16:58:04 +02:00
Atgeirr Flø Rasmussen
33783b1e9f Add FOAMROCK including FoamConfig support and test. 2019-07-02 13:55:42 +02:00
Atgeirr Flø Rasmussen
d61d9c920b Merge pull request #875 from atgeirr/add-foamconfig
Add FoamConfig class and support
2019-07-02 11:45:37 +02:00
Atgeirr Flø Rasmussen
17a2e5d334 Address review comments.
- Use a raw literal.
 - Use 'index', not 'id'.
 - Use FoamConfig(const Deck&) constructor.
2019-07-02 10:43:13 +02:00
Joakim Hove
8f7e6ccd94 Merge pull request #874 from tskille/compareECL
Added new option to compareECL
2019-07-02 07:24:48 +02:00
Torbjørn Skille
51adb23728 Added new option (report steps only) for compareECL for comparing summary results 2019-07-01 16:37:49 +02:00
Atgeirr Flø Rasmussen
7245598952 Include cstddef for std::size_t. 2019-07-01 15:29:21 +02:00
Atgeirr Flø Rasmussen
ba462d67cf Add test for FoamConfig. 2019-07-01 14:40:59 +02:00
Atgeirr Flø Rasmussen
62a3b7334d Add FoamConfig to InitConfig. 2019-07-01 14:40:37 +02:00
Atgeirr Flø Rasmussen
c314464ef3 Add unit support for FoamSurfactantConcentration.
Note that FoamDensity and FoamSurfactantConcentration differ in field units,
as one is then poind/barrel and the other is pound/(1000 cubic feet)!
2019-07-01 14:40:05 +02:00
Atgeirr Flø Rasmussen
57cc97af47 Bugfix: do not use std::fixed output format.
This change lets 1e-20 be printed correctly.
2019-07-01 14:19:41 +02:00
Atgeirr Flø Rasmussen
34d1918a2d Add copyright notice to new files. 2019-07-01 10:49:33 +02:00
Atgeirr Flø Rasmussen
39f8eb18c7 Change class name Foam -> FoamConfig. 2019-07-01 10:47:48 +02:00
Steinar Foss
597bbde151 jenkins will build python. (#865)
Jenkins will build with -DOPM_ENABLE_PYTHON=ON
2019-06-29 08:20:00 +02:00
Joakim Hove
28ba27184a Merge pull request #870 from joakim-hove/udq-summary-name
Make sure that well UDQ with last letter 'L' are included in output
2019-06-29 00:17:53 +02:00
Franz G. Fuchs
4baff64d63 implemented faom config 2019-06-28 12:37:04 +02:00
Joakim Hove
0cf83567eb Make sure that well UDQ with last letter 'L' are included in output 2019-06-28 12:23:33 +02:00
Kai Bao
034488c902 Merge pull request #864 from GitPaean/fixing_maximum_wtest_attempt_with_multiple_wtest
recording the report step that WTEST keyword is specified
2019-06-28 10:36:29 +02:00
Kai Bao
fb8de64487 addressing comments for PR#864 2019-06-28 09:47:40 +02:00
Kai Bao
7c0b2df272 adding test to test the functionality 2019-06-28 09:47:40 +02:00
Kai Bao
290123bc33 Do not keep multiple WTESTWell has same name and reason
when add_well in WellTestConfig .
2019-06-28 09:47:40 +02:00
Kai Bao
11bc26d28d recording the report step that WTEST keyword is specified
so we can easily tell when a new WTEST keyword joins.

When a new WTEST keyword, we will reset the counting of the num_attempt
and maximum number of attempts for the associated well.
2019-06-28 09:47:40 +02:00
Franz G. Fuchs
a68db0a857 update 2019-06-28 09:44:33 +02:00
Franz G. Fuchs
563c6317d4 udpate 2019-06-28 09:43:20 +02:00
Joakim Hove
8dbb8d70fc Merge pull request #868 from joakim-hove/ignore-SUMTHIN
Do not classify 'SUMTHIN' directive as UDQ keyword
2019-06-27 17:53:35 +02:00
Joakim Hove
90ebc66c0b Merge pull request #867 from joakim-hove/rename-enable-python
Rename cmake symbol ENABLE_PYTHON -> OPM_ENABLE_PYTHON
2019-06-27 16:17:37 +02:00
Joakim Hove
d32e0f6eaf Do not classify 'SUMTHIN' directive as UDQ keyword 2019-06-27 16:11:02 +02:00
Joakim Hove
dba43a4a5e Rename cmake symbol ENABLE_PYTHON -> OPM_ENABLE_PYTHON 2019-06-27 15:19:03 +02:00
Joakim Hove
82535a9136 Merge pull request #863 from stefoss23/python_subdir
Python subdirectory
2019-06-27 12:54:43 +02:00
Joakim Hove
ad9c818574 Merge pull request #858 from atgeirr/more-warnings
Turn on -Wextra and -Wshadow warning flags.
2019-06-27 12:53:45 +02:00
Steinar Foss
143c73cdd0 ENABLE_PYTHON OFF. 2019-06-27 12:31:38 +02:00
Steinar Foss
ef936afeaa opm set to PIC with PYTHON ON. 2019-06-27 12:10:02 +02:00
Bård Skaflestad
5bed559f96 Merge pull request #860 from atgeirr/foam_module
Foam module
2019-06-26 11:54:17 +02:00
Atgeirr Flø Rasmussen
c26538f433 Merge pull request #862 from joakim-hove/warnings
Warnings
2019-06-26 11:04:00 +02:00
Joakim Hove
0d5cd70536 Merge pull request #854 from GitPaean/fixing_maximum_wtest_attempt
not removing the well from WellTestState when testing is successful
2019-06-26 09:20:31 +02:00
Joakim Hove
7475636610 Rename arguments to avoid shadowing 2019-06-26 07:51:36 +02:00
Joakim Hove
cd43bb7a5f Remove debug printf() 2019-06-26 07:51:36 +02:00
Joakim Hove
b116eda8bc Remove unused arguments 2019-06-26 07:51:36 +02:00
Joakim Hove
29697a0906 Remove members keywords1 and keywords2 from EclFilesComparator 2019-06-26 07:51:36 +02:00
Kai Bao
28110584a3 removing funciton dropWell for WellTestState 2019-06-25 22:18:55 +02:00
Kai Bao
c0c9d70dcf not removing the well from WellTestState when testing is successful 2019-06-25 22:15:28 +02:00
Joakim Hove
fbfdf5c244 Merge pull request #844 from GitPaean/fixing_warnings
Fixing warnings
2019-06-25 21:08:12 +02:00
Bård Skaflestad
c63e23c140 Allow Saturation Region = 0 in Deactivated Cells
There are models for which SATNUM and/or IMBNUM is zero in
deactivated cells (those for which ACTNUM is also zero in the input
deck).  Allow this case in the initializers for the saturation
function properties (i.e., the endpoint arrays).
2019-06-25 20:51:11 +02:00
Bård Skaflestad
465ab091e0 Support Automatic Generation of Scaled Endpoint Arrays
The endpoint arrays (SWLPC, SGU, KRORW etc) can all be automatically
generated from the unscaled input saturation function tables.
2019-06-25 20:51:11 +02:00
Joakim Hove
189e84d40e Merge pull request #856 from bska/internalize-filleps-kw
InitConfig: Internalize FILLEPS Keyword
2019-06-25 20:49:25 +02:00