some commenting.

This commit is contained in:
Kai Bao committed 2015-12-01 00:06:43 +01:00
1 parent a137db6d37
commit d8634e41e5
2 files changed
+9 -7

No files matched your search

+5 -5
View File
@@ -178,10 +178,10 @@ 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_;
ADB well_perforation_densities_adb_; // TODO: NOT NEEDED
// ADB version. Eventually, only ADB version will be kept.
ADB well_perforation_pressure_diffs_adb_;
ADB well_perforation_pressure_diffs_adb_; // TODO: NOT NEEDED
// Pressure correction due to the different depth of the perforation
// and the cell center of the grid block
@@ -189,7 +189,7 @@ namespace Opm {
// 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_;
ADB well_perforation_pressure_cell_diffs_adb_; // TODO: NOT NEEDED
// 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_.
@@ -199,12 +199,12 @@ namespace Opm {
// 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_;
ADB well_perforation_cell_densities_adb_; // TODO: NOT NEEDED
V well_perforatoin_cell_pressure_diffs_;
// the density of the fluid mixture in the segments
// which is calculated in a implicit way
// which is calculated in an implicit way
ADB well_segment_densities_;
const std::vector<WellMultiSegmentConstPtr> wells_multisegment_;
@@ -194,11 +194,13 @@ namespace Opm {
const int nw = xw.numberOfWells();
// the well cells for multisegment wells and non-segmented wells should be counted seperatedly
// indexing should be put in WellState
std::vector<int> well_cells;
std::vector<int> well_cells_segmented_idx;
std::vector<int> well_cells_non_segmented_idx;
std::vector<int> well_cells_segmented;
std::vector<int> well_cells_non_segmented;
well_cells_segmented_idx.reserve(nperf);
well_cells_non_segmented_idx.reserve(nperf);
well_cells_segmented.reserve(nperf);
@@ -231,8 +233,10 @@ namespace Opm {
const V kr_phase = kr_phase_adb.value();
perf_kr.push_back(kr_phase);
}
// compute the averaged density for the well block
// TODO: for the non-segmented wells, they should be set to zero
// TODO: for the moment, they are still calculated, while not used later.
for (int i = 0; i < nperf; ++i) {
double sum_kr = 0.;
int np = perf_kr.size(); // make sure it is 3
@@ -375,8 +379,6 @@ namespace Opm {
well_perforation_pressure_diffs_ = Eigen::Map<const V>(cdp.data(), nperf);
// TODO: A temporary approach. We calculate all the densities and pressure difference for all the perforations.
// For the segmented wells, the h_nc;
// Firstly, we need to compute the segmented densities first.
// It must be implicit. So it must be ADB variable.