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

removing unhelpful public functions in MultisegmentWells

Browse Source
This commit is contained in:
Kai Bao 2016-04-29 17:08:26 +02:00
parent edf29c322c
commit 9bdf1d5b93
3 changed files with 22 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
opm/autodiff/MultisegmentWells.cpp
View File

@ -198,8 +198,8 @@ namespace Opm {
const int nseg_total = nseg_total_;
if ( !wellOps().has_multisegment_wells ) {
wellSegmentPressureDelta() = ADB::constant(Vector::Zero(nseg_total));
wellSegmentPerforationPressureDiffs() = wellOps().s2p * wellSegmentPressureDelta();
well_segment_pressures_delta_ = ADB::constant(Vector::Zero(nseg_total));
well_segment_perforation_pressure_diffs_ = wellOps().s2p * well_segment_pressures_delta_;
return;
}
@ -220,10 +220,10 @@ namespace Opm {
assert(start_segment == nseg_total);
const ADB grav_adb = ADB::constant(Vector::Constant(nseg_total, grav));
wellSegmentPressureDelta() = segment_depth_delta * grav_adb * wellSegmentDensities();
well_segment_pressures_delta_ = segment_depth_delta * grav_adb * well_segment_densities_;
ADB well_segment_perforation_densities = wellOps().s2p * wellSegmentDensities();
wellSegmentPerforationPressureDiffs() = grav * wellSegmentPerforationDepthDiffs() * well_segment_perforation_densities;
ADB well_segment_perforation_densities = wellOps().s2p * well_segment_densities_;
well_segment_perforation_pressure_diffs_ = grav * well_segment_perforation_depth_diffs_ * well_segment_perforation_densities;
}
} // end of namespace Opm

19
opm/autodiff/MultisegmentWells.hpp
View File

@ -91,40 +91,21 @@ namespace Opm {
int numPerf() const { return nperf_total_; };
const Vector& wellPerforationCellPressureDiffs() const { return well_perforation_cell_pressure_diffs_; };
Vector& wellPerforationCellPressureDiffs() { return well_perforation_cell_pressure_diffs_; };
const ADB& wellSegmentPerforationPressureDiffs() const { return well_segment_perforation_pressure_diffs_; };
ADB& wellSegmentPerforationPressureDiffs() { return well_segment_perforation_pressure_diffs_; };
const Vector& wellSegmentPerforationDepthDiffs() const { return well_segment_perforation_depth_diffs_; };
Vector& wellSegmentPerforationDepthDiffs() { return well_segment_perforation_depth_diffs_; };
const Vector& wellPerforationCellDensities() const { return well_perforation_cell_densities_; };
Vector& wellPerforationCellDensities() { return well_perforation_cell_densities_; };
const ADB& wellSegmentDensities() const { return well_segment_densities_; };
ADB& wellSegmentDensities() { return well_segment_densities_; };
const ADB& wellSegmentPressureDelta() const { return well_segment_pressures_delta_; };
ADB& wellSegmentPressureDelta() { return well_segment_pressures_delta_; };
const std::vector<Vector>& segmentCompSurfVolumeInitial() const { return segment_comp_surf_volume_initial_; };
std::vector<Vector>& segmentCompSurfVolumeInitial() { return segment_comp_surf_volume_initial_; };
const std::vector<ADB>& segmentCompSurfVolumeCurrent() const { return segment_comp_surf_volume_current_; };
std::vector<ADB>& segmentCompSurfVolumeCurrent() { return segment_comp_surf_volume_current_; };
const ADB& segmentMassFlowRates() const { return segment_mass_flow_rates_; };
ADB& segmentMassFlowRates() { return segment_mass_flow_rates_; };
const ADB& segmentViscosities() const { return segment_viscosities_; };
ADB& segmentViscosities() { return segment_viscosities_; };
const std::vector<int>& topWellSegments() const { return top_well_segments_; };
std::vector<int>& topWellSegments() { return top_well_segments_; };
const Vector& segVDt() const { return segvdt_; };
Vector& segVDt() { return segvdt_; };

34
opm/autodiff/MultisegmentWells_impl.hpp
View File

@ -167,9 +167,9 @@ namespace Opm
Selector<double> msperf_selector(is_multisegment_perf, Selector<double>::NotEqualZero);
// Compute drawdown.
ADB h_nc = msperf_selector.select(wellSegmentPerforationPressureDiffs(),
ADB h_nc = msperf_selector.select(well_segment_perforation_pressure_diffs_,
ADB::constant(well_perforation_pressure_diffs));
const Vector h_cj = msperf_selector.select(wellPerforationCellPressureDiffs(), Vector::Zero(nperf));
const Vector h_cj = msperf_selector.select(well_perforation_cell_pressure_diffs_, Vector::Zero(nperf));
// Special handling for when we are called from solveWellEq().
// TODO: restructure to eliminate need for special treatmemt.
@ -325,11 +325,11 @@ namespace Opm
if ( !wellOps().has_multisegment_wells ){
// not sure if this is needed actually
// TODO: to check later if this is really necessary.
wellSegmentDensities() = ADB::constant(Vector::Zero(nseg_total));
segmentMassFlowRates() = ADB::constant(Vector::Zero(nseg_total));
segmentViscosities() = ADB::constant(Vector::Zero(nseg_total));
well_segment_densities_ = ADB::constant(Vector::Zero(nseg_total));
segment_mass_flow_rates_ = ADB::constant(Vector::Zero(nseg_total));
segment_viscosities_ = ADB::constant(Vector::Zero(nseg_total));
for (int phase = 0; phase < np; ++phase) {
segmentCompSurfVolumeCurrent()[phase] = ADB::constant(Vector::Zero(nseg_total));
segment_comp_surf_volume_current_[phase] = ADB::constant(Vector::Zero(nseg_total));
segmentCompSurfVolumeInitial()[phase] = Vector::Zero(nseg_total);
}
return;
@ -491,27 +491,27 @@ namespace Opm
const Vector surface_density = fluid.surfaceDensity(phase, segment_cells);
dens += surface_density * mix[phase];
}
wellSegmentDensities() = dens / volrat;
well_segment_densities_ = dens / volrat;
// Calculating the surface volume of each component in the segment
assert(np == int(segmentCompSurfVolumeCurrent().size()));
const ADB segment_surface_volume = segVDt() / volrat;
assert(np == int(segment_comp_surf_volume_current_.size()));
const ADB segment_surface_volume = segvdt_ / volrat;
for (int phase = 0; phase < np; ++phase) {
segmentCompSurfVolumeCurrent()[phase] = segment_surface_volume * mix[phase];
segment_comp_surf_volume_current_[phase] = segment_surface_volume * mix[phase];
}
// Mass flow rate of the segments
segmentMassFlowRates() = ADB::constant(Vector::Zero(nseg_total));
segment_mass_flow_rates_ = ADB::constant(Vector::Zero(nseg_total));
for (int phase = 0; phase < np; ++phase) {
// TODO: how to remove one repeated surfaceDensity()
const Vector surface_density = fluid.surfaceDensity(phase, segment_cells);
segmentMassFlowRates() += surface_density * segqs[phase];
segment_mass_flow_rates_ += surface_density * segqs[phase];
}
// Viscosity of the fluid mixture in the segments
segmentViscosities() = ADB::constant(Vector::Zero(nseg_total));
segment_viscosities_ = ADB::constant(Vector::Zero(nseg_total));
for (int phase = 0; phase < np; ++phase) {
segmentViscosities() += x[phase] * mu_seg[phase];
segment_viscosities_ += x[phase] * mu_seg[phase];
}
}
@ -546,7 +546,7 @@ namespace Opm
for (int phase = 0; phase < np; ++phase) {
if ( wellOps().has_multisegment_wells ) {
// Gain of the surface volume of each component in the segment by dt
segment_volume_change_dt[phase] = segmentCompSurfVolumeCurrent()[phase] -
segment_volume_change_dt[phase] = segment_comp_surf_volume_current_[phase] -
segmentCompSurfVolumeInitial()[phase];
// Special handling for when we are called from solveWellEq().
@ -702,8 +702,8 @@ namespace Opm
// Special handling for when we are called from solveWellEq().
// TODO: restructure to eliminate need for special treatmemt.
ADB wspd = (state.segp.numBlocks() == 2)
? wellhelpers::onlyWellDerivs(wellSegmentPressureDelta())
: wellSegmentPressureDelta();
? wellhelpers::onlyWellDerivs(well_segment_pressures_delta_)
: well_segment_pressures_delta_;
others_residual = wellOps().eliminate_topseg * (state.segp - wellOps().s2s_outlet * state.segp + wspd);
} else {