Atgeirr Flø Rasmussen
09e254d9a3
Merge pull request #458 from totto82/new_defaults
...
Change defaults
2015-09-07 08:49:36 +02:00
Atgeirr Flø Rasmussen
9ceeba0e8c
Merge pull request #459 from blattms/zoltan-well-aware
...
Use well information during load balancing.
2015-09-07 08:49:04 +02:00
Tor Harald Sandve
18d429ebff
Use CPR as fall back if use_interleaved=false
2015-09-07 06:08:13 +02:00
Atgeirr Flø Rasmussen
6f0f90d1b6
Merge pull request #448 from totto82/WCONINJH
...
Add support for WCONINJH
2015-09-04 15:27:40 +02:00
Atgeirr Flø Rasmussen
c2d652a61f
Merge pull request #455 from totto82/outofbounds_fix
...
BUGFIX Fix out of bounds error
2015-09-04 14:15:07 +02:00
Markus Blatt
c527e15b63
Use well information during load balancing.
...
With this commit we pass the well information to
the loadbalance method of CpGrid to ensure that
each well is stored completely on one process.
2015-09-03 20:28:13 +02:00
Tor Harald Sandve
fd48a6e004
Change defaults
...
Use the more stable interleaved solver instead of CPR as default
Solve well equation initially as default
2015-09-03 12:38:03 +02:00
Tor Harald Sandve
53c1195b64
Rename variable from i to injector
2015-09-03 11:29:12 +02:00
Tor Harald Sandve
944092bd89
Add support for WCONINJH
...
Explicitly adds bhp control on rate controlled history matching
injector.The default bhp limit is a large number to make sure that the
well does not switch. Alternativly bhp limit can be specified using
WELTARG. This is typically done to make sure the bhp limit stays within
the pressure limits in the PVT tables. Support for WELTARG is also added
to the history matching producers (WCONHIST)
2015-09-03 11:26:07 +02:00
Tor Harald Sandve
3a78cd4635
BUGFIX Fix out of bounds error
2015-09-03 09:33:46 +02:00
Atgeirr Flø Rasmussen
59fccb2f86
Merge pull request #422 from andlaus/satfunc_refactoring
...
add a few missing "#include <Evaluation.hpp>"
2015-09-02 15:23:16 +02:00
Andreas Lauser
73710a01d2
move the code which creates a compressed to cartesian cell index map to a separate free function
2015-09-02 14:50:41 +02:00
Atgeirr Flø Rasmussen
bbd1395d3f
Merge pull request #451 from babrodtk/fix_warnings
...
Fixed warnings
2015-09-02 14:31:31 +02:00
Atgeirr Flø Rasmussen
61f49793fb
Merge pull request #453 from babrodtk/bugfix_backup_restore
...
Fix bug reading directly into data owned by std::string
2015-09-02 14:30:55 +02:00
babrodtk
6dd24640c9
Changed c-style cast to c++-style cast
2015-09-02 14:23:35 +02:00
babrodtk
e1632b8522
Fixed bug reading directly into data owned by string
2015-09-02 14:18:52 +02:00
babrodtk
7ea047b9c7
Removed superfluous changes
2015-09-02 14:16:56 +02:00
babrodtk
91a6f4fc4a
Fixed a few more warnings
2015-09-02 13:14:20 +02:00
babrodtk
5b287e0ea8
Fixed warnings
2015-09-02 13:02:27 +02:00
Andreas Lauser
9515ec6cfb
BlackoilPropsAdFromDeck: improve the documentation for the constructors
2015-09-02 12:32:41 +02:00
Andreas Lauser
0e5d8da66b
adapt to the change of the API due to using compressed instead of cartesian indices
2015-09-02 12:32:41 +02:00
Andreas Lauser
a394af6734
flow: initialize the parameters for the material law only once
...
this saves some memory and some time at initialization.
2015-09-02 12:32:41 +02:00
Joakim Hove
009ae54523
Merge pull request #449 from joakim-hove/table-refactor
...
Using TableManager to get tables.
2015-09-02 11:58:17 +02:00
Atgeirr Flø Rasmussen
9913f900aa
Merge pull request #450 from blattms/fix-parallel-satOilmax-size-2
...
Fixes parallel sat oilmax size
2015-09-01 23:15:29 +02:00
Markus Blatt
ff669bc32b
[bugfix] Correctl resize satOilMax in a parallel run.
...
Previously, we tried to make an empty container bigger by
resizing it with its current size. Of course this is wrong and does
not change anything. With this commit we use the size of another
container which already has the correct size.
2015-09-01 20:30:30 +02:00
Joakim Hove
9bd8d73a26
Using TableManager to get tables.
2015-09-01 13:14:51 +02:00
Joakim Hove
13262f6d28
Merge pull request #443 from iLoop2/ThresholdPressure
...
Added suport for new Threshold Pressure behavior
2015-08-24 16:54:12 +02:00
Fredrik Gundersen
6c85751d91
Added suport for new Threshold Pressure behavior
2015-08-24 15:41:32 +02:00
Atgeirr Flø Rasmussen
957290c459
Merge pull request #440 from babrodtk/thp_control_fix
...
Targets for switching to/from THP control (Vertical flow performance)
2015-08-24 09:35:43 +02:00
Atgeirr Flø Rasmussen
5bfdda0c3b
Merge pull request #442 from babrodtk/missing_config_include
...
Added missing config.h include
2015-08-21 13:14:28 +02:00
babrodtk
9148b3f23c
Added missing config.h include
2015-08-21 12:49:18 +02:00
babrodtk
6c590d4bdb
Implemented proper targets for switching to/from THP control
2015-08-19 17:03:41 +02:00
Atgeirr Flø Rasmussen
768714eb32
Merge pull request #438 from atgeirr/silence-warning
...
Silence unused variable warning (release mode only).
2015-08-19 13:34:58 +02:00
Atgeirr Flø Rasmussen
36ccfca172
Silence unused variable warning (release mode only).
2015-08-19 13:33:38 +02:00
Atgeirr Flø Rasmussen
3c1c3a30ab
Merge pull request #430 from babrodtk/vfpprod
...
Vertical flow performance
2015-08-19 13:27:37 +02:00
babrodtk
407512382a
Minor fixes for PR
2015-08-19 12:48:20 +02:00
babrodtk
e89a40ec99
Fixed misleading comments
2015-08-19 12:42:50 +02:00
Atgeirr Flø Rasmussen
dbc9aedc5a
Merge pull request #437 from akva2/fix_install
...
fixed: install correct files
2015-08-19 12:38:27 +02:00
babrodtk
f3553313d2
Rewrote function finding interpolation data
2015-08-19 12:37:54 +02:00
Arne Morten Kvarving
35ecaf2f56
fixed: install correct files
2015-08-19 12:19:34 +02:00
babrodtk
62c2373a9d
Minor refactoring
2015-08-19 11:46:29 +02:00
Atgeirr Flø Rasmussen
575b939dbc
Merge pull request #436 from atgeirr/silence-warning
...
Silence unused argument warning.
2015-08-19 11:42:15 +02:00
Atgeirr Flø Rasmussen
6e1bb5de0e
Silence unused argument warning.
2015-08-19 11:41:22 +02:00
babrodtk
b2335ced24
Minor fixes for PR
2015-08-19 11:32:38 +02:00
Atgeirr Flø Rasmussen
f526c02d3c
Merge pull request #425 from totto82/extendedBlackOil
...
Adds a simple solvent model
2015-08-19 11:30:37 +02:00
babrodtk
6b3356e74d
Minor fixes for comments in PR
2015-08-19 08:07:51 +02:00
babrodtk
b75baac8fc
Fixed sign issue with vfpprod->bhp(flo)
2015-08-18 14:53:36 +02:00
babrodtk
00b63f303f
Added missing file to CMakeLists_files.cmake
2015-08-18 13:42:26 +02:00
babrodtk
139071d39e
Minor performance improvement for non-VFP runs
2015-08-18 10:24:57 +02:00
Tor Harald Sandve
03ce274c59
Add missing file in the cmake list
2015-08-18 07:28:25 +02:00