Commit Graph

6017 Commits

Author SHA1 Message Date
Joakim Hove
6426644ce4 Add method Schedule::groupNames() 2019-07-15 06:01:44 +02:00
Joakim Hove
88afb50d09 Merge pull request #881 from joakim-hove/group2
WIP: Group2
2019-07-06 07:30:25 +02:00
Joakim Hove
f0215f1a3d Merge pull request #887 from joakim-hove/normal-libecl-build
Remove hardcoded libecl commit in jenkins pipeline
2019-07-05 17:42:43 +02:00
Kai Bao
2b41c40c58 Merge pull request #878 from GitPaean/welopen_wtest
WELOPEN and WCON* interact with WECON and WTEST
2019-07-05 11:43:14 +02:00
Joakim Hove
1c777c5ba5 Remove hardcoded libecl commit in jenkins pipeline 2019-07-05 11:16:09 +02:00
Kai Bao
011666b3f9 WELOPEN and WCON* interact with WECON and WTEST
WELOPEN and WCON* can open well closed due to various reasons, physical
or economic.

If a well is shut with WELOPEN and WCON*, we do not try to re-open it
through WTEST.
2019-07-05 10:01:03 +02:00
Atgeirr Flø Rasmussen
6aabb6958d Merge pull request #883 from atgeirr/allow-no-foamfsc
Allow FOAM without FOAMFSC
2019-07-05 09:24:13 +02:00
Joakim Hove
0694515c69 Merge pull request #886 from joakim-hove/jenkins-libecl-build
Jenkins libecl build
2019-07-05 07:07:04 +02:00
Joakim Hove
7f521652f4 Update libecl pr build 2019-07-04 20:17:21 +02:00
Joakim Hove
8740a8dc1a Update libecl github organisation to equinor 2019-07-04 19:06:35 +02:00
Atgeirr Flø Rasmussen
3f5f4c1b40 Merge pull request #885 from atgeirr/use-fixed-libecl-jenkins
Set default commit to use for libecl to a known OPM-compatible commit
2019-07-04 17:42:27 +02:00
Atgeirr Flø Rasmussen
54c8e107b7 Do not use master branch for libecl by default. 2019-07-04 16:35:48 +02:00
Atgeirr Flø Rasmussen
c3dcedc392 Allow FOAM without FOAMFSC
This is necessary to support the table-based gas mobility reduction model.
In order to extend support to the function-based model the FOAMFSC-related
things have been kept.
2019-07-04 12:57:43 +02:00
Atgeirr Flø Rasmussen
e877de94bb Merge pull request #882 from atgeirr/add-wfoam-support
Add WFOAM support
2019-07-04 11:16:46 +02:00
Atgeirr Flø Rasmussen
5144456aa4 Address review comments.
- Use const reference to the dynamic state in handleWFOAM() and handleWPOLYMER().
 - Throw if trying to set foam or polymer injection properties on a production well.
 - Update some tests that failed due to the point above.
2019-07-04 09:23:11 +02:00
Atgeirr Flø Rasmussen
5f8d24c431 Add tests for WFOAM. 2019-07-03 12:39:35 +02:00
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
Joakim Hove
a64745193d Add empty Group2 skeleton 2019-07-03 11:15:51 +02:00
Joakim Hove
fe83324746 Moved Group related files to Group/ folder in filesystem 2019-07-03 11:15:51 +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