Commit 75dae854 authored by Henning Francke's avatar Henning Francke
Browse files

rearranged Water package

parent 90d6ebe3
......@@ -311,7 +311,7 @@ algorithm
annotation (Documentation(info="<html></html>"));
end temperature_phX;
redeclare function extends density "density from state"
redeclare replaceable function extends density "density from state"
algorithm
d := density_pTX(state.p, state.T, state.X);
end density;
......
within BrineProp.WaterMixtureTwoPhase_pT;
function fugacity_H2O
"Calculation of fugacity coefficient according to (Duan 2003)"
// extends fugacity_pTX;
input SI.Pressure p;
input SI.Temp_K T;
output Real phi=0;
algorithm
assert(false, "dummy function for compatibility, should not be called");
end fugacity_H2O;
......@@ -232,12 +232,6 @@ algorithm
// GVF=-1,
end setState_pTX;
redeclare function extends setState_dTX
algorithm
assert(false,"Running dummy setState_dTX. Shouldn't be called.");
state := setState_pTX(1e5,T,X) ",fluidnames)";
end setState_dTX;
redeclare function specificEntropy_pTX
"Computes specific entropy as a function of pressure and temperature"
extends Modelica.Icons.Function;
......@@ -392,6 +386,7 @@ end setState_phX;
annotation(Documentation(info="<html></html>"));
end vapourQuality;
//DUMMY FUNCTIONS
redeclare function extends temperature_ph "to avoid check error"
end temperature_ph;
......@@ -401,6 +396,12 @@ end setState_phX;
redeclare function extends density_pT "to avoid check error"
end density_pT;
redeclare function extends setState_dTX
algorithm
assert(false,"Running dummy setState_dTX. Shouldn't be called.");
state := setState_pTX(1e5,T,X) ",fluidnames)";
end setState_dTX;
annotation (Documentation(info="<html>
<h1>Water_MixtureTwoPhase_pT</h1>
This is a an example use of PartialMixtureTwoPhaseMedium.
......
......@@ -30,4 +30,4 @@ specificEnthalpy_pT
density_pT
setState_dTX
specificEnthalpy
density
fugacity_H2O
within BrineProp.WaterMixtureTwoPhase_pT;
function extends setState_dTX "to avoid check error"
algorithm
end setState_dTX;
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