Commit 90d6ebe3 authored by Henning Francke's avatar Henning Francke
Browse files

Merge branch 'master' of git@git.gfz-potsdam.de:francke/BrineProp.git

# Conflicts:
#	BrineProp/WaterMixtureTwoPhase_pT/package.mo
#	BrineProp/WaterMixtureTwoPhase_pT/package.order
parents 00837a1f 0aa80ed8
......@@ -91,12 +91,14 @@ model BrineProps2phaseFull "Two-phase example demonstrating all features"
Real g=1 "gas content multiplier";
/* parameter SI.Pressure p_set=20*1.01325e5;
parameter SI.Temperature T_set=273.15+30;*/
parameter SI.Temperature T_set=273.15+30;*/
SI.SpecificEnthalpy h_bubble = Medium.bubbleEnthalpy(props.sat);
equation
//DEFINE STATE (define 2 variables pT, ph or Td)
//pT transient
props.p = 10*1.01325e5;
props.T = 273.15+150 "+time";
props.T = 273.15+100 "+time";
/* //ph
props.p = 435e5;
......
......@@ -13,7 +13,6 @@ specificEntropy
specificEnthalpy_ps
setState_psX
setState_pTX
setState_dTX
specificEntropy_pTX
thermalConductivity
specificHeatCapacityCp
......@@ -29,4 +28,6 @@ vapourQuality
temperature_ph
specificEnthalpy_pT
density_pT
fugacity_H2O
setState_dTX
specificEnthalpy
density
within BrineProp.WaterMixtureTwoPhase_pT;
function extends setState_dTX "to avoid check error"
algorithm
end setState_dTX;
within BrineProp.WaterMixtureTwoPhase_pT;
function extends specificEnthalpy "to avoid check error"
algorithm
end specificEnthalpy;
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