From 8877fa6ed07c0bf5fcc2668c99abe4fc3410ce35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Fri, 2 Mar 2012 15:14:29 +0100 Subject: [PATCH] Untabify. --- opm/polymer/PolymerProperties.hpp | 210 +++++++++++++++--------------- 1 file changed, 105 insertions(+), 105 deletions(-) diff --git a/opm/polymer/PolymerProperties.hpp b/opm/polymer/PolymerProperties.hpp index 307360d47..c484ae611 100644 --- a/opm/polymer/PolymerProperties.hpp +++ b/opm/polymer/PolymerProperties.hpp @@ -32,130 +32,130 @@ namespace Opm class PolymerProperties { public: - PolymerProperties() - { - } + PolymerProperties() + { + } - PolymerProperties(double c_max, - double mix_param, - double rock_density, - double dead_pore_vol, - const std::vector& c_vals_visc, - const std::vector& visc_mult_vals, - const std::vector& c_vals_ads, - const std::vector& ads_vals) - : c_max_(c_max), - mix_param_(mix_param), - rock_density_(rock_density), - dead_pore_vol_(dead_pore_vol), - c_vals_visc_(c_vals_visc), - visc_mult_vals_(visc_mult_vals), - c_vals_ads_(c_vals_ads), - ads_vals_(ads_vals) - { - } + PolymerProperties(double c_max, + double mix_param, + double rock_density, + double dead_pore_vol, + const std::vector& c_vals_visc, + const std::vector& visc_mult_vals, + const std::vector& c_vals_ads, + const std::vector& ads_vals) + : c_max_(c_max), + mix_param_(mix_param), + rock_density_(rock_density), + dead_pore_vol_(dead_pore_vol), + c_vals_visc_(c_vals_visc), + visc_mult_vals_(visc_mult_vals), + c_vals_ads_(c_vals_ads), + ads_vals_(ads_vals) + { + } - PolymerProperties(const EclipseGridParser& gridparser) - { - readFromDeck(gridparser); - } + PolymerProperties(const EclipseGridParser& gridparser) + { + readFromDeck(gridparser); + } - void set(double c_max, - double mix_param, - double rock_density, - double dead_pore_vol, - const std::vector& c_vals_visc, - const std::vector& visc_mult_vals, - const std::vector& c_vals_ads, - const std::vector& ads_vals) - { - c_max_ = c_max; - mix_param_ = mix_param; - rock_density_ = rock_density; - dead_pore_vol_ = dead_pore_vol; - c_vals_visc_ = c_vals_visc; - visc_mult_vals_ = visc_mult_vals; - c_vals_ads_ = c_vals_ads; - ads_vals_ = ads_vals; - } + void set(double c_max, + double mix_param, + double rock_density, + double dead_pore_vol, + const std::vector& c_vals_visc, + const std::vector& visc_mult_vals, + const std::vector& c_vals_ads, + const std::vector& ads_vals) + { + c_max_ = c_max; + mix_param_ = mix_param; + rock_density_ = rock_density; + dead_pore_vol_ = dead_pore_vol; + c_vals_visc_ = c_vals_visc; + visc_mult_vals_ = visc_mult_vals; + c_vals_ads_ = c_vals_ads; + ads_vals_ = ads_vals; + } - void readFromDeck(const EclipseGridParser& gridparser) - { + void readFromDeck(const EclipseGridParser& gridparser) + { - // We assume NTMISC=1 - const std::vector& plymax = gridparser.getPLYMAX().plymax_; - c_max_ = plymax[0]; - const std::vector& tlmixpar = gridparser.getTLMIXPAR().tlmixpar_; - mix_param_ = tlmixpar[0]; + // We assume NTMISC=1 + const std::vector& plymax = gridparser.getPLYMAX().plymax_; + c_max_ = plymax[0]; + const std::vector& tlmixpar = gridparser.getTLMIXPAR().tlmixpar_; + mix_param_ = tlmixpar[0]; - // We assume NTSFUN=1 - const std::vector& plyrock = gridparser.getPLYROCK().plyrock_; - dead_pore_vol_ = plyrock[0]; - rock_density_ = plyrock[3]; + // We assume NTSFUN=1 + const std::vector& plyrock = gridparser.getPLYROCK().plyrock_; + dead_pore_vol_ = plyrock[0]; + rock_density_ = plyrock[3]; - // We assume NTPVT=1 - const PLYVISC& plyvisc = gridparser.getPLYVISC(); - c_vals_visc_ = plyvisc.concentration_; - visc_mult_vals_ = plyvisc.factor_; + // We assume NTPVT=1 + const PLYVISC& plyvisc = gridparser.getPLYVISC(); + c_vals_visc_ = plyvisc.concentration_; + visc_mult_vals_ = plyvisc.factor_; - // We assume NTSFUN=1 - const PLYADS& plyads = gridparser.getPLYADS(); - c_vals_ads_ = plyads.local_concentration_; - ads_vals_ = plyads.adsorbed_concentration_; + // We assume NTSFUN=1 + const PLYADS& plyads = gridparser.getPLYADS(); + c_vals_ads_ = plyads.local_concentration_; + ads_vals_ = plyads.adsorbed_concentration_; - } + } - double cMax() const - { - return c_max_; - } + double cMax() const + { + return c_max_; + } - double mixParam() const - { - return mix_param_; - } + double mixParam() const + { + return mix_param_; + } - double rockDensity() const - { - return rock_density_; - }; + double rockDensity() const + { + return rock_density_; + }; - double deadPoreVol() const - { - return dead_pore_vol_; - } + double deadPoreVol() const + { + return dead_pore_vol_; + } - double viscMult(double c) const - { - return Opm::linearInterpolation(c_vals_visc_, visc_mult_vals_, c); - } + double viscMult(double c) const + { + return Opm::linearInterpolation(c_vals_visc_, visc_mult_vals_, c); + } - double viscMultWithDer(double c, double* der) const - { - *der = Opm::linearInterpolationDerivative(c_vals_visc_, visc_mult_vals_, c); - return Opm::linearInterpolation(c_vals_visc_, visc_mult_vals_, c); - } + double viscMultWithDer(double c, double* der) const + { + *der = Opm::linearInterpolationDerivative(c_vals_visc_, visc_mult_vals_, c); + return Opm::linearInterpolation(c_vals_visc_, visc_mult_vals_, c); + } - double adsorbtion(double c) const - { - return Opm::linearInterpolation(c_vals_ads_, ads_vals_, c); - } + double adsorbtion(double c) const + { + return Opm::linearInterpolation(c_vals_ads_, ads_vals_, c); + } - double adsorbtionWithDer(double c, double* der) const - { - *der = Opm::linearInterpolationDerivative(c_vals_ads_, ads_vals_, c); - return Opm::linearInterpolation(c_vals_ads_, ads_vals_, c); - } + double adsorbtionWithDer(double c, double* der) const + { + *der = Opm::linearInterpolationDerivative(c_vals_ads_, ads_vals_, c); + return Opm::linearInterpolation(c_vals_ads_, ads_vals_, c); + } private: - double c_max_; - double mix_param_; - double rock_density_; - double dead_pore_vol_; - std::vector c_vals_visc_; - std::vector visc_mult_vals_; - std::vector c_vals_ads_; - std::vector ads_vals_; + double c_max_; + double mix_param_; + double rock_density_; + double dead_pore_vol_; + std::vector c_vals_visc_; + std::vector visc_mult_vals_; + std::vector c_vals_ads_; + std::vector ads_vals_; }; } // namespace Opm