mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
Untabify.
This commit is contained in:
parent
ea1bd3ec2d
commit
8877fa6ed0
@ -32,130 +32,130 @@ namespace Opm
|
|||||||
class PolymerProperties
|
class PolymerProperties
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
PolymerProperties()
|
PolymerProperties()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
PolymerProperties(double c_max,
|
PolymerProperties(double c_max,
|
||||||
double mix_param,
|
double mix_param,
|
||||||
double rock_density,
|
double rock_density,
|
||||||
double dead_pore_vol,
|
double dead_pore_vol,
|
||||||
const std::vector<double>& c_vals_visc,
|
const std::vector<double>& c_vals_visc,
|
||||||
const std::vector<double>& visc_mult_vals,
|
const std::vector<double>& visc_mult_vals,
|
||||||
const std::vector<double>& c_vals_ads,
|
const std::vector<double>& c_vals_ads,
|
||||||
const std::vector<double>& ads_vals)
|
const std::vector<double>& ads_vals)
|
||||||
: c_max_(c_max),
|
: c_max_(c_max),
|
||||||
mix_param_(mix_param),
|
mix_param_(mix_param),
|
||||||
rock_density_(rock_density),
|
rock_density_(rock_density),
|
||||||
dead_pore_vol_(dead_pore_vol),
|
dead_pore_vol_(dead_pore_vol),
|
||||||
c_vals_visc_(c_vals_visc),
|
c_vals_visc_(c_vals_visc),
|
||||||
visc_mult_vals_(visc_mult_vals),
|
visc_mult_vals_(visc_mult_vals),
|
||||||
c_vals_ads_(c_vals_ads),
|
c_vals_ads_(c_vals_ads),
|
||||||
ads_vals_(ads_vals)
|
ads_vals_(ads_vals)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
PolymerProperties(const EclipseGridParser& gridparser)
|
PolymerProperties(const EclipseGridParser& gridparser)
|
||||||
{
|
{
|
||||||
readFromDeck(gridparser);
|
readFromDeck(gridparser);
|
||||||
}
|
}
|
||||||
|
|
||||||
void set(double c_max,
|
void set(double c_max,
|
||||||
double mix_param,
|
double mix_param,
|
||||||
double rock_density,
|
double rock_density,
|
||||||
double dead_pore_vol,
|
double dead_pore_vol,
|
||||||
const std::vector<double>& c_vals_visc,
|
const std::vector<double>& c_vals_visc,
|
||||||
const std::vector<double>& visc_mult_vals,
|
const std::vector<double>& visc_mult_vals,
|
||||||
const std::vector<double>& c_vals_ads,
|
const std::vector<double>& c_vals_ads,
|
||||||
const std::vector<double>& ads_vals)
|
const std::vector<double>& ads_vals)
|
||||||
{
|
{
|
||||||
c_max_ = c_max;
|
c_max_ = c_max;
|
||||||
mix_param_ = mix_param;
|
mix_param_ = mix_param;
|
||||||
rock_density_ = rock_density;
|
rock_density_ = rock_density;
|
||||||
dead_pore_vol_ = dead_pore_vol;
|
dead_pore_vol_ = dead_pore_vol;
|
||||||
c_vals_visc_ = c_vals_visc;
|
c_vals_visc_ = c_vals_visc;
|
||||||
visc_mult_vals_ = visc_mult_vals;
|
visc_mult_vals_ = visc_mult_vals;
|
||||||
c_vals_ads_ = c_vals_ads;
|
c_vals_ads_ = c_vals_ads;
|
||||||
ads_vals_ = ads_vals;
|
ads_vals_ = ads_vals;
|
||||||
}
|
}
|
||||||
|
|
||||||
void readFromDeck(const EclipseGridParser& gridparser)
|
void readFromDeck(const EclipseGridParser& gridparser)
|
||||||
{
|
{
|
||||||
|
|
||||||
// We assume NTMISC=1
|
// We assume NTMISC=1
|
||||||
const std::vector<double>& plymax = gridparser.getPLYMAX().plymax_;
|
const std::vector<double>& plymax = gridparser.getPLYMAX().plymax_;
|
||||||
c_max_ = plymax[0];
|
c_max_ = plymax[0];
|
||||||
const std::vector<double>& tlmixpar = gridparser.getTLMIXPAR().tlmixpar_;
|
const std::vector<double>& tlmixpar = gridparser.getTLMIXPAR().tlmixpar_;
|
||||||
mix_param_ = tlmixpar[0];
|
mix_param_ = tlmixpar[0];
|
||||||
|
|
||||||
// We assume NTSFUN=1
|
// We assume NTSFUN=1
|
||||||
const std::vector<double>& plyrock = gridparser.getPLYROCK().plyrock_;
|
const std::vector<double>& plyrock = gridparser.getPLYROCK().plyrock_;
|
||||||
dead_pore_vol_ = plyrock[0];
|
dead_pore_vol_ = plyrock[0];
|
||||||
rock_density_ = plyrock[3];
|
rock_density_ = plyrock[3];
|
||||||
|
|
||||||
// We assume NTPVT=1
|
// We assume NTPVT=1
|
||||||
const PLYVISC& plyvisc = gridparser.getPLYVISC();
|
const PLYVISC& plyvisc = gridparser.getPLYVISC();
|
||||||
c_vals_visc_ = plyvisc.concentration_;
|
c_vals_visc_ = plyvisc.concentration_;
|
||||||
visc_mult_vals_ = plyvisc.factor_;
|
visc_mult_vals_ = plyvisc.factor_;
|
||||||
|
|
||||||
// We assume NTSFUN=1
|
// We assume NTSFUN=1
|
||||||
const PLYADS& plyads = gridparser.getPLYADS();
|
const PLYADS& plyads = gridparser.getPLYADS();
|
||||||
c_vals_ads_ = plyads.local_concentration_;
|
c_vals_ads_ = plyads.local_concentration_;
|
||||||
ads_vals_ = plyads.adsorbed_concentration_;
|
ads_vals_ = plyads.adsorbed_concentration_;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
double cMax() const
|
double cMax() const
|
||||||
{
|
{
|
||||||
return c_max_;
|
return c_max_;
|
||||||
}
|
}
|
||||||
|
|
||||||
double mixParam() const
|
double mixParam() const
|
||||||
{
|
{
|
||||||
return mix_param_;
|
return mix_param_;
|
||||||
}
|
}
|
||||||
|
|
||||||
double rockDensity() const
|
double rockDensity() const
|
||||||
{
|
{
|
||||||
return rock_density_;
|
return rock_density_;
|
||||||
};
|
};
|
||||||
|
|
||||||
double deadPoreVol() const
|
double deadPoreVol() const
|
||||||
{
|
{
|
||||||
return dead_pore_vol_;
|
return dead_pore_vol_;
|
||||||
}
|
}
|
||||||
|
|
||||||
double viscMult(double c) const
|
double viscMult(double c) const
|
||||||
{
|
{
|
||||||
return Opm::linearInterpolation(c_vals_visc_, visc_mult_vals_, c);
|
return Opm::linearInterpolation(c_vals_visc_, visc_mult_vals_, c);
|
||||||
}
|
}
|
||||||
|
|
||||||
double viscMultWithDer(double c, double* der) const
|
double viscMultWithDer(double c, double* der) const
|
||||||
{
|
{
|
||||||
*der = Opm::linearInterpolationDerivative(c_vals_visc_, visc_mult_vals_, c);
|
*der = Opm::linearInterpolationDerivative(c_vals_visc_, visc_mult_vals_, c);
|
||||||
return Opm::linearInterpolation(c_vals_visc_, visc_mult_vals_, c);
|
return Opm::linearInterpolation(c_vals_visc_, visc_mult_vals_, c);
|
||||||
}
|
}
|
||||||
|
|
||||||
double adsorbtion(double c) const
|
double adsorbtion(double c) const
|
||||||
{
|
{
|
||||||
return Opm::linearInterpolation(c_vals_ads_, ads_vals_, c);
|
return Opm::linearInterpolation(c_vals_ads_, ads_vals_, c);
|
||||||
}
|
}
|
||||||
|
|
||||||
double adsorbtionWithDer(double c, double* der) const
|
double adsorbtionWithDer(double c, double* der) const
|
||||||
{
|
{
|
||||||
*der = Opm::linearInterpolationDerivative(c_vals_ads_, ads_vals_, c);
|
*der = Opm::linearInterpolationDerivative(c_vals_ads_, ads_vals_, c);
|
||||||
return Opm::linearInterpolation(c_vals_ads_, ads_vals_, c);
|
return Opm::linearInterpolation(c_vals_ads_, ads_vals_, c);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
double c_max_;
|
double c_max_;
|
||||||
double mix_param_;
|
double mix_param_;
|
||||||
double rock_density_;
|
double rock_density_;
|
||||||
double dead_pore_vol_;
|
double dead_pore_vol_;
|
||||||
std::vector<double> c_vals_visc_;
|
std::vector<double> c_vals_visc_;
|
||||||
std::vector<double> visc_mult_vals_;
|
std::vector<double> visc_mult_vals_;
|
||||||
std::vector<double> c_vals_ads_;
|
std::vector<double> c_vals_ads_;
|
||||||
std::vector<double> ads_vals_;
|
std::vector<double> ads_vals_;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Opm
|
} // namespace Opm
|
||||||
|
Loading…
Reference in New Issue
Block a user