OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Removed safetyfactor with membervariable which for now is put to 1.0. Made jacobian calculations more transparent and fixed pointer error.

Browse Source
This commit is contained in:
Halvor M. Nilsen
2012-06-26 08:37:08 +02:00
parent aba26a0583
commit 0d97945aba
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
opm/polymer/PolymerProperties.cpp
View File

@@ -278,8 +278,10 @@ namespace Opm
dmobwat_dc = eff_relperm_wat*dinv_mu_w_eff_dc dmobwat_dc = eff_relperm_wat*dinv_mu_w_eff_dc
+ deff_relperm_wat_dc*inv_mu_w_eff; + deff_relperm_wat_dc*inv_mu_w_eff;
dmob_ds[0*2 + 0] = deff_relperm_wat_ds*inv_mu_w_eff; dmob_ds[0*2 + 0] = deff_relperm_wat_ds*inv_mu_w_eff;
dmob_ds[0*2 + 1] = (drelperm_ds[0*2 + 1] - drelperm_ds[1*2 + 2])/visc[1]; // one have to deside which variables to derive
dmob_ds[1*2 + 0] = -deff_relperm_wat_ds*inv_mu_w_eff; // here the full derivative is written out
dmob_ds[0*2 + 1] = 0.0*(drelperm_ds[0*2 + 1] - drelperm_ds[1*2 + 1])/visc[1];
dmob_ds[1*2 + 0] = -0.0*deff_relperm_wat_ds*inv_mu_w_eff;
dmob_ds[1*2 + 1] = (drelperm_ds[1*2 + 1] - drelperm_ds[0*2 + 1])/visc[1]; dmob_ds[1*2 + 1] = (drelperm_ds[1*2 + 1] - drelperm_ds[0*2 + 1])/visc[1];
} }
} }

17
opm/polymer/TransportModelPolymer.cpp
View File

@@ -196,7 +196,8 @@ namespace Opm
cmax_(0), cmax_(0),
fractionalflow_(grid.number_of_cells, -1.0), fractionalflow_(grid.number_of_cells, -1.0),
mc_(grid.number_of_cells, -1.0), mc_(grid.number_of_cells, -1.0),
method_(method) method_(method),
adhoc_safety_(1.0)
{ {
if (props.numPhases() != 2) { if (props.numPhases() != 2) {
THROW("Property object must have 2 phases"); THROW("Property object must have 2 phases");
@@ -660,7 +661,7 @@ namespace Opm
{ {
ResidualC res(*this, cell); ResidualC res(*this, cell);
const double a = 0.0; const double a = 0.0;
const double b = polyprops_.cMax()*1.1; // Add 10% to account for possible non-monotonicity of hyperbolic system. const double b = polyprops_.cMax()*adhoc_safety_; // Add 10% to account for possible non-monotonicity of hyperbolic system.
int iters_used; int iters_used;
// Check if current state is an acceptable solution. // Check if current state is an acceptable solution.
@@ -709,7 +710,7 @@ namespace Opm
} }
double x_min[2] = { 0.0, 0.0 }; double x_min[2] = { 0.0, 0.0 };
double x_max[2] = { 1.0, polyprops_.cMax()*1.1 }; double x_max[2] = { 1.0, polyprops_.cMax()*adhoc_safety_ };
double x_min_res_s[2] = { x_min[0], x_min[1] }; double x_min_res_s[2] = { x_min[0], x_min[1] };
double x_max_res_s[2] = { x_max[0], x_min[0] }; double x_max_res_s[2] = { x_max[0], x_min[0] };
double x_min_res_sc[2] = { x_min[0], x_min[1] }; double x_min_res_sc[2] = { x_min[0], x_min[1] };
@@ -867,7 +868,7 @@ namespace Opm
} }
const double x_min[2] = { 0.0, 0.0 }; const double x_min[2] = { 0.0, 0.0 };
const double x_max[2] = { 1.0, polyprops_.cMax()*1.1 }; const double x_max[2] = { 1.0, polyprops_.cMax()*adhoc_safety_ };
bool successfull_newton_step = true; bool successfull_newton_step = true;
// initialize x_new to avoid warning // initialize x_new to avoid warning
double x_new[2] = {0.0, 0.0}; double x_new[2] = {0.0, 0.0};
@@ -978,7 +979,7 @@ namespace Opm
// double x_min[2] = { std::max(polyprops_.deadPoreVol(), smin_[2*cell]), 0.0 }; // double x_min[2] = { std::max(polyprops_.deadPoreVol(), smin_[2*cell]), 0.0 };
double x_min[2] = { 0.0, 0.0 }; double x_min[2] = { 0.0, 0.0 };
double x_max[2] = { 1.0, polyprops_.cMax()*1.1 }; double x_max[2] = { 1.0, polyprops_.cMax()*adhoc_safety_ };
bool successfull_newton_step = true; bool successfull_newton_step = true;
double x_new[2]; double x_new[2];
double res_new[2]; double res_new[2];
@@ -1172,12 +1173,14 @@ namespace Opm
double dmobwat_dc; double dmobwat_dc;
polyprops_.effectiveMobilitiesBoth(c, cmax, visc_, relperm, drelperm_ds, polyprops_.effectiveMobilitiesBoth(c, cmax, visc_, relperm, drelperm_ds,
mob, dmob_ds, dmobwat_dc, if_with_der); mob, dmob_ds, dmobwat_dc, if_with_der);
ff = mob[0]/(mob[0] + mob[1]); ff = mob[0]/(mob[0] + mob[1]);
if (if_with_der) { if (if_with_der) {
dmob_dc[0] = dmobwat_dc; dmob_dc[0] = dmobwat_dc;
dmob_dc[1] = 0.; dmob_dc[1] = 0.;
//dff_dsdc[0] = (dmob_ds[0]*mob[1] + dmob_ds[3]*mob[0])/((mob[0] + mob[1])*(mob[0] + mob[1])); // derivative with respect to s //dff_dsdc[0] = (dmob_ds[0]*mob[1] + dmob_ds[3]*mob[0])/((mob[0] + mob[1])*(mob[0] + mob[1])); // derivative with respect to s
dff_dsdc[0] = ((dmob_ds[1]-dmob_ds[2])*mob[1] - (dmob_ds[1]-dmob_ds[3])*mob[0])/((mob[0] + mob[1])*(mob[0] + mob[1])); // derivative with respect to s // at the moment the dmob_ds only have diagonal elements since the saturation is derivated out in effectiveMobilitiesBouth
dff_dsdc[0] = ((dmob_ds[0]-dmob_ds[2])*mob[1] - (dmob_ds[1]-dmob_ds[3])*mob[0])/((mob[0] + mob[1])*(mob[0] + mob[1])); // derivative with respect to s
dff_dsdc[1] = (dmob_dc[0]*mob[1] - dmob_dc[1]*mob[0])/((mob[0] + mob[1])*(mob[0] + mob[1])); // derivative with respect to c dff_dsdc[1] = (dmob_dc[0]*mob[1] - dmob_dc[1]*mob[0])/((mob[0] + mob[1])*(mob[0] + mob[1])); // derivative with respect to c
} }
} }
@@ -1372,7 +1375,7 @@ namespace Opm
} }
const double a = 0.0; const double a = 0.0;
const double b = polyprops_.cMax()*1.1; // Add 10% to account for possible non-monotonicity of hyperbolic system. const double b = polyprops_.cMax()*adhoc_safety_; // Add 10% to account for possible non-monotonicity of hyperbolic system.
int iters_used; int iters_used;
concentration_[cell] = RootFinder::solve(res_c, a, b, maxit_, tol_, iters_used); concentration_[cell] = RootFinder::solve(res_c, a, b, maxit_, tol_, iters_used);
ResidualSGrav res_s(res_c); ResidualSGrav res_s(res_c);

1
opm/polymer/TransportModelPolymer.hpp
View File

@@ -157,6 +157,7 @@ namespace Opm
std::vector<double> mc_; // one per cell std::vector<double> mc_; // one per cell
const double* visc_; const double* visc_;
SingleCellMethod method_; SingleCellMethod method_;
double adhoc_safety_;
// For gravity segregation. // For gravity segregation.
std::vector<double> gravflux_; std::vector<double> gravflux_;