diff --git a/opm/core/props/BlackoilPropertiesFromDeck.hpp b/opm/core/props/BlackoilPropertiesFromDeck.hpp index 78bb74d5..e521e28a 100644 --- a/opm/core/props/BlackoilPropertiesFromDeck.hpp +++ b/opm/core/props/BlackoilPropertiesFromDeck.hpp @@ -90,6 +90,45 @@ namespace Opm const parameter::ParameterGroup& param, bool init_rock=true); + template + BlackoilPropertiesFromDeck(const EclipseGridParser& deck, + int number_of_cells, + const int* global_cell, + const int* cart_dims, + T begin_cell_centroids, + int dimension, + bool init_rock=true); + + + template + BlackoilPropertiesFromDeck(const EclipseGridParser& deck, + int number_of_cells, + const int* global_cell, + const int* cart_dims, + T begin_cell_centroids, + int dimension, + const parameter::ParameterGroup& param, + bool init_rock=true); + + template + BlackoilPropertiesFromDeck(Opm::DeckConstPtr newParserDeck, + int number_of_cells, + const int* global_cell, + const int* cart_dims, + T begin_cell_centroids, + int dimension, + bool init_rock=true); + + template + BlackoilPropertiesFromDeck(Opm::DeckConstPtr newParserDeck, + int number_of_cells, + const int* global_cell, + const int* cart_dims, + T begin_cell_centroids, + int dimension, + const parameter::ParameterGroup& param, + bool init_rock=true); + /// Destructor. virtual ~BlackoilPropertiesFromDeck(); diff --git a/opm/core/props/BlackoilPropertiesFromDeck_impl.hpp b/opm/core/props/BlackoilPropertiesFromDeck_impl.hpp index 3ca4f765..87f2adae 100644 --- a/opm/core/props/BlackoilPropertiesFromDeck_impl.hpp +++ b/opm/core/props/BlackoilPropertiesFromDeck_impl.hpp @@ -1,5 +1,62 @@ namespace Opm { + + + template + BlackoilPropertiesFromDeck::BlackoilPropertiesFromDeck(const EclipseGridParser& deck, + int number_of_cells, + const int* global_cell, + const int* cart_dims, + T begin_cell_centroids, + int dimension, + bool init_rock) + { + init(deck, number_of_cells, global_cell, cart_dims, begin_cell_centroids, dimension, + init_rock); + } + + + template + BlackoilPropertiesFromDeck::BlackoilPropertiesFromDeck(const EclipseGridParser& deck, + int number_of_cells, + const int* global_cell, + const int* cart_dims, + T begin_cell_centroids, + int dimension, + const parameter::ParameterGroup& param, + bool init_rock) + { + init(deck, number_of_cells, global_cell, cart_dims, begin_cell_centroids, dimension, + param, init_rock); + } + + template + BlackoilPropertiesFromDeck::BlackoilPropertiesFromDeck(Opm::DeckConstPtr newParserDeck, + int number_of_cells, + const int* global_cell, + const int* cart_dims, + T begin_cell_centroids, + int dimension, + bool init_rock) + { + init(newParserDeck, number_of_cells, global_cell, cart_dims, begin_cell_centroids, dimension, + init_rock); + } + + template + BlackoilPropertiesFromDeck::BlackoilPropertiesFromDeck(Opm::DeckConstPtr newParserDeck, + int number_of_cells, + const int* global_cell, + const int* cart_dims, + T begin_cell_centroids, + int dimension, + const parameter::ParameterGroup& param, + bool init_rock) + { + init(newParserDeck, number_of_cells, global_cell, cart_dims, begin_cell_centroids, dimension, + param, init_rock); + } + template void BlackoilPropertiesFromDeck::init(const EclipseGridParser& deck, int number_of_cells,