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

Minor beatuifications of code

Browse Source
This commit is contained in:
babrodtk 2015-08-10 15:04:21 +02:00
parent c5c965adec
commit bc2fb23af9
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/autodiff/BlackoilModelBase_impl.hpp
View File

@ -1120,7 +1120,6 @@ namespace detail {
break;
case THP:
//FIXME: Not correct
broken = thp[well] > target;
break;
@ -1141,7 +1140,6 @@ namespace detail {
break;
case THP:
//FIXME: Not correct
broken = thp[well] < target;
break;
@ -1374,7 +1372,7 @@ namespace detail {
const ADB& liquid = subset(state.qs, Span(nw, 1, BlackoilPhases::Liquid*nw));
const ADB& vapour = subset(state.qs, Span(nw, 1, BlackoilPhases::Vapour*nw));
//1. Calculate THP targets
//THP calculation variables
std::vector<int> table_id(nw, -1);
ADB::V thp_v = ADB::V::Zero(nw);
ADB::V alq_v = ADB::V::Zero(nw);

4
opm/autodiff/BlackoilPropsAdFromDeck.hpp
View File

@ -299,8 +299,6 @@ namespace Opm
void setSwatInitScaling(const std::vector<double>& saturation,
const std::vector<double>& pc);
//ARB: hasVFP... og getVFP... må muligens legges i interface-klassen...
private:
/// Initializes the properties.
@ -349,8 +347,6 @@ namespace Opm
// Densities, one std::array per PVT region.
std::vector<std::array<double, BlackoilPhases::MaxNumPhases> > densities_;
// ARB: Smart pointer to VFPProperties.
// VAPPARS
double vap1_;

1
opm/autodiff/SimulatorBase_impl.hpp
View File

@ -54,7 +54,6 @@ namespace Opm
rateConverter_(props_, std::vector<int>(AutoDiffGrid::numCells(grid_), 0)),
threshold_pressures_by_face_(threshold_pressures_by_face),
is_parallel_run_( false ),
//FIXME: should be vfpProperties_(eclipse_state->getVFPInjTables(), eclipse_state->getVFPProdTables())
vfpProperties_(eclipse_state->getVFPProdTables())
{
// Misc init.