add vapwat to gaswater simulators and output molfractions YMFWAT

ebos/eclgenericoutputblackoilmodule.cc

@@ -846,6 +846,15 @@ assignToSolution(data::Solution& sol)
         sol.insert("XMFCO2", UnitSystem::measure::identity, std::move(mfrac), data::TargetType::RESTART_AUXILIARY);
     }
 
+    if (eclState_.runspec().co2Storage() && !rvw_.empty()) {
+        std::vector<double> mfrac(rvw_.size(), 0.0);
+        const auto& pvtnum = eclState_.fieldProps().get_int("PVTNUM");
+        for (size_t i = 0; i < rvw_.size(); ++i) {
+            mfrac[i] = FluidSystem::convertXgWToxgW(FluidSystem::convertRvwToXgW(rvw_[i], pvtnum[i]-1), pvtnum[i]-1);
+        }
+        sol.insert("YMFWAT", UnitSystem::measure::identity, std::move(mfrac), data::TargetType::RESTART_AUXILIARY);
+    }
+
     // Fluid in place
     if (this->outputFipRestart_) {
         for (const auto& phase : Inplace::phases()) {

flow/flow_ebos_gaswater_dissolution.cpp

@@ -53,6 +53,11 @@ struct EnableDisgasInWater<TypeTag, TTag::EclFlowGasWaterDissolutionProblem> {
     static constexpr bool value = true;
 };
 
+template<class TypeTag>
+struct EnableEvaporation<TypeTag, TTag::EclFlowGasWaterDissolutionProblem> {
+    static constexpr bool value = true;
+};
+
 //! The indices required by the model
 template<class TypeTag>
 struct Indices<TypeTag, TTag::EclFlowGasWaterDissolutionProblem>

flow/flow_ebos_gaswater_dissolution_diffuse.cpp

@@ -53,6 +53,11 @@ struct EnableDisgasInWater<TypeTag, TTag::EclFlowGasWaterDissolutionDiffuseProbl
     static constexpr bool value = true;
 };
 
+template<class TypeTag>
+struct EnableEvaporation<TypeTag, TTag::EclFlowGasWaterDissolutionDiffuseProblem> {
+    static constexpr bool value = true;
+};
+
 //! The indices required by the model
 template<class TypeTag>
 struct Indices<TypeTag, TTag::EclFlowGasWaterDissolutionDiffuseProblem>