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

more cleaning up for StandardWellsDense and StandardWell

Browse Source
This commit is contained in:
Kai Bao 2017-07-28 10:08:57 +02:00
parent 0acd0ef387
commit 72ca91d59b
3 changed files with 8 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
opm/autodiff/StandardWell.hpp
View File

@ -39,13 +39,13 @@ namespace Opm
// TODO: several functions related to polymer and PLYSHLOG are not incorprated yet,
// like the function wpolymer, setupCompressedToCartesian, computeRepRadiusPerfLength,
// They are introduced though PR 1220 and will be included later.
using Simulator = typename WellInterface<TypeTag>::Simulator;
using WellState = typename WellInterface<TypeTag>::WellState;
using IntensiveQuantities = typename WellInterface<TypeTag>::IntensiveQuantities;
using FluidSystem = typename WellInterface<TypeTag>::FluidSystem;
using MaterialLaw = typename WellInterface<TypeTag>::MaterialLaw;
using ModelParameters = typename WellInterface<TypeTag>::ModelParameters;
using BlackoilIndices = typename WellInterface<TypeTag>::BlackoilIndices;
using typename WellInterface<TypeTag>::Simulator;
using typename WellInterface<TypeTag>::WellState;
using typename WellInterface<TypeTag>::IntensiveQuantities;
using typename WellInterface<TypeTag>::FluidSystem;
using typename WellInterface<TypeTag>::MaterialLaw;
using typename WellInterface<TypeTag>::ModelParameters;
using typename WellInterface<TypeTag>::BlackoilIndices;
// the positions of the primary variables for StandardWell
// there are three primary variables, the second and the third ones are F_w and F_g
@ -57,13 +57,13 @@ namespace Opm
SFrac = 3
};
using WellInterface<TypeTag>::numEq;
using typename WellInterface<TypeTag>::VectorBlockType;
using typename WellInterface<TypeTag>::MatrixBlockType;
using typename WellInterface<TypeTag>::Mat;
using typename WellInterface<TypeTag>::BVector;
using typename WellInterface<TypeTag>::Eval;
using WellInterface<TypeTag>::numEq;
static const int numWellEq = GET_PROP_VALUE(TypeTag, EnablePolymer)? numEq-1 : numEq; // //numEq; //number of wellEq is only numEq for polymer
static const int contiSolventEqIdx = BlackoilIndices::contiSolventEqIdx;
static const int contiPolymerEqIdx = BlackoilIndices::contiPolymerEqIdx;

5
opm/autodiff/StandardWellsDense.hpp
View File

@ -76,10 +76,7 @@ namespace Opm {
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext;
typedef typename GET_PROP_TYPE(TypeTag, Indices) BlackoilIndices;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
typedef typename GET_PROP_TYPE(TypeTag, IntensiveQuantities) IntensiveQuantities;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
static const int numEq = BlackoilIndices::numEq;
@ -282,8 +279,6 @@ namespace Opm {
void computeAverageFormationFactor(Simulator& ebosSimulator,
std::vector<double>& B_avg) const;
void outputWellState(const WellState& well_state) const;
};

29
opm/autodiff/StandardWellsDense_impl.hpp
View File

@ -1116,33 +1116,4 @@ namespace Opm {
}
template<typename TypeTag>
void
StandardWellsDense<TypeTag>::
outputWellState(const WellState& well_state) const
{
std::cout << " output the bhp " << std::endl;
for (const double bhp : well_state.bhp()) {
std::cout << bhp << " ";
}
std::cout << std::endl;
std::cout << " output the well rates " << std::endl;
for (const double rate : well_state.wellRates()) {
std::cout << rate << " ";
}
std::cout << std::endl;
std::cout << " output the wellSolutions " << std::endl;
for (const double solution : well_state.wellSolutions()) {
std::cout << solution << " ";
}
std::cout << std::endl;
}
} // namespace Opm