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

Merge pull request #1237 from atgeirr/fix-auto-grid

Browse Source 
[bugfix][StandardWellsDense] Remove auto from method parameter list, take 2
This commit is contained in:
Atgeirr Flø Rasmussen 2017-06-27 22:09:34 +02:00 committed by GitHub
commit 4b5c9c03a4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
opm/autodiff/StandardWellsDense.hpp
View File

@ -77,6 +77,7 @@ enum WellVariablePositions {
typedef WellStateFullyImplicitBlackoilDense WellState; typedef WellStateFullyImplicitBlackoilDense WellState;
typedef BlackoilModelParameters ModelParameters; typedef BlackoilModelParameters ModelParameters;
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext; typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext;
typedef typename GET_PROP_TYPE(TypeTag, Indices) BlackoilIndices; typedef typename GET_PROP_TYPE(TypeTag, Indices) BlackoilIndices;
@ -121,7 +122,7 @@ enum WellVariablePositions {
const std::vector<double>& pv_arg, const std::vector<double>& pv_arg,
const RateConverterType* rate_converter, const RateConverterType* rate_converter,
long int global_nc, long int global_nc,
const auto& grid); const Grid& grid);
/// The number of components in the model. /// The number of components in the model.
@ -416,7 +417,7 @@ enum WellVariablePositions {
void setupCompressedToCartesian(const int* global_cell, int number_of_cells, std::map<int,int>& cartesian_to_compressed ) const; void setupCompressedToCartesian(const int* global_cell, int number_of_cells, std::map<int,int>& cartesian_to_compressed ) const;
void computeRepRadiusPerfLength(const auto& grid); void computeRepRadiusPerfLength(const Grid& grid);
}; };

4
opm/autodiff/StandardWellsDense_impl.hpp
View File

@ -49,7 +49,7 @@ namespace Opm {
const std::vector<double>& pv_arg, const std::vector<double>& pv_arg,
const RateConverterType* rate_converter, const RateConverterType* rate_converter,
long int global_nc, long int global_nc,
const auto& grid) const Grid& grid)
{ {
// has to be set always for the convergence check! // has to be set always for the convergence check!
global_nc_ = global_nc; global_nc_ = global_nc;
@ -3161,7 +3161,7 @@ namespace Opm {
template<typename TypeTag> template<typename TypeTag>
void void
StandardWellsDense<TypeTag>:: StandardWellsDense<TypeTag>::
computeRepRadiusPerfLength(const auto& grid) computeRepRadiusPerfLength(const Grid& grid)
{ {
// TODO, the function does not work for parallel running // TODO, the function does not work for parallel running