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

Rename eclState to eclipseState.

Browse Source
This commit is contained in:
osae 2014-10-22 15:41:46 +02:00
parent 2c09d2ce57
commit c7f4ea8abd
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opm/core/props/satfunc/SaturationPropsFromDeck.hpp
View File

@ -60,7 +60,7 @@ namespace Opm
/// \param[in] samples Number of uniform sample points for saturation tables. /// \param[in] samples Number of uniform sample points for saturation tables.
/// NOTE: samples will only be used with the SatFuncSetUniform template argument. /// NOTE: samples will only be used with the SatFuncSetUniform template argument.
void init(Opm::DeckConstPtr deck, void init(Opm::DeckConstPtr deck,
Opm::EclipseStateConstPtr eclState, Opm::EclipseStateConstPtr eclipseState,
const UnstructuredGrid& grid, const UnstructuredGrid& grid,
const int samples); const int samples);
@ -79,7 +79,7 @@ namespace Opm
/// NOTE: samples will only be used with the SatFuncSetUniform template argument. /// NOTE: samples will only be used with the SatFuncSetUniform template argument.
template<class T> template<class T>
void init(Opm::DeckConstPtr deck, void init(Opm::DeckConstPtr deck,
Opm::EclipseStateConstPtr eclState, Opm::EclipseStateConstPtr eclipseState,
int number_of_cells, int number_of_cells,
const int* global_cell, const int* global_cell,
const T& begin_cell_centroids, const T& begin_cell_centroids,
@ -161,7 +161,7 @@ namespace Opm
const Funcs& funcForCell(const int cell) const; const Funcs& funcForCell(const int cell) const;
template<class T> template<class T>
void initEPS(Opm::DeckConstPtr deck, void initEPS(Opm::DeckConstPtr deck,
Opm::EclipseStateConstPtr eclState, Opm::EclipseStateConstPtr eclipseState,
int number_of_cells, int number_of_cells,
const int* global_cell, const int* global_cell,
const T& begin_cell_centroids, const T& begin_cell_centroids,
@ -170,7 +170,7 @@ namespace Opm
std::vector<EPSTransforms>& eps_transf); std::vector<EPSTransforms>& eps_transf);
template<class T> template<class T>
void initEPSKey(Opm::DeckConstPtr deck, void initEPSKey(Opm::DeckConstPtr deck,
Opm::EclipseStateConstPtr eclState, Opm::EclipseStateConstPtr eclipseState,
int number_of_cells, int number_of_cells,
const int* global_cell, const int* global_cell,
const T& begin_cell_centroids, const T& begin_cell_centroids,

24
opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp
View File

@ -49,11 +49,11 @@ namespace Opm
/// Initialize from deck. /// Initialize from deck.
template <class SatFuncSet> template <class SatFuncSet>
void SaturationPropsFromDeck<SatFuncSet>::init(Opm::DeckConstPtr deck, void SaturationPropsFromDeck<SatFuncSet>::init(Opm::DeckConstPtr deck,
Opm::EclipseStateConstPtr eclState, Opm::EclipseStateConstPtr eclipseState,
const UnstructuredGrid& grid, const UnstructuredGrid& grid,
const int samples) const int samples)
{ {
this->init(deck, eclState, grid.number_of_cells, this->init(deck, eclipseState, grid.number_of_cells,
grid.global_cell, grid.cell_centroids, grid.global_cell, grid.cell_centroids,
grid.dimensions, samples); grid.dimensions, samples);
} }
@ -62,7 +62,7 @@ namespace Opm
template <class SatFuncSet> template <class SatFuncSet>
template<class T> template<class T>
void SaturationPropsFromDeck<SatFuncSet>::init(Opm::DeckConstPtr deck, void SaturationPropsFromDeck<SatFuncSet>::init(Opm::DeckConstPtr deck,
Opm::EclipseStateConstPtr eclState, Opm::EclipseStateConstPtr eclipseState,
int number_of_cells, int number_of_cells,
const int* global_cell, const int* global_cell,
const T& begin_cell_centroids, const T& begin_cell_centroids,
@ -129,7 +129,7 @@ namespace Opm
// Initialize tables. // Initialize tables.
satfuncset_.resize(num_tables); satfuncset_.resize(num_tables);
for (int table = 0; table < num_tables; ++table) { for (int table = 0; table < num_tables; ++table) {
satfuncset_[table].init(eclState, table, phase_usage_, samples); satfuncset_[table].init(eclipseState, table, phase_usage_, samples);
} }
// Check EHYSTR status // Check EHYSTR status
@ -194,7 +194,7 @@ namespace Opm
const std::vector<std::string> eps_kw{"SWL", "SWU", "SWCR", "SGL", "SGU", "SGCR", "SOWCR", const std::vector<std::string> eps_kw{"SWL", "SWU", "SWCR", "SGL", "SGU", "SGCR", "SOWCR",
"SOGCR", "KRW", "KRG", "KRO", "KRWR", "KRGR", "KRORW", "KRORG", "PCW", "PCG"}; "SOGCR", "KRW", "KRG", "KRO", "KRWR", "KRGR", "KRORW", "KRORG", "PCW", "PCG"};
eps_transf_.resize(number_of_cells); eps_transf_.resize(number_of_cells);
initEPS(deck, eclState, number_of_cells, global_cell, begin_cell_centroids, initEPS(deck, eclipseState, number_of_cells, global_cell, begin_cell_centroids,
dimensions, eps_kw, eps_transf_); dimensions, eps_kw, eps_transf_);
if (do_hyst_) { if (do_hyst_) {
@ -239,7 +239,7 @@ namespace Opm
"ISOGCR", "IKRW", "IKRG", "IKRO", "IKRWR", "IKRGR", "IKRORW", "IKRORG", "IPCW", "IPCG"}; "ISOGCR", "IKRW", "IKRG", "IKRO", "IKRWR", "IKRGR", "IKRORW", "IKRORG", "IPCW", "IPCG"};
eps_transf_hyst_.resize(number_of_cells); eps_transf_hyst_.resize(number_of_cells);
sat_hyst_.resize(number_of_cells); sat_hyst_.resize(number_of_cells);
initEPS(deck, eclState, number_of_cells, global_cell, begin_cell_centroids, initEPS(deck, eclipseState, number_of_cells, global_cell, begin_cell_centroids,
dimensions, eps_i_kw, eps_transf_hyst_); dimensions, eps_i_kw, eps_transf_hyst_);
} }
} }
@ -467,7 +467,7 @@ namespace Opm
template <class SatFuncSet> template <class SatFuncSet>
template<class T> template<class T>
void SaturationPropsFromDeck<SatFuncSet>::initEPS(Opm::DeckConstPtr deck, void SaturationPropsFromDeck<SatFuncSet>::initEPS(Opm::DeckConstPtr deck,
Opm::EclipseStateConstPtr eclState, Opm::EclipseStateConstPtr eclipseState,
int number_of_cells, int number_of_cells,
const int* global_cell, const int* global_cell,
const T& begin_cell_centroid, const T& begin_cell_centroid,
@ -479,7 +479,7 @@ namespace Opm
const std::vector<double> dummy; const std::vector<double> dummy;
for (size_t i = 0; i < eps_kw.size(); ++i) { for (size_t i = 0; i < eps_kw.size(); ++i) {
initEPSKey(deck, eclState, number_of_cells, global_cell, begin_cell_centroid, dimensions, initEPSKey(deck, eclipseState, number_of_cells, global_cell, begin_cell_centroid, dimensions,
eps_kw[i], eps_vec[i]); eps_kw[i], eps_vec[i]);
} }
@ -545,7 +545,7 @@ namespace Opm
template <class SatFuncSet> template <class SatFuncSet>
template<class T> template<class T>
void SaturationPropsFromDeck<SatFuncSet>::initEPSKey(Opm::DeckConstPtr deck, void SaturationPropsFromDeck<SatFuncSet>::initEPSKey(Opm::DeckConstPtr deck,
Opm::EclipseStateConstPtr eclState, Opm::EclipseStateConstPtr eclipseState,
int number_of_cells, int number_of_cells,
const int* global_cell, const int* global_cell,
const T& begin_cell_centroid, const T& begin_cell_centroid,
@ -557,7 +557,7 @@ namespace Opm
const bool useLiquid = phase_usage_.phase_used[Liquid]; const bool useLiquid = phase_usage_.phase_used[Liquid];
const bool useVapour = phase_usage_.phase_used[Vapour]; const bool useVapour = phase_usage_.phase_used[Vapour];
bool useKeyword = deck->hasKeyword(keyword); bool useKeyword = deck->hasKeyword(keyword);
bool useStateKeyword = eclState->hasDoubleGridProperty(keyword); bool useStateKeyword = eclipseState->hasDoubleGridProperty(keyword);
const std::map<std::string, int> kw2tab = { const std::map<std::string, int> kw2tab = {
{"SWL", 1}, {"SWCR", 2}, {"SWU", 3}, {"SGL", 4}, {"SWL", 1}, {"SWCR", 2}, {"SWU", 3}, {"SGL", 4},
{"SGCR", 5}, {"SGU", 6}, {"SOWCR", 7}, {"SOGCR", 8}, {"SGCR", 5}, {"SGU", 6}, {"SOWCR", 7}, {"SOGCR", 8},
@ -577,7 +577,7 @@ namespace Opm
scaleparam.resize(number_of_cells); scaleparam.resize(number_of_cells);
} }
if (!useKeyword && itab > 0) { if (!useKeyword && itab > 0) {
const auto& enptvdTables = eclState->getEnptvdTables(); const auto& enptvdTables = eclipseState->getEnptvdTables();
int num_tables = enptvdTables.size(); int num_tables = enptvdTables.size();
param_col.resize(num_tables); param_col.resize(num_tables);
depth_col.resize(num_tables); depth_col.resize(num_tables);
@ -675,7 +675,7 @@ namespace Opm
const int* gc = global_cell; const int* gc = global_cell;
std::vector<double> val; std::vector<double> val;
if (keyword[0] == 'S' || keyword[1] == 'S') { // Saturation from EclipseState if (keyword[0] == 'S' || keyword[1] == 'S') { // Saturation from EclipseState
val = eclState->getDoubleGridProperty(keyword)->getData(); val = eclipseState->getDoubleGridProperty(keyword)->getData();
} else { } else {
val = deck->getKeyword(keyword)->getSIDoubleData(); //KR and PC directly from deck. val = deck->getKeyword(keyword)->getSIDoubleData(); //KR and PC directly from deck.
} }