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
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
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
Joakim Hove
0025144079
Merge pull request #1559 from joakim-hove/rst-msw
...
Initialize MSW wells from restart file
2020-03-28 09:47:46 +01:00
Joakim Hove
f320fe3d57
Only compare historical modes in history mode
2020-03-28 08:58:14 +01:00
Joakim Hove
f59fec133d
Check NSCONZ before reading CFKind value from SCON
2020-03-28 08:58:14 +01:00
Joakim Hove
bbc87beed5
Improve error message for connection comparison
2020-03-28 08:58:14 +01:00
Joakim Hove
7bc5272290
Connections / segments: retain start and end from restart
2020-03-28 08:58:14 +01:00
Joakim Hove
d827fd6da5
Update debug message
2020-03-28 08:58:14 +01:00
Joakim Hove
ad5b410940
Sort segments
2020-03-28 08:58:14 +01:00
Joakim Hove
aa6128c4be
Check for invalid value when loading segment information
2020-03-28 08:58:14 +01:00
Joakim Hove
22396d1b21
Do not alter sort value when attaching segment from restart file
2020-03-28 08:58:14 +01:00
Joakim Hove
f613c15727
Connections: keep order from restart file
2020-03-28 08:58:14 +01:00
Joakim Hove
eb8f162663
Enable rst testing with MSW data
2020-03-28 08:58:14 +01:00
Joakim Hove
97173e51a3
Update binary testdata
2020-03-28 08:58:14 +01:00
Joakim Hove
fba1858925
Merge pull request #1652 from bska/resv-totinj
...
Restart: Save/Restore Cumulative Injected Reservoir Volume
2020-03-28 08:57:37 +01:00
Bård Skaflestad
1113c25eb1
Restart: Save/Restore Cumulative Injected Reservoir Volume
...
This commit adds support for persisting the *VIT cumulative summary
vector at the well, group, and field levels in the simulation
restart files. Connection level currently not supported.
2020-03-27 14:59:29 +01:00
Joakim Hove
467f7879a6
Merge pull request #1636 from joakim-hove/add-python-arg
...
Add python arg
2020-03-27 13:43:44 +01:00