the usual rebase fixup commit

opm/simulators/wells/StandardWell_impl.hpp

@@ -1341,9 +1341,11 @@ namespace Opm
 
         updateExtraPrimaryVariables(dwells);
 
+#ifndef NDEBUG
         for (double v : primary_variables_) {
             assert(Opm::isfinite(v));
         }
+#endif
 
     }
 
@@ -1799,12 +1801,7 @@ namespace Opm
 
                 break;
             } // end of switch
-
-#ifndef NDEBUG
-        for (double v : primary_variables_) {
-            assert(Opm::isfinite(v));
         }
-#endif
     }