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

8205 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Joakim Hove
50fb51d56e Add Python arg to Schedule constructor 2020-03-27 12:43:18 +01:00
Joakim Hove
9d3ec9be61 Merge pull request #1646 from joakim-hove/python-fixup2 
Make sure PythonInterpreter can be safely disabled
 2020-03-27 12:42:18 +01:00
Joakim Hove
687887939d Make sure PythonInterpreter can be safely disabled 2020-03-27 12:11:40 +01:00
Joakim Hove
562136772a Merge pull request #1638 from joakim-hove/remove-stale-boost-include 
Remove stale boost includes
 2020-03-27 10:49:52 +01:00
Joakim Hove
7fc75ce61c Merge pull request #1650 from atgeirr/fix-embedded-python-test 
Use braces to force correct parsing.
 2020-03-27 10:49:34 +01:00
Joakim Hove
413a45ec21 Merge pull request #1648 from berland/jq 
Reformat all json keyword files through jq
 2020-03-27 10:48:59 +01:00
Atgeirr Flø Rasmussen
4c5b03b83e Use braces to force correct parsing. 
Without this, clang thinks it is a declaration, not a function call.
 2020-03-27 10:11:12 +01:00
Williham Williham Totland
3e29350e94 Integrate SummaryNode in ESmry (#1642) 2020-03-27 08:07:52 +01:00
Håvard Berland
54b714f361 Reformat all json keyword files through jq 
Ensures similar pretty-printing everywhere.

Includes a bugfix for 000_Eclipse100/O/OVERBURD which had
a } too much
 2020-03-26 23:16:17 +01:00
Joakim Hove
3e2160af28 Merge pull request #1608 from joakim-hove/connections-sort-item 
Connections sort item
 2020-03-26 17:52:54 +01:00
Joakim Hove
c41f375e00 Merge pull request #1645 from akva2/janitoring 
quell compiler warnings
 2020-03-26 17:33:25 +01:00
Joakim Hove
6d8154823a Merge pull request #1643 from joakim-hove/python-fixup 
Temporarily protect against deref when python is disabled
 2020-03-26 16:20:04 +01:00
Arne Morten Kvarving
c07a839f15 quell compiler warnings 2020-03-26 16:07:49 +01:00
Joakim Hove
cce2bc0686 Temporarily protect against deref when python is disabled 2020-03-26 15:38:18 +01:00
Joakim Hove
eca0589fe1 Merge pull request #1641 from joakim-hove/python-enable-enum 
Enable fine grained control of Python ON | OFF
 2020-03-26 14:21:24 +01:00