Merge pull request #1093 from dr-robertk/PR/fix-wellmanager-constructor

Make WellsManager compile with c++-11.
This commit is contained in:
Atgeirr Flø Rasmussen 2016-10-23 07:36:08 +02:00 committed by GitHub
commit 9253969828

View File

@ -94,8 +94,8 @@ namespace Opm
const double* permeability,
const DynamicListEconLimited& list_econ_limited,
bool is_parallel_run=false,
const std::vector<double>& well_potentials={},
const std::unordered_set<std::string>& deactivated_wells = {});
const std::vector<double>& well_potentials=std::vector<double>(),
const std::unordered_set<std::string>& deactivated_wells = std::unordered_set<std::string> ());
WellsManager(const Opm::EclipseState& eclipseState,
const size_t timeStep,
@ -177,9 +177,9 @@ namespace Opm
template<class C2F, class FC, class NTG>
void createWellsFromSpecs( std::vector<const Well*>& wells, size_t timeStep,
const C2F& cell_to_faces,
const C2F& cell_to_faces,
const int* cart_dims,
FC begin_face_centroids,
FC begin_face_centroids,
int dimensions,
std::vector<double>& dz,
std::vector<std::string>& well_names,