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

Rename class Section -> DeckSection

Browse Source
This commit is contained in:
Joakim Hove 2019-12-29 07:21:37 +01:00
parent 9363905e03
commit 90d30e3bc9
36 changed files with 110 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists_files.cmake
View File

@ -47,7 +47,7 @@ if(ENABLE_ECL_INPUT)
src/opm/parser/eclipse/Deck/DeckKeyword.cpp src/opm/parser/eclipse/Deck/DeckKeyword.cpp
src/opm/parser/eclipse/Deck/DeckRecord.cpp src/opm/parser/eclipse/Deck/DeckRecord.cpp
src/opm/parser/eclipse/Deck/DeckOutput.cpp src/opm/parser/eclipse/Deck/DeckOutput.cpp
src/opm/parser/eclipse/Deck/Section.cpp src/opm/parser/eclipse/Deck/DeckSection.cpp
src/opm/parser/eclipse/Deck/UDAValue.cpp src/opm/parser/eclipse/Deck/UDAValue.cpp
src/opm/parser/eclipse/Python/Python.cpp src/opm/parser/eclipse/Python/Python.cpp
src/opm/parser/eclipse/EclipseState/AquiferCT.cpp src/opm/parser/eclipse/EclipseState/AquiferCT.cpp
@ -664,7 +664,7 @@ if(ENABLE_ECL_INPUT)
opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.hpp opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.hpp
opm/parser/eclipse/Deck/DeckItem.hpp opm/parser/eclipse/Deck/DeckItem.hpp
opm/parser/eclipse/Deck/Deck.hpp opm/parser/eclipse/Deck/Deck.hpp
opm/parser/eclipse/Deck/Section.hpp opm/parser/eclipse/Deck/DeckSection.hpp
opm/parser/eclipse/Deck/DeckOutput.hpp opm/parser/eclipse/Deck/DeckOutput.hpp
opm/parser/eclipse/Deck/DeckValue.hpp opm/parser/eclipse/Deck/DeckValue.hpp
opm/parser/eclipse/Deck/DeckKeyword.hpp opm/parser/eclipse/Deck/DeckKeyword.hpp

52
opm/parser/eclipse/Deck/Section.hpp → opm/parser/eclipse/Deck/DeckSection.hpp
View File

@ -29,11 +29,11 @@ namespace Opm {
class UnitSystem; class UnitSystem;
class Parser; class Parser;
class Section : public DeckView { class DeckSection : public DeckView {
public: public:
using DeckView::const_iterator; using DeckView::const_iterator;
Section( const Deck& deck, const std::string& startKeyword ); DeckSection( const Deck& deck, const std::string& startKeyword );
const std::string& name() const; const std::string& name() const;
const UnitSystem& unitSystem() const; const UnitSystem& unitSystem() const;
@ -58,52 +58,52 @@ class Section : public DeckView {
}; };
class RUNSPECSection : public Section { class RUNSPECSection : public DeckSection {
public: public:
using Section::const_iterator; using DeckSection::const_iterator;
explicit RUNSPECSection(const Deck& deck) : Section(deck, "RUNSPEC") {} explicit RUNSPECSection(const Deck& deck) : DeckSection(deck, "RUNSPEC") {}
}; };
class GRIDSection : public Section { class GRIDSection : public DeckSection {
public: public:
using Section::const_iterator; using DeckSection::const_iterator;
explicit GRIDSection(const Deck& deck) : Section(deck, "GRID") {} explicit GRIDSection(const Deck& deck) : DeckSection(deck, "GRID") {}
}; };
class EDITSection : public Section { class EDITSection : public DeckSection {
public: public:
using Section::const_iterator; using DeckSection::const_iterator;
explicit EDITSection(const Deck& deck) : Section(deck, "EDIT") {} explicit EDITSection(const Deck& deck) : DeckSection(deck, "EDIT") {}
}; };
class PROPSSection : public Section { class PROPSSection : public DeckSection {
public: public:
using Section::const_iterator; using DeckSection::const_iterator;
explicit PROPSSection(const Deck& deck) : Section(deck, "PROPS") {} explicit PROPSSection(const Deck& deck) : DeckSection(deck, "PROPS") {}
}; };
class REGIONSSection : public Section { class REGIONSSection : public DeckSection {
public: public:
using Section::const_iterator; using DeckSection::const_iterator;
explicit REGIONSSection(const Deck& deck) : Section(deck, "REGIONS") {} explicit REGIONSSection(const Deck& deck) : DeckSection(deck, "REGIONS") {}
}; };
class SOLUTIONSection : public Section { class SOLUTIONSection : public DeckSection {
public: public:
using Section::const_iterator; using DeckSection::const_iterator;
explicit SOLUTIONSection(const Deck& deck) : Section(deck, "SOLUTION") {} explicit SOLUTIONSection(const Deck& deck) : DeckSection(deck, "SOLUTION") {}
}; };
class SUMMARYSection : public Section { class SUMMARYSection : public DeckSection {
public: public:
using Section::const_iterator; using DeckSection::const_iterator;
explicit SUMMARYSection(const Deck& deck) : Section(deck, "SUMMARY") {} explicit SUMMARYSection(const Deck& deck) : DeckSection(deck, "SUMMARY") {}
}; };
class SCHEDULESection : public Section { class SCHEDULESection : public DeckSection {
public: public:
using Section::const_iterator; using DeckSection::const_iterator;
explicit SCHEDULESection(const Deck& deck) : Section(deck, "SCHEDULE") {} explicit SCHEDULESection(const Deck& deck) : DeckSection(deck, "SCHEDULE") {}
}; };
} }

4
opm/parser/eclipse/EclipseState/Eclipse3DProperties.hpp
View File

@ -39,7 +39,7 @@ namespace Opm {
class DeckKeyword; class DeckKeyword;
class DeckRecord; class DeckRecord;
class EclipseGrid; class EclipseGrid;
class Section; class DeckSection;
class TableManager; class TableManager;
class UnitSystem; class UnitSystem;
@ -76,7 +76,7 @@ namespace Opm {
void processGridProperties(const Deck& deck, void processGridProperties(const Deck& deck,
const EclipseGrid& eclipseGrid); const EclipseGrid& eclipseGrid);
void scanSection(const Section& section, void scanSection(const DeckSection& section,
const EclipseGrid& eclipseGrid, const EclipseGrid& eclipseGrid,
bool edit_section); bool edit_section);

4
opm/parser/eclipse/EclipseState/EclipseState.hpp
View File

@ -55,7 +55,7 @@ namespace Opm {
class IOConfig; class IOConfig;
class ParseContext; class ParseContext;
class RestartConfig; class RestartConfig;
class Section; class DeckSection;
class SimulationConfig; class SimulationConfig;
class TableManager; class TableManager;
class UnitSystem; class UnitSystem;
@ -120,7 +120,7 @@ namespace Opm {
void initTransMult(); void initTransMult();
void initFaults(const Deck& deck); void initFaults(const Deck& deck);
void setMULTFLT(const Opm::Section& section); void setMULTFLT(const Opm::DeckSection& section);
void complainAboutAmbiguousKeyword(const Deck& deck, void complainAboutAmbiguousKeyword(const Deck& deck,
const std::string& keywordName); const std::string& keywordName);

2
opm/parser/eclipse/EclipseState/Grid/GridProperties.hpp
View File

@ -26,7 +26,7 @@
#include <map> #include <map>
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp> #include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp> #include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/GridProperty.hpp> #include <opm/parser/eclipse/EclipseState/Grid/GridProperty.hpp>

2
src/opm/parser/eclipse/Deck/Deck.cpp
View File

@ -22,7 +22,7 @@
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Deck/DeckOutput.hpp> #include <opm/parser/eclipse/Deck/DeckOutput.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp> #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp> #include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/Units/UnitSystem.hpp> #include <opm/parser/eclipse/Units/UnitSystem.hpp>
namespace Opm { namespace Opm {

24
src/opm/parser/eclipse/Deck/Section.cpp → src/opm/parser/eclipse/Deck/DeckSection.cpp
View File

@ -26,7 +26,7 @@
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp> #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp> #include <opm/parser/eclipse/Deck/DeckSection.hpp>
namespace Opm { namespace Opm {
@ -59,27 +59,27 @@ namespace Opm {
return { first, last }; return { first, last };
} }
Section::Section( const Deck& deck, const std::string& section ) DeckSection::DeckSection( const Deck& deck, const std::string& section )
: DeckView( find_section( deck, section ) ), : DeckView( find_section( deck, section ) ),
section_name( section ), section_name( section ),
units( deck.getActiveUnitSystem() ) units( deck.getActiveUnitSystem() )
{} {}
const std::string& Section::name() const { const std::string& DeckSection::name() const {
return this->section_name; return this->section_name;
} }
const UnitSystem& Section::unitSystem() const { const UnitSystem& DeckSection::unitSystem() const {
return this->units; return this->units;
} }
bool Section::hasRUNSPEC(const Deck& deck) { return deck.hasKeyword( "RUNSPEC" ); } bool DeckSection::hasRUNSPEC(const Deck& deck) { return deck.hasKeyword( "RUNSPEC" ); }
bool Section::hasGRID(const Deck& deck) { return deck.hasKeyword( "GRID" ); } bool DeckSection::hasGRID(const Deck& deck) { return deck.hasKeyword( "GRID" ); }
bool Section::hasEDIT(const Deck& deck) { return deck.hasKeyword( "EDIT" ); } bool DeckSection::hasEDIT(const Deck& deck) { return deck.hasKeyword( "EDIT" ); }
bool Section::hasPROPS(const Deck& deck) { return deck.hasKeyword( "PROPS" ); } bool DeckSection::hasPROPS(const Deck& deck) { return deck.hasKeyword( "PROPS" ); }
bool Section::hasREGIONS(const Deck& deck) { return deck.hasKeyword( "REGIONS" ); } bool DeckSection::hasREGIONS(const Deck& deck) { return deck.hasKeyword( "REGIONS" ); }
bool Section::hasSOLUTION(const Deck& deck) { return deck.hasKeyword( "SOLUTION" ); } bool DeckSection::hasSOLUTION(const Deck& deck) { return deck.hasKeyword( "SOLUTION" ); }
bool Section::hasSUMMARY(const Deck& deck) { return deck.hasKeyword( "SUMMARY" ); } bool DeckSection::hasSUMMARY(const Deck& deck) { return deck.hasKeyword( "SUMMARY" ); }
bool Section::hasSCHEDULE(const Deck& deck) { return deck.hasKeyword( "SCHEDULE" ); } bool DeckSection::hasSCHEDULE(const Deck& deck) { return deck.hasKeyword( "SCHEDULE" ); }
} }

14
src/opm/parser/eclipse/EclipseState/Eclipse3DProperties.cpp
View File

@ -24,7 +24,7 @@
#include <string> #include <string>
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp> #include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/EclipseState/Eclipse3DProperties.hpp> #include <opm/parser/eclipse/EclipseState/Eclipse3DProperties.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/Box.hpp> #include <opm/parser/eclipse/EclipseState/Grid/Box.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/BoxManager.hpp> #include <opm/parser/eclipse/EclipseState/Grid/BoxManager.hpp>
@ -768,25 +768,25 @@ namespace Opm {
void Eclipse3DProperties::processGridProperties( const Deck& deck, void Eclipse3DProperties::processGridProperties( const Deck& deck,
const EclipseGrid& eclipseGrid) { const EclipseGrid& eclipseGrid) {
if (Section::hasGRID(deck)) if (DeckSection::hasGRID(deck))
scanSection(GRIDSection(deck), eclipseGrid, false); scanSection(GRIDSection(deck), eclipseGrid, false);
if (Section::hasREGIONS(deck)) if (DeckSection::hasREGIONS(deck))
scanSection(REGIONSSection(deck), eclipseGrid, false); scanSection(REGIONSSection(deck), eclipseGrid, false);
if (Section::hasEDIT(deck)) if (DeckSection::hasEDIT(deck))
scanSection(EDITSection(deck), eclipseGrid, true); scanSection(EDITSection(deck), eclipseGrid, true);
if (Section::hasPROPS(deck)) if (DeckSection::hasPROPS(deck))
scanSection(PROPSSection(deck), eclipseGrid, false); scanSection(PROPSSection(deck), eclipseGrid, false);
if (Section::hasSOLUTION(deck)) if (DeckSection::hasSOLUTION(deck))
scanSection(SOLUTIONSection(deck), eclipseGrid, false); scanSection(SOLUTIONSection(deck), eclipseGrid, false);
} }
void Eclipse3DProperties::scanSection(const Section& section, void Eclipse3DProperties::scanSection(const DeckSection& section,
const EclipseGrid& eclipseGrid, const EclipseGrid& eclipseGrid,
bool edit_section) { bool edit_section) {
BoxManager boxManager(eclipseGrid); BoxManager boxManager(eclipseGrid);

2
src/opm/parser/eclipse/EclipseState/EclipseConfig.cpp
View File

@ -20,7 +20,7 @@
#include <memory> #include <memory>
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp> #include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseConfig.hpp> #include <opm/parser/eclipse/EclipseState/EclipseConfig.hpp>
#include <opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp> #include <opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp>
#include <opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp> #include <opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp>

8
src/opm/parser/eclipse/EclipseState/EclipseState.cpp
View File

@ -23,7 +23,7 @@
#include <opm/common/OpmLog/LogUtil.hpp> #include <opm/common/OpmLog/LogUtil.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp> #include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/EclipseState/Eclipse3DProperties.hpp> #include <opm/parser/eclipse/EclipseState/Eclipse3DProperties.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp> #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
@ -320,7 +320,7 @@ void assert_field_properties(const EclipseGrid& grid, const FieldPropsManager& f
} }
void EclipseState::initFaults(const Deck& deck) { void EclipseState::initFaults(const Deck& deck) {
if (!Section::hasGRID(deck)) if (!DeckSection::hasGRID(deck))
return; return;
const GRIDSection gridSection ( deck ); const GRIDSection gridSection ( deck );
@ -328,7 +328,7 @@ void assert_field_properties(const EclipseGrid& grid, const FieldPropsManager& f
m_faults = FaultCollection(gridSection, m_inputGrid); m_faults = FaultCollection(gridSection, m_inputGrid);
setMULTFLT(gridSection); setMULTFLT(gridSection);
if (Section::hasEDIT(deck)) { if (DeckSection::hasEDIT(deck)) {
setMULTFLT(EDITSection ( deck )); setMULTFLT(EDITSection ( deck ));
} }
@ -337,7 +337,7 @@ void assert_field_properties(const EclipseGrid& grid, const FieldPropsManager& f
void EclipseState::setMULTFLT(const Section& section) { void EclipseState::setMULTFLT(const DeckSection& section) {
for (size_t index=0; index < section.count("MULTFLT"); index++) { for (size_t index=0; index < section.count("MULTFLT"); index++) {
const auto& faultsKeyword = section.getKeyword("MULTFLT" , index); const auto& faultsKeyword = section.getKeyword("MULTFLT" , index);
for (auto iter = faultsKeyword.begin(); iter != faultsKeyword.end(); ++iter) { for (auto iter = faultsKeyword.begin(); iter != faultsKeyword.end(); ++iter) {

2
src/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp
View File

@ -31,7 +31,7 @@
#include <opm/io/eclipse/EclFile.hpp> #include <opm/io/eclipse/EclFile.hpp>
#include <opm/io/eclipse/EclOutput.hpp> #include <opm/io/eclipse/EclOutput.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp> #include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Deck/DeckItem.hpp> #include <opm/parser/eclipse/Deck/DeckItem.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp> #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>

2
src/opm/parser/eclipse/EclipseState/Grid/FaultCollection.cpp
View File

@ -27,7 +27,7 @@
#include <opm/parser/eclipse/Deck/DeckItem.hpp> #include <opm/parser/eclipse/Deck/DeckItem.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp> #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/Deck/DeckRecord.hpp> #include <opm/parser/eclipse/Deck/DeckRecord.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp> #include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/GridDims.hpp> #include <opm/parser/eclipse/EclipseState/Grid/GridDims.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/FaceDir.hpp> #include <opm/parser/eclipse/EclipseState/Grid/FaceDir.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp> #include <opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp>

10
src/opm/parser/eclipse/EclipseState/Grid/FieldProps.cpp
View File

@ -421,19 +421,19 @@ FieldProps::FieldProps(const Deck& deck, const EclipseGrid& grid, const TableMan
} }
if (Section::hasGRID(deck)) if (DeckSection::hasGRID(deck))
this->scanGRIDSection(GRIDSection(deck)); this->scanGRIDSection(GRIDSection(deck));
if (Section::hasEDIT(deck)) if (DeckSection::hasEDIT(deck))
this->scanEDITSection(EDITSection(deck)); this->scanEDITSection(EDITSection(deck));
if (Section::hasREGIONS(deck)) if (DeckSection::hasREGIONS(deck))
this->scanREGIONSSection(REGIONSSection(deck)); this->scanREGIONSSection(REGIONSSection(deck));
if (Section::hasPROPS(deck)) if (DeckSection::hasPROPS(deck))
this->scanPROPSSection(PROPSSection(deck)); this->scanPROPSSection(PROPSSection(deck));
if (Section::hasSOLUTION(deck)) if (DeckSection::hasSOLUTION(deck))
this->scanSOLUTIONSection(SOLUTIONSection(deck)); this->scanSOLUTIONSection(SOLUTIONSection(deck));
} }

2
src/opm/parser/eclipse/EclipseState/Grid/FieldProps.hpp
View File

@ -24,7 +24,7 @@
#include <vector> #include <vector>
#include <opm/parser/eclipse/Deck/value_status.hpp> #include <opm/parser/eclipse/Deck/value_status.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp> #include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/Units/UnitSystem.hpp> #include <opm/parser/eclipse/Units/UnitSystem.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/Box.hpp> #include <opm/parser/eclipse/EclipseState/Grid/Box.hpp>

2
src/opm/parser/eclipse/EclipseState/IOConfig/IOConfig.cpp
View File

@ -29,7 +29,7 @@
#include <opm/parser/eclipse/Deck/DeckItem.hpp> #include <opm/parser/eclipse/Deck/DeckItem.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp> #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/Deck/DeckRecord.hpp> #include <opm/parser/eclipse/Deck/DeckRecord.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp> #include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp> #include <opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/DynamicState.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/DynamicState.hpp>

2
src/opm/parser/eclipse/EclipseState/IOConfig/RestartConfig.cpp
View File

@ -30,7 +30,7 @@
#include <opm/parser/eclipse/Deck/DeckItem.hpp> #include <opm/parser/eclipse/Deck/DeckItem.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp> #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/Deck/DeckRecord.hpp> #include <opm/parser/eclipse/Deck/DeckRecord.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp> #include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/Parser/ParseContext.hpp> #include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Parser/ErrorGuard.hpp> #include <opm/parser/eclipse/Parser/ErrorGuard.hpp>

2
src/opm/parser/eclipse/EclipseState/InitConfig/InitConfig.cpp
View File

@ -23,7 +23,7 @@
#include <opm/parser/eclipse/Deck/DeckItem.hpp> #include <opm/parser/eclipse/Deck/DeckItem.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp> #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/Deck/DeckRecord.hpp> #include <opm/parser/eclipse/Deck/DeckRecord.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp> #include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp> #include <opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp>
#include <opm/parser/eclipse/EclipseState/InitConfig/Equil.hpp> #include <opm/parser/eclipse/EclipseState/InitConfig/Equil.hpp>

4
src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp
View File

@ -31,7 +31,7 @@
#include <opm/parser/eclipse/Deck/DeckItem.hpp> #include <opm/parser/eclipse/Deck/DeckItem.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp> #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/Deck/DeckRecord.hpp> #include <opm/parser/eclipse/Deck/DeckRecord.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp> #include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/Parser/ParseContext.hpp> #include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Parser/ParserKeywords/C.hpp> #include <opm/parser/eclipse/Parser/ParserKeywords/C.hpp>
#include <opm/parser/eclipse/Parser/ParserKeywords/G.hpp> #include <opm/parser/eclipse/Parser/ParserKeywords/G.hpp>
@ -150,7 +150,7 @@ namespace {
handleMESSAGES(keyword, 0); handleMESSAGES(keyword, 0);
} }
if (Section::hasSCHEDULE(deck)) if (DeckSection::hasSCHEDULE(deck))
iterateScheduleSection( parseContext, errors, SCHEDULESection( deck ), grid, fp, eclipseProperties ); iterateScheduleSection( parseContext, errors, SCHEDULESection( deck ), grid, fp, eclipseProperties );
} }

4
src/opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.cpp
View File

@ -20,7 +20,7 @@
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp> #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp> #include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/EclipseState/Eclipse3DProperties.hpp> #include <opm/parser/eclipse/EclipseState/Eclipse3DProperties.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/FieldPropsManager.hpp> #include <opm/parser/eclipse/EclipseState/Grid/FieldPropsManager.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp> #include <opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp>
@ -63,7 +63,7 @@ namespace Opm {
m_VAPOIL(false), m_VAPOIL(false),
m_isThermal(false) m_isThermal(false)
{ {
if (Section::hasRUNSPEC(deck)) { if (DeckSection::hasRUNSPEC(deck)) {
const RUNSPECSection runspec(deck); const RUNSPECSection runspec(deck);
if (runspec.hasKeyword<ParserKeywords::CPR>()) { if (runspec.hasKeyword<ParserKeywords::CPR>()) {
const auto& cpr = runspec.getKeyword<ParserKeywords::CPR>(); const auto& cpr = runspec.getKeyword<ParserKeywords::CPR>();

4
src/opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.cpp
View File

@ -19,7 +19,7 @@
#include <opm/common/OpmLog/OpmLog.hpp> #include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp> #include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/FieldPropsManager.hpp> #include <opm/parser/eclipse/EclipseState/Grid/FieldPropsManager.hpp>
#include <opm/parser/eclipse/EclipseState/Eclipse3DProperties.hpp> #include <opm/parser/eclipse/EclipseState/Eclipse3DProperties.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp> #include <opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp>
@ -45,7 +45,7 @@ namespace Opm {
m_restart(restart) m_restart(restart)
{ {
if( !Section::hasRUNSPEC( deck ) || (!Section::hasSOLUTION( deck ) && !Section::hasGRID( deck )) ) if( !DeckSection::hasRUNSPEC( deck ) || (!DeckSection::hasSOLUTION( deck ) && !DeckSection::hasGRID( deck )) )
return; return;
RUNSPECSection runspecSection( deck ); RUNSPECSection runspecSection( deck );

2
src/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp
View File

@ -27,7 +27,7 @@
#include <opm/parser/eclipse/Deck/DeckItem.hpp> #include <opm/parser/eclipse/Deck/DeckItem.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp> #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/Deck/DeckRecord.hpp> #include <opm/parser/eclipse/Deck/DeckRecord.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp> #include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp> #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp> #include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>

4
src/opm/parser/eclipse/EclipseState/checkDeck.cpp
View File

@ -22,7 +22,7 @@
#include <opm/common/OpmLog/LogUtil.hpp> #include <opm/common/OpmLog/LogUtil.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp> #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp> #include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp> #include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Parser/ParseContext.hpp> #include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Parser/ErrorGuard.hpp> #include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
@ -48,7 +48,7 @@ bool checkDeck( const Deck& deck, const Parser& parser, const ParseContext& pars
// make sure all mandatory sections are present and that their order is correct // make sure all mandatory sections are present and that their order is correct
if (enabledChecks & SectionTopology) { if (enabledChecks & SectionTopology) {
bool ensureKeywordSection = enabledChecks & KeywordSection; bool ensureKeywordSection = enabledChecks & KeywordSection;
deckValid = deckValid && Section::checkSectionTopology(deck, parser, ensureKeywordSection); deckValid = deckValid && DeckSection::checkSectionTopology(deck, parser, ensureKeywordSection);
} }
const std::string& deckUnitSystem = boost::to_upper_copy(deck.getActiveUnitSystem().getName()); const std::string& deckUnitSystem = boost::to_upper_copy(deck.getActiveUnitSystem().getName());

8
src/opm/parser/eclipse/Parser/Parser.cpp
View File

@ -33,7 +33,7 @@
#include <opm/parser/eclipse/Deck/DeckItem.hpp> #include <opm/parser/eclipse/Deck/DeckItem.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp> #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/Deck/DeckRecord.hpp> #include <opm/parser/eclipse/Deck/DeckRecord.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp> #include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp> #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp> #include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
#include <opm/parser/eclipse/Parser/ErrorGuard.hpp> #include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
@ -1195,9 +1195,9 @@ std::vector<std::string> Parser::getAllDeckNames () const {
return false; return false;
} }
bool Section::checkSectionTopology(const Deck& deck, bool DeckSection::checkSectionTopology(const Deck& deck,
const Parser& parser, const Parser& parser,
bool ensureKeywordSectionAffiliation) bool ensureKeywordSectionAffiliation)
{ {
if( deck.size() == 0 ) { if( deck.size() == 0 ) {
std::string msg = "empty decks are invalid\n"; std::string msg = "empty decks are invalid\n";

1
tests/parser/ADDREGTests.cpp
View File

@ -30,7 +30,6 @@
#include <opm/parser/eclipse/Parser/Parser.hpp> #include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp> #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>

2
tests/parser/CopyRegTests.cpp
View File

@ -29,7 +29,7 @@
#include <opm/parser/eclipse/Parser/Parser.hpp> #include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp> #include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp> #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>

2
tests/parser/EclipseGridTests.cpp
View File

@ -35,7 +35,7 @@
#include <opm/parser/eclipse/Units/UnitSystem.hpp> #include <opm/parser/eclipse/Units/UnitSystem.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp> #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp> #include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/Units/UnitSystem.hpp> #include <opm/parser/eclipse/Units/UnitSystem.hpp>

2
tests/parser/EqualRegTests.cpp
View File

@ -29,7 +29,7 @@
#include <opm/parser/eclipse/Parser/Parser.hpp> #include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp> #include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp> #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>

2
tests/parser/FieldPropsTests.cpp
View File

@ -31,7 +31,7 @@
#include <opm/parser/eclipse/Parser/Parser.hpp> #include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Units/UnitSystem.hpp> #include <opm/parser/eclipse/Units/UnitSystem.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp> #include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp> #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp> #include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>

2
tests/parser/GridPropertyTests.cpp
View File

@ -30,7 +30,7 @@
#include <opm/parser/eclipse/Parser/Parser.hpp> #include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Units/UnitSystem.hpp> #include <opm/parser/eclipse/Units/UnitSystem.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp> #include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp> #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/EclipseState/Eclipse3DProperties.hpp> #include <opm/parser/eclipse/EclipseState/Eclipse3DProperties.hpp>

2
tests/parser/MULTREGTScannerTests.cpp
View File

@ -27,7 +27,7 @@
#include <opm/parser/eclipse/Parser/Parser.hpp> #include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp> #include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp> #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>

2
tests/parser/MultiRegTests.cpp
View File

@ -27,7 +27,7 @@
#include <boost/date_time/posix_time/posix_time.hpp> #include <boost/date_time/posix_time/posix_time.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp> #include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp> #include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp> #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/EclipseState/Eclipse3DProperties.hpp> #include <opm/parser/eclipse/EclipseState/Eclipse3DProperties.hpp>

2
tests/parser/PORVTests.cpp
View File

@ -28,7 +28,7 @@
#include <opm/parser/eclipse/Parser/Parser.hpp> #include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp> #include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp> #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/EclipseState/Eclipse3DProperties.hpp> #include <opm/parser/eclipse/EclipseState/Eclipse3DProperties.hpp>

2
tests/parser/ResinsightTest.cpp
View File

@ -21,7 +21,7 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp> #include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp> #include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Parser/ErrorGuard.hpp> #include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
#include <opm/parser/eclipse/Parser/ParseContext.hpp> #include <opm/parser/eclipse/Parser/ParseContext.hpp>

34
tests/parser/SectionTests.cpp
View File

@ -27,7 +27,7 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp> #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp> #include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/Parser/ParseContext.hpp> #include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp> #include <opm/parser/eclipse/Parser/Parser.hpp>
@ -44,8 +44,8 @@ BOOST_AUTO_TEST_CASE(SectionTest) {
deck.addKeyword( DeckKeyword(parser.getKeyword("SCHEDULE"))); deck.addKeyword( DeckKeyword(parser.getKeyword("SCHEDULE")));
deck.addKeyword( DeckKeyword(parser.getKeyword("WELSPECS"))); deck.addKeyword( DeckKeyword(parser.getKeyword("WELSPECS")));
Section runspecSection(deck, "RUNSPEC"); DeckSection runspecSection(deck, "RUNSPEC");
Section gridSection(deck, "GRID"); DeckSection gridSection(deck, "GRID");
BOOST_CHECK(runspecSection.hasKeyword("WELLDIMS")); BOOST_CHECK(runspecSection.hasKeyword("WELLDIMS"));
BOOST_CHECK(gridSection.hasKeyword("PORO")); BOOST_CHECK(gridSection.hasKeyword("PORO"));
@ -64,7 +64,7 @@ BOOST_AUTO_TEST_CASE(IteratorTest) {
deck.addKeyword( DeckKeyword(parser.getKeyword("WELLDIMS"))); deck.addKeyword( DeckKeyword(parser.getKeyword("WELLDIMS")));
deck.addKeyword( DeckKeyword(parser.getKeyword("TABDIMS"))); deck.addKeyword( DeckKeyword(parser.getKeyword("TABDIMS")));
deck.addKeyword( DeckKeyword(parser.getKeyword("GRID"))); deck.addKeyword( DeckKeyword(parser.getKeyword("GRID")));
Section section(deck, "RUNSPEC"); DeckSection section(deck, "RUNSPEC");
int numberOfItems = 0; int numberOfItems = 0;
for (auto iter=section.begin(); iter != section.end(); ++iter) { for (auto iter=section.begin(); iter != section.end(); ++iter) {
@ -209,8 +209,8 @@ BOOST_AUTO_TEST_CASE(SCHEDULESection_NotTerminated) {
BOOST_CHECK_EQUAL(true, section.hasKeyword("COMPDAT")); BOOST_CHECK_EQUAL(true, section.hasKeyword("COMPDAT"));
BOOST_CHECK_EQUAL(true, section.hasKeyword("WCONHIST")); BOOST_CHECK_EQUAL(true, section.hasKeyword("WCONHIST"));
BOOST_CHECK( Section::hasSCHEDULE(deck )); BOOST_CHECK( DeckSection::hasSCHEDULE(deck ));
BOOST_CHECK( !Section::hasREGIONS(deck )); BOOST_CHECK( !DeckSection::hasREGIONS(deck ));
} }
BOOST_AUTO_TEST_CASE(Section_ValidDecks) { BOOST_AUTO_TEST_CASE(Section_ValidDecks) {
@ -230,7 +230,7 @@ BOOST_AUTO_TEST_CASE(Section_ValidDecks) {
"SCHEDULE\n" "SCHEDULE\n"
"TEST5\n"; "TEST5\n";
BOOST_CHECK( Opm::Section::checkSectionTopology( parser.parseString( minimal, mode, errors ), parser) ); BOOST_CHECK( Opm::DeckSection::checkSectionTopology( parser.parseString( minimal, mode, errors ), parser) );
const std::string with_opt = "RUNSPEC\n" const std::string with_opt = "RUNSPEC\n"
"TEST1\n" "TEST1\n"
@ -249,7 +249,7 @@ BOOST_AUTO_TEST_CASE(Section_ValidDecks) {
"SCHEDULE\n" "SCHEDULE\n"
"TEST8\n"; "TEST8\n";
BOOST_CHECK(Opm::Section::checkSectionTopology( parser.parseString( with_opt, mode, errors ), parser)); BOOST_CHECK(Opm::DeckSection::checkSectionTopology( parser.parseString( with_opt, mode, errors ), parser));
} }
BOOST_AUTO_TEST_CASE(Section_InvalidDecks) { BOOST_AUTO_TEST_CASE(Section_InvalidDecks) {
@ -271,7 +271,7 @@ BOOST_AUTO_TEST_CASE(Section_InvalidDecks) {
"SCHEDULE\n" "SCHEDULE\n"
"TEST5\n"; "TEST5\n";
BOOST_CHECK(!Opm::Section::checkSectionTopology( parser.parseString( keyword_before_RUNSPEC, mode, errors ), parser)); BOOST_CHECK(!Opm::DeckSection::checkSectionTopology( parser.parseString( keyword_before_RUNSPEC, mode, errors ), parser));
const std::string wrong_order = "RUNSPEC\n" const std::string wrong_order = "RUNSPEC\n"
"TEST1\n" "TEST1\n"
@ -290,7 +290,7 @@ BOOST_AUTO_TEST_CASE(Section_InvalidDecks) {
"SCHEDULE\n" "SCHEDULE\n"
"TEST8\n"; "TEST8\n";
BOOST_CHECK(!Opm::Section::checkSectionTopology( parser.parseString( wrong_order, mode, errors ), parser)); BOOST_CHECK(!Opm::DeckSection::checkSectionTopology( parser.parseString( wrong_order, mode, errors ), parser));
const std::string duplicate = "RUNSPEC\n" const std::string duplicate = "RUNSPEC\n"
"TEST1\n" "TEST1\n"
@ -311,7 +311,7 @@ BOOST_AUTO_TEST_CASE(Section_InvalidDecks) {
"SCHEDULE\n" "SCHEDULE\n"
"TEST8\n"; "TEST8\n";
BOOST_CHECK(!Opm::Section::checkSectionTopology( parser.parseString( duplicate, mode, errors ), parser)); BOOST_CHECK(!Opm::DeckSection::checkSectionTopology( parser.parseString( duplicate, mode, errors ), parser));
const std::string section_after_SCHEDULE = "RUNSPEC\n" const std::string section_after_SCHEDULE = "RUNSPEC\n"
"TEST1\n" "TEST1\n"
@ -330,7 +330,7 @@ BOOST_AUTO_TEST_CASE(Section_InvalidDecks) {
"EDIT\n" "EDIT\n"
"TEST3\n"; "TEST3\n";
BOOST_CHECK(!Opm::Section::checkSectionTopology( parser.parseString( section_after_SCHEDULE, mode, errors ), parser)); BOOST_CHECK(!Opm::DeckSection::checkSectionTopology( parser.parseString( section_after_SCHEDULE, mode, errors ), parser));
const std::string missing_runspec = "GRID\n" const std::string missing_runspec = "GRID\n"
"TEST2\n" "TEST2\n"
@ -341,7 +341,7 @@ BOOST_AUTO_TEST_CASE(Section_InvalidDecks) {
"SCHEDULE\n" "SCHEDULE\n"
"TEST5\n"; "TEST5\n";
BOOST_CHECK(!Opm::Section::checkSectionTopology( parser.parseString( missing_runspec, mode, errors ), parser)); BOOST_CHECK(!Opm::DeckSection::checkSectionTopology( parser.parseString( missing_runspec, mode, errors ), parser));
const std::string missing_GRID = "RUNSPEC\n" const std::string missing_GRID = "RUNSPEC\n"
@ -353,7 +353,7 @@ BOOST_AUTO_TEST_CASE(Section_InvalidDecks) {
"SCHEDULE\n" "SCHEDULE\n"
"TEST5\n"; "TEST5\n";
BOOST_CHECK(!Opm::Section::checkSectionTopology( parser.parseString( missing_GRID, mode, errors ), parser)); BOOST_CHECK(!Opm::DeckSection::checkSectionTopology( parser.parseString( missing_GRID, mode, errors ), parser));
const std::string missing_PROPS = "RUNSPEC\n" const std::string missing_PROPS = "RUNSPEC\n"
"TEST1\n" "TEST1\n"
@ -364,7 +364,7 @@ BOOST_AUTO_TEST_CASE(Section_InvalidDecks) {
"SCHEDULE\n" "SCHEDULE\n"
"TEST5\n"; "TEST5\n";
BOOST_CHECK(!Opm::Section::checkSectionTopology( parser.parseString( missing_PROPS, mode, errors ), parser)); BOOST_CHECK(!Opm::DeckSection::checkSectionTopology( parser.parseString( missing_PROPS, mode, errors ), parser));
const std::string missing_SOLUTION = "RUNSPEC\n" const std::string missing_SOLUTION = "RUNSPEC\n"
"TEST1\n" "TEST1\n"
@ -375,7 +375,7 @@ BOOST_AUTO_TEST_CASE(Section_InvalidDecks) {
"SCHEDULE\n" "SCHEDULE\n"
"TEST5\n"; "TEST5\n";
BOOST_CHECK(!Opm::Section::checkSectionTopology( parser.parseString( missing_SOLUTION, mode, errors ), parser)); BOOST_CHECK(!Opm::DeckSection::checkSectionTopology( parser.parseString( missing_SOLUTION, mode, errors ), parser));
const std::string missing_SCHEDULE = "RUNSPEC\n" const std::string missing_SCHEDULE = "RUNSPEC\n"
"TEST1\n" "TEST1\n"
@ -386,5 +386,5 @@ BOOST_AUTO_TEST_CASE(Section_InvalidDecks) {
"SOLUTION\n" "SOLUTION\n"
"TEST4\n"; "TEST4\n";
BOOST_CHECK(!Opm::Section::checkSectionTopology( parser.parseString( missing_SCHEDULE, mode, errors ), parser)); BOOST_CHECK(!Opm::DeckSection::checkSectionTopology( parser.parseString( missing_SCHEDULE, mode, errors ), parser));
} }

2
tests/parser/SimulationConfigTest.cpp
View File

@ -25,7 +25,7 @@
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp> #include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp> #include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/Parser/ParserKeywords/C.hpp> #include <opm/parser/eclipse/Parser/ParserKeywords/C.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp> #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/GridProperties.hpp> #include <opm/parser/eclipse/EclipseState/Grid/GridProperties.hpp>

2
tests/parser/integration/EclipseGridCreateFromDeck.cpp
View File

@ -27,7 +27,7 @@
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp> #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp> #include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp> #include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp> #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp> #include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>