OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added missing variant of initBlackoilStateFromDeck with new parser and without UG.

Browse Source
This commit is contained in:
Markus Blatt 2014-04-09 14:34:04 +02:00
parent 0dcd0351fc
commit 4c2120c770
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
opm/core/simulator/initState_impl.hpp
View File

@ -1037,24 +1037,46 @@ namespace Opm
const double gravity, const double gravity,
State& state) State& state)
{ {
initStateFromDeck(grid, props, newParserDeck, gravity, state); initBlackoilStateFromDeck(grid.number_of_cells, grid.global_cell,
grid.number_of_faces, UgGridHelpers::faceCells(grid),
grid.face_centroids, grid.cell_centroids,grid.dimensions,
props, newParserDeck, gravity, state);
}
/// Initialize a blackoil state from input deck.
template <class FaceCells, class FCI, class CCI, class Props, class State>
void initBlackoilStateFromDeck(int number_of_cells,
const int* global_cell,
int number_of_faces,
FaceCells face_cells,
FCI begin_face_centroids,
CCI begin_cell_centroids,
int dimensions,
const Props& props,
Opm::DeckConstPtr newParserDeck,
const double gravity,
State& state)
{
initStateFromDeck(number_of_cells, global_cell, number_of_faces,
face_cells, begin_face_centroids, begin_cell_centroids,
dimensions, props, newParserDeck, gravity, state);
if (newParserDeck->hasKeyword("RS")) { if (newParserDeck->hasKeyword("RS")) {
const std::vector<double>& rs_deck = newParserDeck->getKeyword("RS")->getSIDoubleData(); const std::vector<double>& rs_deck = newParserDeck->getKeyword("RS")->getSIDoubleData();
const int num_cells = grid.number_of_cells; const int num_cells = number_of_cells;
for (int c = 0; c < num_cells; ++c) { for (int c = 0; c < num_cells; ++c) {
int c_deck = (grid.global_cell == NULL) ? c : grid.global_cell[c]; int c_deck = (global_cell == NULL) ? c : global_cell[c];
state.gasoilratio()[c] = rs_deck[c_deck]; state.gasoilratio()[c] = rs_deck[c_deck];
} }
initBlackoilSurfvolUsingRSorRV(grid, props, state); initBlackoilSurfvolUsingRSorRV(number_of_cells, props, state);
computeSaturation(props,state); computeSaturation(props,state);
} else if (newParserDeck->hasKeyword("RV")){ } else if (newParserDeck->hasKeyword("RV")){
const std::vector<double>& rv_deck = newParserDeck->getKeyword("RV")->getSIDoubleData(); const std::vector<double>& rv_deck = newParserDeck->getKeyword("RV")->getSIDoubleData();
const int num_cells = grid.number_of_cells; const int num_cells = number_of_cells;
for (int c = 0; c < num_cells; ++c) { for (int c = 0; c < num_cells; ++c) {
int c_deck = (grid.global_cell == NULL) ? c : grid.global_cell[c]; int c_deck = (global_cell == NULL) ? c : global_cell[c];
state.rv()[c] = rv_deck[c_deck]; state.rv()[c] = rv_deck[c_deck];
} }
initBlackoilSurfvolUsingRSorRV(grid, props, state); initBlackoilSurfvolUsingRSorRV(number_of_cells, props, state);
computeSaturation(props,state); computeSaturation(props,state);
} }
else { else {