OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3425 from akva2/nullopt

Browse Source 
changed: use std::nullopt
This commit is contained in:
Markus Blatt 2021-07-01 15:31:09 +02:00 committed by GitHub
commit ef8bd1861f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
opm/simulators/wells/MultisegmentWellGeneric.cpp
View File

@ -395,7 +395,7 @@ computeBhpAtThpLimitInj(const std::function<std::vector<double>(const double)>&
// Handle the no solution case.
if (sign_change_index == -1) {
return std::optional<double>();
return std::nullopt;
}
// Solve for the proper solution in the given interval.
@ -414,7 +414,7 @@ computeBhpAtThpLimitInj(const std::function<std::vector<double>(const double)>&
assert(low == controls.bhp_limit);
deferred_logger.warning("FAILED_ROBUST_BHP_THP_SOLVE",
"Robust bhp(thp) solve failed for well " + baseif_.name());
return std::optional<double>();
return std::nullopt;
}
try {
const double solved_bhp = RegulaFalsiBisection<WarnAndContinueOnError>::
@ -428,7 +428,7 @@ computeBhpAtThpLimitInj(const std::function<std::vector<double>(const double)>&
catch (...) {
deferred_logger.warning("FAILED_ROBUST_BHP_THP_SOLVE",
"Robust bhp(thp) solve failed for well " + baseif_.name());
return std::optional<double>();
return std::nullopt;
}
}
@ -591,7 +591,7 @@ computeBhpAtThpLimitProd(const std::function<std::vector<double>(const double)>&
// Return failure.
deferred_logger.warning("FAILED_ROBUST_BHP_THP_SOLVE_BRACKETING_FAILURE",
"Robust bhp(thp) solve failed due to bracketing failure for well " + baseif_.name());
return std::optional<double>();
return std::nullopt;
}
}
}
@ -617,7 +617,7 @@ computeBhpAtThpLimitProd(const std::function<std::vector<double>(const double)>&
catch (...) {
deferred_logger.warning("FAILED_ROBUST_BHP_THP_SOLVE",
"Robust bhp(thp) solve failed for well " + baseif_.name());
return std::optional<double>();
return std::nullopt;
}
}

12
opm/simulators/wells/StandardWellGeneric.cpp
View File

@ -459,7 +459,7 @@ computeBhpAtThpLimitProdWithAlq(const std::function<std::vector<double>(const do
// Handle the no solution case.
if (sign_change_index == -1) {
return std::optional<double>();
return std::nullopt;
}
// Solve for the proper solution in the given interval.
@ -478,7 +478,7 @@ computeBhpAtThpLimitProdWithAlq(const std::function<std::vector<double>(const do
assert(low == controls.bhp_limit);
deferred_logger.warning("FAILED_ROBUST_BHP_THP_SOLVE",
"Robust bhp(thp) solve failed for well " + baseif_.name());
return std::optional<double>();
return std::nullopt;
}
try {
const double solved_bhp = RegulaFalsiBisection<>::
@ -492,7 +492,7 @@ computeBhpAtThpLimitProdWithAlq(const std::function<std::vector<double>(const do
catch (...) {
deferred_logger.warning("FAILED_ROBUST_BHP_THP_SOLVE",
"Robust bhp(thp) solve failed for well " + baseif_.name());
return std::optional<double>();
return std::nullopt;
}
}
@ -647,7 +647,7 @@ computeBhpAtThpLimitInj(const std::function<std::vector<double>(const double)>&
// Handle the no solution case.
if (sign_change_index == -1) {
return std::optional<double>();
return std::nullopt;
}
// Solve for the proper solution in the given interval.
@ -666,7 +666,7 @@ computeBhpAtThpLimitInj(const std::function<std::vector<double>(const double)>&
assert(low == controls.bhp_limit);
deferred_logger.warning("FAILED_ROBUST_BHP_THP_SOLVE",
"Robust bhp(thp) solve failed for well " + baseif_.name());
return std::optional<double>();
return std::nullopt;
}
try {
const double solved_bhp = RegulaFalsiBisection<>::
@ -680,7 +680,7 @@ computeBhpAtThpLimitInj(const std::function<std::vector<double>(const double)>&
catch (...) {
deferred_logger.warning("FAILED_ROBUST_BHP_THP_SOLVE",
"Robust bhp(thp) solve failed for well " + baseif_.name());
return std::optional<double>();
return std::nullopt;
}
}