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

Merge pull request #1023 from joakim-hove/guiderate-warnings

Browse Source 
Fix GuideRate warnings
This commit is contained in:
Joakim Hove 2019-09-17 19:37:51 +02:00 committed by GitHub
commit 8a88d64bd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/parser/eclipse/EclipseState/Schedule/Group/GuideRate.hpp
View File

@ -32,7 +32,7 @@ class GuideRate {
struct GuideRateValue {
GuideRateValue() = default;
GuideRateValue(std::time_t t, double v):
GuideRateValue(double t, double v):
sim_time(t),
value(v)
{}
@ -46,7 +46,7 @@ struct GuideRateValue {
return !(*this == other);
}
std::time_t sim_time;
double sim_time;
double value;
};
@ -57,7 +57,7 @@ public:
private:
void well_update(const std::string& wgname, size_t report_step, double sim_time, double oil_pot, double gas_pot, double wat_pot);
void group_update(const std::string& wgname, size_t report_step, double sim_time, double oil_pot, double gas_pot, double wat_pot);
double get(const std::string& wgname, size_t report_step) const;
double get(const std::string& wgname) const;
double eval_form(const GuideRateModel& model, double oil_pot, double gas_pot, double wat_pot, const GuideRateValue * prev) const;
double eval_group_pot() const;
double eval_group_resvinj() const;

10
src/opm/parser/eclipse/EclipseState/Schedule/Group/GuideRate.cpp
View File

@ -27,7 +27,7 @@ GuideRate::GuideRate(const Schedule& schedule_arg) :
{}
double GuideRate::get(const std::string& wgname, size_t report_step) const {
double GuideRate::get(const std::string& wgname) const {
const auto& value = this->values.at(wgname);
return value.value;
}
@ -43,7 +43,7 @@ double GuideRate::update(const std::string& wgname, size_t report_step, double s
} else
throw std::out_of_range("No such well/group: ");
return this->get(wgname, report_step);
return this->get(wgname);
}
@ -110,11 +110,7 @@ void GuideRate::well_update(const std::string& wgname, size_t report_step, doubl
}
double GuideRate::eval_form(const GuideRateModel& model, double oil_pot, double gas_pot, double wat_pot, const GuideRateValue * prev) const {
double pot = 0;
double R1 = 0.5;
double R2 = 0.5;
double new_guide_rate = model.eval(pot, R1, R2);
double new_guide_rate = model.eval(oil_pot, gas_pot, wat_pot);
if (!prev)
return new_guide_rate;