Merge branch 'master' of https://github.com/OPM/opm-simulators into fix_cpr_oil_gas

opm/autodiff/ISTLSolverEbos.hpp

@@ -494,7 +494,9 @@ protected:
             // TODO: Revise when linear solvers interface opm-core is done
             // Construct linear solver.
             // GMRes solver
-            int verbosity = ( isIORank_ ) ? parameters_.linear_solver_verbosity_ : 0;
+            int verbosity = 0;
+            if (simulator_.gridView().comm().rank() == 0)
+                verbosity = parameters_.linear_solver_verbosity_;
 
             if ( parameters_.newton_use_gmres_ ) {
                 Dune::RestartedGMResSolver<Vector> linsolve(opA, sp, precond,
@@ -838,7 +840,6 @@ protected:
         mutable int iterations_;
         mutable bool converged_;
         boost::any parallelInformation_;
-        bool isIORank_;
 
         std::unique_ptr<Matrix> matrix_;
         Vector *rhs_;

opm/autodiff/MissingFeatures.cpp

@@ -94,8 +94,6 @@ namespace MissingFeatures {
             "CONNECTION",
             "CPR",
             "DATE",
-            "ECHO",
-            "EDITNNC",
             "ENDACTIO",
             "ENDFIN"
             "ENDNUM",
@@ -131,7 +129,6 @@ namespace MissingFeatures {
             "NETBALAN",
             "NEXTSTEP",
             "NOCASC",
-            "NOECHO",
             "NOGGF",
             "NOINSPEC",
             "NOMONITO",
@@ -170,7 +167,6 @@ namespace MissingFeatures {
             "RPTPROS",
             "PRTRST",
             "RPTRUNSP",
-            "RPTSCHED",
             "RPTSMRY",
             "RPTSOL",
             "RSCONST",
@@ -205,7 +201,6 @@ namespace MissingFeatures {
             "WPAVE",
             "WPITAB",
             "WTEMP",
-            "WTEST",
             "WTRACER",
             "ZIPPY2" };
         std::multimap<std::string, PartiallySupported<std::string> > string_options;