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 WellStateFullyImplicitBlackoil class instead of WellState.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2014-03-18 11:27:40 +01:00
parent e7f4637461
commit 295677c8c1
6 changed files with 29 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
opm/autodiff/FullyImplicitBlackoilSolver.cpp
View File

@@ -24,12 +24,12 @@
#include <opm/autodiff/AutoDiffHelpers.hpp>
#include <opm/autodiff/BlackoilPropsAdInterface.hpp>
#include <opm/autodiff/GeoProps.hpp>
#include <opm/autodiff/WellStateFullyImplicitBlackoil.hpp>
#include <opm/core/grid.h>
#include <opm/core/linalg/LinearSolverInterface.hpp>
#include <opm/core/props/rock/RockCompressibility.hpp>
#include <opm/core/simulator/BlackoilState.hpp>
#include <opm/core/simulator/WellState.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/well_controls.h>
@@ -223,7 +223,7 @@ namespace {
FullyImplicitBlackoilSolver::
step(const double dt,
BlackoilState& x ,
WellState& xw)
WellStateFullyImplicitBlackoil& xw)
{
const V pvdt = geo_.poreVolume() / dt;
@@ -331,7 +331,7 @@ namespace {
FullyImplicitBlackoilSolver::SolutionState
FullyImplicitBlackoilSolver::constantState(const BlackoilState& x,
const WellState& xw)
const WellStateFullyImplicitBlackoil& xw)
{
const int nc = grid_.number_of_cells;
const int np = x.numPhases();
@@ -427,7 +427,7 @@ namespace {
FullyImplicitBlackoilSolver::SolutionState
FullyImplicitBlackoilSolver::variableState(const BlackoilState& x,
const WellState& xw)
const WellStateFullyImplicitBlackoil& xw)
{
const int nc = grid_.number_of_cells;
const int np = x.numPhases();
@@ -616,7 +616,7 @@ namespace {
FullyImplicitBlackoilSolver::
assemble(const V& pvdt,
const BlackoilState& x ,
const WellState& xw )
const WellStateFullyImplicitBlackoil& xw )
{
// Create the primary variables.
const SolutionState state = variableState(x, xw);
@@ -878,7 +878,7 @@ namespace {
void FullyImplicitBlackoilSolver::updateState(const V& dx,
BlackoilState& state,
WellState& well_state)
WellStateFullyImplicitBlackoil& well_state)
{
const int np = fluid_.numPhases();
const int nc = grid_.number_of_cells;

14
opm/autodiff/FullyImplicitBlackoilSolver.hpp
View File

@@ -33,7 +33,7 @@ namespace Opm {
class RockCompressibility;
class LinearSolverInterface;
class BlackoilState;
class WellState;
class WellStateFullyImplicitBlackoil;
/// A fully implicit solver for the black-oil problem.
@@ -76,7 +76,7 @@ namespace Opm {
void
step(const double dt ,
BlackoilState& state ,
WellState& wstate);
WellStateFullyImplicitBlackoil& wstate);
private:
// Types and enums
@@ -148,11 +148,11 @@ namespace Opm {
// Private methods.
SolutionState
constantState(const BlackoilState& x,
const WellState& xw);
const WellStateFullyImplicitBlackoil& xw);
SolutionState
variableState(const BlackoilState& x,
const WellState& xw);
const WellStateFullyImplicitBlackoil& xw);
void
computeAccum(const SolutionState& state,
@@ -160,14 +160,14 @@ namespace Opm {
void
assemble(const V& dtpv,
const BlackoilState& x ,
const WellState& xw );
const BlackoilState& x,
const WellStateFullyImplicitBlackoil& xw);
V solveJacobianSystem() const;
void updateState(const V& dx,
BlackoilState& state,
WellState& well_state);
WellStateFullyImplicitBlackoil& well_state);
std::vector<ADB>
computePressures(const SolutionState& state) const;

22
opm/autodiff/SimulatorFullyImplicitBlackoil.cpp
View File

@@ -29,6 +29,7 @@
#include <opm/autodiff/GeoProps.hpp>
#include <opm/autodiff/FullyImplicitBlackoilSolver.hpp>
#include <opm/autodiff/BlackoilPropsAdInterface.hpp>
#include <opm/autodiff/WellStateFullyImplicitBlackoil.hpp>
#include <opm/core/grid.h>
#include <opm/core/wells.h>
@@ -48,7 +49,6 @@
#include <opm/core/grid/ColumnExtract.hpp>
#include <opm/core/simulator/BlackoilState.hpp>
#include <opm/core/simulator/WellState.hpp>
#include <opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.hpp>
#include <boost/filesystem.hpp>
@@ -77,7 +77,7 @@ namespace Opm
SimulatorReport run(SimulatorTimer& timer,
BlackoilState& state,
WellState& well_state);
WellStateFullyImplicitBlackoil& well_state);
private:
// Data.
@@ -127,7 +127,7 @@ namespace Opm
SimulatorReport SimulatorFullyImplicitBlackoil::run(SimulatorTimer& timer,
BlackoilState& state,
WellState& well_state)
WellStateFullyImplicitBlackoil& well_state)
{
return pimpl_->run(timer, state, well_state);
}
@@ -198,7 +198,7 @@ namespace Opm
std::copy(d.begin(), d.end(), std::ostream_iterator<double>(file, "\n"));
}
}
static void outputWellStateMatlab(const Opm::WellState& well_state,
static void outputWellStateMatlab(const Opm::WellStateFullyImplicitBlackoil& well_state,
const int step,
const std::string& output_dir)
{
@@ -312,10 +312,10 @@ namespace Opm
SimulatorReport SimulatorFullyImplicitBlackoil::Impl::run(SimulatorTimer& timer,
BlackoilState& state,
WellState& well_state)
WellStateFullyImplicitBlackoil& well_state)
{
eclipseWriter_.writeInit(timer, state, well_state);
eclipseWriter_.writeTimeStep(timer, state, well_state);
eclipseWriter_.writeInit(timer, state, well_state.basicWellState());
eclipseWriter_.writeTimeStep(timer, state, well_state.basicWellState());
// Initialisation.
std::vector<double> porevol;
@@ -384,13 +384,9 @@ namespace Opm
// Optionally, check if well controls are satisfied.
if (check_well_controls_) {
Opm::computePhaseFlowRatesPerWell(*wells_,
well_state.perfRates(),
fractional_flows,
well_resflows_phase);
std::cout << "Checking well conditions." << std::endl;
// For testing we set surface := reservoir
well_control_passed = wells_manager_.conditionsMet(well_state.bhp(), well_resflows_phase, well_resflows_phase);
well_control_passed = wells_manager_.conditionsMet(well_state.bhp(), well_state.wellRates(), well_state.wellRates());
++well_control_iteration;
if (!well_control_passed && well_control_iteration > max_well_control_iterations_) {
OPM_THROW(std::runtime_error, "Could not satisfy well conditions in " << max_well_control_iterations_ << " tries.");
@@ -426,7 +422,7 @@ namespace Opm
// write an output file for later inspection
if (output_) {
eclipseWriter_.writeTimeStep(timer, state, well_state);
eclipseWriter_.writeTimeStep(timer, state, well_state.basicWellState());
}
// advance to next timestep before reporting at this location

4
opm/autodiff/SimulatorFullyImplicitBlackoil.hpp
View File

@@ -37,7 +37,7 @@ namespace Opm
class LinearSolverInterface;
class SimulatorTimer;
class BlackoilState;
class WellState;
class WellStateFullyImplicitBlackoil;
struct SimulatorReport;
/// Class collecting all necessary components for a two-phase simulation.
@@ -84,7 +84,7 @@ namespace Opm
/// \return simulation report, with timing data
SimulatorReport run(SimulatorTimer& timer,
BlackoilState& state,
WellState& well_state);
WellStateFullyImplicitBlackoil& well_state);
private:
class Impl;