refactor well controls use new well controls gourp.

This commit is contained in:
Liu Ming
2014-01-10 14:15:24 +08:00
parent 7243418cc5
commit 139bfb7e62
4 changed files with 34 additions and 21 deletions

View File

@@ -1,4 +1,3 @@
#include <cmath>
#include <vector>
#include <opm/polymer/fullyimplicit/AutoDiffBlock.hpp>
@@ -170,6 +169,8 @@ namespace Opm {
}
double
PolymerPropsAd::deadPoreVol() const
{
@@ -360,8 +361,10 @@ namespace Opm {
double res_factor = polymer_props_.resFactor();
double factor = (res_factor - 1.) / max_ads;
ADB rk = one + ads * factor;
ADB dkrw_ds = krw / rk.value();
ADB dkrw_dc = -krw.value() / (rk.value() * rk.value()) * ads * factor;
// ADB dkrw_ds = krw / rk.value();
ADB dkrw_ds = krw / rk;
// ADB dkrw_dc = -krw.value() / (rk.value() * rk.value()) * ads * factor;
ADB dkrw_dc = -factor * krw / (rk * rk) * ads ;
const int num_blocks = c.numBlocks();
std::vector<ADB::M> jacs(num_blocks);