removing several member variables not useful

they are related to the presure correction caclulations.
This commit is contained in:
Kai Bao 2015-10-19 13:11:07 +02:00
parent 9f218ef1a3
commit f3b885dc0d
2 changed files with 4 additions and 13 deletions

View File

@ -165,30 +165,27 @@ namespace Opm {
// ADB version of the densities, when using AVG way, the calculation of the density and hydrostatic head
// is implicit
ADB well_perforation_densities_adb_; // TODO: NOT NEEDED
// ADB well_perforation_densities_adb_; // TODO: NOT NEEDED for explicit SEG way
// ADB version. Eventually, only ADB version will be kept.
ADB well_perforation_pressure_diffs_adb_; // TODO: NOT NEEDED
// ADB well_perforation_pressure_diffs_adb_; // TODO: NOT NEEDED for explicit SEG way
// Pressure correction due to the different depth of the perforation
// and the cell center of the grid block
// For the non-segmented wells, since the perforation are forced to be
// at the center of the grid cell, it should be ZERO.
// It should only apply to the mutli-segmented wells.
V well_perforation_pressure_cell_diffs_;
ADB well_perforation_pressure_cell_diffs_adb_; // TODO: NOT NEEDED
V well_perforation_cell_pressure_diffs_;
// Pressure correction due to the depth differennce between segment depth and perforation depth.
// TODO: It should be able to be merge as a part of the perforation_pressure_diffs_.
// TODO: It will only be able to be merge as a part of the perforation_pressure_diffs_
ADB well_perforations_segment_pressure_diffs_;
// the average of the fluid densities in the grid block
// which is used to calculate the hydrostatic head correction due to the depth difference of the perforation
// and the cell center of the grid block
V well_perforation_cell_densities_;
ADB well_perforation_cell_densities_adb_; // TODO: NOT NEEDED
V well_perforation_cell_pressure_diffs_;
// the density of the fluid mixture in the segments
// which is calculated in an implicit way

View File

@ -76,12 +76,7 @@ namespace Opm {
const std::vector<WellMultiSegmentConstPtr>& wells_multisegment)
: Base(param, grid, fluid, geo, rock_comp_props, wells_arg, linsolver,
eclState, has_disgas, has_vapoil, terminal_output)
// not all will be necessary eventually
, well_perforation_densities_adb_(ADB::null())
, well_perforation_pressure_diffs_adb_(ADB::null())
, well_perforation_pressure_cell_diffs_adb_(ADB::null())
, well_perforations_segment_pressure_diffs_(ADB::null())
, well_perforation_cell_densities_adb_(ADB::null())
, well_segment_densities_(ADB::null())
, well_segment_pressures_delta_(ADB::null())
, segment_comp_surf_volume_initial_(fluid.numPhases())
@ -457,7 +452,6 @@ namespace Opm {
// Are they actually zero for the current cases?
// TODO
well_perforations_segment_pressure_diffs_ = ADB::constant(V::Zero(xw.numPerforations()));
well_perforation_pressure_cell_diffs_ = V::Zero(xw.numPerforations());
well_perforation_cell_pressure_diffs_ = V::Zero(xw.numPerforations());
#if 0
std::cout << " avg_press " << std::endl;