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

Merge pull request #1249 from GitPaean/fixing_vfp_flow_ebos

Browse Source 
Fixing vfp related running with flow_ebos
This commit is contained in:
Atgeirr Flø Rasmussen 2017-08-07 16:42:27 +02:00 committed by GitHub
commit 4ca5260545
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
opm/autodiff/BlackoilModelEbos.hpp
View File

@ -181,6 +181,7 @@ namespace Opm {
wellModel().setWellsActive( wellsActive ); wellModel().setWellsActive( wellsActive );
// compute global sum of number of cells // compute global sum of number of cells
global_nc_ = detail::countGlobalCells(grid_); global_nc_ = detail::countGlobalCells(grid_);
wellModel().setVFPProperties(&vfp_properties_);
if (!istlSolver_) if (!istlSolver_)
{ {
OPM_THROW(std::logic_error,"solver down cast to ISTLSolver failed"); OPM_THROW(std::logic_error,"solver down cast to ISTLSolver failed");

1
opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
View File

@ -435,7 +435,6 @@ protected:
well_model.init(phaseUsage, well_model.init(phaseUsage,
activePhases, activePhases,
/*vfpProperties=*/nullptr,
gravity, gravity,
legacyDepth_, legacyDepth_,
legacyPoreVolume_, legacyPoreVolume_,

2
opm/autodiff/StandardWellsDense.hpp
View File

@ -118,7 +118,6 @@ enum WellVariablePositions {
void init(const PhaseUsage phase_usage_arg, void init(const PhaseUsage phase_usage_arg,
const std::vector<bool>& active_arg, const std::vector<bool>& active_arg,
const VFPProperties* vfp_properties_arg,
const double gravity_arg, const double gravity_arg,
const std::vector<double>& depth_arg, const std::vector<double>& depth_arg,
const std::vector<double>& pv_arg, const std::vector<double>& pv_arg,
@ -126,6 +125,7 @@ enum WellVariablePositions {
long int global_nc, long int global_nc,
const Grid& grid); const Grid& grid);
void setVFPProperties(const VFPProperties* vfp_properties_arg);
/// The number of components in the model. /// The number of components in the model.
int numComponents() const int numComponents() const

15
opm/autodiff/StandardWellsDense_impl.hpp
View File

@ -43,7 +43,6 @@ namespace Opm {
StandardWellsDense<TypeTag>:: StandardWellsDense<TypeTag>::
init(const PhaseUsage phase_usage_arg, init(const PhaseUsage phase_usage_arg,
const std::vector<bool>& active_arg, const std::vector<bool>& active_arg,
const VFPProperties* vfp_properties_arg,
const double gravity_arg, const double gravity_arg,
const std::vector<double>& depth_arg, const std::vector<double>& depth_arg,
const std::vector<double>& pv_arg, const std::vector<double>& pv_arg,
@ -60,7 +59,6 @@ namespace Opm {
phase_usage_ = phase_usage_arg; phase_usage_ = phase_usage_arg;
active_ = active_arg; active_ = active_arg;
vfp_properties_ = vfp_properties_arg;
gravity_ = gravity_arg; gravity_ = gravity_arg;
cell_depths_ = extractPerfData(depth_arg); cell_depths_ = extractPerfData(depth_arg);
pv_ = pv_arg; pv_ = pv_arg;
@ -132,6 +130,19 @@ namespace Opm {
template<typename TypeTag>
void
StandardWellsDense<TypeTag>::
setVFPProperties(const VFPProperties* vfp_properties_arg)
{
vfp_properties_ = vfp_properties_arg;
}
template<typename TypeTag> template<typename TypeTag>
SimulatorReport SimulatorReport
StandardWellsDense<TypeTag>:: StandardWellsDense<TypeTag>::