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

Corrected typo: adsorbtion -> adsorption.

Browse Source
This commit is contained in:
Xavier Raynaud 2012-03-27 11:26:55 +02:00
parent acedd4b596
commit b846b15f1f
5 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/polymer_reorder.cpp
View File

@ -201,8 +201,8 @@ public:
class CAds,
class DCAdsDc>
void adsorbtion(const PolyC& c, const PolyC& cmax, CAds& cads, DCAdsDc& dcadsdc) {
cads = polyprops_.adsorbtionWithDer(c, cmax, &dcadsdc);
void adsorption(const PolyC& c, const PolyC& cmax, CAds& cads, DCAdsDc& dcadsdc) {
cads = polyprops_.adsorptionWithDer(c, cmax, &dcadsdc);
}
const std::vector<double> porosity() const {

18
opm/polymer/PolymerProperties.hpp
View File

@ -169,38 +169,38 @@ namespace Opm
return Opm::linearInterpolation(c_vals_visc_, visc_mult_vals_, c);
}
double simpleAdsorbtion(double c) const
double simpleAdsorption(double c) const
{
return Opm::linearInterpolation(c_vals_ads_, ads_vals_, c);
}
double simpleAdsorbtionWithDer(double c, double* der) const
double simpleAdsorptionWithDer(double c, double* der) const
{
*der = Opm::linearInterpolationDerivative(c_vals_ads_, ads_vals_, c);
return Opm::linearInterpolation(c_vals_ads_, ads_vals_, c);
}
double adsorbtion(double c, double cmax) const
double adsorption(double c, double cmax) const
{
if (ads_index_ == 1) {
return simpleAdsorbtion(c);
return simpleAdsorption(c);
} else if (ads_index_ == 2) {
return simpleAdsorbtion(std::max(c, cmax));
return simpleAdsorption(std::max(c, cmax));
} else {
THROW("Invalid Adsoption index");
}
}
double adsorbtionWithDer(double c, double cmax, double* der) const
double adsorptionWithDer(double c, double cmax, double* der) const
{
if (ads_index_ == 1) {
return simpleAdsorbtionWithDer(c, der);
return simpleAdsorptionWithDer(c, der);
} else if (ads_index_ == 2) {
if (c < cmax) {
*der = 0;
return simpleAdsorbtion(cmax);
return simpleAdsorption(cmax);
} else {
return simpleAdsorbtionWithDer(c, der);
return simpleAdsorptionWithDer(c, der);
}
} else {
THROW("Invalid Adsoption index");

4
opm/polymer/SinglePointUpwindTwoPhasePolymer.hpp
View File

@ -516,9 +516,9 @@ namespace Opm {
store_.dsc(cell) = s[0]*c - sat[cell*2 + 0]*cpoly[cell];
double dcadsdc;
double cads;
fluid_.adsorbtion(cpoly[cell], cmax[cell], cads, dcadsdc);
fluid_.adsorption(cpoly[cell], cmax[cell], cads, dcadsdc);
store_.dcads(cell) = -cads;
fluid_.adsorbtion(c, cmax[cell], cads, dcadsdc);
fluid_.adsorption(c, cmax[cell], cads, dcadsdc);
store_.dcads(cell) += cads;
store_.dcadsdc(cell) = dcadsdc;
double s_min = fluid_.s_min(cell);

32
opm/polymer/TransportModelPolymer.cpp
View File

@ -294,8 +294,8 @@ namespace Opm
ff = tm.fracFlow(s_arg, c_arg, cell);
mc = tm.computeMc(c_arg);
double rhor = tm.polyprops_.rockDensity();
double ads0 = tm.polyprops_.adsorbtion(c0, cmax0);
double ads = tm.polyprops_.adsorbtion(c_arg, cmax0);
double ads0 = tm.polyprops_.adsorption(c0, cmax0);
double ads = tm.polyprops_.adsorption(c_arg, cmax0);
res_s = s_arg - s0 + dtpv*(outflux*ff + influx);
res_c = s_arg*(1 - dps)*c_arg - (s0 - dps)*c0
+ rhor*((1.0 - porosity)/porosity)*(ads - ads0)
@ -314,8 +314,8 @@ namespace Opm
double ff = tm.fracFlow(s, c, cell);
double mc = tm.computeMc(c);
double rhor = tm.polyprops_.rockDensity();
double ads0 = tm.polyprops_.adsorbtion(c0, cmax0);
double ads = tm.polyprops_.adsorbtion(c, cmax0);
double ads0 = tm.polyprops_.adsorption(c0, cmax0);
double ads = tm.polyprops_.adsorption(c, cmax0);
double res = (1 - dps)*s*c - (1 - dps)*s0*c0
+ rhor*((1.0 - porosity)/porosity)*(ads - ads0)
+ dtpv*(outflux*ff*mc + influx_polymer);
@ -345,7 +345,7 @@ namespace Opm
cmax0 = tm.cmax_[cell];
dps = tm.polyprops_.deadPoreVol();
rhor = tm.polyprops_.rockDensity();
ads0 = tm.polyprops_.adsorbtion(c0, cmax0);
ads0 = tm.polyprops_.adsorption(c0, cmax0);
res_factor = tm.polyprops_.resFactor();
c_max_ads = tm.polyprops_.cMaxAds();
double dflux = -tm.source_[cell];
@ -387,8 +387,8 @@ namespace Opm
double mc = tm.computeMc(c);
double dps = tm.polyprops_.deadPoreVol();
double rhor = tm.polyprops_.rockDensity();
double ads0 = tm.polyprops_.adsorbtion(c0, cmax0);
double ads = tm.polyprops_.adsorbtion(c, cmax0);
double ads0 = tm.polyprops_.adsorption(c0, cmax0);
double ads = tm.polyprops_.adsorption(c, cmax0);
res[0] = s - s0 + dtpv*(outflux*ff + influx);
res[1] = (1 - dps)*s*c - (1 - dps)*s0*c0
+ rhor*((1.0 - porosity)/porosity)*(ads - ads0)
@ -403,8 +403,8 @@ namespace Opm
mc = tm.computeMc(c);
double dps = tm.polyprops_.deadPoreVol();
double rhor = tm.polyprops_.rockDensity();
double ads0 = tm.polyprops_.adsorbtion(c0, cmax0);
double ads = tm.polyprops_.adsorbtion(c, cmax0);
double ads0 = tm.polyprops_.adsorption(c0, cmax0);
double ads = tm.polyprops_.adsorption(c, cmax0);
res[0] = s - s0 + dtpv*(outflux*ff + influx);
res[1] = (1 - dps)*s*c - (1 - dps)*s0*c0
+ rhor*((1.0 - porosity)/porosity)*(ads - ads0)
@ -426,7 +426,7 @@ namespace Opm
double c = x[1];
double ff = tm.fracFlow(s, c, cell);
double mc = tm.computeMc(c);
double ads = tm.polyprops_.adsorbtion(c, cmax0);
double ads = tm.polyprops_.adsorption(c, cmax0);
return (1 - dps)*s*c - (1 - dps)*s0*c0
+ rhor*((1.0 - porosity)/porosity)*(ads - ads0)
+ dtpv*(outflux*ff*mc + influx_polymer);
@ -457,7 +457,7 @@ namespace Opm
double mc_dc;
double mc = tm.computeMcWithDer(c, &mc_dc);
double ads_dc;
double ads = tm.polyprops_.adsorbtionWithDer(c, cmax0, &ads_dc);
double ads = tm.polyprops_.adsorptionWithDer(c, cmax0, &ads_dc);
res[0] = s - s0 + dtpv*(outflux*ff + influx);
res[1] = (1 - dps)*s*c - (1 - dps)*s0*c0
+ rhor*((1.0 - porosity)/porosity)*(ads - ads0)
@ -493,9 +493,9 @@ namespace Opm
double mc = tm.computeMcWithDer(c, &mc_dc);
double dps = tm.polyprops_.deadPoreVol();
double rhor = tm.polyprops_.rockDensity();
double ads0 = tm.polyprops_.adsorbtion(c0, cmax0);
double ads0 = tm.polyprops_.adsorption(c0, cmax0);
double ads_dc;
double ads = tm.polyprops_.adsorbtionWithDer(c, cmax0, &ads_dc);
double ads = tm.polyprops_.adsorptionWithDer(c, cmax0, &ads_dc);
res[0] = s - s0 + dtpv*(outflux*ff + influx);
res[1] = (1 - dps)*s*c - (1 - dps)*s0*c0
+ rhor*((1.0 - porosity)/porosity)*(ads - ads0)
@ -539,7 +539,7 @@ namespace Opm
double mc_dc;
double mc = tm.computeMcWithDer(c, &mc_dc);
double ads_dc;
tm.polyprops_.adsorbtionWithDer(c, cmax0, &ads_dc);
tm.polyprops_.adsorptionWithDer(c, cmax0, &ads_dc);
res_s_ds_dc[0] = 1 + dtpv*outflux*ff_ds_dc[0];
res_s_ds_dc[1] = dtpv*outflux*ff_ds_dc[1];
res_c_ds_dc[0] = (1 - dps)*c + dtpv*outflux*(ff_ds_dc[0])*mc;
@ -833,7 +833,7 @@ namespace Opm
{
double c_max_limit = polyprops_.cMax();
double cbar = c/c_max_limit;
double c_ads = polyprops_.adsorbtion(c, cmax_[cell]);
double c_ads = polyprops_.adsorption(c, cmax_[cell]);
double c_max_ads = polyprops_.cMaxAds();
double res_factor = polyprops_.resFactor();
double res_k = 1 + (res_factor - 1)*c_ads/c_max_ads;
@ -860,7 +860,7 @@ namespace Opm
double cbar = c/c_max_limit;
double c_ads_dc;
double c_max = cmax_[cell];
double c_ads = polyprops_.adsorbtionWithDer(c, c_max, &c_ads_dc);
double c_ads = polyprops_.adsorptionWithDer(c, c_max, &c_ads_dc);
double c_max_ads = polyprops_.cMaxAds();
double res_factor = polyprops_.resFactor();
double res_k = 1 + (res_factor - 1)*c_ads/c_max_ads;

2
opm/polymer/polymerUtilities.cpp
View File

@ -204,7 +204,7 @@ namespace Opm
const double* poro = props.porosity();
double abs_mass = 0.0;
for (int cell = 0; cell < num_cells; ++cell) {
abs_mass += polyprops.simpleAdsorbtion(cmax[cell])*pv[cell]*((1.0 - poro[cell])/poro[cell])*rhor;
abs_mass += polyprops.simpleAdsorption(cmax[cell])*pv[cell]*((1.0 - poro[cell])/poro[cell])*rhor;
}
return abs_mass;
}