Commit Graph

9877 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
71c5129d3d Do not build the extra Flow variants by default. 2019-10-11 08:46:17 +02:00
Atgeirr Flø Rasmussen
10e2200a25 Add two new flow variants for one-phase (water, water+energy) simulation. 2019-10-11 08:19:18 +02:00
Atgeirr Flø Rasmussen
7270aa3013 Update flow_tag.hpp to match current flow.cpp.
The flow_tag.hpp file is used for simple construction of simulators for
particular models or other compile-time choices. This updates it to
get identical behaviour as that of mainline (multi-model) Flow.
2019-10-11 08:19:18 +02:00
Atgeirr Flø Rasmussen
3ddcdf2349 Only run relperm diagnostics for > 1 phase cases. 2019-10-11 08:19:18 +02:00
Atgeirr Flø Rasmussen
2d9f41b1aa Rename getPerfPressure() -> getPerfCellPressure(). 2019-10-11 08:19:18 +02:00
Halvor M. Nilsen
d873ae165d Enable single-phase runs. 2019-10-11 08:19:18 +02:00
Markus Blatt
e4e8425bad
Merge pull request #1858 from dr-robertk/PR/cleanup-sparsematrixadapter
Cleanup SparseMatrixAdapter.
2019-10-09 12:44:52 +02:00
Robert Kloefkorn
f708286111 [cleanup][Wells] Consequently use SparseMatrixAdapter in addWellContributions. 2019-10-09 10:27:38 +02:00
Bård Skaflestad
239677d48a
Merge pull request #2043 from bska/prepare-smry-without-libecl
Prepare for Making Summary Writing Independent of LibECL
2019-10-07 05:01:53 -05:00
Bård Skaflestad
1b610f06a4 Prepare for Making Summary Writing Independent of LibECL
This commit adds requisite libecl includes that are needed as an
intermediate steps for enabling new summary writing independent of
libecl.
2019-10-04 20:32:09 +02:00
Atgeirr Flø Rasmussen
189dc150fb
Merge pull request #2039 from totto82/moveBanner
move PRT header to the top
2019-10-03 14:28:06 +02:00
Tor Harald Sandve
aeb29a5412 move PRT header to the top 2019-10-03 12:13:13 +02:00
Joakim Hove
06a683a689
Merge pull request #2037 from stefoss23/add_keywords_G1
Added keywords beginning w/ G and H.
2019-10-02 16:53:15 +02:00
Steinar Foss
bab522d433 added keywords beginning w/ G and H. 2019-10-02 15:50:17 +02:00
Atgeirr Flø Rasmussen
2b9e30df33
Merge pull request #2036 from blattms/improve-vanguard-layering-violation
Make sure subclass functions are not called before subclass is initia…
2019-10-02 14:57:00 +02:00
Robert Kloefkorn
28cf1c17be [bugfix][EclWriter] GlobalGrid and GridView can potentially differ and
that is why types should be extracted from the structures that provide the objects.
2019-10-02 12:48:12 +02:00
Markus Blatt
a0fa87e81f Make sure subclass functions are not called before subclass is initialized.
This at least slightly improves the old design. In that design the
subclass had no own constructor but inherited the one of the base class.
That base class constructor called certain subclass
functions (createGrids_, filterConnections_, updateOutputDir_, and
finalizeInit_)that would initialize raw pointers of the
subclass. Hence subclasses where not allowed to have non-pod members
and those used later (e.g. deleted in the destructor) had to be
initialized in these functions.

The new (still ugly) design introduces constructors into the
subclasses and skips inheriting constructors. Now one must call a base
class function classImplementationInit which will still call the
functions createGrids_, filterConnections_, updateOutputDir_, and
finalizeInit_, but at least at this point the baseclass is fully
constructed and the subclass is constructed as much as
possible/needed (non-pod types will be initialized now.)
2019-10-01 21:18:17 +02:00
Atgeirr Flø Rasmussen
96af6ca5f0
Merge pull request #2023 from totto82/fix_solvent_restart
Fix solvent restart
2019-10-01 15:35:22 +02:00
Tor Harald Sandve
afba6c8e8e Fix solvent restart 2019-10-01 13:07:29 +02:00
Joakim Hove
1544f84fb4
Merge pull request #2031 from joakim-hove/missing-features-W
Add keywords WSEGDFIN - WSEGTABL as not supported
2019-10-01 07:48:06 +02:00
Joakim Hove
7a87b04182
Merge pull request #2026 from bska/chase-summarystate-api-change
Chase SummaryState API Change
2019-09-30 18:50:19 +02:00
Joakim Hove
07c5430ac3 Add keywords WSEGDFIN - WSEGTABL as not supported 2019-09-30 18:47:25 +02:00
Bård Skaflestad
d979fb0fae Blackoil Output: Chase API Change in SummaryNode Class
In particular, the .type() function is renamed to .category(), and
it no longer returns a LibECL type.  Similarly, the .num() function
has been renamed to .number().
2019-09-30 15:00:05 +02:00
Bård Skaflestad
fabc067b5e Blackoil Output: Don't Include "eclwriter.hh"
The EclWriter class depends on the EclOutputBlackOilModule, not the
other way around.  This removes a cyclic include.
2019-09-30 14:47:50 +02:00
Bård Skaflestad
c06881b04e
Merge pull request #2027 from joakim-hove/missing-keywords-V
Add missing features on U, V and T
2019-09-30 14:44:16 +02:00
Joakim Hove
cc2304c8b1
Merge pull request #2025 from stefoss23/add_keywords_G
MissingFeatures.cpp: added keywords beginning w/ G.
2019-09-27 20:58:27 +02:00
Joakim Hove
97209c2b6e Add missing features on U, V and T 2019-09-27 20:55:12 +02:00
Steinar Foss
0734802996 MissingFeatures.cpp: added keywords beginning w/ G. 2019-09-25 15:49:44 +02:00
Atgeirr Flø Rasmussen
9ded4bc6ac
Merge pull request #2022 from totto82/enableDriftInFlow
Make it possible to test driftCompensation i Flow
2019-09-25 12:23:22 +02:00
Tor Harald Sandve
dfede36018 Make is possible to test driftCompensation i Flow, Default is still false 2019-09-25 09:03:32 +02:00
Atgeirr Flø Rasmussen
20fdd62569
Merge pull request #2020 from joakim-hove/make-equilrecord
Use new EquilRecord from opm-common
2019-09-24 08:28:21 +02:00
Joakim Hove
dccb9bfa10
Merge pull request #2017 from atgeirr/fix-abort-unknown-param
Abort the run before reading the deck if there are unknown params.
2019-09-23 22:10:17 +02:00
Joakim Hove
06107450d6 Uuse new EquilRecord from opm-common 2019-09-23 21:42:41 +02:00
Atgeirr Flø Rasmussen
4f22b3c468
Merge pull request #2006 from tskille/EclipseGrid
Fixed typo for EclipseGrid member function
2019-09-23 15:56:19 +02:00
Bård Skaflestad
6aa701ae04
Merge pull request #2018 from joakim-hove/summary-state-time
Pass sim start argument to SummaryState constructor
2019-09-20 13:33:03 +02:00
Joakim Hove
bbb9cd3483 Pass sim start argument to SummaryState constructor 2019-09-20 07:40:04 +02:00
Atgeirr Flø Rasmussen
37854bcdcb
Merge pull request #2016 from akva2/ewoms_to_models
Move ewoms/* into an opm/models/* structure
2019-09-19 14:23:47 +02:00
Atgeirr Flø Rasmussen
c7200460ab Abort the run before reading the deck if there are unknown params. 2019-09-19 14:20:05 +02:00
Joakim Hove
7ab5bf8598
Merge pull request #2015 from stefoss23/add_keywords_F1
WIP. added keywords beginning w/ F and G.
2019-09-19 12:24:32 +02:00
Arne Morten Kvarving
8d78334e21 changed: ewoms/io -> opm/models/io 2019-09-19 11:17:12 +02:00
Arne Morten Kvarving
1aba020ea3 changed: ewoms/disc -> opm/models/discretization 2019-09-19 11:16:26 +02:00
Arne Morten Kvarving
d3d9831fc3 changed: ewoms/common -> opm/models/utils 2019-09-19 11:14:36 +02:00
Arne Morten Kvarving
7048589ec1 changed: ewoms/models/blackoil -> opm/models/blackoil 2019-09-19 11:12:45 +02:00
Tor Harald Sandve
afdce991c2
Merge pull request #2004 from atgeirr/update-missingfeatures
Remove some supported keywords from the missing features list.
2019-09-19 09:43:55 +02:00
Steinar Foss
112225f338 added keywords beginning w/ F and G. 2019-09-18 16:20:37 +02:00
Atgeirr Flø Rasmussen
03e7e0be52
Merge pull request #2013 from akva2/janitoring
Some janitoring
2019-09-18 15:57:21 +02:00
Atgeirr Flø Rasmussen
1fc26e2e96
Merge pull request #2007 from akva2/rename_parallel
changed: ewoms/parallel -> opm/models/parallel
2019-09-18 15:40:40 +02:00
Atgeirr Flø Rasmussen
523e38e095 Remove some supported keywords from the missing features list. 2019-09-18 15:34:38 +02:00
Arne Morten Kvarving
b2ce159509 quell unused variable warning 2019-09-18 13:03:21 +02:00
Arne Morten Kvarving
ec007c1a86 quell shadowing warning 2019-09-18 13:03:13 +02:00