Commit Graph

11074 Commits

Author SHA1 Message Date
Jostein Alvestad
85367ec6d7 corrections/improvements based on comments from reviewer 2021-10-25 14:27:28 +02:00
Jostein Alvestad
6830a8581e added incorrectly deleted files 2021-10-25 14:27:26 +02:00
Jostein Alvestad
6b7875765d added unit tests to InteHead and DoubHead for NETBALAN 2021-10-25 14:27:23 +02:00
Jostein Alvestad
60d57f06b7 added DOUBHEAD items for NETBALAN 2021-10-25 14:27:20 +02:00
Jostein Alvestad
d1a1050e67 small correction to code 2021-10-25 14:27:18 +02:00
Jostein Alvestad
2911e11033 added changes to write NETBALAN keyword data to InteHead 2021-10-25 14:27:16 +02:00
Joakim Hove
e323c4a88c Make sure Schdule keyword is retained in FileDeck::skip 2021-10-24 10:08:46 +02:00
Joakim Hove
5f0bd0a5c7 Implement FileDeck::Index::operator+(std::size_t shift) 2021-10-24 10:01:48 +02:00
Joakim Hove
344dd516a0 Fix rst_deck for non skiprest 2021-10-23 17:49:22 +02:00
Joakim Hove
822a97c8d9 Load LIFTOP options from restart file 2021-10-22 15:53:03 +02:00
Joakim Hove
737a76918f Load WLIFTOPT wells from restart file 2021-10-22 15:25:38 +02:00
Joakim Hove
58c0e7d868 Load GasLift settings from restart file 2021-10-22 15:25:38 +02:00
Joakim Hove
741bd5da95
Merge pull request #2777 from joakim-hove/wliftopt-update
Add two extra items for WLIFTOPT restart output
2021-10-22 15:24:42 +02:00
Joakim Hove
a2d217ad36 Add two extra items for WLIFTOPT restart output 2021-10-22 13:30:24 +02:00
Joakim Hove
a1942ccec7
Merge pull request #2778 from atgeirr/bump-version
Bump version.
2021-10-22 13:24:20 +02:00
Atgeirr Flø Rasmussen
bd9bc77129 Bump version. 2021-10-22 10:17:59 +02:00
Williham Williham Totland
4134b98701 Introduce class SchduleGrid to be used as grid by Schedule class 2021-10-22 08:35:17 +02:00
Joakim Hove
798e93e4a8
Merge pull request #2774 from blattms/dune-2.8-imported-targets
Define imported targets needed e.g. for dune-fem 2.8.0
2021-10-21 20:17:43 +02:00
Markus Blatt
c6e1730a0a Search for GMP if dune-common is used.
We do suggest dune-fem for opm-models and that one links to it
if available.
2021-10-21 15:33:02 +02:00
Markus Blatt
e67a55bf86 dune-fem uses QuadMath if available, search for it.
One still has to set USE_QUADMATH to true otherwise no
search will happen.
2021-10-21 15:30:44 +02:00
Markus Blatt
d577b74106 Introduced DUNE-2.8 compatible imported targets where needed.
I.e. in the find_package files for PTScotch ParMETIS, Quadmath,
SuiteSparse, and SuperLU.
2021-10-21 15:29:12 +02:00
Markus Blatt
c713d540e6 Adds a rudimentary FindTBB.cmake to make DUNE 2.8 with TBB work
Fixes errors like

Target "test_communication_utils" links to target
"PkgConfig::PkgConfigTBB" but the target
was not found.  Perhaps a find_package() call is missing for an IMPORTED
target, or an ALIAS target is missing?
2021-10-20 22:06:29 +02:00
Markus Blatt
22e9452de0 Search for TBB in Finddune-common.cmake
When configured with TBB dune-common-targets.cmake lists the
imported TBB::tbb or PkgConfig::PkgConfigTBB target
in INTERFACE_LINK_LIBRARIES. Hence we need to be able to resolve
this target in opm. We do this by searching for TBB id dune-common
is a prerequisite.

This commit fixes the problem only for newer versions of TBB shipping a
TBBConfig.cmake file.

The error fixed is along these lines:

Target "test_communication_utils" links to target "TBB::tbb" but the target
was not found.  Perhaps a find_package() call is missing for an IMPORTED
target, or an ALIAS target is missing?
2021-10-20 22:06:29 +02:00
Bård Skaflestad
e7d528e1d2
Merge pull request #2427 from bska/connection-cumulatives-restart
Save/Restore Connection Level Cumulatives to/from Restart
2021-10-20 17:04:23 +02:00
Bård Skaflestad
65538e3ac9 Save/Restore Connection Level Cumulatives to/from Restart
This commit add support for saving connection-level cumulative
quantities (e.g., those denoted by summary vectors COPT or CVIT) to
the restart file (in the 'XCON' array) and to restore these values
back to the 'SummaryState' object upon simulation restart.

Thanks to Torbjørn Skille and Jostein Alvestad for invaluable
assistance in characterising these XCON items.
2021-10-20 15:47:12 +02:00
Bård Skaflestad
8d1e13fd0c Configure Additional Summary Quantites for Restart
In particular, ensure that connection-level cumulatives are always
available in the SummaryState.  Also generate the connection-level
flowing gas/oil ratio (CGOR) while here.
2021-10-20 15:47:12 +02:00
Bård Skaflestad
941df67e24 Identify More Connection Restart Items
In particular, add named items for cumulative production and
injection in the XCON array.  These are needed in order to generate
continuous connection-level curves in restarted runs.

While here, also add a named item for the well-level cumulative oil
injection quantity.
2021-10-20 15:47:12 +02:00
Bård Skaflestad
9f0185018e
Merge pull request #2769 from joakim-hove/rst-deck-skip
Rst deck skip
2021-10-20 15:45:30 +02:00
Joakim Hove
ace87a357a Handle skipping in SCHEDULE section 2021-10-20 14:02:13 +02:00
Bård Skaflestad
9c5df232ed
Merge pull request #2768 from joakim-hove/update-test-data
Update test data
2021-10-20 12:58:09 +02:00
Joakim Hove
1044be41a2 Replace DATES -> TSTEP for restart testing 2021-10-20 11:28:34 +02:00
Joakim Hove
f644bf1659 Insert comment with report step in DATES testdata 2021-10-20 09:35:39 +02:00
Joakim Hove
6ca08afb74
Merge pull request #2763 from joakim-hove/wtmult-simple
Basic support for WTMULT
2021-10-20 08:31:43 +02:00
Joakim Hove
24d1f58aca
Merge pull request #2767 from joakim-hove/rst-deck-output
Rst deck output
2021-10-20 08:01:21 +02:00
Bård Skaflestad
5e3ba88dde
Merge pull request #2759 from joakim-hove/restart-errors
Validate restart input in constructor
2021-10-19 21:52:54 +02:00
Joakim Hove
93de5d5f69 Use default aware function when building DeckKeyword 2021-10-19 19:13:15 +02:00
Joakim Hove
22edbe79ab DeckKeyword - slash termination correctly initialized 2021-10-19 19:13:15 +02:00
Joakim Hove
a22458a592 Use {} for constructor call 2021-10-19 13:26:26 +02:00
Bård Skaflestad
8d16838e6f
Merge pull request #2766 from OPM/fix/missing-includes
fix missing includes
2021-10-19 13:20:19 +02:00
Bernd Flemisch
60477ac627 fix missing includes 2021-10-19 12:07:48 +02:00
Joakim Hove
5e3e20c552 Implement basic WTMULT behavior 2021-10-19 11:59:49 +02:00
Arne Morten Kvarving
648abeef1f
Merge pull request #2765 from akva2/janitoring
remove unused variables
2021-10-19 11:49:55 +02:00
Joakim Hove
a3d37aad1e Remove comment about UDA in WTMULT 2021-10-19 11:12:32 +02:00
Joakim Hove
14453560da Add UDAValue::operator*= 2021-10-19 11:12:06 +02:00
Arne Morten Kvarving
d65c232057 remove unused variables 2021-10-19 10:53:34 +02:00
Bård Skaflestad
726a0589ec
Merge pull request #2760 from joakim-hove/handle-nextstep
Internalize NEXTSTEP keyword and interact with TUNING.TSINIT
2021-10-18 18:34:14 +02:00
Bård Skaflestad
dc633cdee9
Merge pull request #2764 from akva2/janitoring
fixed: forward struct as struct
2021-10-18 17:33:29 +02:00
Arne Morten Kvarving
ff5c3b9574 fixed: forward struct as struct 2021-10-18 15:42:48 +02:00
Joakim Hove
5bd9906569
Merge pull request #2761 from bska/sumthin-rptonly-smry-sect
Initialize RPTONLY/SUMTHIN Settings From SUMMARY Section
2021-10-18 13:09:43 +02:00
Bård Skaflestad
70bb2afe93
Merge pull request #2762 from akva2/janitoring
avoid signed/unsigned comparison warnings
2021-10-18 13:04:34 +02:00