Commit 25e4ba45 authored by Henning Francke's avatar Henning Francke
Browse files

Merge branch 'v0.4.1'

# Conflicts:
#	BrineProp/Brine5salts/package.mo
#	BrineProp/Brine5salts3gas/package.mo
#	BrineProp/GasData/solubility_CH4_pTX_Duan2006.mo
#	BrineProp/GasData/solubility_CO2_pTX_Duan2006.mo
#	BrineProp/GasData/solubility_N2_pTX_Mao2006.mo
#	BrineProp/SpecificEnthalpies/specificHeatCapacityCp_pTX_liq_Francke.mo
parents 0edd107f 32d105de
...@@ -131,6 +131,10 @@ algorithm ...@@ -131,6 +131,10 @@ algorithm
print("m["+String(i)+"]= "+String(m[i])+""); print("m["+String(i)+"]= "+String(m[i])+"");
end if; end if;
if debugmode then
print("m["+String(i)+"]= "+String(m[i])+"");
end if;
M_salt[i] := salt.M_salt*1000 "in g/mol"; M_salt[i] := salt.M_salt*1000 "in g/mol";
m_r := salt.m_r; m_r := salt.m_r;
z_plus := salt.z_plus; z_plus := salt.z_plus;
......
...@@ -46,7 +46,7 @@ equation ...@@ -46,7 +46,7 @@ equation
// props.Xi = { 0, 0, 0, 0, 0} "pure water"; // props.Xi = { 0, 0, 0, 0, 0} "pure water";
// props.Xi = {6*SaltData.M_NaCl/(1+6*SaltData.M_NaCl),0,0,0,0} "6-molar NaCl solution"; // props.Xi = {6*SaltData.M_NaCl/(1+6*SaltData.M_NaCl),0,0,0,0} "6-molar NaCl solution";
// props.Xi = {n_Na*SaltData.M_NaCl,n_K*SaltData.M_KCl,n_Ca*SaltData.M_CaCl2,0,0}/(1+n_Na*SaltData.M_NaCl+n_K*SaltData.M_KCl+n_Ca*SaltData.M_CaCl2) "specify molalities above"; // props.Xi = {n_Na*SaltData.M_NaCl,n_K*SaltData.M_KCl,n_Ca*SaltData.M_CaCl2,0,0}/(1+n_Na*SaltData.M_NaCl+n_K*SaltData.M_KCl+n_Ca*SaltData.M_CaCl2) "specify molalities above";
props.Xi = {0.0839077010751,0.00253365118988,0.122786737978,0,0} props.Xi = {0*0.0839077010751,0*0.00253365118988,0.122786737978,0,0}
"GrSk brine composition (Feldbusch 2-2013 1.1775g/ml V2)"; "GrSk brine composition (Feldbusch 2-2013 1.1775g/ml V2)";
//SPECIFY THERMODYNAMIC STATE //SPECIFY THERMODYNAMIC STATE
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment