cleaning up commented codes and adding a few comments.

This commit is contained in:
Kai Bao 2015-06-22 15:41:56 +02:00
parent 39986c3363
commit 5cdc677672
2 changed files with 2 additions and 10 deletions

View File

@ -282,6 +282,8 @@ namespace Opm {
const std::vector<ADB>& phasePressure, const SolutionState& state,
std::vector<double>& water_vel, std::vector<double>& visc_mult);
/// Computing the water velocity without shear-thinning for the well perforations based on the water flux rate.
/// The water velocity will be used for shear-thinning calculation.
void computeWaterShearVelocityWells(const SolutionState& state, WellState& xw, const ADB& cq_sw,
std::vector<double>& water_vel_wells, std::vector<double>& visc_mult_wells);

View File

@ -606,7 +606,6 @@ namespace Opm {
computeWaterShearVelocityWells(state, well_state, cq_s[water_pos], water_vel_wells, visc_mult_wells);
if ( !polymer_props_ad_.computeShearMultLog(water_vel_wells, visc_mult_wells, shear_mult_wells_) ) {
// std::cout << " failed in calculating the shear factors for wells " << std::endl;
OPM_THROW(std::runtime_error, " failed in calculating the shear factors for wells ");
}
@ -614,15 +613,6 @@ namespace Opm {
V shear_mult_wells_v = Eigen::Map<V>(shear_mult_wells_.data(), shear_mult_wells_.size());
ADB shear_mult_wells_adb = ADB::constant(shear_mult_wells_v);
mob_perfcells[water_pos] = mob_perfcells[water_pos] / shear_mult_wells_adb;
/* const int nw = wells().number_of_wells;
const int nperf = wells().well_connpos[nw];
const std::vector<int> well_cells(wells().well_cells, wells().well_cells + nperf);
// assuming the water phase is the first phase
const int nw = wells().number_of_wells;
mob_perfcells = subset(rq_[0].mob,well_cells); */
}
Base::computeWellFlux(state, mob_perfcells, b_perfcells, aliveWells, cq_s);