Kai Bao
c120313f09
renaming visc parameters to mu_w for better readability
2016-04-14 15:09:03 +02:00
Kai Bao
30774d8309
correcting buggy visc pointer usage in effective viscosity calculation
2016-04-14 14:52:00 +02:00
Kai Bao
666f91505d
using effective polymer viscosity for polymer mobility calculation.
2016-04-14 13:45:21 +02:00
Pål Grønås Drange
77fc26475b
Using new EclipseState API, made ->s into .s
2016-04-12 14:47:50 +02:00
Jørgen Kvalsvik
19e41bd246
Change Deck access methods/types to references
...
opm-parser#677 changes the return types for the Deck family of classes.
This patch fixes all broken code from that patch set.
https://github.com/OPM/opm-parser/pull/677
2016-02-19 11:55:19 +01:00
Jørgen Kvalsvik
850f0884f1
Improve includes from opm-parser
...
Adopting to opm-parser PR#661, add previously missing includes.
OPM/opm-parser#661
2016-01-26 13:32:34 +01:00
Jørgen Kvalsvik
087710df7d
Fixes includes wrt opm-parser PR-656
...
Several files stopped compiling due to relying on opm-parser headers doing
includes. From opm-parser PR-656 https://github.com/OPM/opm-parser/pull/656
this assumption is no longer valid.
2016-01-20 15:11:30 +01:00
Joakim Hove
24601480e3
Using new Table api.
2016-01-08 13:57:38 +01:00
Kai Bao
0936917610
removing some white spaces.
2015-10-24 13:23:25 +02:00
Kai Bao
2b5f7c2b5c
correcting the typo when reading PLYROCK table.
...
PlymaxTable was used instead.
2015-10-24 13:19:36 +02:00
paean
956b8fc633
silencing a shadowing warning related to shrate.
2015-10-19 07:53:27 +02:00
Andreas Lauser
651bd91482
use the error macros from opm-common
2015-10-12 15:24:59 +02:00
Joakim Hove
1a0358d85a
Using TableContainer.
2015-10-04 09:00:01 +02:00
Joakim Hove
86dfd557a0
Using TableManager to get tables.
2015-09-01 13:02:15 +02:00
Kai Bao
46edf7bb90
minor formatting for spaces for one if statement.
2015-06-23 14:02:57 +02:00
Kai Bao
d2602cc73f
Merge branch 'Adding_PLYSHLOG_RELATED' into Adding_SHRATE_RELATED
...
Conflicts:
opm/polymer/PolymerProperties.hpp
2015-06-23 10:27:25 +02:00
Kai Bao
81d9fe7a55
moving function computeShearMultLog to class PolymerProperties
2015-06-10 13:48:03 +02:00
Kai Bao
3e449a31d6
adjusting some spaces related to brackets.
...
No functions change.
2015-06-09 12:29:49 +02:00
Kai Bao
009addb142
adding the unit conversion when SHRATE present
2015-06-05 15:25:23 +02:00
Kai Bao
11ad42ee22
unit conversion for the PLYSHLOG table.
...
insteading handling it in the opm-parser
2015-06-05 09:13:25 +02:00
Kai Bao
db420faf75
Adding PLYSHLOG related to PolymerProperies.
2015-06-03 09:56:29 +02:00
Atgeirr Flø Rasmussen
3c29b12f1f
Merge pull request #71 from qilicun/use_plmixpar
...
use PLMIXPAR instead of TLMIXPAR.
2014-10-20 09:17:22 +02:00
Atgeirr Flø Rasmussen
23ea7cbd11
Merge pull request #69 from qilicun/fix_bugs
...
PLYVISC and PLYADS should not just have only one row.
2014-10-17 12:21:58 +02:00
Liu Ming
d99a0ff7a1
use PLMIXPAR instead of TLMIXPAR.
2014-10-15 09:47:43 +08:00
Andreas Lauser
7c122c18d3
use the TLMIXPAR keyword directly
...
instead of using a table class. This is because the keyword is not a
table...
2014-10-14 12:29:31 +02:00
Liu Ming
54c8014453
PLYVISC and PLYADS should not just have only one row.
2014-10-14 16:28:11 +08:00
Andreas Lauser
9fbf4b2b3b
adapt the the table related API changes of opm-parser
2014-09-17 13:28:39 +02:00
Andreas Lauser
3a6d989d5e
move the code away from EclipsGridParser to opm-parser
2014-04-26 11:13:59 +02:00
Liu Ming
31ddb2f098
let shear vef return derivative.
2014-03-26 16:02:39 +08:00
Liu Ming
7a193dca1e
return the value by linear interpolation.
2014-03-21 14:34:46 +08:00
Liu Ming
9204434a4d
make the member functions return a const reference.
2014-03-19 09:23:20 +08:00
Liu Ming
1e41e58ce7
makd PolymerProperties handle PLYSHEAR keyword.
2014-03-18 13:25:52 +08:00
Andreas Lauser
6a6d0c9b28
Replace the ASSERT and ASSERT2 macros by assert
2013-09-03 15:43:51 +02:00
Atgeirr Flø Rasmussen
23cef788fc
Adapt to changed include paths for some opm-core headers.
2013-03-12 11:08:33 +01:00
Xavier Raynaud
7721defbd3
Fixed/Added documentation comments.
2012-09-05 11:45:54 +02:00
Xavier Raynaud
6748a6e5e9
some code optimization (instead of mu_w_eff, use its inverse).
2012-04-26 09:25:46 +02:00
Xavier Raynaud
ab961dda94
more efficient polymer code (replaced std::vector by double*).
2012-04-25 08:39:39 +02:00
Xavier Raynaud
e867c53722
polymerUtilities uses now PolymerProperties to compute effective mobilities.
2012-04-23 11:49:05 +02:00
Xavier Raynaud
4794348740
added computeMc function in PolymerProperties.
2012-04-23 10:27:27 +02:00
Xavier Raynaud
a0794117c9
Cleaned code for computation of residual, many changes, not tested!
2012-04-19 17:21:08 +02:00
Atgeirr Flø Rasmussen
adf40b19c1
Fixed initialization bug in PolymerProperties.
2012-04-10 10:25:07 +02:00
Atgeirr Flø Rasmussen
724645b3f8
Introduced enum for adsorption behaviour to make code more self-documenting.
2012-03-27 15:33:48 +02:00
Xavier Raynaud
b846b15f1f
Corrected typo: adsorbtion -> adsorption.
2012-03-27 11:26:55 +02:00
Xavier Raynaud
6d9f0ea3ec
Added support for adsorbtion index (desorbtion allowed or not).
2012-03-26 16:37:39 +02:00
Xavier Raynaud
023cbb228e
Fixed bug for computeMc.
2012-03-26 13:45:14 +02:00
Xavier Raynaud
4e3f486d13
Simplified computation of coefficient mc.
2012-03-26 11:31:12 +02:00
Xavier Raynaud
1836247dab
Added actual resistance factor. Not tested.
2012-03-23 17:40:03 +01:00
Xavier Raynaud
49b9f340ac
Added functions to compute mobilities and coefficient mc (with derivatives).
2012-03-20 11:58:09 +01:00
Bård Skaflestad
d12d444411
Include <cmath> for std::pow().
2012-03-06 21:59:02 +01:00
Atgeirr Flø Rasmussen
1919284446
Added effectiveInvVisc() method.
2012-03-06 16:06:00 +01:00
