mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
Merge branch 'master' into gravity-in-wells
This commit is contained in:
commit
7406847201
@ -783,7 +783,7 @@ namespace Opm
|
|||||||
&& (injSpec().control_mode_ != InjectionSpecification::GRUP && injSpec().control_mode_ != InjectionSpecification::NONE)) {
|
&& (injSpec().control_mode_ != InjectionSpecification::GRUP && injSpec().control_mode_ != InjectionSpecification::NONE)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!wells_->type[self_index_] == INJECTOR) {
|
if (wells_->type[self_index_] != INJECTOR) {
|
||||||
ASSERT(target == 0.0);
|
ASSERT(target == 0.0);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -860,7 +860,7 @@ namespace Opm
|
|||||||
std::cout << "Returning" << std::endl;
|
std::cout << "Returning" << std::endl;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!wells_->type[self_index_] == PRODUCER) {
|
if (wells_->type[self_index_] != PRODUCER) {
|
||||||
ASSERT(target == 0.0);
|
ASSERT(target == 0.0);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user