Undoing minor changes not required anymore.

opm/models/blackoil/blackoilintensivequantities.hh

@@ -109,11 +109,10 @@ class BlackOilIntensiveQuantities
     using Toolbox = MathToolbox<Evaluation>;
     using DimMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
     using FluxIntensiveQuantities = typename FluxModule::FluxIntensiveQuantities;
-    
+    using FluidState = BlackOilFluidState<Evaluation, FluidSystem, enableTemperature, enableEnergy, compositionSwitchEnabled,  enableEvaporation, enableBrine, enableSaltPrecipitation, Indices::numPhases >;
     using DiffusionIntensiveQuantities = BlackOilDiffusionIntensiveQuantities<TypeTag, enableDiffusion>;
 
 public:
-    using FluidState = BlackOilFluidState<Evaluation, FluidSystem, enableTemperature, enableEnergy, compositionSwitchEnabled,  enableEvaporation, enableBrine, enableSaltPrecipitation, Indices::numPhases >;
     BlackOilIntensiveQuantities()
     {
         if (compositionSwitchEnabled) {

opm/models/blackoil/blackoilmodel.hh

@@ -271,9 +271,6 @@ template<class TypeTag >
 class BlackOilModel
     : public MultiPhaseBaseModel<TypeTag>
 {
-public:
-    using LocalResidual = GetPropType<TypeTag, Properties::LocalResidual>;
-private:
     using Implementation = GetPropType<TypeTag, Properties::Model>;
     using ParentType = MultiPhaseBaseModel<TypeTag>;
 
@@ -301,6 +298,9 @@ private:
     using MICPModule = BlackOilMICPModule<TypeTag>;
 
 public:
+
+    using LocalResidual = GetPropType<TypeTag, Properties::LocalResidual>;
+
     BlackOilModel(Simulator& simulator)
         : ParentType(simulator)
     {}

opm/models/blackoil/blackoilnewtonmethod.hh

@@ -232,6 +232,7 @@ public:
         numPriVarsSwitched_ = comm.sum(numPriVarsSwitched_);
     }
 
+protected:
     /*!
      * \copydoc FvBaseNewtonMethod::updatePrimaryVariables_
      */