Add solvent to phaseUsage

opm/core/props/BlackoilPhases.hpp

@@ -38,6 +38,7 @@ namespace Opm
         int num_phases;
         int phase_used[MaxNumPhases];
         int phase_pos[MaxNumPhases];
+        bool has_solvent;
     };
 
     /// Check or assign presence of a formed, free phase.  Limited to

opm/core/props/phaseUsageFromDeck.hpp

@@ -66,6 +66,12 @@ namespace Opm
             OPM_THROW(std::runtime_error, "Cannot handle cases with no OIL, i.e. water-gas systems.");
         }
 
+        // Add solvent info
+        pu.has_solvent = false;
+        if (phase.active(Phase::SOLVENT)) {
+            pu.has_solvent = true;
+        }
+
         return pu;
     }
 
@@ -112,6 +118,12 @@ namespace Opm
             OPM_THROW(std::runtime_error, "Cannot handle cases with no OIL, i.e. water-gas systems.");
         }
 
+        // Add solvent info
+        pu.has_solvent = false;
+        if (phase.active(Phase::SOLVENT)) {
+            pu.has_solvent = true;
+        }
+
         return pu;
     }