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

changed: rename serializeObject to serializationTestObject

Browse Source 
makes it more clear what these members are used for.
This commit is contained in:
Arne Morten Kvarving 2022-10-04 14:07:37 +02:00
parent cea1dea368
commit fb0f3c451e
256 changed files with 567 additions and 567 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/common/OpmLog/KeywordLocation.hpp
View File

@ -53,7 +53,7 @@ public:
std::string format(const std::string& msg_fmt) const; std::string format(const std::string& msg_fmt) const;
static KeywordLocation serializeObject() static KeywordLocation serializationTestObject()
{ {
KeywordLocation result; KeywordLocation result;
result.keyword = "KW"; result.keyword = "KW";

2
opm/input/eclipse/Deck/Deck.hpp
View File

@ -69,7 +69,7 @@ namespace Opm {
Deck( const Deck& ); Deck( const Deck& );
Deck( Deck&& ); Deck( Deck&& );
static Deck serializeObject(); static Deck serializationTestObject();
Deck& operator=(const Deck& rhs); Deck& operator=(const Deck& rhs);
bool operator==(const Deck& data) const; bool operator==(const Deck& data) const;

2
opm/input/eclipse/Deck/DeckItem.hpp
View File

@ -46,7 +46,7 @@ namespace Opm {
DeckItem( const std::string&, UDAValue, const std::vector<Dimension>& active_dim, const std::vector<Dimension>& default_dim); DeckItem( const std::string&, UDAValue, const std::vector<Dimension>& active_dim, const std::vector<Dimension>& default_dim);
DeckItem( const std::string&, double, const std::vector<Dimension>& active_dim, const std::vector<Dimension>& default_dim); DeckItem( const std::string&, double, const std::vector<Dimension>& active_dim, const std::vector<Dimension>& default_dim);
static DeckItem serializeObject(); static DeckItem serializationTestObject();
const std::string& name() const; const std::string& name() const;

2
opm/input/eclipse/Deck/DeckKeyword.hpp
View File

@ -46,7 +46,7 @@ namespace Opm {
DeckKeyword(const ParserKeyword& parserKeyword, const std::vector<int>& data); DeckKeyword(const ParserKeyword& parserKeyword, const std::vector<int>& data);
DeckKeyword(const ParserKeyword& parserKeyword, const std::vector<double>& data, const UnitSystem& system_active, const UnitSystem& system_default); DeckKeyword(const ParserKeyword& parserKeyword, const std::vector<double>& data, const UnitSystem& system_active, const UnitSystem& system_default);
static DeckKeyword serializeObject(); static DeckKeyword serializationTestObject();
const std::string& name() const; const std::string& name() const;
void setFixedSize(); void setFixedSize();

2
opm/input/eclipse/Deck/DeckRecord.hpp
View File

@ -36,7 +36,7 @@ namespace Opm {
DeckRecord() = default; DeckRecord() = default;
DeckRecord( std::vector< DeckItem >&& items, const bool check_for_duplicate_names = true ); DeckRecord( std::vector< DeckItem >&& items, const bool check_for_duplicate_names = true );
static DeckRecord serializeObject(); static DeckRecord serializationTestObject();
size_t size() const; size_t size() const;
void addItem( DeckItem deckItem ); void addItem( DeckItem deckItem );

2
opm/input/eclipse/Deck/UDAValue.hpp
View File

@ -51,7 +51,7 @@ public:
void update(const std::string& s); void update(const std::string& s);
void update_value(const UDAValue& other); void update_value(const UDAValue& other);
static UDAValue serializeObject(); static UDAValue serializationTestObject();
/* /*
The get<double>() and get<std::string>() methods will throw an The get<double>() and get<std::string>() methods will throw an

2
opm/input/eclipse/EclipseState/Aquifer/Aquancon.hpp
View File

@ -93,7 +93,7 @@ namespace Opm {
void pruneDeactivatedAquiferConnections(const std::vector<std::size_t>& deactivated_cells); void pruneDeactivatedAquiferConnections(const std::vector<std::size_t>& deactivated_cells);
void loadFromRestart(const RestartIO::RstAquifer& rst_aquifers); void loadFromRestart(const RestartIO::RstAquifer& rst_aquifers);
static Aquancon serializeObject(); static Aquancon serializationTestObject();
const std::unordered_map<int, std::vector<Aquancon::AquancCell>>& data() const; const std::unordered_map<int, std::vector<Aquancon::AquancCell>>& data() const;
bool operator==(const Aquancon& other) const; bool operator==(const Aquancon& other) const;

4
opm/input/eclipse/EclipseState/Aquifer/AquiferCT.hpp
View File

@ -81,7 +81,7 @@ namespace Opm {
std::vector<double> dimensionless_time{}; std::vector<double> dimensionless_time{};
std::vector<double> dimensionless_pressure{}; std::vector<double> dimensionless_pressure{};
static AQUCT_data serializeObject(); static AQUCT_data serializationTestObject();
double timeConstant() const { return this->time_constant_; } double timeConstant() const { return this->time_constant_; }
double influxConstant() const { return this->influx_constant_; } double influxConstant() const { return this->influx_constant_; }
@ -129,7 +129,7 @@ namespace Opm {
void loadFromRestart(const RestartIO::RstAquifer& rst, void loadFromRestart(const RestartIO::RstAquifer& rst,
const TableManager& tables); const TableManager& tables);
static AquiferCT serializeObject(); static AquiferCT serializationTestObject();
std::size_t size() const; std::size_t size() const;
std::vector<AquiferCT::AQUCT_data>::const_iterator begin() const; std::vector<AquiferCT::AQUCT_data>::const_iterator begin() const;

2
opm/input/eclipse/EclipseState/Aquifer/AquiferConfig.hpp
View File

@ -53,7 +53,7 @@ public:
void loadFromRestart(const RestartIO::RstAquifer& aquifers, void loadFromRestart(const RestartIO::RstAquifer& aquifers,
const TableManager& tables); const TableManager& tables);
static AquiferConfig serializeObject(); static AquiferConfig serializationTestObject();
bool active() const; bool active() const;
const AquiferCT& ct() const; const AquiferCT& ct() const;

4
opm/input/eclipse/EclipseState/Aquifer/Aquifetp.hpp
View File

@ -71,7 +71,7 @@ class Aquifetp {
std::optional<double> initial_pressure{}; std::optional<double> initial_pressure{};
std::optional<double> initial_temperature{}; std::optional<double> initial_temperature{};
static AQUFETP_data serializeObject(); static AQUFETP_data serializationTestObject();
double timeConstant() const { return this->time_constant_; } double timeConstant() const { return this->time_constant_; }
double waterDensity() const { return this->water_density_; } double waterDensity() const { return this->water_density_; }
@ -110,7 +110,7 @@ class Aquifetp {
void loadFromRestart(const RestartIO::RstAquifer& rst, void loadFromRestart(const RestartIO::RstAquifer& rst,
const TableManager& tables); const TableManager& tables);
static Aquifetp serializeObject(); static Aquifetp serializationTestObject();
const std::vector<Aquifetp::AQUFETP_data>& data() const; const std::vector<Aquifetp::AQUFETP_data>& data() const;

2
opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquifers.hpp
View File

@ -57,7 +57,7 @@ namespace Opm {
void initConnections(const Deck& deck, const EclipseGrid& grid); void initConnections(const Deck& deck, const EclipseGrid& grid);
void postProcessConnections(const EclipseGrid& grid, const std::vector<int>& actnum); void postProcessConnections(const EclipseGrid& grid, const std::vector<int>& actnum);
static NumericalAquifers serializeObject(); static NumericalAquifers serializationTestObject();
template <class Serializer> template <class Serializer>
void serializeOp(Serializer& serializer) void serializeOp(Serializer& serializer)
{ {

2
opm/input/eclipse/EclipseState/EclipseConfig.hpp
View File

@ -34,7 +34,7 @@ namespace Opm {
explicit EclipseConfig(const Deck& deck); explicit EclipseConfig(const Deck& deck);
EclipseConfig(const InitConfig& initConfig, const IOConfig& io_conf); EclipseConfig(const InitConfig& initConfig, const IOConfig& io_conf);
static EclipseConfig serializeObject(); static EclipseConfig serializationTestObject();
InitConfig& init(); InitConfig& init();
IOConfig& io(); IOConfig& io();

2
opm/input/eclipse/EclipseState/EndpointScaling.hpp
View File

@ -30,7 +30,7 @@ class EndpointScaling {
EndpointScaling() noexcept = default; EndpointScaling() noexcept = default;
explicit EndpointScaling( const Deck& ); explicit EndpointScaling( const Deck& );
static EndpointScaling serializeObject(); static EndpointScaling serializationTestObject();
/* true if endpoint scaling is enabled, otherwise false */ /* true if endpoint scaling is enabled, otherwise false */
operator bool() const noexcept; operator bool() const noexcept;

2
opm/input/eclipse/EclipseState/Grid/Fault.hpp
View File

@ -35,7 +35,7 @@ public:
Fault() = default; Fault() = default;
explicit Fault(const std::string& faultName); explicit Fault(const std::string& faultName);
static Fault serializeObject(); static Fault serializationTestObject();
const std::string& getName() const; const std::string& getName() const;
void setTransMult(double transMult); void setTransMult(double transMult);

2
opm/input/eclipse/EclipseState/Grid/FaultCollection.hpp
View File

@ -37,7 +37,7 @@ public:
FaultCollection(); FaultCollection();
FaultCollection(const GRIDSection& gridSection, const GridDims& grid); FaultCollection(const GRIDSection& gridSection, const GridDims& grid);
static FaultCollection serializeObject(); static FaultCollection serializationTestObject();
size_t size() const; size_t size() const;
bool hasFault(const std::string& faultName) const; bool hasFault(const std::string& faultName) const;

2
opm/input/eclipse/EclipseState/Grid/FaultFace.hpp
View File

@ -36,7 +36,7 @@ public:
size_t K1 , size_t K2, size_t K1 , size_t K2,
FaceDir::DirEnum faceDir); FaceDir::DirEnum faceDir);
static FaultFace serializeObject(); static FaultFace serializationTestObject();
std::vector<size_t>::const_iterator begin() const; std::vector<size_t>::const_iterator begin() const;
std::vector<size_t>::const_iterator end() const; std::vector<size_t>::const_iterator end() const;

2
opm/input/eclipse/EclipseState/Grid/GridDims.hpp
View File

@ -34,7 +34,7 @@ namespace Opm {
explicit GridDims(const std::array<int, 3>& xyz); explicit GridDims(const std::array<int, 3>& xyz);
GridDims(std::size_t nx, std::size_t ny, std::size_t nz); GridDims(std::size_t nx, std::size_t ny, std::size_t nz);
static GridDims serializeObject(); static GridDims serializationTestObject();
explicit GridDims(const Deck& deck); explicit GridDims(const Deck& deck);

2
opm/input/eclipse/EclipseState/Grid/MULTREGTScanner.hpp
View File

@ -92,7 +92,7 @@ namespace Opm {
const FieldPropsManager* fp_arg, const FieldPropsManager* fp_arg,
const std::vector< const DeckKeyword* >& keywords); const std::vector< const DeckKeyword* >& keywords);
static MULTREGTScanner serializeObject(); static MULTREGTScanner serializationTestObject();
double getRegionMultiplier(size_t globalCellIdx1, size_t globalCellIdx2, FaceDir::DirEnum faceDir) const; double getRegionMultiplier(size_t globalCellIdx1, size_t globalCellIdx2, FaceDir::DirEnum faceDir) const;

2
opm/input/eclipse/EclipseState/Grid/NNC.hpp
View File

@ -106,7 +106,7 @@ public:
/// Construct from input deck. /// Construct from input deck.
NNC(const EclipseGrid& grid, const Deck& deck); NNC(const EclipseGrid& grid, const Deck& deck);
static NNC serializeObject(); static NNC serializationTestObject();
bool addNNC(const size_t cell1, const size_t cell2, const double trans); bool addNNC(const size_t cell1, const size_t cell2, const double trans);
const std::vector<NNCdata>& input() const { return m_input; } const std::vector<NNCdata>& input() const { return m_input; }

2
opm/input/eclipse/EclipseState/Grid/TranCalculator.hpp
View File

@ -105,7 +105,7 @@ public:
serializer(actions); serializer(actions);
} }
static TranCalculator serializeObject() static TranCalculator serializationTestObject()
{ {
TranCalculator tran("test"); TranCalculator tran("test");
tran.add_action(ScalarOperation::MIN, "FGOP"); tran.add_action(ScalarOperation::MIN, "FGOP");

2
opm/input/eclipse/EclipseState/Grid/TransMult.hpp
View File

@ -50,7 +50,7 @@ namespace Opm {
TransMult() = default; TransMult() = default;
TransMult(const GridDims& dims, const Deck& deck, const FieldPropsManager& fp); TransMult(const GridDims& dims, const Deck& deck, const FieldPropsManager& fp);
static TransMult serializeObject(); static TransMult serializationTestObject();
double getMultiplier(size_t globalIndex, FaceDir::DirEnum faceDir) const; double getMultiplier(size_t globalIndex, FaceDir::DirEnum faceDir) const;
double getMultiplier(size_t i , size_t j , size_t k, FaceDir::DirEnum faceDir) const; double getMultiplier(size_t i , size_t j , size_t k, FaceDir::DirEnum faceDir) const;

2
opm/input/eclipse/EclipseState/IOConfig/IOConfig.hpp
View File

@ -152,7 +152,7 @@ namespace Opm {
explicit IOConfig( const Deck& ); explicit IOConfig( const Deck& );
explicit IOConfig( const std::string& input_path ); explicit IOConfig( const std::string& input_path );
static IOConfig serializeObject(); static IOConfig serializationTestObject();
void setEclCompatibleRST(bool ecl_rst); void setEclCompatibleRST(bool ecl_rst);
bool getEclCompatibleRST() const; bool getEclCompatibleRST() const;

2
opm/input/eclipse/EclipseState/InitConfig/Equil.hpp
View File

@ -62,7 +62,7 @@ namespace Opm {
Equil() = default; Equil() = default;
explicit Equil( const DeckKeyword& ); explicit Equil( const DeckKeyword& );
static Equil serializeObject(); static Equil serializationTestObject();
const EquilRecord& getRecord( size_t id ) const; const EquilRecord& getRecord( size_t id ) const;

4
opm/input/eclipse/EclipseState/InitConfig/FoamConfig.hpp
View File

@ -39,7 +39,7 @@ public:
FoamData(const DeckRecord& FOAMFSC_record, const DeckRecord& FOAMROCK_record); FoamData(const DeckRecord& FOAMFSC_record, const DeckRecord& FOAMROCK_record);
explicit FoamData(const DeckRecord& FOAMROCK_record); explicit FoamData(const DeckRecord& FOAMROCK_record);
static FoamData serializeObject(); static FoamData serializationTestObject();
double referenceSurfactantConcentration() const; double referenceSurfactantConcentration() const;
double exponent() const; double exponent() const;
@ -80,7 +80,7 @@ public:
FoamConfig() = default; FoamConfig() = default;
explicit FoamConfig(const Deck&); explicit FoamConfig(const Deck&);
static FoamConfig serializeObject(); static FoamConfig serializationTestObject();
const FoamData& getRecord(std::size_t index) const; const FoamData& getRecord(std::size_t index) const;

2
opm/input/eclipse/EclipseState/InitConfig/InitConfig.hpp
View File

@ -35,7 +35,7 @@ namespace Opm {
InitConfig(); InitConfig();
explicit InitConfig(const Deck& deck); explicit InitConfig(const Deck& deck);
static InitConfig serializeObject(); static InitConfig serializationTestObject();
void setRestart( const std::string& root, int step); void setRestart( const std::string& root, int step);
bool restartRequested() const; bool restartRequested() const;

2
opm/input/eclipse/EclipseState/MICPpara.hpp
View File

@ -31,7 +31,7 @@ class Deck;
explicit MICPpara(const Deck& deck); explicit MICPpara(const Deck& deck);
static MICPpara serializeObject() static MICPpara serializationTestObject()
{ {
MICPpara mp; MICPpara mp;
mp.m_density_biofilm = 100; mp.m_density_biofilm = 100;

20
opm/input/eclipse/EclipseState/Runspec.hpp
View File

@ -60,7 +60,7 @@ class Phases {
Phases( bool oil, bool gas, bool wat, bool solvent = false, bool polymer = false, bool energy = false, Phases( bool oil, bool gas, bool wat, bool solvent = false, bool polymer = false, bool energy = false,
bool polymw = false, bool foam = false, bool brine = false, bool zfraction = false ) noexcept; bool polymw = false, bool foam = false, bool brine = false, bool zfraction = false ) noexcept;
static Phases serializeObject(); static Phases serializationTestObject();
bool active( Phase ) const noexcept; bool active( Phase ) const noexcept;
size_t size() const noexcept; size_t size() const noexcept;
@ -83,7 +83,7 @@ public:
Welldims() = default; Welldims() = default;
explicit Welldims(const Deck& deck); explicit Welldims(const Deck& deck);
static Welldims serializeObject(); static Welldims serializationTestObject();
int maxConnPerWell() const int maxConnPerWell() const
{ {
@ -161,7 +161,7 @@ public:
WellSegmentDims(); WellSegmentDims();
explicit WellSegmentDims(const Deck& deck); explicit WellSegmentDims(const Deck& deck);
static WellSegmentDims serializeObject(); static WellSegmentDims serializationTestObject();
int maxSegmentedWells() const int maxSegmentedWells() const
@ -200,7 +200,7 @@ public:
NetworkDims(); NetworkDims();
explicit NetworkDims(const Deck& deck); explicit NetworkDims(const Deck& deck);
static NetworkDims serializeObject(); static NetworkDims serializationTestObject();
int maxNONodes() const int maxNONodes() const
{ {
@ -240,7 +240,7 @@ public:
AquiferDimensions(); AquiferDimensions();
explicit AquiferDimensions(const Deck& deck); explicit AquiferDimensions(const Deck& deck);
static AquiferDimensions serializeObject(); static AquiferDimensions serializationTestObject();
int maxAnalyticAquifers() const int maxAnalyticAquifers() const
{ {
@ -272,7 +272,7 @@ public:
EclHysterConfig() = default; EclHysterConfig() = default;
explicit EclHysterConfig(const Deck& deck); explicit EclHysterConfig(const Deck& deck);
static EclHysterConfig serializeObject(); static EclHysterConfig serializationTestObject();
/*! /*!
* \brief Specify whether hysteresis is enabled or not. * \brief Specify whether hysteresis is enabled or not.
@ -339,7 +339,7 @@ public:
const ThreePhaseOilKrModel model, const ThreePhaseOilKrModel model,
const KeywordFamily family); const KeywordFamily family);
static SatFuncControls serializeObject(); static SatFuncControls serializationTestObject();
double minimumRelpermMobilityThreshold() const double minimumRelpermMobilityThreshold() const
{ {
@ -380,7 +380,7 @@ public:
void update(int value); void update(int value);
int value() const; int value() const;
static Nupcol serializeObject(); static Nupcol serializationTestObject();
bool operator==(const Nupcol& data) const; bool operator==(const Nupcol& data) const;
template<class Serializer> template<class Serializer>
@ -414,7 +414,7 @@ public:
serializer(this->min_iter); serializer(this->min_iter);
} }
static Tracers serializeObject(); static Tracers serializationTestObject();
bool operator==(const Tracers& data) const; bool operator==(const Tracers& data) const;
private: private:
@ -435,7 +435,7 @@ public:
Runspec() = default; Runspec() = default;
explicit Runspec( const Deck& ); explicit Runspec( const Deck& );
static Runspec serializeObject(); static Runspec serializationTestObject();
std::time_t start_time() const noexcept; std::time_t start_time() const noexcept;
const UDQParams& udqParams() const noexcept; const UDQParams& udqParams() const noexcept;

4
opm/input/eclipse/EclipseState/SimulationConfig/BCConfig.hpp
View File

@ -61,7 +61,7 @@ public:
BCFace() = default; BCFace() = default;
explicit BCFace(const DeckRecord& record); explicit BCFace(const DeckRecord& record);
static BCFace serializeObject(); static BCFace serializationTestObject();
bool operator==(const BCFace& other) const; bool operator==(const BCFace& other) const;
@ -85,7 +85,7 @@ public:
BCConfig() = default; BCConfig() = default;
explicit BCConfig(const Deck& deck); explicit BCConfig(const Deck& deck);
static BCConfig serializeObject(); static BCConfig serializationTestObject();
std::size_t size() const; std::size_t size() const;
std::vector<BCFace>::const_iterator begin() const; std::vector<BCFace>::const_iterator begin() const;

2
opm/input/eclipse/EclipseState/SimulationConfig/RockConfig.hpp
View File

@ -61,7 +61,7 @@ struct RockComp {
RockConfig(); RockConfig();
RockConfig(const Deck& deck, const FieldPropsManager& fp); RockConfig(const Deck& deck, const FieldPropsManager& fp);
static RockConfig serializeObject(); static RockConfig serializationTestObject();
bool active() const; bool active() const;
const std::vector<RockConfig::RockComp>& comp() const; const std::vector<RockConfig::RockComp>& comp() const;

2
opm/input/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp
View File

@ -38,7 +38,7 @@ namespace Opm {
const Deck& deck, const Deck& deck,
const FieldPropsManager& fp); const FieldPropsManager& fp);
static SimulationConfig serializeObject(); static SimulationConfig serializationTestObject();
const RockConfig& rock_config() const; const RockConfig& rock_config() const;
const ThresholdPressure& getThresholdPressure() const; const ThresholdPressure& getThresholdPressure() const;

2
opm/input/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp
View File

@ -46,7 +46,7 @@ namespace Opm {
{} {}
//! \brief Returns an instance for serialization tests. //! \brief Returns an instance for serialization tests.
static ThresholdPressure serializeObject(); static ThresholdPressure serializationTestObject();
/* /*
The hasRegionBarrier() method checks if a threshold pressure The hasRegionBarrier() method checks if a threshold pressure

4
opm/input/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp
View File

@ -48,7 +48,7 @@ namespace Opm {
SummaryConfigNode() = default; SummaryConfigNode() = default;
explicit SummaryConfigNode(std::string keyword, const Category cat, KeywordLocation loc_arg); explicit SummaryConfigNode(std::string keyword, const Category cat, KeywordLocation loc_arg);
static SummaryConfigNode serializeObject(); static SummaryConfigNode serializationTestObject();
SummaryConfigNode& parameterType(const Type type); SummaryConfigNode& parameterType(const Type type);
SummaryConfigNode& namedEntity(std::string name); SummaryConfigNode& namedEntity(std::string name);
@ -160,7 +160,7 @@ namespace Opm {
const std::set<std::string>& shortKwds, const std::set<std::string>& shortKwds,
const std::set<std::string>& smryKwds); const std::set<std::string>& smryKwds);
static SummaryConfig serializeObject(); static SummaryConfig serializationTestObject();
const_iterator begin() const; const_iterator begin() const;
const_iterator end() const; const_iterator end() const;

2
opm/input/eclipse/EclipseState/Tables/Aqudims.hpp
View File

@ -38,7 +38,7 @@ namespace Opm {
explicit Aqudims(const Deck& deck); explicit Aqudims(const Deck& deck);
static Aqudims serializeObject() static Aqudims serializationTestObject()
{ {
Aqudims result; Aqudims result;
result.m_mxnaqn = 1; result.m_mxnaqn = 1;

2
opm/input/eclipse/EclipseState/Tables/BrineDensityTable.hpp
View File

@ -26,7 +26,7 @@ namespace Opm {
class BrineDensityTable { class BrineDensityTable {
public: public:
static BrineDensityTable serializeObject(); static BrineDensityTable serializationTestObject();
void init(const Opm::DeckRecord& record); void init(const Opm::DeckRecord& record);
const std::vector<double>& getBrineDensityColumn() const; const std::vector<double>& getBrineDensityColumn() const;

2
opm/input/eclipse/EclipseState/Tables/ColumnSchema.hpp
View File

@ -34,7 +34,7 @@ namespace Opm {
ColumnSchema(const std::string& name , Table::ColumnOrderEnum order, Table::DefaultAction defaultAction); ColumnSchema(const std::string& name , Table::ColumnOrderEnum order, Table::DefaultAction defaultAction);
ColumnSchema(const std::string& name , Table::ColumnOrderEnum order, double defaultValue); ColumnSchema(const std::string& name , Table::ColumnOrderEnum order, double defaultValue);
static ColumnSchema serializeObject(); static ColumnSchema serializationTestObject();
const std::string& name() const; const std::string& name() const;
bool validOrder( double value1 , double value2) const; bool validOrder( double value1 , double value2) const;

2
opm/input/eclipse/EclipseState/Tables/DenT.hpp
View File

@ -52,7 +52,7 @@ namespace Opm {
DenT() = default; DenT() = default;
explicit DenT(const DeckKeyword& keyword); explicit DenT(const DeckKeyword& keyword);
static DenT serializeObject(); static DenT serializationTestObject();
const entry& operator[](const std::size_t index) const; const entry& operator[](const std::size_t index) const;
bool operator==(const DenT& other) const; bool operator==(const DenT& other) const;

2
opm/input/eclipse/EclipseState/Tables/Eqldims.hpp
View File

@ -42,7 +42,7 @@ namespace Opm {
m_nstrvd( nstrvd ) m_nstrvd( nstrvd )
{ } { }
static Eqldims serializeObject() static Eqldims serializationTestObject()
{ {
return Eqldims(1, 2, 3, 4, 5); return Eqldims(1, 2, 3, 4, 5);
} }

30
opm/input/eclipse/EclipseState/Tables/FlatTable.hpp
View File

@ -92,7 +92,7 @@ struct GravityTable : public FlatTableWithCopy<GRAVITYRecord>
explicit GravityTable(const DeckKeyword& kw); explicit GravityTable(const DeckKeyword& kw);
explicit GravityTable(std::initializer_list<GRAVITYRecord> records); explicit GravityTable(std::initializer_list<GRAVITYRecord> records);
static GravityTable serializeObject() static GravityTable serializationTestObject()
{ {
return GravityTable({{1.0, 2.0, 3.0}}); return GravityTable({{1.0, 2.0, 3.0}});
} }
@ -133,7 +133,7 @@ struct DensityTable : public FlatTableWithCopy<DENSITYRecord>
explicit DensityTable(const GravityTable& gravity); explicit DensityTable(const GravityTable& gravity);
explicit DensityTable(std::initializer_list<DENSITYRecord> records); explicit DensityTable(std::initializer_list<DENSITYRecord> records);
static DensityTable serializeObject() static DensityTable serializationTestObject()
{ {
return DensityTable({{1.0, 2.0, 3.0}}); return DensityTable({{1.0, 2.0, 3.0}});
} }
@ -185,7 +185,7 @@ struct DiffCoeffRecord {
struct DiffCoeffTable : public FlatTable< DiffCoeffRecord > { struct DiffCoeffTable : public FlatTable< DiffCoeffRecord > {
using FlatTable< DiffCoeffRecord >::FlatTable; using FlatTable< DiffCoeffRecord >::FlatTable;
static DiffCoeffTable serializeObject() static DiffCoeffTable serializationTestObject()
{ {
return DiffCoeffTable({{1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0}}); return DiffCoeffTable({{1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0}});
} }
@ -225,7 +225,7 @@ struct PvtwTable : public FlatTableWithCopy<PVTWRecord>
explicit PvtwTable(const DeckKeyword& kw); explicit PvtwTable(const DeckKeyword& kw);
explicit PvtwTable(std::initializer_list<PVTWRecord> records); explicit PvtwTable(std::initializer_list<PVTWRecord> records);
static PvtwTable serializeObject() static PvtwTable serializationTestObject()
{ {
return PvtwTable({{1.0, 2.0, 3.0, 4.0, 5.0}}); return PvtwTable({{1.0, 2.0, 3.0, 4.0, 5.0}});
} }
@ -259,7 +259,7 @@ struct ROCKRecord {
struct RockTable : public FlatTable< ROCKRecord > { struct RockTable : public FlatTable< ROCKRecord > {
using FlatTable< ROCKRecord >::FlatTable; using FlatTable< ROCKRecord >::FlatTable;
static RockTable serializeObject() static RockTable serializationTestObject()
{ {
return RockTable({{1.0, 2.0}}); return RockTable({{1.0, 2.0}});
} }
@ -296,7 +296,7 @@ struct PVCDORecord {
struct PvcdoTable : public FlatTable< PVCDORecord > { struct PvcdoTable : public FlatTable< PVCDORecord > {
using FlatTable< PVCDORecord >::FlatTable; using FlatTable< PVCDORecord >::FlatTable;
static PvcdoTable serializeObject() static PvcdoTable serializationTestObject()
{ {
return PvcdoTable({{1.0, 2.0, 3.0, 4.0, 5.0}}); return PvcdoTable({{1.0, 2.0, 3.0, 4.0, 5.0}});
} }
@ -321,7 +321,7 @@ struct PlmixparRecord {
struct PlmixparTable : public FlatTable< PlmixparRecord> { struct PlmixparTable : public FlatTable< PlmixparRecord> {
using FlatTable< PlmixparRecord >::FlatTable; using FlatTable< PlmixparRecord >::FlatTable;
static PlmixparTable serializeObject() static PlmixparTable serializationTestObject()
{ {
return PlmixparTable({PlmixparRecord{1.0}}); return PlmixparTable({PlmixparRecord{1.0}});
} }
@ -355,7 +355,7 @@ struct PlyvmhRecord {
struct PlyvmhTable : public FlatTable<PlyvmhRecord> { struct PlyvmhTable : public FlatTable<PlyvmhRecord> {
using FlatTable< PlyvmhRecord >::FlatTable; using FlatTable< PlyvmhRecord >::FlatTable;
static PlyvmhTable serializeObject() static PlyvmhTable serializationTestObject()
{ {
return PlyvmhTable({{1.0, 2.0, 3.0, 4.0}}); return PlyvmhTable({{1.0, 2.0, 3.0, 4.0}});
} }
@ -380,7 +380,7 @@ struct ShrateRecord {
struct ShrateTable : public FlatTable<ShrateRecord> { struct ShrateTable : public FlatTable<ShrateRecord> {
using FlatTable< ShrateRecord >::FlatTable; using FlatTable< ShrateRecord >::FlatTable;
static ShrateTable serializeObject() static ShrateTable serializationTestObject()
{ {
return ShrateTable({ShrateRecord{1.0}}); return ShrateTable({ShrateRecord{1.0}});
} }
@ -405,7 +405,7 @@ struct Stone1exRecord {
struct Stone1exTable : public FlatTable<Stone1exRecord> { struct Stone1exTable : public FlatTable<Stone1exRecord> {
using FlatTable< Stone1exRecord >::FlatTable; using FlatTable< Stone1exRecord >::FlatTable;
static Stone1exTable serializeObject() static Stone1exTable serializationTestObject()
{ {
return Stone1exTable({Stone1exRecord{1.0}}); return Stone1exTable({Stone1exRecord{1.0}});
} }
@ -433,7 +433,7 @@ struct TlmixparRecord {
struct TlmixparTable : public FlatTable< TlmixparRecord> { struct TlmixparTable : public FlatTable< TlmixparRecord> {
using FlatTable< TlmixparRecord >::FlatTable; using FlatTable< TlmixparRecord >::FlatTable;
static TlmixparTable serializeObject() static TlmixparTable serializationTestObject()
{ {
return TlmixparTable({{1.0, 2.0}}); return TlmixparTable({{1.0, 2.0}});
} }
@ -461,7 +461,7 @@ struct VISCREFRecord {
struct ViscrefTable : public FlatTable< VISCREFRecord > { struct ViscrefTable : public FlatTable< VISCREFRecord > {
using FlatTable< VISCREFRecord >::FlatTable; using FlatTable< VISCREFRecord >::FlatTable;
static ViscrefTable serializeObject() static ViscrefTable serializationTestObject()
{ {
return ViscrefTable({{1.0, 2.0}}); return ViscrefTable({{1.0, 2.0}});
} }
@ -492,7 +492,7 @@ struct WATDENTRecord {
struct WatdentTable : public FlatTable< WATDENTRecord > { struct WatdentTable : public FlatTable< WATDENTRecord > {
using FlatTable< WATDENTRecord >::FlatTable; using FlatTable< WATDENTRecord >::FlatTable;
static WatdentTable serializeObject() static WatdentTable serializationTestObject()
{ {
return WatdentTable({{1.0, 2.0, 3.0}}); return WatdentTable({{1.0, 2.0, 3.0}});
} }
@ -565,7 +565,7 @@ struct SatFuncLETRecord {
struct SwofletTable : public FlatTable< SatFuncLETRecord > { struct SwofletTable : public FlatTable< SatFuncLETRecord > {
using FlatTable< SatFuncLETRecord >::FlatTable; using FlatTable< SatFuncLETRecord >::FlatTable;
static SwofletTable serializeObject() static SwofletTable serializationTestObject()
{ {
return SwofletTable({{1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0}}); return SwofletTable({{1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0}});
} }
@ -575,7 +575,7 @@ struct SwofletTable : public FlatTable< SatFuncLETRecord > {
struct SgofletTable : public FlatTable< SatFuncLETRecord > { struct SgofletTable : public FlatTable< SatFuncLETRecord > {
using FlatTable< SatFuncLETRecord >::FlatTable; using FlatTable< SatFuncLETRecord >::FlatTable;
static SgofletTable serializeObject() static SgofletTable serializationTestObject()
{ {
return SgofletTable({{1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0}}); return SgofletTable({{1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0}});
} }

2
opm/input/eclipse/EclipseState/Tables/JFunc.hpp
View File

@ -34,7 +34,7 @@ public:
JFunc(); JFunc();
explicit JFunc(const Deck& deck); explicit JFunc(const Deck& deck);
static JFunc serializeObject(); static JFunc serializationTestObject();
double alphaFactor() const; double alphaFactor() const;
double betaFactor() const; double betaFactor() const;

2
opm/input/eclipse/EclipseState/Tables/JouleThomson.hpp
View File

@ -50,7 +50,7 @@ namespace Opm {
JouleThomson() = default; JouleThomson() = default;
explicit JouleThomson(const DeckKeyword& keyword); explicit JouleThomson(const DeckKeyword& keyword);
static JouleThomson serializeObject(); static JouleThomson serializationTestObject();
const entry& operator[](const std::size_t index) const; const entry& operator[](const std::size_t index) const;
bool operator==(const JouleThomson& other) const; bool operator==(const JouleThomson& other) const;

2
opm/input/eclipse/EclipseState/Tables/PlymwinjTable.hpp
View File

@ -30,7 +30,7 @@ namespace Opm {
PlymwinjTable() = default; PlymwinjTable() = default;
explicit PlymwinjTable(const DeckKeyword& table); explicit PlymwinjTable(const DeckKeyword& table);
static PlymwinjTable serializeObject(); static PlymwinjTable serializationTestObject();
const std::vector<std::vector<double>>& getMoleWeights() const; const std::vector<std::vector<double>>& getMoleWeights() const;
bool operator==(const PlymwinjTable& data) const; bool operator==(const PlymwinjTable& data) const;

2
opm/input/eclipse/EclipseState/Tables/PlyshlogTable.hpp
View File

@ -34,7 +34,7 @@ namespace Opm {
PlyshlogTable() = default; PlyshlogTable() = default;
PlyshlogTable(const DeckRecord& indexRecord, const DeckRecord& dataRecord); PlyshlogTable(const DeckRecord& indexRecord, const DeckRecord& dataRecord);
static PlyshlogTable serializeObject(); static PlyshlogTable serializationTestObject();
double getRefPolymerConcentration() const; double getRefPolymerConcentration() const;
double getRefSalinity() const; double getRefSalinity() const;

2
opm/input/eclipse/EclipseState/Tables/PolyInjTable.hpp
View File

@ -43,7 +43,7 @@ namespace Opm {
class PolyInjTable { class PolyInjTable {
public: public:
static PolyInjTable serializeObject(); static PolyInjTable serializationTestObject();
int getTableNumber() const; int getTableNumber() const;

2
opm/input/eclipse/EclipseState/Tables/PvtgTable.hpp
View File

@ -30,7 +30,7 @@ namespace Opm {
PvtgTable() = default; PvtgTable() = default;
PvtgTable( const DeckKeyword& keyword, size_t tableIdx); PvtgTable( const DeckKeyword& keyword, size_t tableIdx);
static PvtgTable serializeObject(); static PvtgTable serializationTestObject();
bool operator==(const PvtgTable& data) const; bool operator==(const PvtgTable& data) const;
}; };

2
opm/input/eclipse/EclipseState/Tables/PvtgwTable.hpp
View File

@ -31,7 +31,7 @@ namespace Opm {
PvtgwTable() = default; PvtgwTable() = default;
PvtgwTable( const DeckKeyword& keyword, size_t tableIdx); PvtgwTable( const DeckKeyword& keyword, size_t tableIdx);
static PvtgwTable serializeObject(); static PvtgwTable serializationTestObject();
bool operator==(const PvtgwTable& data) const; bool operator==(const PvtgwTable& data) const;
}; };

2
opm/input/eclipse/EclipseState/Tables/PvtgwoTable.hpp
View File

@ -31,7 +31,7 @@ namespace Opm {
PvtgwoTable() = default; PvtgwoTable() = default;
PvtgwoTable( const DeckKeyword& keyword, size_t tableIdx); PvtgwoTable( const DeckKeyword& keyword, size_t tableIdx);
static PvtgwoTable serializeObject(); static PvtgwoTable serializationTestObject();
bool operator==(const PvtgwoTable& data) const; bool operator==(const PvtgwoTable& data) const;
}; };

2
opm/input/eclipse/EclipseState/Tables/PvtoTable.hpp
View File

@ -40,7 +40,7 @@ namespace Opm {
PvtoTable() = default; PvtoTable() = default;
PvtoTable(const DeckKeyword& keyword, size_t tableIdx); PvtoTable(const DeckKeyword& keyword, size_t tableIdx);
static PvtoTable serializeObject(); static PvtoTable serializationTestObject();
bool operator==(const PvtoTable& data) const; bool operator==(const PvtoTable& data) const;

2
opm/input/eclipse/EclipseState/Tables/PvtsolTable.hpp
View File

@ -29,7 +29,7 @@ namespace Opm {
public: public:
PvtsolTable() = default; PvtsolTable() = default;
PvtsolTable(const DeckKeyword& keyword, size_t tableIdx); PvtsolTable(const DeckKeyword& keyword, size_t tableIdx);
static PvtsolTable serializeObject(); static PvtsolTable serializationTestObject();
bool operator==(const PvtsolTable& data) const; bool operator==(const PvtsolTable& data) const;
}; };
} }

2
opm/input/eclipse/EclipseState/Tables/PvtwsaltTable.hpp
View File

@ -29,7 +29,7 @@ namespace Opm {
public: public:
PvtwsaltTable(); PvtwsaltTable();
static PvtwsaltTable serializeObject(); static PvtwsaltTable serializationTestObject();
void init(const Opm::DeckRecord& record0, const Opm::DeckRecord& record1); void init(const Opm::DeckRecord& record0, const Opm::DeckRecord& record1);
size_t size() const; size_t size() const;

2
opm/input/eclipse/EclipseState/Tables/PvtxTable.hpp
View File

@ -118,7 +118,7 @@ The first row actually corresponds to saturated values.
PvtxTable() = default; PvtxTable() = default;
explicit PvtxTable(const std::string& columnName); explicit PvtxTable(const std::string& columnName);
static PvtxTable serializeObject(); static PvtxTable serializationTestObject();
const SimpleTable& getUnderSaturatedTable(size_t tableNumber) const; const SimpleTable& getUnderSaturatedTable(size_t tableNumber) const;
void init(const DeckKeyword& keyword, size_t tableIdx); void init(const DeckKeyword& keyword, size_t tableIdx);

2
opm/input/eclipse/EclipseState/Tables/Regdims.hpp
View File

@ -48,7 +48,7 @@ namespace Opm {
m_NPLMIX( nplmix ) m_NPLMIX( nplmix )
{} {}
static Regdims serializeObject() static Regdims serializationTestObject()
{ {
return Regdims(1, 2, 3, 4, 5); return Regdims(1, 2, 3, 4, 5);
} }

2
opm/input/eclipse/EclipseState/Tables/Rock2dTable.hpp
View File

@ -29,7 +29,7 @@ namespace Opm {
public: public:
Rock2dTable(); Rock2dTable();
static Rock2dTable serializeObject(); static Rock2dTable serializationTestObject();
void init(const Opm::DeckRecord& record, size_t tableIdx); void init(const Opm::DeckRecord& record, size_t tableIdx);
size_t size() const; size_t size() const;

2
opm/input/eclipse/EclipseState/Tables/Rock2dtrTable.hpp
View File

@ -29,7 +29,7 @@ namespace Opm {
public: public:
Rock2dtrTable(); Rock2dtrTable();
static Rock2dtrTable serializeObject(); static Rock2dtrTable serializationTestObject();
void init(const Opm::DeckRecord& record, size_t tableIdx); void init(const Opm::DeckRecord& record, size_t tableIdx);
size_t size() const; size_t size() const;

2
opm/input/eclipse/EclipseState/Tables/RocktabTable.hpp
View File

@ -33,7 +33,7 @@ namespace Opm {
bool hasStressOption, bool hasStressOption,
const int tableID); const int tableID);
static RocktabTable serializeObject(); static RocktabTable serializationTestObject();
const TableColumn& getPressureColumn() const; const TableColumn& getPressureColumn() const;
const TableColumn& getPoreVolumeMultiplierColumn() const; const TableColumn& getPoreVolumeMultiplierColumn() const;

2
opm/input/eclipse/EclipseState/Tables/RwgsaltTable.hpp
View File

@ -30,7 +30,7 @@ namespace Opm {
public: public:
RwgsaltTable(); RwgsaltTable();
static RwgsaltTable serializeObject(); static RwgsaltTable serializationTestObject();
void init(const Opm::DeckRecord& record1); void init(const Opm::DeckRecord& record1);
size_t size() const; size_t size() const;

2
opm/input/eclipse/EclipseState/Tables/SimpleTable.hpp
View File

@ -39,7 +39,7 @@ namespace Opm {
SimpleTable(TableSchema, const DeckItem& deckItem, const int tableID); SimpleTable(TableSchema, const DeckItem& deckItem, const int tableID);
explicit SimpleTable( TableSchema ); explicit SimpleTable( TableSchema );
static SimpleTable serializeObject(); static SimpleTable serializationTestObject();
void addColumns(); void addColumns();
//! \brief Initialize deck item. //! \brief Initialize deck item.

2
opm/input/eclipse/EclipseState/Tables/SkprpolyTable.hpp
View File

@ -30,7 +30,7 @@ namespace Opm {
SkprpolyTable() = default; SkprpolyTable() = default;
explicit SkprpolyTable(const DeckKeyword& table); explicit SkprpolyTable(const DeckKeyword& table);
static SkprpolyTable serializeObject(); static SkprpolyTable serializationTestObject();
double referenceConcentration() const; double referenceConcentration() const;

2
opm/input/eclipse/EclipseState/Tables/SkprwatTable.hpp
View File

@ -30,7 +30,7 @@ namespace Opm {
SkprwatTable() = default; SkprwatTable() = default;
explicit SkprwatTable(const DeckKeyword& table); explicit SkprwatTable(const DeckKeyword& table);
static SkprwatTable serializeObject(); static SkprwatTable serializationTestObject();
const std::vector<std::vector<double>>& getSkinPressures() const; const std::vector<std::vector<double>>& getSkinPressures() const;

2
opm/input/eclipse/EclipseState/Tables/SolventDensityTable.hpp
View File

@ -25,7 +25,7 @@ namespace Opm {
class SolventDensityTable { class SolventDensityTable {
public: public:
static SolventDensityTable serializeObject(); static SolventDensityTable serializationTestObject();
void init(const Opm::DeckRecord& record); void init(const Opm::DeckRecord& record);
const std::vector<double>& getSolventDensityColumn() const; const std::vector<double>& getSolventDensityColumn() const;

2
opm/input/eclipse/EclipseState/Tables/StandardCond.hpp
View File

@ -24,7 +24,7 @@ namespace Opm {
struct StandardCond { struct StandardCond {
StandardCond(); StandardCond();
static StandardCond serializeObject(); static StandardCond serializationTestObject();
bool operator==(const StandardCond& data) const { bool operator==(const StandardCond& data) const {
return temperature == data.temperature && return temperature == data.temperature &&

2
opm/input/eclipse/EclipseState/Tables/TLMixpar.hpp
View File

@ -57,7 +57,7 @@ public:
TLMixpar() = default; TLMixpar() = default;
explicit TLMixpar(const Deck& deck); explicit TLMixpar(const Deck& deck);
static TLMixpar serializeObject(); static TLMixpar serializationTestObject();
std::size_t size() const; std::size_t size() const;
bool empty() const; bool empty() const;
const TLMixRecord& operator[](const std::size_t index) const; const TLMixRecord& operator[](const std::size_t index) const;

2
opm/input/eclipse/EclipseState/Tables/Tabdims.hpp
View File

@ -45,7 +45,7 @@ namespace Opm {
explicit Tabdims(const Deck& deck); explicit Tabdims(const Deck& deck);
static Tabdims serializeObject() static Tabdims serializationTestObject()
{ {
Tabdims result; Tabdims result;
result.m_ntsfun = 1; result.m_ntsfun = 1;

2
opm/input/eclipse/EclipseState/Tables/TableColumn.hpp
View File

@ -36,7 +36,7 @@ namespace Opm {
TableColumn(const TableColumn& c2) { *this = c2; } TableColumn(const TableColumn& c2) { *this = c2; }
static TableColumn serializeObject(); static TableColumn serializationTestObject();
size_t size( ) const; size_t size( ) const;
const std::string& name() const; const std::string& name() const;

2
opm/input/eclipse/EclipseState/Tables/TableContainer.hpp
View File

@ -64,7 +64,7 @@ namespace Opm {
TableContainer(); TableContainer();
explicit TableContainer( size_t maxTables ); explicit TableContainer( size_t maxTables );
static TableContainer serializeObject(); static TableContainer serializationTestObject();
bool empty() const; bool empty() const;

2
opm/input/eclipse/EclipseState/Tables/TableManager.hpp
View File

@ -67,7 +67,7 @@ namespace Opm {
explicit TableManager( const Deck& deck ); explicit TableManager( const Deck& deck );
TableManager() = default; TableManager() = default;
static TableManager serializeObject(); static TableManager serializationTestObject();
const TableContainer& getTables( const std::string& tableName ) const; const TableContainer& getTables( const std::string& tableName ) const;
const TableContainer& operator[](const std::string& tableName) const; const TableContainer& operator[](const std::string& tableName) const;

2
opm/input/eclipse/EclipseState/Tables/TableSchema.hpp
View File

@ -30,7 +30,7 @@ namespace Opm {
class TableSchema { class TableSchema {
public: public:
static TableSchema serializeObject(); static TableSchema serializationTestObject();
void addColumn( ColumnSchema ); void addColumn( ColumnSchema );
const ColumnSchema& getColumn( const std::string& name ) const; const ColumnSchema& getColumn( const std::string& name ) const;

2
opm/input/eclipse/EclipseState/TracerConfig.hpp
View File

@ -110,7 +110,7 @@ public:
TracerConfig() = default; TracerConfig() = default;
TracerConfig(const UnitSystem& unit_system, const Deck& deck); TracerConfig(const UnitSystem& unit_system, const Deck& deck);
static TracerConfig serializeObject(); static TracerConfig serializationTestObject();
size_t size() const; size_t size() const;
bool empty() const; bool empty() const;

2
opm/input/eclipse/Schedule/Action/ASTNode.hpp
View File

@ -20,7 +20,7 @@ public:
ASTNode(double value); ASTNode(double value);
ASTNode(TokenType type_arg, FuncType func_type_arg, const std::string& func_arg, const std::vector<std::string>& arg_list_arg); ASTNode(TokenType type_arg, FuncType func_type_arg, const std::string& func_arg, const std::vector<std::string>& arg_list_arg);
static ASTNode serializeObject(); static ASTNode serializationTestObject();
Action::Result eval(const Action::Context& context) const; Action::Result eval(const Action::Context& context) const;
Action::Value value(const Action::Context& context) const; Action::Value value(const Action::Context& context) const;

2
opm/input/eclipse/Schedule/Action/Actdims.hpp
View File

@ -32,7 +32,7 @@ public:
Actdims(); Actdims();
explicit Actdims(const Deck& deck); explicit Actdims(const Deck& deck);
static Actdims serializeObject(); static Actdims serializationTestObject();
std::size_t max_keywords() const; std::size_t max_keywords() const;
std::size_t max_line_count() const; std::size_t max_line_count() const;

2
opm/input/eclipse/Schedule/Action/ActionAST.hpp
View File

@ -46,7 +46,7 @@ public:
AST() = default; AST() = default;
explicit AST(const std::vector<std::string>& tokens); explicit AST(const std::vector<std::string>& tokens);
static AST serializeObject(); static AST serializationTestObject();
Result eval(const Context& context) const; Result eval(const Context& context) const;

4
opm/input/eclipse/Schedule/Action/ActionResult.hpp
View File

@ -88,7 +88,7 @@ public:
serializer(this->well_set); serializer(this->well_set);
} }
static WellSet serializeObject(); static WellSet serializationTestObject();
private: private:
std::unordered_set<std::string> well_set; std::unordered_set<std::string> well_set;
@ -121,7 +121,7 @@ public:
serializer(this->matching_wells); serializer(this->matching_wells);
} }
static Result serializeObject(); static Result serializationTestObject();
private: private:
void assign(bool value); void assign(bool value);

2
opm/input/eclipse/Schedule/Action/ActionX.hpp
View File

@ -79,7 +79,7 @@ public:
ActionX(const DeckRecord& record, std::time_t start_time); ActionX(const DeckRecord& record, std::time_t start_time);
explicit ActionX(const RestartIO::RstAction& rst_action); explicit ActionX(const RestartIO::RstAction& rst_action);
static ActionX serializeObject(); static ActionX serializationTestObject();
void addKeyword(const DeckKeyword& kw); void addKeyword(const DeckKeyword& kw);
bool ready(const State& state, std::time_t sim_time) const; bool ready(const State& state, std::time_t sim_time) const;

2
opm/input/eclipse/Schedule/Action/Actions.hpp
View File

@ -43,7 +43,7 @@ public:
Actions() = default; Actions() = default;
Actions(const std::vector<ActionX>& action, const std::vector<PyAction>& pyactions); Actions(const std::vector<ActionX>& action, const std::vector<PyAction>& pyactions);
static Actions serializeObject(); static Actions serializationTestObject();
std::size_t py_size() const; std::size_t py_size() const;
std::size_t ecl_size() const; std::size_t ecl_size() const;

2
opm/input/eclipse/Schedule/Action/PyAction.hpp
View File

@ -48,7 +48,7 @@ public:
static RunCount from_string(std::string run_count); static RunCount from_string(std::string run_count);
static PyAction serializeObject(); static PyAction serializationTestObject();
PyAction() = default; PyAction() = default;
PyAction(std::shared_ptr<const Python> python, const std::string& name, RunCount run_count, const std::string& module_file); PyAction(std::shared_ptr<const Python> python, const std::string& name, RunCount run_count, const std::string& module_file);
bool run(EclipseState& ecl_state, Schedule& schedule, std::size_t report_step, SummaryState& st, bool run(EclipseState& ecl_state, Schedule& schedule, std::size_t report_step, SummaryState& st,

4
opm/input/eclipse/Schedule/Action/State.hpp
View File

@ -52,7 +52,7 @@ struct RunState {
this->run_count += 1; this->run_count += 1;
} }
static RunState serializeObject() static RunState serializationTestObject()
{ {
RunState rs; RunState rs;
rs.run_count = 100; rs.run_count = 100;
@ -97,7 +97,7 @@ public:
} }
static State serializeObject(); static State serializationTestObject();
bool operator==(const State& other) const; bool operator==(const State& other) const;
private: private:

2
opm/input/eclipse/Schedule/Action/WGNames.hpp
View File

@ -34,7 +34,7 @@ public:
bool has_well(const std::string& wname) const; bool has_well(const std::string& wname) const;
bool has_group(const std::string& gname) const; bool has_group(const std::string& gname) const;
static WGNames serializeObject(); static WGNames serializationTestObject();
bool operator==(const WGNames& other) const; bool operator==(const WGNames& other) const;
template<class Serializer> template<class Serializer>

6
opm/input/eclipse/Schedule/CompletedCells.hpp
View File

@ -62,7 +62,7 @@ public:
serializer(this->ntg); serializer(this->ntg);
} }
static Props serializeObject(){ static Props serializationTestObject(){
Props props; Props props;
props.permx = 10.0; props.permx = 10.0;
props.permy = 78.0; props.permy = 78.0;
@ -91,7 +91,7 @@ public:
this->props == other.props; this->props == other.props;
} }
static Cell serializeObject() { static Cell serializationTestObject() {
Cell cell(0,1,1,1); Cell cell(0,1,1,1);
cell.depth = 12345; cell.depth = 12345;
cell.dimensions = {1.0,2.0,3.0}; cell.dimensions = {1.0,2.0,3.0};
@ -127,7 +127,7 @@ public:
std::pair<bool, Cell&> try_get(std::size_t i, std::size_t j, std::size_t k); std::pair<bool, Cell&> try_get(std::size_t i, std::size_t j, std::size_t k);
bool operator==(const CompletedCells& other) const; bool operator==(const CompletedCells& other) const;
static CompletedCells serializeObject(); static CompletedCells serializationTestObject();
template<class Serializer> template<class Serializer>
void serializeOp(Serializer& serializer) void serializeOp(Serializer& serializer)

4
opm/input/eclipse/Schedule/Events.hpp
View File

@ -146,7 +146,7 @@ namespace Opm
class Events { class Events {
public: public:
static Events serializeObject(); static Events serializationTestObject();
void addEvent(ScheduleEvents::Events event); void addEvent(ScheduleEvents::Events event);
bool hasEvent(uint64_t eventMask) const; bool hasEvent(uint64_t eventMask) const;
@ -168,7 +168,7 @@ namespace Opm
class WellGroupEvents { class WellGroupEvents {
public: public:
static WellGroupEvents serializeObject(); static WellGroupEvents serializationTestObject();
void addWell(const std::string& wname); void addWell(const std::string& wname);
void addGroup(const std::string& gname); void addGroup(const std::string& gname);

6
opm/input/eclipse/Schedule/GasLiftOpt.hpp
View File

@ -82,7 +82,7 @@ public:
} }
static Group serializeObject() { static Group serializationTestObject() {
Group group; Group group;
group.m_name = "GR"; group.m_name = "GR";
group.m_max_lift_gas = 100; group.m_max_lift_gas = 100;
@ -217,7 +217,7 @@ public:
serializer(m_alloc_extra_gas); serializer(m_alloc_extra_gas);
} }
static Well serializeObject() { static Well serializationTestObject() {
Well well; Well well;
well.m_name = "WELL"; well.m_name = "WELL";
well.m_max_rate = 2000; well.m_max_rate = 2000;
@ -269,7 +269,7 @@ public:
bool has_group(const std::string& group) const; bool has_group(const std::string& group) const;
std::size_t num_wells() const; std::size_t num_wells() const;
static GasLiftOpt serializeObject(); static GasLiftOpt serializationTestObject();
bool operator==(const GasLiftOpt& other) const; bool operator==(const GasLiftOpt& other) const;
template<class Serializer> template<class Serializer>

2
opm/input/eclipse/Schedule/Group/GConSale.hpp
View File

@ -73,7 +73,7 @@ namespace Opm {
MaxProcedure max_proc; MaxProcedure max_proc;
}; };
static GConSale serializeObject(); static GConSale serializationTestObject();
bool has(const std::string& name) const; bool has(const std::string& name) const;
const GCONSALEGroup& get(const std::string& name) const; const GCONSALEGroup& get(const std::string& name) const;

2
opm/input/eclipse/Schedule/Group/GConSump.hpp
View File

@ -64,7 +64,7 @@ namespace Opm {
std::string network_node; std::string network_node;
}; };
static GConSump serializeObject(); static GConSump serializationTestObject();
bool has(const std::string& name) const; bool has(const std::string& name) const;
const GCONSUMPGroup& get(const std::string& name) const; const GCONSUMPGroup& get(const std::string& name) const;

2
opm/input/eclipse/Schedule/Group/GPMaint.hpp
View File

@ -51,7 +51,7 @@ friend class GPMaint;
GPMaint() = default; GPMaint() = default;
GPMaint(std::size_t report_step, const DeckRecord& record); GPMaint(std::size_t report_step, const DeckRecord& record);
static GPMaint serializeObject(); static GPMaint serializationTestObject();
double pressure_target() const; double pressure_target() const;
double prop_constant() const; double prop_constant() const;

6
opm/input/eclipse/Schedule/Group/Group.hpp
View File

@ -146,7 +146,7 @@ struct GroupInjectionProperties {
double guide_rate = 0; double guide_rate = 0;
GuideRateInjTarget guide_rate_def = GuideRateInjTarget::NO_GUIDE_RATE; GuideRateInjTarget guide_rate_def = GuideRateInjTarget::NO_GUIDE_RATE;
static GroupInjectionProperties serializeObject(); static GroupInjectionProperties serializationTestObject();
int injection_controls = 0; int injection_controls = 0;
bool operator==(const GroupInjectionProperties& other) const; bool operator==(const GroupInjectionProperties& other) const;
@ -203,7 +203,7 @@ struct GroupProductionProperties {
GuideRateProdTarget guide_rate_def = GuideRateProdTarget::NO_GUIDE_RATE; GuideRateProdTarget guide_rate_def = GuideRateProdTarget::NO_GUIDE_RATE;
double resv_target = 0; double resv_target = 0;
bool available_group_control = true; bool available_group_control = true;
static GroupProductionProperties serializeObject(); static GroupProductionProperties serializationTestObject();
int production_controls = 0; int production_controls = 0;
bool operator==(const GroupProductionProperties& other) const; bool operator==(const GroupProductionProperties& other) const;
@ -248,7 +248,7 @@ struct ProductionControls {
Group(const std::string& group_name, std::size_t insert_index_arg, double udq_undefined_arg, const UnitSystem& unit_system); Group(const std::string& group_name, std::size_t insert_index_arg, double udq_undefined_arg, const UnitSystem& unit_system);
Group(const RestartIO::RstGroup& rst_group, std::size_t insert_index_arg, double udq_undefined_arg, const UnitSystem& unit_system); Group(const RestartIO::RstGroup& rst_group, std::size_t insert_index_arg, double udq_undefined_arg, const UnitSystem& unit_system);
static Group serializeObject(); static Group serializationTestObject();
std::size_t insert_index() const; std::size_t insert_index() const;
const std::string& name() const; const std::string& name() const;

2
opm/input/eclipse/Schedule/Group/GuideRateConfig.hpp
View File

@ -89,7 +89,7 @@ struct GroupInjTarget {
} }
}; };
static GuideRateConfig serializeObject(); static GuideRateConfig serializationTestObject();
const GuideRateModel& model() const; const GuideRateModel& model() const;
bool has_model() const; bool has_model() const;

2
opm/input/eclipse/Schedule/Group/GuideRateModel.hpp
View File

@ -65,7 +65,7 @@ public:
double damping_factor); double damping_factor);
static GuideRateModel serializeObject(); static GuideRateModel serializationTestObject();
double eval(double oil_pot, double gas_pot, double wat_pot) const; double eval(double oil_pot, double gas_pot, double wat_pot) const;
bool updateLINCOM(const UDAValue& alpha, const UDAValue& beta, const UDAValue& gamma) const; bool updateLINCOM(const UDAValue& alpha, const UDAValue& beta, const UDAValue& gamma) const;

2
opm/input/eclipse/Schedule/MSW/AICD.hpp
View File

@ -37,7 +37,7 @@ namespace Opm {
AutoICD() = default; AutoICD() = default;
AutoICD(const DeckRecord& record); AutoICD(const DeckRecord& record);
static AutoICD serializeObject(); static AutoICD serializationTestObject();
// the function will return a map // the function will return a map
// [ // [

2
opm/input/eclipse/Schedule/MSW/SICD.hpp
View File

@ -51,7 +51,7 @@ namespace Opm {
ICDStatus status, ICDStatus status,
double scalingFactor); double scalingFactor);
static SICD serializeObject(); static SICD serializationTestObject();
// the function will return a map // the function will return a map
// [ // [

4
opm/input/eclipse/Schedule/MSW/Segment.hpp
View File

@ -49,7 +49,7 @@ namespace Opm {
void serializeOp(Serializer&) { void serializeOp(Serializer&) {
} }
static RegularSegment serializeObject() { static RegularSegment serializationTestObject() {
return RegularSegment(); return RegularSegment();
} }
@ -79,7 +79,7 @@ namespace Opm {
double internal_diameter_in, double roughness_in, double cross_area_in, double volume_in, bool data_ready_in); double internal_diameter_in, double roughness_in, double cross_area_in, double volume_in, bool data_ready_in);
Segment(const RestartIO::RstSegment& rst_segment); Segment(const RestartIO::RstSegment& rst_segment);
static Segment serializeObject(); static Segment serializationTestObject();
int segmentNumber() const; int segmentNumber() const;
int branchNumber() const; int branchNumber() const;

2
opm/input/eclipse/Schedule/MSW/Valve.hpp
View File

@ -48,7 +48,7 @@ namespace Opm {
double pipeCrossA, double pipeCrossA,
ICDStatus stat); ICDStatus stat);
static Valve serializeObject(); static Valve serializationTestObject();
// the function will return a map // the function will return a map
// [ // [

2
opm/input/eclipse/Schedule/MSW/WellSegments.hpp
View File

@ -71,7 +71,7 @@ namespace Opm {
explicit WellSegments(const DeckKeyword& keyword); explicit WellSegments(const DeckKeyword& keyword);
void loadWELSEGS( const DeckKeyword& welsegsKeyword); void loadWELSEGS( const DeckKeyword& welsegsKeyword);
static WellSegments serializeObject(); static WellSegments serializationTestObject();
std::size_t size() const; std::size_t size() const;
double depthTopSegment() const; double depthTopSegment() const;

2
opm/input/eclipse/Schedule/MessageLimits.hpp
View File

@ -30,7 +30,7 @@ namespace Opm {
MessageLimits(); MessageLimits();
explicit MessageLimits(const Deck& deck); explicit MessageLimits(const Deck& deck);
static MessageLimits serializeObject(); static MessageLimits serializationTestObject();
///Get all the value from MESSAGES keyword. ///Get all the value from MESSAGES keyword.
int getMessagePrintLimit() const; int getMessagePrintLimit() const;

2
opm/input/eclipse/Schedule/Network/Balance.hpp
View File

@ -49,7 +49,7 @@ public:
explicit Balance(bool network_active); explicit Balance(bool network_active);
explicit Balance(const RestartIO::RstNetbalan& netbalan); explicit Balance(const RestartIO::RstNetbalan& netbalan);
static Balance serializeObject(); static Balance serializationTestObject();
CalcMode mode() const; CalcMode mode() const;
double interval() const; double interval() const;

2
opm/input/eclipse/Schedule/Network/Branch.hpp
View File

@ -49,7 +49,7 @@ public:
AlqEQ alq_eq() const; AlqEQ alq_eq() const;
std::optional<double> alq_value() const; std::optional<double> alq_value() const;
static Branch serializeObject(); static Branch serializationTestObject();
bool operator==(const Branch& other) const; bool operator==(const Branch& other) const;
template<class Serializer> template<class Serializer>

2
opm/input/eclipse/Schedule/Network/ExtNetwork.hpp
View File

@ -50,7 +50,7 @@ public:
int NoOfBranches() const; int NoOfBranches() const;
bool operator==(const ExtNetwork& other) const; bool operator==(const ExtNetwork& other) const;
static ExtNetwork serializeObject(); static ExtNetwork serializationTestObject();
template<class Serializer> template<class Serializer>
void serializeOp(Serializer& serializer) void serializeOp(Serializer& serializer)

2
opm/input/eclipse/Schedule/Network/Node.hpp
View File

@ -42,7 +42,7 @@ public:
void add_gas_lift_gas(bool add_gas); void add_gas_lift_gas(bool add_gas);
void as_choke(const std::string& target_group); void as_choke(const std::string& target_group);
static Node serializeObject(); static Node serializationTestObject();
bool operator==(const Node& other) const; bool operator==(const Node& other) const;
template<class Serializer> template<class Serializer>

2
opm/input/eclipse/Schedule/OilVaporizationProperties.hpp
View File

@ -44,7 +44,7 @@ namespace Opm
OilVaporizationProperties(); OilVaporizationProperties();
explicit OilVaporizationProperties(const size_t numPvtReginIdx); explicit OilVaporizationProperties(const size_t numPvtReginIdx);
static OilVaporizationProperties serializeObject(); static OilVaporizationProperties serializationTestObject();
static void updateDRSDT(Opm::OilVaporizationProperties& ovp, const std::vector<double>& maxDRSDT, const std::vector<std::string>& option); static void updateDRSDT(Opm::OilVaporizationProperties& ovp, const std::vector<double>& maxDRSDT, const std::vector<std::string>& option);
static void updateDRSDTCON(Opm::OilVaporizationProperties& ovp, const std::vector<double>& maxDRSDT, const std::vector<std::string>& option); static void updateDRSDTCON(Opm::OilVaporizationProperties& ovp, const std::vector<double>& maxDRSDT, const std::vector<std::string>& option);

4
opm/input/eclipse/Schedule/RFTConfig.hpp
View File

@ -68,7 +68,7 @@ public:
std::optional<RFTConfig> next() const; std::optional<RFTConfig> next() const;
std::optional<RFTConfig> well_open(const std::string& wname) const; std::optional<RFTConfig> well_open(const std::string& wname) const;
static RFTConfig serializeObject(); static RFTConfig serializationTestObject();
bool operator==(const RFTConfig& data) const; bool operator==(const RFTConfig& data) const;
template <class Serializer> template <class Serializer>
@ -86,7 +86,7 @@ private:
using StateMap = std::unordered_map<std::string, Kind>; using StateMap = std::unordered_map<std::string, Kind>;
// Please make sure that member functions serializeOp(), operator==(), // Please make sure that member functions serializeOp(), operator==(),
// and serializeObject() are also up to date when changing this list of // and serializationTestObject() are also up to date when changing this list of
// data members. // data members.
bool first_open_rft = false; bool first_open_rft = false;
StateMap<RFT> rft_state{}; StateMap<RFT> rft_state{};

2
opm/input/eclipse/Schedule/RPTConfig.hpp
View File

@ -44,7 +44,7 @@ public:
std::size_t size() const { return this->m_mnemonics.size(); }; std::size_t size() const { return this->m_mnemonics.size(); };
unsigned& at(const std::string& key) { return this->m_mnemonics.at(key); }; unsigned& at(const std::string& key) { return this->m_mnemonics.at(key); };
static RPTConfig serializeObject(); static RPTConfig serializationTestObject();
bool operator==(const RPTConfig& other) const; bool operator==(const RPTConfig& other) const;
private: private:

2
opm/input/eclipse/Schedule/RSTConfig.hpp
View File

@ -200,7 +200,7 @@ public:
void update(const DeckKeyword& keyword, const ParseContext& parseContext, ErrorGuard& errors); void update(const DeckKeyword& keyword, const ParseContext& parseContext, ErrorGuard& errors);
void init_next(); void init_next();
static RSTConfig first(const RSTConfig& src); static RSTConfig first(const RSTConfig& src);
static RSTConfig serializeObject(); static RSTConfig serializationTestObject();
template<class Serializer> template<class Serializer>
void serializeOp(Serializer& serializer) { void serializeOp(Serializer& serializer) {

14
opm/input/eclipse/Schedule/Schedule.hpp
View File

@ -111,15 +111,15 @@ namespace Opm
} }
static ScheduleStatic serializeObject() { static ScheduleStatic serializationTestObject() {
auto python = std::make_shared<Python>(Python::Enable::OFF); auto python = std::make_shared<Python>(Python::Enable::OFF);
ScheduleStatic st(python); ScheduleStatic st(python);
st.m_deck_message_limits = MessageLimits::serializeObject(); st.m_deck_message_limits = MessageLimits::serializationTestObject();
st.m_runspec = Runspec::serializeObject(); st.m_runspec = Runspec::serializationTestObject();
st.m_unit_system = UnitSystem::newFIELD(); st.m_unit_system = UnitSystem::newFIELD();
st.m_input_path = "Some/funny/path"; st.m_input_path = "Some/funny/path";
st.rst_config = RSTConfig::serializeObject(); st.rst_config = RSTConfig::serializationTestObject();
st.rst_info = ScheduleRestartInfo::serializeObject(); st.rst_info = ScheduleRestartInfo::serializationTestObject();
return st; return st;
} }
@ -200,7 +200,7 @@ namespace Opm
const std::optional<int>& output_interval = {}, const std::optional<int>& output_interval = {},
const RestartIO::RstState* rst = nullptr); const RestartIO::RstState* rst = nullptr);
static Schedule serializeObject(); static Schedule serializationTestObject();
/* /*
* If the input deck does not specify a start time, Eclipse's 1. Jan * If the input deck does not specify a start time, Eclipse's 1. Jan
@ -534,7 +534,7 @@ namespace Opm
// Please update the member functions // Please update the member functions
// - operator==(const Schedule&) const // - operator==(const Schedule&) const
// - serializeObject() // - serializationTestObject()
// - serializeOp(Serializer&) // - serializeOp(Serializer&)
// when you update/change this list of data members. // when you update/change this list of data members.
ScheduleStatic m_static; ScheduleStatic m_static;

Some files were not shown because too many files have changed in this diff Show More