Markus Blatt
ad44564f27
Merge pull request #3619 from Tongdongq/opencl-refactor
...
Opencl refactor
2021-11-08 16:45:57 +01:00
Joakim Hove
8240bd9d76
Merge pull request #3669 from joakim-hove/rename-geo-keywords
...
Rename EclipseState::apply_geo_keywords -> apply_schedule_keywords
2021-11-08 11:46:35 +01:00
Joakim Hove
733dee789f
Merge pull request #3670 from bska/support-fluid-api-gravity
...
Mark GRAVITY Keyword as Supported in the Simulator
2021-11-08 09:57:22 +01:00
Bård Skaflestad
40fdb9e1d6
Mark GRAVITY Keyword as Supported in the Simulator
...
The input layer now converts this input to DENSITY data.
2021-11-07 22:34:31 +01:00
Joakim Hove
0de04f8c48
Rename EclipseState::apply_geo_keywords -> apply_schedule_keywords
2021-11-07 19:58:20 +01:00
Atgeirr Flø Rasmussen
84392a25b4
Merge pull request #3648 from joakim-hove/phase-usage-constructor
...
Create PhaseUsage constructor
2021-11-05 15:35:50 +01:00
Joakim Hove
34260544eb
Merge pull request #3647 from joakim-hove/update-rates-after-actionx
...
Update rates after actionx
2021-11-05 12:01:22 +01:00
Joakim Hove
9511f56e6d
Merge pull request #3666 from bska/dont-copy-vfp-wrapper-tables
...
Switch to Passing VFP Wrapper Tables as References
2021-11-05 10:19:13 +01:00
Joakim Hove
fd5640774b
Call SingleWellState::update_targets for ACTIONX affected wells
2021-11-05 09:48:27 +01:00
Bård Skaflestad
07d6de3bbc
Switch to Passing VFP Wrapper Tables as References
...
We don't need to copy those mapping tables on each call.
2021-11-04 21:28:55 +01:00
Tong Dong Qiu
803a2ac2f4
Allow CMake to set CHOW_PATEL variables
2021-11-04 15:47:33 +01:00
Tong Dong Qiu
920eeee426
Rename namespace bda to Opm::Accelerator
2021-11-04 15:47:33 +01:00
Tong Dong Qiu
b945502a82
Minor improvements
2021-11-04 15:45:33 +01:00
Tong Dong Qiu
78b1714481
Move apply_stdwells kernels to OpenclKernels
2021-11-04 14:25:39 +01:00
Tong Dong Qiu
1583292bf4
Move opencl kernels to static class
2021-11-04 14:25:22 +01:00
Tong Dong Qiu
b8587daaa7
Move ChowPatel decomposition to appropriate file
2021-11-04 13:58:06 +01:00
Bård Skaflestad
869de90b56
Merge pull request #3663 from blattms/remove-warn-opencl
...
Fixes warning about catching polymorphic type by value.
2021-11-03 18:30:57 +01:00
Markus Blatt
02bbe995c3
Fixes warning about catching polymorphic type by value.
...
Removed message in amgclbackend was:
warning: catching polymorphic type ‘class
boost::property_tree::json_parser::json_parser_error’ by value
[-Wcatch-value=]
2021-11-03 18:07:56 +01:00
Tor Harald Sandve
f755cc3be1
Merge pull request #3645 from totto82/fixNoWellReduction
...
Adjust reduction rate when well control is considered for GRUP
2021-11-03 15:32:18 +01:00
Bård Skaflestad
2971a3f051
Merge pull request #3659 from joakim-hove/refactor-wellstate-init
...
Refactor wellstate init
2021-11-03 13:16:34 +01:00
Joakim Hove
44ad5ab190
Remove superfluos is injector or producer test
2021-11-03 12:35:28 +01:00
Joakim Hove
05317e1d72
Extract functionality to update target rates to SingleWellState
2021-11-03 12:30:40 +01:00
Joakim Hove
5a986ee430
Move updateStatus functionality to SingleWellState
2021-11-03 12:30:40 +01:00
Joakim Hove
53dba36513
Move resetConnectionFactor to SingleWellState
2021-11-03 12:30:40 +01:00
Tor Harald Sandve
a57374fae9
Adjust reduction rate when well control is considered for GRUP
...
The reduction rate is computed differently for cases without wells under GRUP
For a well to check whether to switch to GRUP it needed to use the reduction rate
that would have been computed if this particular well was under GRUP control
and thus recompute the reduction rate without entering the no-grup path
2021-11-03 11:42:18 +01:00
Joakim Hove
743e14583a
Merge pull request #3661 from joakim-hove/equil-finite-check
...
Replace numerical assert check with std::isfinite() and throw
2021-11-03 11:42:15 +01:00
Atgeirr Flø Rasmussen
0dc743421e
Merge pull request #3662 from atgeirr/fix-extra-mpi-init
...
Remove extra MPI initialization.
2021-11-03 09:19:03 +01:00
Atgeirr Flø Rasmussen
c8828ad43b
Remove extra MPI initialization.
...
Initialization is now done in the Main::initMPI() method.
For configurations with dune-fem, this also caused crashes
with dune-fem versions prior to 2.8.
2021-11-02 20:35:20 +01:00
Bård Skaflestad
4a74fd1282
Merge pull request #3633 from bska/accumulate-wxxgr-for-all-gcon-wells
...
Report Well Level Injection Guide Rates if Group Controlled
2021-11-02 17:59:58 +01:00
Joakim Hove
dec387d95d
Replace numerical assert check with std::isfinite() and throw
2021-11-02 17:04:48 +01:00
Bård Skaflestad
1e34d714bf
Report Well Level Production Guide Rates if Group Controlled
...
This commit extends the guide rate reporting to always extracting
and reporting pertinent production guide rates at the well level
(i.e., WxPGR) if at least one of the groups in the well's upline has
an entry in GCONPROD. This is for increased compatibility with
ECLIPSE.
2021-11-02 16:19:56 +01:00
Bård Skaflestad
0c70eac490
Report Well Level Injection Guide Rates if Group Controlled
...
This commit uses the new GroupTreeWalker helper class to ensure that
we always extract and report pertinent injection guide rates at the
well level (i.e., WxIGR) if at least one of the groups in the well's
upline has an entry for the corresponding phase in GCONINJE. This
is for increased compatibility with ECLIPSE.
Prior to this change we would report zero-valued WWIGR vectors on a
real field case which made analysing simulation results needlessly
difficult.
2021-11-02 16:19:56 +01:00
Bård Skaflestad
2b0aa379f5
Extract Group Tree Walk to Helper Class
...
This commit extracts a helper class, GroupTreeWalker, from the
current implementation of 'calculateAllGroupGuiderates()'. This is
in preparation of adding a similar approach to extracting WxIGR for
all wells for which at least one group in the upline has an entry in
GCONINJE.
The user can add visitor operations for wells and groups, typically
with side effects, and then choose whether to run a pre-order walk
(visit groups before their children) or a post-order walk (visit
children-i.e., wells, before their parents).
2021-11-02 16:19:56 +01:00
Atgeirr Flø Rasmussen
2cf78c6da0
Merge pull request #3660 from atgeirr/remove-redundant-class
...
Remove ISTLSolverEbosFlexible and flow_blackoil_dunecpr.
2021-11-02 15:32:53 +01:00
Atgeirr Flø Rasmussen
5503e6ca06
Remove ISTLSolverEbosFlexible and flow_blackoil_dunecpr.
...
The class ISTLSolverEbos has all features of the removed class, and
is not much more complex. The flow_blackoil_dunecpr is the only
program using it, and is redundant.
2021-11-02 15:02:48 +01:00
Markus Blatt
932ddcd32d
Merge pull request #3652 from akva2/use_opencl_hpp
...
changed: probe for cl/opencl.hpp and use if found
2021-11-02 09:31:05 +01:00
Arne Morten Kvarving
7de50b94c7
changed: probe for cl/opencl.hpp and use if found
...
this to avoid a spam of warnings
2021-11-01 19:41:05 +01:00
Joakim Hove
101b277bfe
Merge pull request #3642 from joakim-hove/remove-groupstate-dump
...
Remove debugging aid GroupState::dump
2021-11-01 17:51:32 +01:00
Joakim Hove
5336822242
Remove unused utility class PhasePresence
2021-11-01 17:06:50 +01:00
Joakim Hove
bcdc974585
Create PhaseUsage constructor
2021-11-01 17:04:42 +01:00
Joakim Hove
ec780676e2
Split initSinglewell for producer and injector
2021-11-01 16:02:34 +01:00
Joakim Hove
d213bc9d78
Initialize static perforation data in SingleWellState constructor
2021-11-01 16:02:34 +01:00
Joakim Hove
6c16b5dbb8
Move variable to local scope
2021-11-01 16:02:34 +01:00
Joakim Hove
93218b05c2
Use multiple returns in init single well
2021-11-01 16:02:34 +01:00
Joakim Hove
2527970d11
Replace two assert() with one throw
2021-11-01 16:02:34 +01:00
Joakim Hove
029d1794f8
Remove local variable
2021-11-01 16:02:34 +01:00
Joakim Hove
807ac101d8
Add name member to SingleWellState
2021-11-01 16:02:34 +01:00
Joakim Hove
03cf7b0327
Move updateStatus functionality to SingleWellState
2021-11-01 16:02:31 +01:00
Atgeirr Flø Rasmussen
624d8b1343
Merge pull request #3651 from akva2/remove_gcc7_compat
...
use std::filesystem directly
2021-11-01 15:30:03 +01:00
Joakim Hove
129288b2bd
Add operator[] to WellState
2021-11-01 13:47:40 +01:00