Kai Bao
7d7b05a126
removing unused Span variable.
2015-08-17 15:04:31 +02:00
Kai Bao
a816f4c06c
optimizing the formInterleavedSystem().
...
The current implementation avoids the using of formEllipticSystem() and
vercatCollapseJacs(), which take a significant amount of computing time
during the non-linear solutions.
2015-08-17 13:36:44 +02:00
babrodtk
3fddf86eef
Initialized well connection pressures first
...
in assemble(...). This makes VFPINJ behave as expected, and
VFPPROD for the "trivial table". For the nontrivial table,
VFPPROD does not match expected behaviour.
2015-08-17 13:05:32 +02:00
babrodtk
657a7c58b8
Added hydrostatic correction for vfp table depth
...
Closer to reproducing proper results, but som oscillating
behaviour in plots of actual BHP.
2015-08-14 14:48:15 +02:00
Atgeirr Flø Rasmussen
8897e2bb46
Merge pull request #431 from atgeirr/silence-warnings
...
Silence warnings.
2015-08-14 14:04:10 +02:00
babrodtk
748440eea6
Fixed bug with VFPPROD tables
2015-08-12 15:15:33 +02:00
babrodtk
c513ed4a17
Implemented support for VFPINJ tables. Runs through synthetic non-trivial example
2015-08-11 16:31:43 +02:00
babrodtk
2994d1d932
Refactoring
2015-08-11 12:21:06 +02:00
babrodtk
08dd631a8d
Refactoring/restructuring
2015-08-11 10:24:55 +02:00
babrodtk
5af128bcb6
Refactoring
2015-08-11 09:47:06 +02:00
Atgeirr Flø Rasmussen
9a0ff41221
Silence warnings.
2015-08-11 09:20:35 +02:00
babrodtk
503885fd93
Fixed warnings
2015-08-10 15:34:19 +02:00
babrodtk
bc2fb23af9
Minor beatuifications of code
2015-08-10 15:04:21 +02:00
Joakim Hove
cd02c3fb83
Merge pull request #429 from joakim-hove/parsemode2
...
Using new string based ParseMode api.
2015-08-10 14:36:27 +02:00
babrodtk
c5c965adec
Fixed bugs in tests for VFP tables
2015-08-10 09:31:25 +02:00
babrodtk
d45543b8fb
Proper integration of derivatives for THP
2015-08-10 08:55:06 +02:00
babrodtk
ff403afb1d
Fixed bug in superset when index list empty
2015-08-10 08:55:06 +02:00
babrodtk
22b94b75e6
VFP table which maps THP==BHP gives identical results
2015-08-10 08:55:06 +02:00
babrodtk
7eb94caeba
Updated integration of VFP tables. Produces almost identical results to bhp control
2015-08-10 08:55:05 +02:00
babrodtk
16a4580219
Implemented test to check derivatives for interpolateplane
2015-08-10 08:55:05 +02:00
babrodtk
34edf3a5b8
Changed API of VFPProperties to take ADBs
2015-08-10 08:55:05 +02:00
André R. Brodtkorb
66c13d9b96
Added proper scaling for derivatives
2015-08-10 08:55:05 +02:00
André R. Brodtkorb
99c23d3810
Bugfix interpolation
2015-08-10 08:55:05 +02:00
babrodtk
1a3d12deac
implemented struct to keep track of derivatives during interpolation
2015-08-10 08:55:05 +02:00
babrodtk
f424a26651
Added initial calculation of derivatives
2015-08-10 08:55:05 +02:00
babrodtk
0d36d81e51
Implemented test for case when bhp(thp) == bhp
2015-08-10 08:55:05 +02:00
babrodtk
32e4c8caab
Minor bug-fixes
2015-08-10 08:55:05 +02:00
babrodtk
926f7ba175
Return zero for e.g., the gas:oil-ratio if no oil
2015-08-10 08:54:34 +02:00
babrodtk
79410685ca
Refactoring and updated tests
2015-08-10 08:54:34 +02:00
babrodtk
0467af953c
Added function to compute THP from BHP using VFP tables
2015-08-10 08:54:34 +02:00
babrodtk
d27403b427
Initial integration of VFPProdTables
2015-08-10 08:54:34 +02:00
babrodtk
3260e978da
Minor refactoring of VFPProperties to prepare for support for VFPINJ tables
2015-08-10 08:53:42 +02:00
babrodtk
15d3171ae1
Partial integration of VFPProperties into BlackoilModel
2015-08-10 08:53:42 +02:00
André R. Brodtkorb
066e54bbfc
Updated VFPProperties to support a vector VFPProdTable's
2015-08-10 08:50:26 +02:00
André R. Brodtkorb
fe7b5f2f6f
Updated tests to support units
2015-08-10 08:50:26 +02:00
André R. Brodtkorb
179a210ad5
Updated VFPProperties to use the newly implemented VFPProdTable class in opm-parser (with units)
2015-08-10 08:50:26 +02:00
André R. Brodtkorb
1d7f601fab
Removed superfluous varible
2015-08-10 08:50:26 +02:00
André R. Brodtkorb
3d14ea9432
Added test of the most high-level bhp function
2015-08-10 08:50:26 +02:00
André R. Brodtkorb
ab445a6d9a
Added proper error checking and partial units
2015-08-10 08:50:26 +02:00
André R. Brodtkorb
ccf06c2c1c
Added tests for computing the flo/wfr/gfr values based on the aqua/liquid/vapour flow rates
2015-08-10 08:50:26 +02:00
André R. Brodtkorb
2f6e44500b
Updated ADB test case
2015-08-10 08:50:26 +02:00
André R. Brodtkorb
3dfd9ad56d
Added ADB version of bhp function
2015-08-10 08:50:25 +02:00
André R. Brodtkorb
0e3b951cd0
Added skeleton of interpolation using ADBs as input
2015-08-10 08:50:25 +02:00
André R. Brodtkorb
7b0132b110
Added linear extrapolation
2015-08-10 08:50:25 +02:00
André R. Brodtkorb
106467e889
Tabs to spaces
2015-08-10 08:50:25 +02:00
André R. Brodtkorb
67b55f873c
Created tests for the VFPProperties class
2015-08-10 08:50:25 +02:00
André R. Brodtkorb
a54804c0cc
Added initial version of VFPProperties
2015-08-10 08:50:25 +02:00
Joakim Hove
6680279815
Using new string based ParseMode api.
2015-08-09 22:18:36 +02:00
Atgeirr Flø Rasmussen
d00d78453c
Merge pull request #428 from dr-robertk/PR/remove-hackery-for-dune2.4
...
DuneMatrix: remove hackery of defining private as protected.
2015-08-07 13:04:30 +02:00
Robert Kloefkorn
9cf207f1fb
DuneMatrix: remove hackery of defining private as protected. This issues has been
...
resolved in dune-2.4.
2015-08-07 12:08:06 +02:00