Skip to content

Commit

Permalink
Renaming
Browse files Browse the repository at this point in the history
  • Loading branch information
magnesj committed Sep 6, 2023
1 parent c14732c commit 9b52025
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void RicImportValveTemplatesFeature::onActionTriggered( bool isChecked )
RimValveTemplateCollection* templateColl = RimProject::current()->allValveTemplateCollections().front();
for ( const auto& fileName : fileNames )
{
auto values = RiaOpmParserTools::extractWsegaicd( fileName.toStdString() );
auto values = RiaOpmParserTools::extractWsegAicd( fileName.toStdString() );
for ( const auto value : values )
{
auto newTemplate = RimValveTemplate::createAicdTemplate( value );
Expand Down
8 changes: 4 additions & 4 deletions ApplicationLibCode/ProjectDataModel/RiaOpmParserTools.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ std::map<std::string, std::vector<std::pair<int, int>>> RiaOpmParserTools::extra
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RiaOpmParserTools::AicdTemplateValues> RiaOpmParserTools::extractWsegaicd( const std::string& filename )
std::vector<RiaOpmParserTools::AicdTemplateValues> RiaOpmParserTools::extractWsegAicd( const std::string& filename )
{
if ( !std::filesystem::exists( filename ) ) return {};

Expand All @@ -218,12 +218,12 @@ std::vector<RiaOpmParserTools::AicdTemplateValues> RiaOpmParserTools::extractWse
Opm::ParseContext parseContext( Opm::InputError::Action::WARN );
auto deck = parser.parseFile( filename, parseContext );

std::string keyword = "WSEGAICD";
auto keywordList = deck.getKeywordList( keyword );
const std::string keyword = "WSEGAICD";
auto keywordList = deck.getKeywordList( keyword );
if ( keywordList.empty() ) return {};

std::vector<RiaOpmParserTools::AicdTemplateValues> aicdData;
for ( auto kw : keywordList )
for ( const auto& kw : keywordList )
{
auto name = kw->name();

Expand Down
2 changes: 1 addition & 1 deletion ApplicationLibCode/ProjectDataModel/RiaOpmParserTools.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ class RiaOpmParserTools
static std::map<std::string, std::vector<std::pair<int, int>>> extractWseglink( const std::string& filename );

using AicdTemplateValues = std::map<std::string, std::variant<std::string, double>>;
static std::vector<AicdTemplateValues> extractWsegaicd( const std::string& filename );
static std::vector<AicdTemplateValues> extractWsegAicd( const std::string& filename );
};

0 comments on commit 9b52025

Please sign in to comment.