diff --git a/opm/parser/eclipse/Deck/DeckDoubleItem.hpp b/opm/parser/eclipse/Deck/DeckDoubleItem.hpp index d9c17bcff..a7a0ce894 100644 --- a/opm/parser/eclipse/Deck/DeckDoubleItem.hpp +++ b/opm/parser/eclipse/Deck/DeckDoubleItem.hpp @@ -32,7 +32,7 @@ namespace Opm { class DeckDoubleItem : public DeckItem { public: - DeckDoubleItem(std::string name, bool scalar = true) : DeckItem(name , scalar) {} + DeckDoubleItem(std::string name_, bool scalar = true) : DeckItem(name_, scalar) {} double getRawDouble(size_t index) const; const std::vector& getRawDoubleData() const; double getSIDouble(size_t index) const; diff --git a/opm/parser/eclipse/Deck/DeckFloatItem.hpp b/opm/parser/eclipse/Deck/DeckFloatItem.hpp index e8354e113..5de159391 100644 --- a/opm/parser/eclipse/Deck/DeckFloatItem.hpp +++ b/opm/parser/eclipse/Deck/DeckFloatItem.hpp @@ -32,7 +32,7 @@ namespace Opm { class DeckFloatItem : public DeckItem { public: - DeckFloatItem(std::string name , bool scalar = true) : DeckItem(name , scalar) {} + DeckFloatItem(std::string name_, bool scalar = true) : DeckItem(name_, scalar) {} float getRawFloat(size_t index) const; //const std::vector& getRawFloatData() const; float getSIFloat(size_t index) const; diff --git a/opm/parser/eclipse/Deck/DeckIntItem.hpp b/opm/parser/eclipse/Deck/DeckIntItem.hpp index b7c2ccae8..89b7e7be3 100644 --- a/opm/parser/eclipse/Deck/DeckIntItem.hpp +++ b/opm/parser/eclipse/Deck/DeckIntItem.hpp @@ -30,7 +30,7 @@ namespace Opm { class DeckIntItem : public DeckItem { public: - DeckIntItem(std::string name , bool scalar = true) : DeckItem(name , scalar) {} + DeckIntItem(std::string name_, bool scalar = true) : DeckItem(name_, scalar) {} int getInt(size_t index) const; const std::vector& getIntData() const; diff --git a/opm/parser/eclipse/Deck/DeckItem.cpp b/opm/parser/eclipse/Deck/DeckItem.cpp index f10729a70..8cb1c47ad 100644 --- a/opm/parser/eclipse/Deck/DeckItem.cpp +++ b/opm/parser/eclipse/Deck/DeckItem.cpp @@ -23,8 +23,8 @@ namespace Opm { - DeckItem::DeckItem(const std::string& name , bool scalar) { - m_name = name; + DeckItem::DeckItem(const std::string& name_, bool scalar) { + m_name = name_; m_defaultApplied = false; m_scalar = scalar; } diff --git a/opm/parser/eclipse/Deck/DeckStringItem.hpp b/opm/parser/eclipse/Deck/DeckStringItem.hpp index e285f721a..87da9b43e 100644 --- a/opm/parser/eclipse/Deck/DeckStringItem.hpp +++ b/opm/parser/eclipse/Deck/DeckStringItem.hpp @@ -31,7 +31,7 @@ namespace Opm { class DeckStringItem : public DeckItem { public: - DeckStringItem(std::string name, bool scalar = true) : DeckItem(name, scalar) { + DeckStringItem(std::string name_, bool scalar = true) : DeckItem(name_, scalar) { } std::string getString(size_t index) const; const std::vector& getStringData() const; diff --git a/opm/parser/eclipse/EclipseState/Schedule/Group.cpp b/opm/parser/eclipse/EclipseState/Schedule/Group.cpp index 49961542c..be69e73f3 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Group.cpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Group.cpp @@ -83,13 +83,13 @@ namespace Opm { /*****************************************************************/ - Group::Group(const std::string& name , TimeMapConstPtr timeMap , size_t creationTimeStep) : + Group::Group(const std::string& name_, TimeMapConstPtr timeMap , size_t creationTimeStep) : m_injection( new GroupInjection::InjectionData(timeMap) ), m_production( new GroupProduction::ProductionData( timeMap )), m_wells( new DynamicState(timeMap , WellSetConstPtr(new WellSet() ))), m_isProductionGroup( new DynamicState(timeMap, true)) { - m_name = name; + m_name = name_; m_creationTimeStep = creationTimeStep; } @@ -114,8 +114,8 @@ namespace Opm { return !m_isProductionGroup->get(timeStep); } - void Group::setProductionGroup(size_t timeStep, bool isProductionGroup) { - m_isProductionGroup->add(timeStep, isProductionGroup); + void Group::setProductionGroup(size_t timeStep, bool isProductionGroup_) { + m_isProductionGroup->add(timeStep, isProductionGroup_); } diff --git a/opm/parser/eclipse/EclipseState/Schedule/GroupTreeNode.cpp b/opm/parser/eclipse/EclipseState/Schedule/GroupTreeNode.cpp index bfdb9d5eb..dce65d39c 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/GroupTreeNode.cpp +++ b/opm/parser/eclipse/EclipseState/Schedule/GroupTreeNode.cpp @@ -22,8 +22,8 @@ namespace Opm { - GroupTreeNode::GroupTreeNode(const std::string& name) { - m_name = name; + GroupTreeNode::GroupTreeNode(const std::string& name_) { + m_name = name_; } const std::string& GroupTreeNode::name() const { diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well.cpp b/opm/parser/eclipse/EclipseState/Schedule/Well.cpp index 08e5d33b6..d412e0861 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Well.cpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Well.cpp @@ -27,7 +27,7 @@ namespace Opm { - Well::Well(const std::string& name, int headI, int headJ, double refDepth, Phase::PhaseEnum preferredPhase, + Well::Well(const std::string& name_, int headI, int headJ, double refDepth, Phase::PhaseEnum preferredPhase, TimeMapConstPtr timeMap, size_t creationTimeStep) : m_status(new DynamicState(timeMap, WellCommon::OPEN)), m_isAvailableForGroupControl(new DynamicState(timeMap, true)), @@ -44,7 +44,7 @@ namespace Opm { m_refDepth(refDepth), m_preferredPhase(preferredPhase) { - m_name = name; + m_name = name_; m_creationTimeStep = creationTimeStep; } @@ -106,8 +106,8 @@ namespace Opm { return m_isAvailableForGroupControl->get(timeStep); } - void Well::setAvailableForGroupControl(size_t timeStep, bool isAvailableForGroupControl) { - m_isAvailableForGroupControl->add(timeStep, isAvailableForGroupControl); + void Well::setAvailableForGroupControl(size_t timeStep, bool isAvailableForGroupControl_) { + m_isAvailableForGroupControl->add(timeStep, isAvailableForGroupControl_); } double Well::getGuideRate(size_t timeStep) const { diff --git a/opm/parser/eclipse/Parser/ParserBoolItem.hpp b/opm/parser/eclipse/Parser/ParserBoolItem.hpp index b67ac6b2e..6981a9a7d 100644 --- a/opm/parser/eclipse/Parser/ParserBoolItem.hpp +++ b/opm/parser/eclipse/Parser/ParserBoolItem.hpp @@ -28,7 +28,7 @@ namespace Opm { class ParserBoolItem : public ParserItem { public: - ParserBoolItem(const std::string& itemName, ParserItemSizeEnum sizeType) : ParserItem(itemName, sizeType) {}; + ParserBoolItem(const std::string& itemName, ParserItemSizeEnum sizeType_) : ParserItem(itemName, sizeType_) {}; private: }; diff --git a/opm/parser/eclipse/Parser/ParserDoubleItem.cpp b/opm/parser/eclipse/Parser/ParserDoubleItem.cpp index 3ac0eeb5d..54026f8da 100644 --- a/opm/parser/eclipse/Parser/ParserDoubleItem.cpp +++ b/opm/parser/eclipse/Parser/ParserDoubleItem.cpp @@ -31,8 +31,8 @@ namespace Opm { ParserDoubleItem::ParserDoubleItem(const std::string& itemName, - ParserItemSizeEnum sizeType) : - ParserItem(itemName, sizeType) + ParserItemSizeEnum sizeType_) : + ParserItem(itemName, sizeType_) { m_default = defaultDouble(); } @@ -49,7 +49,7 @@ namespace Opm } - ParserDoubleItem::ParserDoubleItem(const std::string& itemName, ParserItemSizeEnum sizeType, double defaultValue) : ParserItem(itemName, sizeType) + ParserDoubleItem::ParserDoubleItem(const std::string& itemName, ParserItemSizeEnum sizeType_, double defaultValue) : ParserItem(itemName, sizeType_) { setDefault( defaultValue ); } @@ -90,15 +90,15 @@ namespace Opm bool ParserDoubleItem::equalDimensions(const ParserItem& other) const { - bool equal=false; + bool equal_=false; if (other.numDimensions() == numDimensions()) { - equal = true; + equal_ = true; for (size_t idim=0; idim < numDimensions(); idim++) { if (other.getDimension(idim) != getDimension(idim)) - equal = false; + equal_ = false; } } - return equal; + return equal_; } void ParserDoubleItem::push_backDimension(const std::string& dimension) { diff --git a/opm/parser/eclipse/Parser/ParserFloatItem.cpp b/opm/parser/eclipse/Parser/ParserFloatItem.cpp index 7b189cbb2..9b5a75273 100644 --- a/opm/parser/eclipse/Parser/ParserFloatItem.cpp +++ b/opm/parser/eclipse/Parser/ParserFloatItem.cpp @@ -31,8 +31,8 @@ namespace Opm { ParserFloatItem::ParserFloatItem(const std::string& itemName, - ParserItemSizeEnum sizeType) : - ParserItem(itemName, sizeType) + ParserItemSizeEnum sizeType_) : + ParserItem(itemName, sizeType_) { m_default = defaultFloat(); } @@ -49,7 +49,7 @@ namespace Opm } - ParserFloatItem::ParserFloatItem(const std::string& itemName, ParserItemSizeEnum sizeType, float defaultValue) : ParserItem(itemName, sizeType) + ParserFloatItem::ParserFloatItem(const std::string& itemName, ParserItemSizeEnum sizeType_, float defaultValue) : ParserItem(itemName, sizeType_) { setDefault( defaultValue ); } @@ -90,15 +90,15 @@ namespace Opm bool ParserFloatItem::equalDimensions(const ParserItem& other) const { - bool equal=false; + bool equal_=false; if (other.numDimensions() == numDimensions()) { - equal = true; + equal_ = true; for (size_t idim=0; idim < numDimensions(); idim++) { if (other.getDimension(idim) != getDimension(idim)) - equal = false; + equal_ = false; } } - return equal; + return equal_; } void ParserFloatItem::push_backDimension(const std::string& dimension) { diff --git a/opm/parser/eclipse/Parser/ParserIntItem.cpp b/opm/parser/eclipse/Parser/ParserIntItem.cpp index cd909e8bd..45d2f042c 100644 --- a/opm/parser/eclipse/Parser/ParserIntItem.cpp +++ b/opm/parser/eclipse/Parser/ParserIntItem.cpp @@ -32,7 +32,7 @@ namespace Opm { m_default = defaultInt(); } - ParserIntItem::ParserIntItem(const std::string& itemName, ParserItemSizeEnum sizeType) : ParserItem(itemName, sizeType) { + ParserIntItem::ParserIntItem(const std::string& itemName, ParserItemSizeEnum sizeType_) : ParserItem(itemName, sizeType_) { m_default = defaultInt(); } @@ -40,7 +40,7 @@ namespace Opm { setDefault(defaultValue); } - ParserIntItem::ParserIntItem(const std::string& itemName, ParserItemSizeEnum sizeType, int defaultValue) : ParserItem(itemName, sizeType) { + ParserIntItem::ParserIntItem(const std::string& itemName, ParserItemSizeEnum sizeType_, int defaultValue) : ParserItem(itemName, sizeType_) { setDefault(defaultValue); } diff --git a/opm/parser/eclipse/Parser/ParserItem.cpp b/opm/parser/eclipse/Parser/ParserItem.cpp index 338235bf4..47fc8db05 100644 --- a/opm/parser/eclipse/Parser/ParserItem.cpp +++ b/opm/parser/eclipse/Parser/ParserItem.cpp @@ -25,9 +25,9 @@ namespace Opm { - ParserItem::ParserItem(const std::string& itemName, ParserItemSizeEnum sizeType) { + ParserItem::ParserItem(const std::string& itemName, ParserItemSizeEnum sizeType_) { m_name.assign(itemName); - m_sizeType = sizeType; + m_sizeType = sizeType_; m_defaultSet = false; m_description = ""; } diff --git a/opm/parser/eclipse/Parser/ParserKeyword.cpp b/opm/parser/eclipse/Parser/ParserKeyword.cpp index 8a0a6d0f9..2276c90bf 100644 --- a/opm/parser/eclipse/Parser/ParserKeyword.cpp +++ b/opm/parser/eclipse/Parser/ParserKeyword.cpp @@ -66,9 +66,9 @@ namespace Opm { m_fixedSize = fixedKeywordSize; } - ParserKeyword::ParserKeyword(const std::string& name, const std::string& sizeKeyword, const std::string& sizeItem, ParserKeywordActionEnum action, bool isTableCollection) { + ParserKeyword::ParserKeyword(const std::string& name, const std::string& sizeKeyword, const std::string& sizeItem, ParserKeywordActionEnum action, bool _isTableCollection) { commonInit(name, OTHER_KEYWORD_IN_DECK , action); - m_isTableCollection = isTableCollection; + m_isTableCollection = _isTableCollection; initSizeKeyword(sizeKeyword, sizeItem); } @@ -441,23 +441,23 @@ namespace Opm { (m_isDataKeyword == other.m_isDataKeyword) && (m_isTableCollection == other.m_isTableCollection) && (m_action == other.m_action)) { - bool equal = false; + bool equal_ = false; switch (m_keywordSizeType) { case FIXED: if (m_fixedSize == other.m_fixedSize) - equal = true; + equal_ = true; break; case OTHER_KEYWORD_IN_DECK: if ((m_sizeDefinitionPair.first == other.m_sizeDefinitionPair.first) && (m_sizeDefinitionPair.second == other.m_sizeDefinitionPair.second)) - equal = true; + equal_ = true; break; default: - equal = true; + equal_ = true; break; } - return equal; + return equal_; } else return false; } diff --git a/opm/parser/eclipse/Parser/ParserRecord.cpp b/opm/parser/eclipse/Parser/ParserRecord.cpp index 002f4f57b..fdf2ff46b 100644 --- a/opm/parser/eclipse/Parser/ParserRecord.cpp +++ b/opm/parser/eclipse/Parser/ParserRecord.cpp @@ -109,7 +109,7 @@ namespace Opm { } bool ParserRecord::equal(const ParserRecord& other) const { - bool equal = true; + bool equal_ = true; if (size() == other.size()) { size_t itemIndex = 0; while (true) { @@ -120,15 +120,15 @@ namespace Opm { ParserItemConstPtr otherItem = other.get(itemIndex); if (!item->equal(*otherItem)) { - equal = false; + equal_ = false; break; } } itemIndex++; } } else - equal = false; - return equal; + equal_ = false; + return equal_; } } diff --git a/opm/parser/eclipse/Parser/ParserStringItem.cpp b/opm/parser/eclipse/Parser/ParserStringItem.cpp index ed564a7b1..bc9f8b171 100644 --- a/opm/parser/eclipse/Parser/ParserStringItem.cpp +++ b/opm/parser/eclipse/Parser/ParserStringItem.cpp @@ -29,11 +29,11 @@ namespace Opm { } - ParserStringItem::ParserStringItem(const std::string& itemName, ParserItemSizeEnum sizeType) : ParserItem(itemName, sizeType) { + ParserStringItem::ParserStringItem(const std::string& itemName, ParserItemSizeEnum sizeType_) : ParserItem(itemName, sizeType_) { m_default = defaultString(); } - ParserStringItem::ParserStringItem(const std::string& itemName, ParserItemSizeEnum sizeType, const std::string& defaultValue) : ParserItem(itemName, sizeType) { + ParserStringItem::ParserStringItem(const std::string& itemName, ParserItemSizeEnum sizeType_, const std::string& defaultValue) : ParserItem(itemName, sizeType_) { setDefault(defaultValue); } diff --git a/opm/parser/eclipse/Units/UnitSystem.cpp b/opm/parser/eclipse/Units/UnitSystem.cpp index 31552c499..87b8d6dc4 100644 --- a/opm/parser/eclipse/Units/UnitSystem.cpp +++ b/opm/parser/eclipse/Units/UnitSystem.cpp @@ -115,22 +115,22 @@ namespace Opm { bool UnitSystem::equal(const UnitSystem& other) const { - bool equal = (m_dimensions.size() == other.m_dimensions.size()); + bool equal_ = (m_dimensions.size() == other.m_dimensions.size()); - if (equal) { + if (equal_) { for (auto iter = m_dimensions.begin(); iter != m_dimensions.end(); ++iter) { std::shared_ptr dim = getDimension( iter->first ); if (other.hasDimension( iter->first )) { std::shared_ptr otherDim = other.getDimension( iter->first ); if (!dim->equal(*otherDim)) - equal = false; + equal_ = false; } else - equal = false; + equal_ = false; } } - return equal; + return equal_; }