Merge pull request #4945 from vkip/network_reroute

Network reroute - avoid looking up nonexisting nodes
This commit is contained in:
Kai Bao 2023-11-08 19:59:40 +01:00 committed by GitHub
commit 25b007c46e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 2 deletions

View File

@ -1118,8 +1118,14 @@ updateNetworkPressures(const int reportStepIdx)
return network_imbalance;
if (!previous_node_pressures.empty()) {
for (const auto& [name, pressure]: previous_node_pressures) {
const auto new_pressure = node_pressures_.at(name);
for (const auto& [name, new_pressure]: node_pressures_) {
if (previous_node_pressures.count(name) <= 0) {
if (std::abs(new_pressure) > network_imbalance) {
network_imbalance = std::abs(new_pressure);
}
continue;
}
const auto pressure = previous_node_pressures.at(name);
const double change = (new_pressure - pressure);
if (std::abs(change) > network_imbalance) {
network_imbalance = std::abs(change);

View File

@ -108,6 +108,22 @@ add_test_compareECLFiles(CASENAME network_standard
DIR network
TEST_ARGS --enable-tuning=true)
add_test_compareECLFiles(CASENAME network_01_reroute
FILENAME NETWORK-01-REROUTE
SIMULATOR flow
ABS_TOL ${abs_tol}
REL_TOL ${rel_tol}
DIR network
TEST_ARGS --enable-tuning=true --local-well-solve-control-switching=true)
add_test_compareECLFiles(CASENAME network_01_reroute_std
FILENAME NETWORK-01-REROUTE_STD
SIMULATOR flow
ABS_TOL ${abs_tol}
REL_TOL ${rel_tol}
DIR network
TEST_ARGS --enable-tuning=true --local-well-solve-control-switching=true)
add_test_compareECLFiles(CASENAME gas_precsalt
FILENAME GASWATER_VAPWAT_PRECSALT
SIMULATOR flow