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 all "newParserDeck" objects to "deck"

Browse Source 
The "new" parser is now "the" parser...
This commit is contained in:
Andreas Lauser 2014-04-26 12:03:07 +02:00
parent 55927d68cf
commit b5266db401
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,7 +61,7 @@ namespace Opm
*/ */
void initStateEquil(const UnstructuredGrid& grid, void initStateEquil(const UnstructuredGrid& grid,
const BlackoilPropertiesInterface& props, const BlackoilPropertiesInterface& props,
const Opm::DeckConstPtr newParserDeck, const Opm::DeckConstPtr deck,
const double gravity, const double gravity,
BlackoilState& state); BlackoilState& state);
@ -182,11 +182,11 @@ namespace Opm
namespace DeckDependent { namespace DeckDependent {
inline inline
std::vector<EquilRecord> std::vector<EquilRecord>
getEquil(const Opm::DeckConstPtr newParserDeck) getEquil(const Opm::DeckConstPtr deck)
{ {
if (newParserDeck->hasKeyword("EQUIL")) { if (deck->hasKeyword("EQUIL")) {
Opm::EquilWrapper eql(newParserDeck->getKeyword("EQUIL")); Opm::EquilWrapper eql(deck->getKeyword("EQUIL"));
const int nrec = eql.numRegions(); const int nrec = eql.numRegions();
@ -228,14 +228,14 @@ namespace Opm
inline inline
std::vector<int> std::vector<int>
equilnum(const Opm::DeckConstPtr newParserDeck, equilnum(const Opm::DeckConstPtr deck,
const UnstructuredGrid& G ) const UnstructuredGrid& G )
{ {
std::vector<int> eqlnum; std::vector<int> eqlnum;
if (newParserDeck->hasKeyword("EQLNUM")) { if (deck->hasKeyword("EQLNUM")) {
eqlnum.resize(G.number_of_cells); eqlnum.resize(G.number_of_cells);
const std::vector<int>& e = const std::vector<int>& e =
newParserDeck->getKeyword("EQLNUM")->getIntData(); deck->getKeyword("EQLNUM")->getIntData();
const int* gc = G.global_cell; const int* gc = G.global_cell;
for (int cell = 0; cell < G.number_of_cells; ++cell) { for (int cell = 0; cell < G.number_of_cells; ++cell) {
const int deck_pos = (gc == NULL) ? cell : gc[cell]; const int deck_pos = (gc == NULL) ? cell : gc[cell];
@ -255,7 +255,7 @@ namespace Opm
class InitialStateComputer { class InitialStateComputer {
public: public:
InitialStateComputer(const BlackoilPropertiesInterface& props, InitialStateComputer(const BlackoilPropertiesInterface& props,
const Opm::DeckConstPtr newParserDeck, const Opm::DeckConstPtr deck,
const UnstructuredGrid& G , const UnstructuredGrid& G ,
const double grav = unit::gravity) const double grav = unit::gravity)
: pp_(props.numPhases(), : pp_(props.numPhases(),
@ -266,20 +266,20 @@ namespace Opm
rv_(G.number_of_cells) rv_(G.number_of_cells)
{ {
// Get the equilibration records. // Get the equilibration records.
const std::vector<EquilRecord> rec = getEquil(newParserDeck); const std::vector<EquilRecord> rec = getEquil(deck);
// Create (inverse) region mapping. // Create (inverse) region mapping.
const RegionMapping<> eqlmap(equilnum(newParserDeck, G)); const RegionMapping<> eqlmap(equilnum(deck, G));
// Create Rs functions. // Create Rs functions.
rs_func_.reserve(rec.size()); rs_func_.reserve(rec.size());
if (newParserDeck->hasKeyword("DISGAS")) { if (deck->hasKeyword("DISGAS")) {
for (size_t i = 0; i < rec.size(); ++i) { for (size_t i = 0; i < rec.size(); ++i) {
const int cell = *(eqlmap.cells(i).begin()); const int cell = *(eqlmap.cells(i).begin());
if (rec[i].live_oil_table_index > 0) { if (rec[i].live_oil_table_index > 0) {
if (newParserDeck->hasKeyword("RSVD") && if (deck->hasKeyword("RSVD") &&
size_t(rec[i].live_oil_table_index) <= newParserDeck->getKeyword("RSVD")->size()) { size_t(rec[i].live_oil_table_index) <= deck->getKeyword("RSVD")->size()) {
Opm::SingleRecordTable rsvd(newParserDeck->getKeyword("RSVD"),std::vector<std::string>{"vd", "rs"},rec[i].live_oil_table_index-1); Opm::SingleRecordTable rsvd(deck->getKeyword("RSVD"),std::vector<std::string>{"vd", "rs"},rec[i].live_oil_table_index-1);
std::vector<double> vd(rsvd.getColumn("vd")); std::vector<double> vd(rsvd.getColumn("vd"));
std::vector<double> rs(rsvd.getColumn("rs")); std::vector<double> rs(rsvd.getColumn("rs"));
rs_func_.push_back(std::make_shared<Miscibility::RsVD>(props, cell, vd, rs)); rs_func_.push_back(std::make_shared<Miscibility::RsVD>(props, cell, vd, rs));
@ -304,13 +304,13 @@ namespace Opm
} }
rv_func_.reserve(rec.size()); rv_func_.reserve(rec.size());
if (newParserDeck->hasKeyword("VAPOIL")) { if (deck->hasKeyword("VAPOIL")) {
for (size_t i = 0; i < rec.size(); ++i) { for (size_t i = 0; i < rec.size(); ++i) {
const int cell = *(eqlmap.cells(i).begin()); const int cell = *(eqlmap.cells(i).begin());
if (rec[i].wet_gas_table_index > 0) { if (rec[i].wet_gas_table_index > 0) {
if (newParserDeck->hasKeyword("RVVD") && if (deck->hasKeyword("RVVD") &&
size_t(rec[i].wet_gas_table_index) <= newParserDeck->getKeyword("RVVD")->size()) { size_t(rec[i].wet_gas_table_index) <= deck->getKeyword("RVVD")->size()) {
Opm::SingleRecordTable rvvd(newParserDeck->getKeyword("RVVD"),std::vector<std::string>{"vd", "rv"},rec[i].wet_gas_table_index-1); Opm::SingleRecordTable rvvd(deck->getKeyword("RVVD"),std::vector<std::string>{"vd", "rv"},rec[i].wet_gas_table_index-1);
std::vector<double> vd(rvvd.getColumn("vd")); std::vector<double> vd(rvvd.getColumn("vd"));
std::vector<double> rv(rvvd.getColumn("rv")); std::vector<double> rv(rvvd.getColumn("rv"));
rv_func_.push_back(std::make_shared<Miscibility::RvVD>(props, cell, vd, rv)); rv_func_.push_back(std::make_shared<Miscibility::RvVD>(props, cell, vd, rv));

4
opm/core/simulator/initStateEquil_impl.hpp
View File

@ -737,12 +737,12 @@ namespace Opm
*/ */
void initStateEquil(const UnstructuredGrid& grid, void initStateEquil(const UnstructuredGrid& grid,
const BlackoilPropertiesInterface& props, const BlackoilPropertiesInterface& props,
const Opm::DeckConstPtr newParserDeck, const Opm::DeckConstPtr deck,
const double gravity, const double gravity,
BlackoilState& state) BlackoilState& state)
{ {
typedef Equil::DeckDependent::InitialStateComputer ISC; typedef Equil::DeckDependent::InitialStateComputer ISC;
ISC isc(props, newParserDeck, grid, gravity); ISC isc(props, deck, grid, gravity);
const auto pu = props.phaseUsage(); const auto pu = props.phaseUsage();
const int ref_phase = pu.phase_used[BlackoilPhases::Liquid] const int ref_phase = pu.phase_used[BlackoilPhases::Liquid]
? pu.phase_pos[BlackoilPhases::Liquid] ? pu.phase_pos[BlackoilPhases::Liquid]