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

4935 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove
a732ddeb50
Merge pull request #512 from joakim-hove/bump-versions 
Bump versions to 2018.10-rc1
 2018-10-02 15:50:58 +02:00
Joakim Hove
4768b5cd95 Bump versions to 2018.10-rc1 2018-10-02 15:27:41 +02:00
Joakim Hove
c81e5027c9
Merge pull request #510 from bska/difftime 
TimeMap: Use difftime() for Time Deltas as double
 2018-10-02 14:44:44 +02:00
Bård Skaflestad
23950403f1 TimeMap: Use difftime() for Time Deltas as double 
Reduces the amount of explicit arithmetic on std::time_t values and
thereby, implicitly, the assumption of targeting Posix systems only.
 2018-10-02 13:11:02 +02:00
Bård Skaflestad
33372a3337
Merge pull request #506 from jalvestad/flow-flow-restart 
EclipseRestart-improvements
 2018-10-02 13:05:43 +02:00
Jostein Alvestad
c067e48276 Additional improvement and correction for writing of eclipse compatible restart file 2018-09-28 15:39:25 +02:00
Jostein Alvestad
5d398565c2 Improved the code structure - current improvement 2018-09-28 11:23:42 +02:00
Jostein Alvestad
a9a82e3814 Minor correction to previous commit rseg [39] was not properly assigned 2018-09-28 09:56:03 +02:00
Jostein Alvestad
3f94b580a2 Added changes to improve treatment of multi segment wells in Eclipse Restart 
Added flowing well bottom hole pressure to item[8] and [39] plus adjusted item[9]
 2018-09-28 09:48:03 +02:00
Jostein Alvestad
cfc1b29c08 Added improvements and corrections to handle writing of eclipse compatible restart file 
for more general well data
 2018-09-27 16:23:34 +02:00
Jostein Alvestad
264d451d56 Added additional changes to handle repeated read of COMPDAT 
for same grid i,j,k cell.
Corrections for handling wells with only 1 connection
Correction for XWEL - BG being NaN
 2018-09-27 16:23:32 +02:00
Jostein Alvestad
21eddfbdf2 Added changes to handle repeated read of COMPDAT for same grid cells 2018-09-27 16:23:31 +02:00
Joakim Hove
34b9cbcaa4
Merge pull request #502 from GitPaean/alq_unit_wcon 
not converting the unit of ALQ value in VFPPROD
 2018-09-26 20:16:42 +02:00
Kai Bao
8721385104 not converting the unit of ALQ value in VFPPROD 
since the ALQ value in WCON* keywords are not converted based on the
unit of ALQ in the VFPPROD keyword. Easiest fix is not to convert either
of them.
 2018-09-26 13:01:29 +02:00
Arne Morten Kvarving
fa85844a9b
Merge pull request #500 from akva2/bash_completion 
added: cmake glue for adding bash tab completion for an installed product
 2018-09-25 12:32:03 +02:00
Arne Morten Kvarving
e3bc8a6ad7 fixed: fail build in jenkins scripts if installation target fails 2018-09-25 12:31:11 +02:00
Arne Morten Kvarving
564f064392 added: cmake glue for adding bash tab completion for an installed product 2018-09-25 12:31:11 +02:00
Arne Morten Kvarving
5477711420
Merge pull request #504 from akva2/restart_fixups 
Fixups after restart merge
 2018-09-25 10:58:21 +02:00
Arne Morten Kvarving
23c1aa9308 changed: use memcpy to avoid aliasing warnings 2018-09-25 10:04:39 +02:00
Arne Morten Kvarving
0e2dbf737e fixed: do not try to append size_t to string using + 2018-09-25 10:04:39 +02:00
Arne Morten Kvarving
5a2eec25b2 fixed: change to signed loop counters 
avoids signed/unsigned comparison warnings
 2018-09-25 10:04:39 +02:00
Arne Morten Kvarving
ae7c7fdf74 changed: flip comparison to avoid warnings 
warning: assuming signed overflow does not occur when assuming that (X +
c) < X is always false [-Wstrict-overflow]
 2018-09-25 10:04:39 +02:00
Arne Morten Kvarving
ddf6f153f7 fixed: use constructor argument instead of (broken) init loop 2018-09-25 10:04:39 +02:00
Arne Morten Kvarving
9f7b9be7f4 changed: make unsigned to avoid narrowing warnings/errors 2018-09-25 10:04:39 +02:00
Arne Morten Kvarving
0b85652c35 remove unused symbols 2018-09-25 10:04:39 +02:00
Arne Morten Kvarving
4bb0ede6b4
Merge pull request #503 from rolk/503_warncompat 
Do not warn if just def'ed HAVE_ vars are set to 1
 2018-09-24 08:54:54 +02:00
Roland Kaufmann
d847e10d96 Do not warn if just def'ed HAVE_ vars are set to 1 
Some configuration scripts probe and just set HAVE_FOO without any
values, whereas others set it explicitly to 1. If these two are mixed,
for instance that the same package is used by two of our prerequisites,
but in different manner, then we get compatibility warnings when we try
to run the configuration script, even though there is no real conflict.

dune-fem, dune-alugrid and dune-localfunctions have this problem (around
release 2018.04).

This patch special-code the test so if the old value was previously
either just defined or explicitly set to the value 1, a warning will not
be issued if then suddenly the other variant is used.
 2018-09-21 13:49:39 +02:00
Atgeirr Flø Rasmussen
5fb0c91c05
Merge pull request #454 from jalvestad/restart-group+mswell 
Restart group+mswell
 2018-09-21 10:14:47 +02:00
Bård Skaflestad
ff53a2334c
Merge pull request #499 from totto82/fix_save_keywords 
BugFix size of save_keywords
 2018-09-20 17:59:30 +02:00
Tor Harald Sandve
776d851b26 Fix size of save_keywords 2018-09-20 13:50:23 +02:00
Joakim Hove
2884d02a71
Merge pull request #501 from joakim-hove/komodo-fixup 
Add quotes to ensure string evaluation
 2018-09-20 13:18:13 +02:00
Joakim Hove
90459cac7e Add quotes to ensure string evaluation 2018-09-19 23:33:54 +02:00
Bård Skaflestad
b03ccdc6e1 SWEL/XWEL: Guard Against Missing Summary Vectors 
Commit 36af2aad (PR #496) switched to not calculating the well's
summary vectors in the case of outputting the initial condition
(SEQNUM=0).  Account for this possibility when creating SWEL and
XWEL.
 2018-09-19 16:02:17 +02:00
Jostein Alvestad
fa9275f1af Added correction to treatment of multisegment wells in preparation for writing of eclipse 
compatible restart file
 2018-09-19 16:02:17 +02:00
Jostein Alvestad
ef6e0b084d Corrected merge conflicts with upstream master 
Write cumulative production / injection only in eclipse compatible mode
 2018-09-19 16:02:17 +02:00
Bård Skaflestad
a3b37eee4f Support Retrieving Well Vectors from {I,X}{WEL,CON} 
This commit extends function RestartIO::load() to retrieve most of
the well restart data (aggregate flow rates per well connection,
or per well) from the standard ECL restart vectors IWEL, XWEL, ICON,
and XCON.  We still prefer the dedicated OPM_* variants if
available, but this commit brings us closer to being able to retire
OPM_XWEL.

While here, also add WELLDIMS to FIRST_SIM_THPRES to restore the
STORE_THPRES unit test.
 2018-09-19 16:02:16 +02:00
Bård Skaflestad
980f55271f Connection Data: Write Flow Rates to XCON 
This commit adds a simple facility for outputting surface rates of
the oil, gas, and water components for each well connection, as well
as total reservoir voidage rate per well connection if available in
the data::Connection object.
 2018-09-19 16:02:16 +02:00
Bård Skaflestad
335b070564 Aggregate Connection Data: Use Named Indices 
This commit introduces a new set of named indices pertaining to the
*CON vectors (ICON, SCON, XCON).  Use these where appropriate in
ICON and SCON.
 2018-09-19 16:02:15 +02:00
Bård Skaflestad
d42c98223c Refactor Implementation of RestartIO::save() 
In particular, reimplement write_kw() in terms of vector<T> rather
than EclKW<T> to simplify callers.  While here, also move some file
handling operations out to separate helper functions to make control
flow more linear in the body of RestartIO::save(), and prune unused
arguments from other helper functions.
 2018-09-19 16:02:15 +02:00
Bård Skaflestad
2f868a7325 Split RestartIO into Separate Load/Save Files 
This is in preparation of introducing support for loading most
well-related solution items from the regular vectors IWEL, XWEL,
ICON, and XCON.
 2018-09-19 16:02:14 +02:00
Jostein Alvestad
96f2528083 Added changes to CMakeLists_files.cmake to correct for rebase 2018-09-19 16:02:14 +02:00
Bård Skaflestad
38c4d07282 Aggregate Well Data: Miscellaneous Cleanup 
Fix a few white-space issues and use 'atm' unit of measurement for
the default lower BHP limit of producers.
 2018-09-19 16:02:14 +02:00
Bård Skaflestad
77904d6aab Aggregate Well Data: Fix SWEL UoM for Injectors 
Unit of measurement for non-gas injectors must be liquid surface
rate for O/W injectors and 'rate' (reservoir voidage rate) for RESV
injectors.
 2018-09-19 16:02:13 +02:00
Bård Skaflestad
6688a9286f Unit Tests: Fix Comparison Values 2018-09-19 16:02:13 +02:00
Bård Skaflestad
9637109ca8 Test Data: Add WELLDIMS for Restart Purposes 
The new restart code depends on having WELLDIMS available in order
to allocate appropriately sized output vectors.
 2018-09-19 16:02:13 +02:00
Bård Skaflestad
41d0a56967 Test Restart: Use Non-Default SummaryState Values 
Needed by the new restart code.
 2018-09-19 16:02:12 +02:00
Jostein Alvestad
9d32793796 Added improvements to connection data ICON (account for inactive cells) etc. 2018-09-19 16:02:12 +02:00
Jostein Alvestad
13e849140c Added changes to identify issues for improving ICON 2018-09-19 16:02:11 +02:00
Jostein Alvestad
0e1e4e08e7 Added changes to improve handling of ICON 2018-09-19 16:02:11 +02:00
Jostein Alvestad
3fb7149226 Added change to rseg item 11 2018-09-19 16:02:10 +02:00