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

8235 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Blatt
c7e70da2c5 Do not call project another time in OpmLibMain 
Each project should and does this in their own top level
CMakeLists.cmake at the very beginning anyway.
 2020-04-02 19:44:32 +02:00
Joakim Hove
fd221bb949 Merge pull request #1670 from joakim-hove/esmry-rm-seqtime 
Esmry rm seqtime
 2020-04-02 13:59:05 +02:00
Joakim Hove
e3c491ad38 Merge pull request #1671 from wito/smpec-unit-fix 
[FIX] Wrong unit names given for field units with certain values of UnitSystem::measure
 2020-04-02 13:51:02 +02:00
Williham Williham Totland
c255116133 Adds static assertions to ensure at compile time that all unit names are provided. 2020-04-02 10:23:46 +02:00
Williham Williham Totland
4919d850a9 Resolves an issue with units resulting from silent string concatenation. 2020-04-02 10:19:28 +02:00
Joakim Hove
33ecf4215d ESmry: use templated function rstep_vector() 2020-04-02 09:35:59 +02:00
Joakim Hove
f8e793a21a ESmry: remove unused member seqTime 2020-04-02 09:32:12 +02:00
Bård Skaflestad
dc0b91609e Merge pull request #1656 from joakim-hove/rst-well-shut 
Rst well shut
 2020-04-01 23:11:04 +02:00
Bård Skaflestad
d918f052e2 Merge pull request #1668 from bska/pot-rate-smry-alias 
Summary: Recognise Aliases for Potential Phase Injection Rates
 2020-04-01 22:39:26 +02:00
Bård Skaflestad
dfb4b5ef3a Summary: Recognise Aliases for Potential Phase Injection Rates 
This commit adds the aliases 'WGIP' and 'WWIP' for the existing
summary vector names 'WGPI' (potential gas injection rate at well
level), and 'WWPI' (potental water injection rate at well level),
respectively.

Some datasets in 'opm-tests' use these alias names.
 2020-04-01 21:38:33 +02:00
Joakim Hove
d3817e2fc2 Merge pull request #1665 from wito/rptconfig-rptsched 
Handle RPTSCHED keywords in a time-sensitive manner
 2020-04-01 14:00:41 +02:00
Joakim Hove
07e6be97e9 msim: Add temporary well to msim testcase - and verify SHUT status 2020-04-01 13:29:17 +02:00
Joakim Hove
f115ed43f5 msim: Ensure that only open wells get an assigned rate 2020-04-01 13:18:00 +02:00
Joakim Hove
8483251aec msim: Pass correct substep flag 2020-04-01 13:18:00 +02:00
Joakim Hove
7cd004bf71 msim: ensure data::wells instance is not reused 2020-04-01 13:18:00 +02:00
Joakim Hove
e51edcf1c8 Add comment about multiple calls to setCurrentControl() 2020-04-01 13:18:00 +02:00
Williham Williham Totland
f3fbfc41ad Completes RPTConfig to pass tests. 2020-04-01 13:02:29 +02:00
Williham Williham Totland
9f7664fe13 Makes the new interface compile against tests. 2020-04-01 13:02:29 +02:00
Bård Skaflestad
03657799ce Merge pull request #1659 from joakim-hove/rst-well-shut2 
Rst well shut2
 2020-04-01 12:32:54 +02:00
Joakim Hove
61fa2d899e Merge pull request #1664 from akva2/janitoring 
quell shadowing warnings
 2020-04-01 11:05:25 +02:00
Arne Morten Kvarving
21db859ece quell shadowing warnings 2020-04-01 10:39:14 +02:00
Williham Williham Totland
ea269c7cc7 Implement writing of RSM file 2020-04-01 10:30:10 +02:00
Joakim Hove
f441d385f3 Fix initialization in test 2020-04-01 10:28:05 +02:00
Joakim Hove
278402b63e Check well status before checking active control 2020-04-01 10:28:05 +02:00
Joakim Hove
fe6714c14d Enable THP production control if THP target is set in restart file 2020-04-01 10:28:05 +02:00
Joakim Hove
07e590a0ed Check that will is OPEN before checking active control 2020-04-01 10:21:58 +02:00
Joakim Hove
efff382517 Add test for ReportConfig 2020-04-01 10:17:05 +02:00
Joakim Hove
7c0ddd0b9d Merge pull request #1654 from joakim-hove/skiprest-exceptions 
Skiprest exceptions
 2020-04-01 09:38:54 +02:00
Joakim Hove
07843654b1 SKIPREST: Make sure e.g. VFP tables are loaded even under SKIPREST 2020-04-01 08:23:15 +02:00
Joakim Hove
7aaf68fbc4 Add testdeck for the situation with SKIPREST and e.g VFP 2020-04-01 08:02:32 +02:00
Bård Skaflestad
420446f318 Merge pull request #1663 from joakim-hove/cmake-fix 
Embed build timestamp also in UseVersion.cmake
 2020-03-31 23:57:17 +02:00
Atgeirr Flø Rasmussen
3111505ed6 Merge pull request #1661 from joakim-hove/connections-wellpi 
WPIMULT: directly multiply the connection transmissibility factor
 2020-03-31 18:59:46 +02:00
Joakim Hove
320f9b5510 Emed build timestamp also in UseVersion.cmake 2020-03-31 17:23:25 +02:00
Joakim Hove
a8ad5cd9f2 Merge pull request #1662 from joakim-hove/fix-non-python 
Fix codepath for non-python
 2020-03-31 17:18:02 +02:00
Joakim Hove
5ac2b3f531 Fix codepath for non-python 2020-03-31 16:56:44 +02:00
Joakim Hove
6fb2989708 WPIMULT: directly multiply the connection transmissibility factor 2020-03-31 16:53:28 +02:00
Joakim Hove
14bd2f7d48 Merge pull request #1660 from joakim-hove/python-shared-ptr 
Use std::shared_ptr<Python> for Python argument in Schedule
 2020-03-31 16:50:43 +02:00
Joakim Hove
5444eade2f Use std::shared_ptr<Python> for Python argument in Schedule 2020-03-31 10:26:55 +02:00
Joakim Hove
cebef15dc4 Merge pull request #1653 from joakim-hove/compile-timestamp 
Generate BUILD_TIMESTAMP macro with build system
 2020-03-31 07:56:14 +02:00
Joakim Hove
cc60a65f14 Merge pull request #1364 from bska/no-dyndata-seqnum-0 
Don't Output Dynamic Data to Restart File for SEQNUM=0
 2020-03-31 07:55:11 +02:00
Joakim Hove
fe1ef0a65f Generate BUILD_TIMESTAMP macro with build system 2020-03-30 15:11:48 +02:00
Bård Skaflestad
5c787ef97e Don't Needlessly Copy Complete Well Objects 
We're able to implement the top-level restart file well writing code
without calling Schedule::getWells() and should therefore do so.

While here, also restore formatting in LoadRestart.cpp.
 2020-03-30 14:39:04 +02:00
Bård Skaflestad
43ef003452 Header: Make 'ih' Not Const to Activate NRVO 2020-03-30 14:39:04 +02:00
Bård Skaflestad
bc28de3372 Don't Output Dynamic Data to Restart File for SEQNUM=0 
This commit introduces a special case for the restart file writing
code.  In particular we no longer write dynamic data vectors (e.g.,
*WEL, *GRP, *CON) to the restart file if we're being asked to output
the initial condition (i.e., report step/sequence number 0).

Add the report step as a new explicit parameter to createInteHEAD()
instead of inferring this value from the "sim_step" and output
dynamic sizes as zero for report_step=0.  While here, also correct
an omission from earlier commit 7986e99e.  We must ensure that the
maximum number of wells in the field (intehead[163]) is at least as
large as the current number of active wells (intehead[16]).

Update "intehead" test to account for report_step being passed
directly as an argument to InteHEAD::stepParam().
 2020-03-30 14:39:04 +02:00
Bård Skaflestad
269537b101 Merge pull request #1658 from akva2/bad_janitoring 
fix faulty fix in 811d2e2a64
 2020-03-30 14:37:02 +02:00
Arne Morten Kvarving
7e26c6a5e9 fix faulty fix in 811d2e2a64 
sched uses python, so we have to reorder the members instead
 2020-03-30 14:20:08 +02:00
Joakim Hove
fa8afbcc6d Merge pull request #1655 from akva2/janitoring 
Quell warnings
 2020-03-30 13:52:38 +02:00
Arne Morten Kvarving
ebc92fb92e fixed: proper initializer list order 2020-03-30 12:38:47 +02:00
Arne Morten Kvarving
811d2e2a64 quell unused parameter warning when built without python support 2020-03-30 12:33:34 +02:00
Arne Morten Kvarving
83d1627dbb quell signed/unsigned comparison warning 2020-03-30 12:33:20 +02:00