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

Fix well classification that was only correct by accident

opm/core/vag_format/vag.cpp

@@ -64,7 +64,7 @@ namespace OPM
 	    }
 	    //cout << endl;
 	}
-	if(!(int(pos_struct.value.size())==pos_struct.pos[n])){
+	if(int(pos_struct.value.size()) != pos_struct.pos[n]){
 	    cerr << "Failed to read pos structure" << endl;
 	    cerr << "pos_struct.value.size()" << pos_struct.value.size() << endl;
 	    cerr << "pos_struct.pos[n+1]" << pos_struct.pos[n] << endl;

opm/core/wells/WellsGroup.cpp

@@ -783,7 +783,7 @@ namespace Opm
              && (injSpec().control_mode_ != InjectionSpecification::GRUP && injSpec().control_mode_ != InjectionSpecification::NONE)) {
             return;
         }
-        if (!wells_->type[self_index_] == INJECTOR) {
+        if (wells_->type[self_index_] != INJECTOR) {
             ASSERT(target == 0.0);
             return;
         }
@@ -860,7 +860,7 @@ namespace Opm
             std::cout << "Returning" << std::endl;
             return;
         }
-        if (!wells_->type[self_index_] == PRODUCER) {
+        if (wells_->type[self_index_] != PRODUCER) {
             ASSERT(target == 0.0);
             return;
         }