Support gas dissolution in water (Rsw)

- adapt to interface change in waterPvt()
- add gas + water + disgasw simulator

Note
- MSW is not supported
- EQUIL initialization is not supported

opm/simulators/aquifers/AquiferAnalytical.hpp

@@ -62,6 +62,8 @@ public:
     enum { enableEnergy = getPropValue<TypeTag, Properties::EnableEnergy>() };
     enum { enableBrine = getPropValue<TypeTag, Properties::EnableBrine>() };
     enum { enableEvaporation = getPropValue<TypeTag, Properties::EnableEvaporation>() };
+    enum { has_disgas_in_water = getPropValue<TypeTag, Properties::EnableDisgasInWater>() };
+
     enum { enableSaltPrecipitation = getPropValue<TypeTag, Properties::EnableSaltPrecipitation>() };
 
     static constexpr int numEq = BlackoilIndices::numEq;
@@ -77,6 +79,7 @@ public:
                                           enableEvaporation,
                                           enableBrine,
                                           enableSaltPrecipitation,
+                                          has_disgas_in_water,
                                           BlackoilIndices::numPhases>;
 
     // Constructor

opm/simulators/aquifers/AquiferInterface.hpp

@@ -79,7 +79,8 @@ protected:
 
     int phaseIdx_() const
     {
-        if (co2store_())
+        // If OIL is used to model brine the aquifer should do the same
+        if (co2store_() && FluidSystem::phaseIsActive(FluidSystem::oilPhaseIdx))
             return FluidSystem::oilPhaseIdx;
 
         return FluidSystem::waterPhaseIdx;