OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed unused rock compressibilty objects from interface.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2013-03-15 11:45:53 +01:00
parent d13fed6cab
commit aadae49b41
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
opm/core/simulator/SimulatorIncompTwophase.cpp
View File

@ -349,7 +349,6 @@ namespace Opm
std::vector<double> porevol;
computePorevolume(grid, props.porosity(), porevol);
tsolver_.reset(new Opm::TransportSolverTwophaseImplicit(
*rock_comp_props,
grid,
props,
porevol,

11
opm/core/transport/TransportSolverTwophaseImplicit.cpp
View File

@ -35,7 +35,6 @@ namespace Opm
{
TransportSolverTwophaseImplicit::TransportSolverTwophaseImplicit(
const Opm::RockCompressibility& rock_comp,
const UnstructuredGrid& grid,
const Opm::IncompPropertiesInterface& props,
const std::vector<double>& porevol,
@ -46,14 +45,14 @@ namespace Opm
model_(fluid_, grid, porevol, gravity, param.getDefault("guess_old_solution", false)),
tsolver_(model_),
grid_(grid),
props_(props),
rock_comp_(rock_comp)
props_(props)
{
ctrl_.max_it = param.getDefault("max_it", 20);
ctrl_.verbosity = param.getDefault("verbosity", 0);
ctrl_.max_it_ls = param.getDefault("max_it_ls", 5);
model_.initGravityTrans(grid_, half_trans);
tsrc_ = create_transport_source(2, 2);
initial_porevolume_cell0_ = porevol[0];
}
TransportSolverTwophaseImplicit::~TransportSolverTwophaseImplicit()
@ -72,9 +71,9 @@ namespace Opm
const double dt,
TwophaseState& state)
{
std::vector<double> porevol;
if (rock_comp_.isActive()) {
computePorevolume(grid_, props_.porosity(), rock_comp_, state.pressure(), porevol);
// A very crude check for constant porosity (i.e. no rock-compressibility).
if (porevolume[0] != initial_porevolume_cell0_) {
THROW("Detected changed pore volumes, but solver cannot handle rock compressibility.");
}
double ssrc[] = { 1.0, 0.0 };
double dummy[] = { 0.0, 0.0 };

9
opm/core/transport/TransportSolverTwophaseImplicit.hpp
View File

@ -39,10 +39,6 @@
#include <opm/core/transport/CSRMatrixBlockAssembler.hpp>
#include <opm/core/transport/SinglePointUpwindTwoPhase.hpp>
#include <opm/core/props/rock/RockCompressibility.hpp>
#include <opm/core/wells/WellsManager.hpp>
#include <opm/core/simulator/WellState.hpp>
#include <boost/scoped_ptr.hpp>
#include <vector>
@ -60,8 +56,7 @@ namespace Opm
/// \param[in] props Rock and fluid properties.
/// \param[in] tol Tolerance used in the solver.
/// \param[in] maxit Maximum number of non-linear iterations used.
TransportSolverTwophaseImplicit(const Opm::RockCompressibility& rock_comp,
const UnstructuredGrid& grid,
TransportSolverTwophaseImplicit(const UnstructuredGrid& grid,
const Opm::IncompPropertiesInterface& props,
const std::vector<double>& porevol,
const double* gravity,
@ -115,8 +110,8 @@ namespace Opm
const UnstructuredGrid& grid_;
Opm::ImplicitTransportDetails::NRControl ctrl_;
const Opm::IncompPropertiesInterface& props_;
const Opm::RockCompressibility& rock_comp_;
TransportSource* tsrc_;
double initial_porevolume_cell0_;
};
} // namespace Opm