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

Use PolymerData struct as moved to namespace Opm and defined in TransportModelPolymer.hpp.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2012-02-12 23:45:43 +01:00
parent 8cb2af77e7
commit a3dfdad3a6
4 changed files with 13 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
opm/polymer/polymermodel.cpp
View File

@ -28,7 +28,7 @@ struct ParametersSRes
double outflux; /* sum_j max(v_ij, 0) */
int cell;
const Opm::IncompPropertiesInterface* props;
const PolymerData* polydata;
const Opm::PolymerData* polydata;
};
struct ParametersCRes
@ -44,7 +44,7 @@ struct ParametersCRes
PolymerSolverData* psdata;
int cell;
double s;
const PolymerData* polydata;
const Opm::PolymerData* polydata;
};
@ -56,10 +56,10 @@ static double fluxfun_props(double s,
double c,
int cell,
const Opm::IncompPropertiesInterface* props,
const PolymerData* polydata);
const Opm::PolymerData* polydata);
static double compute_mc(double c,
const Opm::IncompPropertiesInterface* props,
const PolymerData* polydata);
const Opm::PolymerData* polydata);
void
destroy_solverdata(struct PolymerSolverData *d)
@ -75,7 +75,7 @@ destroy_solverdata(struct PolymerSolverData *d)
struct PolymerSolverData *
init_solverdata(struct UnstructuredGrid *grid,
const Opm::IncompPropertiesInterface* props,
const PolymerData* polydata,
const Opm::PolymerData* polydata,
const double *darcyflux,
const double *porevolume,
const double *porosity,
@ -298,7 +298,7 @@ get_parameters_c(struct PolymerSolverData *d, int cell)
static double fluxfun_props(double s, double c, int cell,
const Opm::IncompPropertiesInterface* props,
const PolymerData* pd)
const Opm::PolymerData* pd)
{
const double* visc = props->viscosity();
double c_max_limit = pd->c_max_limit;
@ -322,7 +322,7 @@ static double fluxfun_props(double s, double c, int cell,
static double compute_mc(double c,
const Opm::IncompPropertiesInterface* props,
const PolymerData* pd)
const Opm::PolymerData* pd)
{
const double* visc = props->viscosity();
double c_max_limit = pd->c_max_limit;

26
opm/polymer/polymermodel.hpp
View File

@ -5,6 +5,7 @@
#define POLYMER_HPP_INCLUDED
#include <opm/core/utility/linearInterpolation.hpp>
#include <opm/polymer/TransportModelPolymer.hpp> // For PolymerData.
struct UnstructuredGrid;
namespace Opm
@ -12,32 +13,11 @@ namespace Opm
class IncompPropertiesInterface;
}
struct PolymerData
{
double c_max_limit;
double omega;
double viscMult(double c) const
{
return Opm::linearInterpolation(c_vals_visc, visc_mult_vals, c);
}
double rhor;
double dps;
double adsorbtion(double c) const
{
return Opm::linearInterpolation(c_vals_ads, ads_vals, c);
}
std::vector<double> c_vals_visc;
std::vector<double> visc_mult_vals;
std::vector<double> c_vals_ads;
std::vector<double> ads_vals;
};
struct PolymerSolverData {
struct UnstructuredGrid *grid;
const Opm::IncompPropertiesInterface* props;
const PolymerData* polydata;
const Opm::PolymerData* polydata;
const double *darcyflux; /* one flux per face in cdata::grid*/
const double *porevolume; /* one volume per cell */
const double *porosity;
@ -61,7 +41,7 @@ destroy_solverdata(struct PolymerSolverData *d);
struct PolymerSolverData *
init_solverdata(struct UnstructuredGrid *grid,
const Opm::IncompPropertiesInterface* props,
const PolymerData* polydata,
const Opm::PolymerData* polydata,
const double *darcyflux,
const double *porevolume,
const double *porosity,

2
opm/polymer/polymertransport.cpp
View File

@ -22,7 +22,7 @@ void polymertransport(
const double inflow_c,
struct UnstructuredGrid *grid,
const Opm::IncompPropertiesInterface* props,
const PolymerData* polydata,
const Opm::PolymerData* polydata,
const double *darcyflux,
double *saturation,
double *concentration,

4
opm/polymer/polymertransport.hpp
View File

@ -7,10 +7,10 @@
namespace Opm
{
class IncompPropertiesInterface;
struct PolymerData;
}
struct UnstructuredGrid;
struct PolymerData;
void polymertransport(
const double *porevolume,
@ -20,7 +20,7 @@ void polymertransport(
const double inflow_c,
struct UnstructuredGrid *grid,
const Opm::IncompPropertiesInterface* props,
const PolymerData* polydata,
const Opm::PolymerData* polydata,
const double *darcyflux,
double *saturation,
double *concentration,