mirror of
https://github.com/OPM/opm-simulators.git
synced 2024-11-25 18:50:19 -06:00
more efficient polymer code (replaced std::vector by double*).
This commit is contained in:
Xavier Raynaud
parent
6eb68c9652
commit
ab961dda94
@ -187,10 +187,10 @@ namespace Opm
|
||||
double& eff_relperm_wat,
|
||||
double& deff_relperm_wat_ds,
|
||||
double& deff_relperm_wat_dc) const {
|
||||
effectiveRelpermBoth(c, cmax, relperm,
|
||||
drelperm_ds, eff_relperm_wat,
|
||||
deff_relperm_wat_ds, deff_relperm_wat_dc,
|
||||
true);
|
||||
effectiveRelpermBoth(c, cmax, relperm,
|
||||
drelperm_ds, eff_relperm_wat,
|
||||
deff_relperm_wat_ds, deff_relperm_wat_dc,
|
||||
true);
|
||||
}
|
||||
|
||||
void PolymerProperties::effectiveRelpermBoth(const double c,
|
||||
@ -219,22 +219,22 @@ namespace Opm
|
||||
const double cmax,
|
||||
const double* visc,
|
||||
const double* relperm,
|
||||
std::vector<double>& mob) const
|
||||
double* mob) const
|
||||
{
|
||||
double dummy1;
|
||||
double dummy2[2];
|
||||
std::vector<double> dummy3;
|
||||
double dummy;
|
||||
double dummy_pointer[4];
|
||||
effectiveMobilitiesBoth(c, cmax, visc, relperm,
|
||||
dummy2, mob, dummy3, dummy1, false);
|
||||
dummy_pointer, mob, dummy_pointer, dummy, false);
|
||||
}
|
||||
|
||||
|
||||
void PolymerProperties::effectiveMobilitiesWithDer(const double c,
|
||||
const double cmax,
|
||||
const double* visc,
|
||||
const double* relperm,
|
||||
const double* drelpermds,
|
||||
std::vector<double>& mob,
|
||||
std::vector<double>& dmobds,
|
||||
double* mob,
|
||||
double* dmobds,
|
||||
double& dmobwatdc) const
|
||||
{
|
||||
effectiveMobilitiesBoth(c, cmax, visc,
|
||||
@ -247,8 +247,8 @@ namespace Opm
|
||||
const double* visc,
|
||||
const double* relperm,
|
||||
const double* drelperm_ds,
|
||||
std::vector<double>& mob,
|
||||
std::vector<double>& dmob_ds,
|
||||
double* mob,
|
||||
double* dmob_ds,
|
||||
double& dmobwat_dc,
|
||||
bool if_with_der) const
|
||||
{
|
||||
@ -260,10 +260,12 @@ namespace Opm
|
||||
double eff_relperm_wat;
|
||||
double deff_relperm_wat_ds;
|
||||
double deff_relperm_wat_dc;
|
||||
|
||||
effectiveRelpermBoth(c, cmax, relperm,
|
||||
drelperm_ds, eff_relperm_wat,
|
||||
deff_relperm_wat_ds, deff_relperm_wat_dc,
|
||||
if_with_der);
|
||||
|
||||
mob[0] = eff_relperm_wat/visc_eff[0];
|
||||
mob[1] = relperm[1]/visc_eff[1];
|
||||
|
||||
@ -274,8 +276,6 @@ namespace Opm
|
||||
dmob_ds[0*2 + 1] = drelperm_ds[0*2 + 1]/visc_eff[1];
|
||||
dmob_ds[1*2 + 0] = drelperm_ds[1*2 + 0]/visc_eff[0];
|
||||
dmob_ds[1*2 + 1] = drelperm_ds[1*2 + 1]/visc_eff[1];
|
||||
} else {
|
||||
dmob_ds.clear();
|
||||
}
|
||||
}
|
||||
|
||||
@ -285,10 +285,10 @@ namespace Opm
|
||||
const double* relperm,
|
||||
double& totmob) const
|
||||
{
|
||||
std::vector<double> dummy(2);
|
||||
double dummy2[4];
|
||||
effectiveTotalMobilityBoth(c, cmax, visc, relperm, dummy2,
|
||||
totmob, dummy, false);
|
||||
double dummy1[4];
|
||||
double dummy2[2];
|
||||
effectiveTotalMobilityBoth(c, cmax, visc, relperm, dummy1,
|
||||
totmob, dummy2, false);
|
||||
}
|
||||
|
||||
void PolymerProperties::effectiveTotalMobilityWithDer(const double c,
|
||||
@ -297,7 +297,7 @@ namespace Opm
|
||||
const double* relperm,
|
||||
const double* drelperm_ds,
|
||||
double& totmob,
|
||||
std::vector<double>& dtotmob_dsdc) const
|
||||
double* dtotmob_dsdc) const
|
||||
{
|
||||
effectiveTotalMobilityBoth(c, cmax, visc, relperm, drelperm_ds,
|
||||
totmob, dtotmob_dsdc, true);
|
||||
@ -309,11 +309,11 @@ namespace Opm
|
||||
const double* relperm,
|
||||
const double* drelperm_ds,
|
||||
double& totmob,
|
||||
std::vector<double>& dtotmob_dsdc,
|
||||
double* dtotmob_dsdc,
|
||||
bool if_with_der) const
|
||||
{
|
||||
std::vector<double> mob(2);
|
||||
std::vector<double> dmob_ds(2);
|
||||
double mob[2];
|
||||
double dmob_ds[2];
|
||||
double dmobwat_dc;
|
||||
effectiveMobilitiesBoth(c, cmax, visc, relperm, drelperm_ds,
|
||||
mob, dmob_ds, dmobwat_dc, if_with_der);
|
||||
@ -321,8 +321,6 @@ namespace Opm
|
||||
if (if_with_der) {
|
||||
dtotmob_dsdc[0] = dmob_ds[0] + dmob_ds[2]; //derivative with respect to s
|
||||
dtotmob_dsdc[1] = dmobwat_dc; //derivative with respect to c
|
||||
} else {
|
||||
dtotmob_dsdc.clear();
|
||||
}
|
||||
}
|
||||
|
||||
@ -333,7 +331,7 @@ namespace Opm
|
||||
}
|
||||
|
||||
void PolymerProperties::computeMcWithDer(const double& c, double& mc,
|
||||
double& dmc_dc) const
|
||||
double& dmc_dc) const
|
||||
{
|
||||
computeMcBoth(c, mc, dmc_dc, true);
|
||||
}
|
||||
|
||||
@ -178,15 +178,15 @@ namespace Opm
|
||||
const double cmax,
|
||||
const double* visc,
|
||||
const double* relperm,
|
||||
std::vector<double>& mob) const;
|
||||
double* mob) const;
|
||||
|
||||
void effectiveMobilitiesWithDer(const double c,
|
||||
const double cmax,
|
||||
const double* visc,
|
||||
const double* relperm,
|
||||
const double* drelpermds,
|
||||
std::vector<double>& mob,
|
||||
std::vector<double>& dmob_ds,
|
||||
double* mob,
|
||||
double* dmob_ds,
|
||||
double& dmobwatdc) const;
|
||||
|
||||
void effectiveMobilitiesBoth(const double c,
|
||||
@ -194,8 +194,8 @@ namespace Opm
|
||||
const double* visc,
|
||||
const double* relperm,
|
||||
const double* drelperm_ds,
|
||||
std::vector<double>& mob,
|
||||
std::vector<double>& dmob_ds,
|
||||
double* mob,
|
||||
double* dmob_ds,
|
||||
double& dmobwat_dc,
|
||||
bool if_with_der) const;
|
||||
|
||||
@ -211,7 +211,7 @@ namespace Opm
|
||||
const double* relperm,
|
||||
const double* drelpermds,
|
||||
double& totmob,
|
||||
std::vector<double>& dtotmob_dsdc) const;
|
||||
double* dtotmob_dsdc) const;
|
||||
|
||||
void effectiveTotalMobilityBoth(const double c,
|
||||
const double cmax,
|
||||
@ -219,7 +219,7 @@ namespace Opm
|
||||
const double* relperm,
|
||||
const double* drelperm_ds,
|
||||
double& totmob,
|
||||
std::vector<double>& dtotmob_dsdc,
|
||||
double* dtotmob_dsdc,
|
||||
bool if_with_der) const;
|
||||
|
||||
void computeMc(const double& c, double& mc) const;
|
||||
|
||||
@ -499,9 +499,9 @@ namespace Opm {
|
||||
const Grid& g ,
|
||||
JacobianSystem& sys) {
|
||||
|
||||
std::vector<double> s(2, 0.);
|
||||
std::vector<double> mob(2, 0.);
|
||||
std::vector<double> dmobds(4, 0.);
|
||||
double s[2];
|
||||
double mob[2];
|
||||
double dmobds[4];
|
||||
double dmobwatdc;
|
||||
double c, cmax;
|
||||
double mc, dmcdc;
|
||||
|
||||
@ -53,11 +53,11 @@ public:
|
||||
void computeGradientResS(const double* x, double* res, double* gradient) const;
|
||||
void computeGradientResC(const double* x, double* res, double* gradient) const;
|
||||
void computeJacobiRes(const double* x, double* dres_s_dsdc, double* dres_c_dsdc) const;
|
||||
|
||||
private:
|
||||
|
||||
private:
|
||||
void computeResAndJacobi(const double* x, const bool if_res_s, const bool if_res_c,
|
||||
const bool if_dres_s_dsdc, const bool if_dres_c_dsdc,
|
||||
double* res, double* dres_s_dsdc,
|
||||
double* res, double* dres_s_dsdc,
|
||||
double* dres_c_dsdc, double& mc, double& ff) const;
|
||||
};
|
||||
|
||||
@ -349,7 +349,7 @@ namespace Opm
|
||||
#ifdef EXTRA_DEBUG_OUTPUT
|
||||
std::cout << "c = " << c << " s = " << s << " c-residual = " << res << std::endl;
|
||||
#endif
|
||||
return res;
|
||||
return res;
|
||||
}
|
||||
|
||||
double lastSaturation() const
|
||||
@ -461,14 +461,14 @@ namespace Opm
|
||||
}
|
||||
|
||||
void TransportModelPolymer::ResidualEquation::computeResAndJacobi(const double* x, const bool if_res_s, const bool if_res_c,
|
||||
const bool if_dres_s_dsdc, const bool if_dres_c_dsdc,
|
||||
double* res, double* dres_s_dsdc,
|
||||
double* dres_c_dsdc, double& mc, double& ff) const
|
||||
const bool if_dres_s_dsdc, const bool if_dres_c_dsdc,
|
||||
double* res, double* dres_s_dsdc,
|
||||
double* dres_c_dsdc, double& mc, double& ff) const
|
||||
{
|
||||
if ((if_dres_s_dsdc || if_dres_c_dsdc) && gradient_method == Analytic) {
|
||||
double s = x[0];
|
||||
double c = x[1];
|
||||
std::vector<double> dff_dsdc(2);
|
||||
double dff_dsdc[2];
|
||||
double mc_dc;
|
||||
double ads_dc;
|
||||
double ads;
|
||||
@ -498,7 +498,7 @@ namespace Opm
|
||||
+ dtpv*outflux*(dff_dsdc[1]*mc + ff*mc_dc);
|
||||
}
|
||||
|
||||
} else if (if_res_c || if_res_s) {
|
||||
} else if (if_res_c || if_res_s) {
|
||||
double s = x[0];
|
||||
double c = x[1];
|
||||
tm.fracFlow(s, c, cmax0, cell, ff);
|
||||
@ -514,7 +514,7 @@ namespace Opm
|
||||
+ dtpv*(outflux*ff*mc + influx_polymer);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ((if_dres_c_dsdc || if_dres_s_dsdc) && gradient_method == FinDif) {
|
||||
double epsi = 1e-8;
|
||||
double res_epsi[2];
|
||||
@ -578,7 +578,7 @@ namespace Opm
|
||||
concentration_[cell] = modifiedRegulaFalsi(res, a, b, maxit_, tol_, iters_used);
|
||||
cmax_[cell] = std::max(cmax_[cell], concentration_[cell]);
|
||||
saturation_[cell] = res.lastSaturation();
|
||||
fracFlow(saturation_[cell], concentration_[cell], cmax_[cell], cell,
|
||||
fracFlow(saturation_[cell], concentration_[cell], cmax_[cell], cell,
|
||||
fractionalflow_[cell]);
|
||||
computeMc(concentration_[cell], mc_[cell]);
|
||||
}
|
||||
@ -825,43 +825,44 @@ namespace Opm
|
||||
<< num_iters << " iterations." << std::endl;
|
||||
}
|
||||
|
||||
|
||||
void TransportModelPolymer::fracFlow(double s, double c, double cmax,
|
||||
int cell, double& ff) const
|
||||
{
|
||||
std::vector<double> dummy;
|
||||
double* dummy;
|
||||
fracFlowBoth(s, c, cmax, cell, ff, dummy, false);
|
||||
}
|
||||
|
||||
void TransportModelPolymer::fracFlowWithDer(double s, double c, double cmax,
|
||||
int cell, double& ff,
|
||||
std::vector<double>& dff_dsdc) const
|
||||
|
||||
void TransportModelPolymer::fracFlowWithDer(double s, double c, double cmax,
|
||||
int cell, double& ff,
|
||||
double* dff_dsdc) const
|
||||
{
|
||||
fracFlowBoth(s, c, cmax, cell, ff, dff_dsdc, true);
|
||||
}
|
||||
|
||||
void TransportModelPolymer::fracFlowBoth(double s, double c, double cmax, int cell,
|
||||
double& ff, std::vector<double>& dff_dsdc,
|
||||
void TransportModelPolymer::fracFlowBoth(double s, double c, double cmax, int cell,
|
||||
double& ff, double* dff_dsdc,
|
||||
bool if_with_der) const
|
||||
{
|
||||
double relperm[2];
|
||||
double drelperm_ds[4];
|
||||
double sat[2] = {s, 1 - s};
|
||||
props_.relperm(1, sat, &cell, relperm, drelperm_ds);
|
||||
std::vector<double> mob(2);
|
||||
std::vector<double> dmob_ds(2);
|
||||
std::vector<double> dmob_dc(2);
|
||||
if (if_with_der) {
|
||||
props_.relperm(1, sat, &cell, relperm, drelperm_ds);
|
||||
} else {
|
||||
props_.relperm(1, sat, &cell, relperm, 0);
|
||||
}
|
||||
double mob[2];
|
||||
double dmob_ds[2];
|
||||
double dmob_dc[2];
|
||||
double dmobwat_dc;
|
||||
polyprops_.effectiveMobilitiesBoth(c, cmax, visc_, relperm, drelperm_ds,
|
||||
mob, dmob_ds, dmobwat_dc, if_with_der);
|
||||
dmob_dc[0] = dmobwat_dc;
|
||||
dmob_dc[1] = 0.;
|
||||
ff = mob[0]/(mob[0] + mob[1]);
|
||||
if (if_with_der) {
|
||||
dmob_dc[0] = dmobwat_dc;
|
||||
dmob_dc[1] = 0.;
|
||||
dff_dsdc[0] = (dmob_ds[0]*mob[1] - dmob_ds[1]*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
|
||||
} else {
|
||||
dff_dsdc.clear();
|
||||
}
|
||||
}
|
||||
|
||||
@ -870,8 +871,8 @@ namespace Opm
|
||||
polyprops_.computeMc(c, mc);
|
||||
}
|
||||
|
||||
void TransportModelPolymer::computeMcWithDer(double c, double& mc,
|
||||
double &dmc_dc) const
|
||||
void TransportModelPolymer::computeMcWithDer(double c, double& mc,
|
||||
double &dmc_dc) const
|
||||
{
|
||||
polyprops_.computeMcWithDer(c, mc, dmc_dc);
|
||||
}
|
||||
@ -902,16 +903,16 @@ namespace
|
||||
|
||||
|
||||
CurveInSCPlane::CurveInSCPlane()
|
||||
{
|
||||
}
|
||||
{
|
||||
}
|
||||
|
||||
// Setup the curve (see comment above).
|
||||
// The curve is parametrized by t in [0, t_max], t_out is equal to t when the curve hits the bounding
|
||||
// rectangle. x_out=(s_out, c_out) denotes the values of s and c at that point.
|
||||
void CurveInSCPlane::setup(const double* x, const double* direction,
|
||||
const double* end_point, const double* x_min,
|
||||
const double* x_max, double& t_max_out,
|
||||
double& t_out_out)
|
||||
const double* end_point, const double* x_min,
|
||||
const double* x_max, double& t_max_out,
|
||||
double& t_out_out)
|
||||
{
|
||||
x_[0] = x[0];
|
||||
x_[1] = x[1];
|
||||
@ -972,7 +973,7 @@ namespace
|
||||
void CurveInSCPlane::computeXOfT(double* x_of_t, const double t) const {
|
||||
if (t <= t_out_) {
|
||||
x_of_t[0] = x_[0] + t*direction_[0];
|
||||
x_of_t[1] = x_[1] + t*direction_[1];
|
||||
x_of_t[1] = x_[1] + t*direction_[1];
|
||||
} else {
|
||||
x_of_t[0] = 1/(t_max_-t_out_)*((t_max_ - t)*x_out_[0] + end_point_[0]*(t - t_out_));
|
||||
x_of_t[1] = 1/(t_max_-t_out_)*((t_max_ - t)*x_out_[1] + end_point_[1]*(t - t_out_));
|
||||
|
||||
@ -98,10 +98,10 @@ namespace Opm
|
||||
|
||||
|
||||
void fracFlow(double s, double c, double cmax, int cell, double& ff) const;
|
||||
void fracFlowWithDer(double s, double cmax, double c, int cell, double& ff,
|
||||
std::vector<double>& dff_dsdc) const;
|
||||
void fracFlowWithDer(double s, double c, double cmax, int cell, double& ff,
|
||||
double* dff_dsdc) const;
|
||||
void fracFlowBoth(double s, double c, double cmax, int cell, double& ff,
|
||||
std::vector<double>& dff_dsdc, bool if_with_der) const;
|
||||
double* dff_dsdc, bool if_with_der) const;
|
||||
void computeMc(double c, double& mc) const;
|
||||
void computeMcWithDer(double c, double& mc, double& dmc_dc) const;
|
||||
};
|
||||
|
||||
@ -79,7 +79,7 @@ namespace Opm
|
||||
props.relperm(num_cells, &s[0], &cells[0], &kr[0], 0);
|
||||
const double* visc = props.viscosity();
|
||||
const double* rho = props.density();
|
||||
std::vector<double> mob(num_phases); // here we assume num_phases=2
|
||||
double mob[num_phases]; // here we assume num_phases=2
|
||||
for (int cell = 0; cell < num_cells; ++cell) {
|
||||
double* kr_cell = &kr[2*cell];
|
||||
polyprops.effectiveMobilities(c[cell], cmax[cell], visc, kr_cell,
|
||||
@ -132,7 +132,7 @@ namespace Opm
|
||||
polyprod = 0.0;
|
||||
const double* visc = props.viscosity();
|
||||
std::vector<double> kr_cell(np);
|
||||
std::vector<double> mob(np);
|
||||
double mob[np];
|
||||
for (int cell = 0; cell < num_cells; ++cell) {
|
||||
if (src[cell] > 0.0) {
|
||||
injected[0] += src[cell]*dt;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user