From 94417e78039a553746e5d22d13b78a078bbd771b Mon Sep 17 00:00:00 2001
From: longemen3000 <longemen3000@gmail.com>
Date: Tue, 26 Nov 2024 23:55:34 -0300
Subject: [PATCH] fix indexing error when setting a vapour fraction

---
 .../property_solvers/multicomponent/flash/QP.jl |  3 ++-
 .../multicomponent/flash/general_flash.jl       | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/methods/property_solvers/multicomponent/flash/QP.jl b/src/methods/property_solvers/multicomponent/flash/QP.jl
index 0a8b6bdd2..d9caec927 100644
--- a/src/methods/property_solvers/multicomponent/flash/QP.jl
+++ b/src/methods/property_solvers/multicomponent/flash/QP.jl
@@ -29,7 +29,8 @@ function qp_flash_x0(model,β,p,z,method::FlashMethod)
     else
         T = method.T0
     end
-    return pt_flash_x0(model,p,T,z,method;k0 = :suggest)
+    r = pt_flash_x0(model,p,T,z,method;k0 = :suggest)
+    return r
 end
 
 function qp_flash(model::EoSModel,β,p,z;kwargs...)
diff --git a/src/methods/property_solvers/multicomponent/flash/general_flash.jl b/src/methods/property_solvers/multicomponent/flash/general_flash.jl
index 7c7c32e50..45955d000 100644
--- a/src/methods/property_solvers/multicomponent/flash/general_flash.jl
+++ b/src/methods/property_solvers/multicomponent/flash/general_flash.jl
@@ -1,6 +1,7 @@
 struct Vfrac
     k::Int
 end
+
 struct FlashSpecifications{S1,V1,S2,V2}
     spec1::S1
     val1::V1
@@ -69,6 +70,16 @@ function normalize_spec(s::FlashSpecifications,k)
     return FlashSpecifications(spec1,newval1,spec2,newval2)
 end
 
+function set_vfrac(s::FlashSpecifications,i)
+    if s.spec1 isa Vfrac
+        return FlashSpecifications(Vfrac(i[s.spec1.k]),s.val1,s.spec2,s.val2)
+    elseif s.spec2 isa Vfrac
+        return FlashSpecifications(s.spec1,s.val1,Vfrac(s.spec2.k),s.val2)
+    else
+        return s
+    end
+end
+
 function xy_input_to_flash_vars(input,np,nc,z)
     idx_comps_end = nc*np
     idx_comps = 1:idx_comps_end
@@ -355,7 +366,7 @@ function xy_flash_neq(output,model,zbulk,np,input,state::F,μconfig) where F
     elseif spec2 == volume
         output[end] = (∑v - val2)/vs
     elseif spec2 isa Vfrac
-        i_spec = spec1.k
+        i_spec = spec2.k
         output[end-1] = β[i_spec] - val2
     else
         output[end] = (val2 - ∑a - p_end*∑v - T*∑s)*RTinv
@@ -436,6 +447,7 @@ function xy_flash(model::EoSModel,spec::FlashSpecifications,z,comps0,β0,volumes
     input_0_1[idx_comps] .= true
     #we want to select the anchor phase with biggest fraction
     idx = sortperm(β0)
+    
     flash_vars = xy_input_to_flash_vars(input,np,nc,z)
     compsx,βx,volumesx = flash_vars
     for j in 1:np
@@ -458,7 +470,7 @@ function xy_flash(model::EoSModel,spec::FlashSpecifications,z,comps0,β0,volumes
         input[end] = T0
     end
     _1 = one(eltype(input))
-    new_spec = normalize_spec(spec,∑z*_1)
+    new_spec = normalize_spec(set_vfrac(spec,idx),∑z*_1)
     zz = z * (1/∑z*_1)
     J = similar(input,(l,l))
     J .= 0
@@ -497,6 +509,7 @@ function xy_flash(model::EoSModel,spec::FlashSpecifications,z,comps0,β0,volumes
                 x[j] = 0.5*(1 + x_old[j])
             end
         end
+        
         Fnorm = norm(F,Inf)
         xmax = maximum(x)
         xnorm = Solvers.dnorm(x,x_old,Inf)