Merge pull request #84 from bska/fix-equality-comparisons

Fix well classification that was only correct by accident
This commit is contained in:
Atgeirr Flø Rasmussen
2012-10-25 01:08:48 -07:00
+2 -2
View File
@@ -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;
} }