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
Joakim Hove
31b6baa676 Reshuffle segments and connections after restart 2020-06-07 09:09:15 +02:00
Joakim Hove
0daac0b9e3 Merge pull request #1804 from joakim-hove/segment-perf-length 
Segment perf length
 2020-06-05 11:05:24 +02:00
Joakim Hove
5b51c57a5e Update SpiralICD scaling factor during initialization 2020-06-05 08:00:53 +02:00
Joakim Hove
bf3f8e1b08 Merge pull request #1809 from joakim-hove/refactor-compsegs 
Refactor COMPSEGS handling
 2020-06-04 22:58:01 +02:00
Markus Blatt
23dd41ba38 Support querying GAP/NOGAP mode for Pinch form EclipseGrid. 
While we currently only support GAP and do not need this,
we will need it eventually to support NOGAP in the simulator.
 2020-06-04 20:19:51 +02:00
Joakim Hove
6b468787c8 Refactor COMPSEGS handling 
When handling the COMPSEGS keyword the connections are updated with segment
number and the segments are updated with total perforated length. The new
Compsegs::processCOMPSEGS() function will create new updated copies of both
WellSegments and WellConnections.
 2020-06-04 16:57:40 +02:00
Joakim Hove
5b0045d4a5 Merge pull request #1808 from joakim-hove/sicd-refactor-step0 
Sicd refactor step0
 2020-06-04 15:58:08 +02:00
Joakim Hove
6e60ebfc74 Merge pull request #1807 from akva2/fix_invalid_deref 
fixed: reorder logging and update call
 2020-06-04 14:50:53 +02:00
Arne Morten Kvarving
c620d392d2 fixed: reorder logging and update call 
the update call can invalidate the reference since the underlying
smart pointer is replaced, and when there are no remaining references,
it is deleted.
 2020-06-04 13:16:18 +02:00
Cintia Goncalves Machado
628afd7abe finalizeSaltTables 2020-06-04 11:43:59 +02:00
Joakim Hove
1b2fc9a7fa Add new function to calculate total perforated length for segment 2020-06-03 08:28:53 +02:00
Joakim Hove
dcec08767d Add member perf_length to Segment class 2020-06-03 08:28:53 +02:00
Joakim Hove
7b33ab4519 Merge pull request #1805 from hakonhagland/glift_setters 
Added some getters for LIFTOPT.
 2020-06-02 11:00:54 +02:00
Håkon Hægland
f7d2631a57 Added const keyword to getters. 
The access method should be marked as const so to make the compiler
aware that they should not modify the state of the object.
 2020-06-02 09:20:54 +02:00
Håkon Hægland
c6d49a4b44 Added some getters for LIFTOPT. 
Added getters for gaslift_increment() and min_eco_gradient() in
the Opm::GasLiftOpt class.
 2020-06-02 07:21:01 +02:00
Bård Skaflestad
475dde4bb1 Merge pull request #1803 from joakim-hove/all-shut-message 
All shut message
 2020-06-01 23:37:17 +02:00
Joakim Hove
998b555662 Move message "All connections shut -> shut well" 2020-06-01 20:02:06 +02:00
Joakim Hove
80bd81c892 Remove commented out code 2020-06-01 08:59:38 +02:00
Bård Skaflestad
f7b2bb4a07 Merge pull request #1802 from atgeirr/clang-is-not-gcc 
Ensure clang uses the normal standard headers.
 2020-05-29 16:26:20 +02:00
Atgeirr Flø Rasmussen
937747323d Ensure clang uses the normal standard headers. 
Clang defines __GNUC__ to 4, as that represents its level of
support for the GNU C dialect. The gcc compiler does not provide
a macro indicating the compiler separately from the dialect supported.
We must therefore use the __clang__ macro to avoid false positives.
 2020-05-29 14:31:37 +02:00
Atgeirr Flø Rasmussen
1a1bb29a13 Merge pull request #1800 from atgeirr/bump-version 
Bump version number
 2020-05-29 13:34:28 +02:00
Joakim Hove
ccf3f150f2 Merge pull request #1798 from joakim-hove/aicd 
Rename SpiralICD -> SICD
 2020-05-29 07:24:38 +02:00
Joakim Hove
4fbfe3b8ec Merge pull request #1799 from joakim-hove/halvor_opm_restart 
Halvor opm restart
 2020-05-28 17:41:59 +02:00
Atgeirr Flø Rasmussen
f783282f49 Bump version number 2020-05-28 16:50:26 +02:00
Joakim Hove
4e7ac10320 Explicitly mark const overload in Python binding 2020-05-28 16:21:14 +02:00
hnil
7db2cc0c2e add new function to make input and output definitions uniform for example for forward runs 2020-05-28 16:08:34 +02:00
hnil
2c04ada035 added unification of inputoutput 2020-05-28 16:08:34 +02:00
hnil
e3d39a8b64 changes to be able to set request for restart. Also change the parallel restart to read uniform output 2020-05-28 16:08:34 +02:00
Markus Blatt
0352258f22 Merge pull request #1796 from blattms/require-disabled-packages 
Send error for required but disabled packages.
 2020-05-28 11:48:01 +02:00
Joakim Hove
7df0577a58 Rename SpiralICD -> SICD 2020-05-28 11:03:24 +02:00
Bård Skaflestad
49e2099436 Merge pull request #1795 from bska/thp-restart-support 
Add Restart I/O Support for Well's THP
 2020-05-20 15:07:56 +02:00
Markus Blatt
9452796c57 Send error for required but disabled packages. 
When using CMAKE_DISABLE_FIND_PACKAGE_<name>=ON for a required package
CMake did not issue an errors since we never trigger the find_package
call. With this commit we now check whether such package is required
and send an error.
 2020-05-20 14:55:52 +02:00
Bård Skaflestad
c71ffd1415 Add Restart I/O Support for Well's THP 
This commit adds support for saving and restoring a well's THP
quantitiy.  We put the THP into the summary facility's list of
"required restart quantities" and pick up the value converted to
output units from the SummaryState.

On restart we restore the THP value to internal (SI) units and
transport the value to the simulator in data::Well::thp.  While
here, also add the THP value to the RstWell object although
currently not strictly needed in that context.
 2020-05-19 22:20:55 +02:00
Bård Skaflestad
88f8313568 Merge pull request #1793 from OPM/fix/add-missing-includes 
add some missing includes
 2020-05-19 21:35:57 +02:00
Bård Skaflestad
7194463033 Merge pull request #1794 from OPM/fix/designated-initializer 
avoid designated initializer error
 2020-05-19 21:34:44 +02:00
Bernd Flemisch
283da4d2b6 [test] avoid designated initializer error 2020-05-19 13:03:45 +02:00
Bernd Flemisch
54f08156ad add some missing includes 2020-05-19 12:59:22 +02:00
Bård Skaflestad
0d9eda9b76 Merge pull request #1792 from bska/restart-guiderate-locations 
Restart: Prepare to Output Well/Group Guide Rates
 2020-05-18 23:43:11 +02:00
Bård Skaflestad
317d1ba14e Restart: Prepare to Output Well/Group Guide Rates 
This commit identifies vector items in XWEL and XGRP that hold guide
rate values at the well and group levels, and adds functionality to
output those values to the restart file.  We do not identify such
value at the FIELD level.  As with other summary-like quantities, we
expect to pick up the fully converted values from a SummaryState
object.

Calculating and storing the guide rate quantities in SummaryState is
the subject of future work.
 2020-05-18 21:56:57 +02:00
Joakim Hove
598f0e9056 Merge pull request #1791 from joakim-hove/group-index-offset 
Fix group number used in IUAP restart array
 2020-05-18 17:37:52 +02:00
Bård Skaflestad
6f45df5e93 Merge pull request #1790 from joakim-hove/network-vfp0 
When defining branch properties: vfp == 0 should delete branch
 2020-05-16 00:46:58 +02:00
Joakim Hove
0aa5fd9f09 Fix group number used in IUAP restart array 2020-05-15 16:26:57 +02:00
Bård Skaflestad
5560f43a8c Merge pull request #1782 from hnil/abs_convergence 
changed rootfinders to return also when absolute tolerance is less th…
 2020-05-15 15:19:33 +02:00
Joakim Hove
66acfb5249 When defining branch properties: vfp == 0 should delete branch 2020-05-15 14:21:44 +02:00
Joakim Hove
d1babffa8b Merge pull request #1789 from joakim-hove/udqactive-gconprod 
Make sure the UDQ usage in GCONPROD is recorded
 2020-05-15 13:17:02 +02:00
hnil
47df32ef1a fixed the tolerance also in RegulaFalsiBisection 2020-05-15 08:55:38 +02:00
Joakim Hove
fd5a42801f Make sure the UDQ usage in GCONPROD is recorded 2020-05-15 08:27:52 +02:00
Atgeirr Flø Rasmussen
7cff27c801 Merge pull request #1788 from atgeirr/fix-missing-openmp 
Let make_lodsmry also work without OpenMP.
 2020-05-14 19:11:51 +02:00
Atgeirr Flø Rasmussen
28f3df5259 Let make_lodsmry also work without OpenMP. 2020-05-14 16:58:51 +02:00
Bård Skaflestad
162e0b53cd Merge pull request #1787 from atgeirr/add-missing-include 
Add missing <array> include.
 2020-05-14 15:43:45 +02:00