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

DeckKeyword constructor does not mutate UnitSystem

Browse Source
This commit is contained in:
Joakim Hove 2021-03-27 10:19:25 +01:00
parent 0f59fe900b
commit 19addd0fc6
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/parser/eclipse/Deck/DeckKeyword.hpp
View File

@ -44,9 +44,9 @@ namespace Opm {
DeckKeyword();
explicit DeckKeyword(const ParserKeyword& parserKeyword);
DeckKeyword(const KeywordLocation& location, const std::string& keywordName);
DeckKeyword(const ParserKeyword& parserKeyword, const std::vector<std::vector<DeckValue>>& record_list, UnitSystem& system_active, UnitSystem& system_default);
DeckKeyword(const ParserKeyword& parserKeyword, const std::vector<std::vector<DeckValue>>& record_list, const UnitSystem& system_active, const UnitSystem& system_default);
DeckKeyword(const ParserKeyword& parserKeyword, const std::vector<int>& data);
DeckKeyword(const ParserKeyword& parserKeyword, const std::vector<double>& data, UnitSystem& system_active, UnitSystem& system_default);
DeckKeyword(const ParserKeyword& parserKeyword, const std::vector<double>& data, const UnitSystem& system_active, const UnitSystem& system_default);
static DeckKeyword serializeObject();

12
src/opm/parser/eclipse/Deck/DeckKeyword.cpp
View File

@ -85,7 +85,7 @@ namespace Opm {
}
DeckKeyword::DeckKeyword(const ParserKeyword& parserKeyword, const std::vector<std::vector<DeckValue>>& record_list, UnitSystem& system_active, UnitSystem& system_default) :
DeckKeyword::DeckKeyword(const ParserKeyword& parserKeyword, const std::vector<std::vector<DeckValue>>& record_list, const UnitSystem& system_active, const UnitSystem& system_default) :
DeckKeyword(parserKeyword)
{
if (parserKeyword.hasFixedSize() && (record_list.size() != parserKeyword.getFixedSize()))
@ -115,8 +115,8 @@ namespace Opm {
std::vector<Dimension> active_dimensions;
std::vector<Dimension> default_dimensions;
if (dim.size() > 0) {
active_dimensions.push_back( system_active.getNewDimension(dim[0]) );
default_dimensions.push_back( system_default.getNewDimension(dim[0]) );
active_dimensions.push_back( system_active.parse(dim[0]) );
default_dimensions.push_back( system_default.parse(dim[0]) );
}
DeckItem deck_item(parser_item.name(), double(), active_dimensions, default_dimensions);
add_deckvalue<double>(std::move(deck_item), deck_record, parser_item, input_record, j);
@ -164,7 +164,7 @@ namespace Opm {
}
DeckKeyword::DeckKeyword(const ParserKeyword& parserKeyword, const std::vector<double>& data, UnitSystem& system_active, UnitSystem& system_default) :
DeckKeyword::DeckKeyword(const ParserKeyword& parserKeyword, const std::vector<double>& data, const UnitSystem& system_active, const UnitSystem& system_default) :
DeckKeyword(parserKeyword)
{
if (!parserKeyword.isDataKeyword())
@ -181,8 +181,8 @@ namespace Opm {
std::vector<Dimension> active_dimensions;
std::vector<Dimension> default_dimensions;
if (dim.size() > 0) {
active_dimensions.push_back( system_active.getNewDimension(dim[0]) );
default_dimensions.push_back( system_default.getNewDimension(dim[0]) );
active_dimensions.push_back( system_active.parse(dim[0]) );
default_dimensions.push_back( system_default.parse(dim[0]) );
}
DeckItem item(parser_item.name(), double(), active_dimensions, default_dimensions);
for (double val : data)