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

Take default UDQ value from UDQPARAM

Browse Source
This commit is contained in:
Vegard Kippe
2023-09-21 21:13:47 +02:00
parent cadbcda982
commit 1594680f35
3 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,12 +41,12 @@ namespace Opm {
const SummaryState& summary_state;
const std::string& well_name;
const size_t segment_number;
const double udq_default;
ValveUDAEval(const SummaryState& summary_state_, const std::string& well_name_,
const size_t segment_number_, const double udq_default_);
double value(const UDAValue& value) const;
ValveUDAEval(const SummaryState& summary_state_,
const std::string& well_name_,
const size_t segment_number_);
double value(const UDAValue& value, const double udq_default = 0.0) const;
};
@@ -54,7 +54,7 @@ namespace Opm {
public:
Valve();
explicit Valve(const DeckRecord& record);
explicit Valve(const DeckRecord& record, const double udq_default = 0.0);
Valve(double conFlowCoeff,
double conCrossA,
double conMaxCrossA,
@@ -70,7 +70,7 @@ namespace Opm {
// [
// "WELL1" : [<seg1, valv1>, <seg2, valv2> ...]
// ....
static std::map<std::string, std::vector<std::pair<int, Valve> > > fromWSEGVALV(const DeckKeyword& keyword);
static std::map<std::string, std::vector<std::pair<int, Valve> > > fromWSEGVALV(const DeckKeyword& keyword, const double udq_default = 0.0);
// parameters for constriction pressure loss
double conFlowCoefficient() const;
@@ -108,6 +108,7 @@ namespace Opm {
serializer(m_pipe_roughness);
serializer(m_pipe_cross_area);
serializer(m_status);
serializer(m_udq_default);
}
private:
@@ -121,6 +122,8 @@ namespace Opm {
double m_pipe_roughness;
double m_pipe_cross_area;
ICDStatus m_status;
double m_udq_default{0.0};
};
}

3
src/opm/input/eclipse/Schedule/KeywordHandlers.cpp
View File

@@ -2211,7 +2211,8 @@ Well{0} entered with 'FIELD' parent group:
}
void Schedule::handleWSEGVALV(HandlerContext& handlerContext) {
const std::map<std::string, std::vector<std::pair<int, Valve> > > valves = Valve::fromWSEGVALV(handlerContext.keyword);
const double udq_default = this->getUDQConfig(handlerContext.currentStep).params().undefinedValue();
const std::map<std::string, std::vector<std::pair<int, Valve> > > valves = Valve::fromWSEGVALV(handlerContext.keyword, udq_default);
for (const auto& map_elem : valves) {
const std::string& well_name_pattern = map_elem.first;

16
src/opm/input/eclipse/Schedule/MSW/Valve.cpp
View File

@@ -25,15 +25,14 @@
namespace Opm {
ValveUDAEval::ValveUDAEval(const SummaryState& summary_state_, const std::string& well_name_,
const size_t segment_number_, const double udq_default_) :
const size_t segment_number_) :
summary_state(summary_state_),
well_name(well_name_),
segment_number(segment_number_),
udq_default(udq_default_)
segment_number(segment_number_)
{}
double ValveUDAEval::value(const UDAValue& value) const {
double ValveUDAEval::value(const UDAValue& value, const double udq_default) const {
if (value.is<double>())
return value.getSI();
@@ -74,10 +73,11 @@ namespace Opm {
{
}
Valve::Valve(const DeckRecord& record)
Valve::Valve(const DeckRecord& record, const double udq_default)
: m_con_flow_coeff(record.getItem("CV").get<double>(0))
, m_con_cross_area(record.getItem("AREA").get<UDAValue>(0))
, m_con_cross_area_value(m_con_cross_area.is<double>() ? m_con_cross_area.getSI() : -1.0)
, m_udq_default(udq_default)
{
// we initialize negative values for the values are defaulted
const double value_for_default = -1.e100;
@@ -138,7 +138,7 @@ namespace Opm {
}
std::map<std::string, std::vector<std::pair<int, Valve> > >
Valve::fromWSEGVALV(const DeckKeyword& keyword)
Valve::fromWSEGVALV(const DeckKeyword& keyword, const double udq_default)
{
std::map<std::string, std::vector<std::pair<int, Valve> > > res;
@@ -147,7 +147,7 @@ namespace Opm {
const int segment_number = record.getItem("SEGMENT_NUMBER").get<int>(0);
const Valve valve(record);
const Valve valve(record, udq_default);
res[well_name].push_back(std::make_pair(segment_number, valve));
}
@@ -164,7 +164,7 @@ namespace Opm {
double Valve::conCrossArea(const std::optional<const ValveUDAEval>& uda_eval_optional) {
m_con_cross_area_value = uda_eval_optional.has_value() ?
uda_eval_optional.value().value(m_con_cross_area) :
uda_eval_optional.value().value(m_con_cross_area, m_udq_default) :
m_con_cross_area.getSI();
return m_con_cross_area_value;
}