Internalize nupcol in ScheduleState
This commit is contained in:
@@ -283,7 +283,6 @@ namespace Opm
|
||||
|
||||
void applyAction(std::size_t reportStep, const Action::ActionX& action, const Action::Result& result);
|
||||
void applyWellProdIndexScaling(const std::string& well_name, const std::size_t reportStep, const double scalingFactor);
|
||||
int getNupcol(std::size_t reportStep) const;
|
||||
|
||||
|
||||
const Network::ExtNetwork& network(std::size_t report_step) const;
|
||||
@@ -342,7 +341,6 @@ namespace Opm
|
||||
m_network.serializeOp(serializer);
|
||||
m_glo.serializeOp(serializer);
|
||||
rft_config.serializeOp(serializer);
|
||||
m_nupcol.template serializeOp<Serializer, false>(serializer);
|
||||
restart_config.serializeOp(serializer);
|
||||
serializer.map(wellgroup_events);
|
||||
if (!serializer.isSerializing()) {
|
||||
@@ -381,7 +379,6 @@ namespace Opm
|
||||
DynamicState<std::shared_ptr<Network::ExtNetwork>> m_network;
|
||||
DynamicState<std::shared_ptr<GasLiftOpt>> m_glo;
|
||||
RFTConfig rft_config;
|
||||
DynamicState<int> m_nupcol;
|
||||
RestartConfig restart_config;
|
||||
UnitSystem unit_system;
|
||||
std::optional<int> exit_status;
|
||||
|
||||
@@ -59,6 +59,9 @@ namespace Opm {
|
||||
void tuning(Tuning tuning);
|
||||
const Tuning& tuning() const;
|
||||
|
||||
void nupcol(int nupcol);
|
||||
int nupcol() const;
|
||||
|
||||
|
||||
template<class Serializer>
|
||||
void serializeOp(Serializer& serializer) {
|
||||
@@ -66,6 +69,7 @@ namespace Opm {
|
||||
serializer(m_end_time);
|
||||
serializer(m_pavg);
|
||||
m_tuning.serializeOp(serializer);
|
||||
serializer(m_nupcol);
|
||||
}
|
||||
|
||||
private:
|
||||
@@ -74,6 +78,7 @@ namespace Opm {
|
||||
|
||||
std::shared_ptr<PAvg> m_pavg;
|
||||
Tuning m_tuning;
|
||||
int m_nupcol;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user