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

BlackoilModelEbos: minor stylistic improvements

Browse Source 
mainly indentation fixes and removal of duplicate blank lines.
This commit is contained in:
Andreas Lauser 2017-03-13 10:04:27 +01:00
parent 78995a7f61
commit 384fcc5114
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
opm/autodiff/BlackoilModelEbos.hpp
View File

@ -633,7 +633,6 @@ namespace Opm {
double step = dsMax()/maxVal; double step = dsMax()/maxVal;
step = std::min(step, 1.0); step = std::min(step, 1.0);
const Opm::PhaseUsage& pu = fluid_.phaseUsage(); const Opm::PhaseUsage& pu = fluid_.phaseUsage();
if (active_[Water]) { if (active_[Water]) {
double& sw = reservoir_state.saturation()[cell_idx*np + pu.phase_pos[ Water ]]; double& sw = reservoir_state.saturation()[cell_idx*np + pu.phase_pos[ Water ]];
@ -669,7 +668,6 @@ namespace Opm {
double& rs = reservoir_state.gasoilratio()[cell_idx]; double& rs = reservoir_state.gasoilratio()[cell_idx];
double& rv = reservoir_state.rv()[cell_idx]; double& rv = reservoir_state.rv()[cell_idx];
// phase translation sg <-> rs // phase translation sg <-> rs
const HydroCarbonState hydroCarbonState = reservoir_state.hydroCarbonState()[cell_idx]; const HydroCarbonState hydroCarbonState = reservoir_state.hydroCarbonState()[cell_idx];
const auto& intQuants = *(ebosSimulator_.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/0)); const auto& intQuants = *(ebosSimulator_.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/0));
@ -706,9 +704,6 @@ namespace Opm {
break; break;
} }
const double& rsSat = FluidSystem::oilPvt().saturatedGasDissolutionFactor(fs.pvtRegionIndex(), reservoir_state.temperature()[cell_idx], reservoir_state.pressure()[cell_idx]); const double& rsSat = FluidSystem::oilPvt().saturatedGasDissolutionFactor(fs.pvtRegionIndex(), reservoir_state.temperature()[cell_idx], reservoir_state.pressure()[cell_idx]);
if (rs > ( rsSat * (1+epsilon) ) ) { if (rs > ( rsSat * (1+epsilon) ) ) {
reservoir_state.hydroCarbonState()[cell_idx] = HydroCarbonState::GasAndOil; reservoir_state.hydroCarbonState()[cell_idx] = HydroCarbonState::GasAndOil;
@ -727,6 +722,7 @@ namespace Opm {
//std::cout << "watonly rv -> sg" << cell_idx << std::endl; //std::cout << "watonly rv -> sg" << cell_idx << std::endl;
break; break;
} }
const double& rvSat = FluidSystem::gasPvt().saturatedOilVaporizationFactor(fs.pvtRegionIndex(), reservoir_state.temperature()[cell_idx], reservoir_state.pressure()[cell_idx]); const double& rvSat = FluidSystem::gasPvt().saturatedOilVaporizationFactor(fs.pvtRegionIndex(), reservoir_state.temperature()[cell_idx], reservoir_state.pressure()[cell_idx]);
if (rv > rvSat * (1+epsilon) ) { if (rv > rvSat * (1+epsilon) ) {
reservoir_state.hydroCarbonState()[cell_idx] = HydroCarbonState::GasAndOil; reservoir_state.hydroCarbonState()[cell_idx] = HydroCarbonState::GasAndOil;
@ -1382,8 +1378,6 @@ namespace Opm {
return fip_; return fip_;
} }
const Simulator& ebosSimulator() const const Simulator& ebosSimulator() const
{ return ebosSimulator_; } { return ebosSimulator_; }
@ -1394,7 +1388,6 @@ namespace Opm {
return *istlSolver_; return *istlSolver_;
} }
// --------- Data members --------- // --------- Data members ---------
Simulator& ebosSimulator_; Simulator& ebosSimulator_;
@ -1428,10 +1421,6 @@ namespace Opm {
BVector dx_old_; BVector dx_old_;
mutable FIPDataType fip_; mutable FIPDataType fip_;
// --------- Protected methods ---------
public: public:
/// return the StandardWells object /// return the StandardWells object
@ -1714,10 +1703,8 @@ namespace Opm {
std::cout << "equation scaling not suported yet" << std::endl; std::cout << "equation scaling not suported yet" << std::endl;
//updateEquationsScaling(); //updateEquationsScaling();
} }
} }
double dpMaxRel() const { return param_.dp_max_rel_; } double dpMaxRel() const { return param_.dp_max_rel_; }
double dsMax() const { return param_.ds_max_; } double dsMax() const { return param_.ds_max_; }
double drMaxRel() const { return param_.dr_max_rel_; } double drMaxRel() const { return param_.dr_max_rel_; }