diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Interfaces/Connectors/SolarPort_a.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Interfaces/Connectors/SolarPort_a.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Interfaces/Connectors/SolarPort_a.mo" 2022-03-10 09:57:37.728144091 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Interfaces/Connectors/SolarPort_a.mo" 2022-03-10 09:58:13.452148619 +0000
@@ -1,9 +1,9 @@
within SolarTherm.Interfaces.Connectors;
connector SolarPort_a "Generic solar connector at design inlet"
extends SolarTherm.Interfaces.Connectors.SolarPort;
- input Modelica.SIunits.Angle dec "Solar declination angle";
- input Modelica.SIunits.Angle hra "Solar hour angle";
- input Modelica.SIunits.Irradiance dni "Direct Solar Irradiance";
+ input Modelica.Units.SI.Angle dec "Solar declination angle";
+ input Modelica.Units.SI.Angle hra "Solar hour angle";
+ input Modelica.Units.SI.Irradiance dni "Direct Solar Irradiance";
annotation(defaultComponentName = "port_a", Diagram(coordinateSystem(preserveAspectRatio = false, extent = {{-100, -100}, {100, 100}}), graphics={ Ellipse(
extent={{-40,40},{40,-40}},
lineColor={161,80,0},
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Interfaces/Connectors/SolarPort_b.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Interfaces/Connectors/SolarPort_b.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Interfaces/Connectors/SolarPort_b.mo" 2022-03-10 09:57:37.728144091 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Interfaces/Connectors/SolarPort_b.mo" 2022-03-10 09:58:13.440148616 +0000
@@ -1,9 +1,9 @@
within SolarTherm.Interfaces.Connectors;
connector SolarPort_b "Generic solar connector at design outlet"
extends SolarTherm.Interfaces.Connectors.SolarPort;
- output Modelica.SIunits.Angle dec "Solar declination angle";
- output Modelica.SIunits.Angle hra "Solar hour angle";
- output Modelica.SIunits.Irradiance dni "Direct Solar Irradiance";
+ output Modelica.Units.SI.Angle dec "Solar declination angle";
+ output Modelica.Units.SI.Angle hra "Solar hour angle";
+ output Modelica.Units.SI.Irradiance dni "Direct Solar Irradiance";
annotation(defaultComponentName = "port_b", Diagram(coordinateSystem(preserveAspectRatio = false, extent = {{-100, -100}, {100, 100}}), graphics={ Ellipse(
extent={{-40,40},{40,-40}},
lineColor={161,80,0},
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Interfaces/Connectors/WeatherBus.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Interfaces/Connectors/WeatherBus.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Interfaces/Connectors/WeatherBus.mo" 2022-03-10 09:57:37.728144091 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Interfaces/Connectors/WeatherBus.mo" 2022-03-10 09:58:13.396148611 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Interfaces.Connectors;
expandable connector WeatherBus "Bus for weather data"
- import SI = Modelica.SIunits;
- import nSI = Modelica.SIunits.Conversions.NonSIunits;
+ import Modelica.Units.SI;
+ import nSI = Modelica.Units.NonSI;
nSI.Angle_deg alt "Sun altitude";
nSI.Angle_deg azi "Sun azimuth (Clockwise from North=0)";
nSI.Angle_deg elo "Ecliptic longitude (reduced to range [-90, 90])";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Interfaces/Models/HeatExchangerInterface.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Interfaces/Models/HeatExchangerInterface.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Interfaces/Models/HeatExchangerInterface.mo" 2022-03-10 09:57:37.728144091 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Interfaces/Models/HeatExchangerInterface.mo" 2022-03-10 09:58:13.364148607 +0000
@@ -22,7 +22,7 @@
annotation (Placement(visible = true,transformation(origin = {44, 21}, extent = {{-7.5, -7.5}, {7.5, 7.5}}, rotation = 0),
iconTransformation(origin = {44, 21}, extent = {{-2.5, -2.5}, {2.5, 2.5}}, rotation = 0)));
// Variables
- Modelica.SIunits.HeatFlowRate Q_flow;
+ Modelica.Units.SI.HeatFlowRate Q_flow;
annotation(
Icon(coordinateSystem(extent = {{-40, -40}, {40, 40}})),
Diagram(coordinateSystem(extent = {{-40, -40}, {40, 40}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Materials/Graphite.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Materials/Graphite.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Materials/Graphite.mo" 2022-03-10 09:57:37.728144091 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Materials/Graphite.mo" 2022-03-10 09:58:13.136148579 +0000
@@ -4,7 +4,7 @@
import SolarTherm.Utilities.Interpolation.Interpolate1D;
//constant SI.MolarMass MM = 12.011e-3 "Molar mass (kg/mol)";
- //constant SI.Temperature T_melt = 933.47 "Melting point (K)";
+ //constant SI.Temperature T_melt = 933.47 "Melting point (K)";
//https://nucleus.iaea.org/sites/graphiteknowledgebase/wiki/Guide_to_Graphite/What%20is%20Graphite.aspx
//constant Real cost = 1.8 "USD/kg";
@@ -31,7 +31,7 @@
// reference: https://webbook.nist.gov/cgi/cbook.cgi?ID=C7782425&Mask=2#Thermo-Condensed
// Butland and Maddison, 1973
// Butland, A.T.D.; Maddison, R.J., The specific heat of graphite: an evaluation of measurements, J. Nucl. Mater., 1973, 49, 45-56.
- //T = 200 to 3500 K. Least squares fit of 'best' data gives:
+ //T = 200 to 3500 K. Least squares fit of 'best' data gives:
// Cp = 0.538657 + 9.11129x10-6T - 90.2725T^-1 - 43449.3T^-2 + 1.59309x107T^-3 - 1.43688x109T^-4 cal/g*K (250 to 3000 K)
input SI.Temperature T "Absolute temperature (K)";
output SI.SpecificEnthalpy h "Specific Enthalpy (J/kg)";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Materials/PartialMaterial.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Materials/PartialMaterial.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Materials/PartialMaterial.mo" 2022-03-10 09:57:37.728144091 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Materials/PartialMaterial.mo" 2022-03-10 09:58:13.088148572 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Materials;
partial package PartialMaterial
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import CN = Modelica.Constants;
package Tables = Modelica.Blocks.Tables;
import SolarTherm.Utilities.Interpolation.Interpolate1D;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/CO2/CO2_ph.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/CO2/CO2_ph.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/CO2/CO2_ph.mo" 2022-03-10 09:57:37.728144091 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/CO2/CO2_ph.mo" 2022-03-10 09:58:12.932148553 +0000
@@ -1,4 +1,4 @@
-within SolarTherm.Media.CO2;
+within SolarTherm.Media.CO2;
package CO2_ph "CO2, explicit in p and h, in range 60 - 300 bars, 20 - 800°C"
/* For a new medium, make a copy of this package and remove
the "partial" keyword from the package definition above.
@@ -51,7 +51,7 @@
The code fragment below is for a single-substance medium with
p,T as independent variables.
*/
- import SI=Modelica.SIunits;
+ import Modelica.Units.SI;
type Temperature = Real (
final quantity="ThermodynamicTemperature",
@@ -103,7 +103,7 @@
h = state.h;
u = h - p / d;
MM = 0.044;
- R = 8.3144 / MM;
+ R_s = 8.3144 / MM;
state.p = p;
T = T_p_h(p, h, tableIDT_p_h);
end BaseProperties;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/CO2/CO2_utilities.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/CO2/CO2_utilities.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/CO2/CO2_utilities.mo" 2022-03-10 09:57:37.728144091 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/CO2/CO2_utilities.mo" 2022-03-10 09:58:12.912148549 +0000
@@ -6,9 +6,9 @@
function cp_p_h "Specific heat capacity of CO2 as a function of pressure and enthalpy. Performs interpolation with the tableID declared in the Medium declaration."
extends Modelica.Icons.Function;
input Modelica.Media.Interfaces.Types.AbsolutePressure p "Pressure";
- input Modelica.SIunits.SpecificEnthalpy h "Enthalpy";
+ input Modelica.Units.SI.SpecificEnthalpy h "Enthalpy";
input Modelica.Blocks.Types.ExternalCombiTable2D tableID;
- output Modelica.SIunits.SpecificHeatCapacity cp "Specific heat capacity";
+ output Modelica.Units.SI.SpecificHeatCapacity cp "Specific heat capacity";
external"C" cp = ModelicaStandardTables_CombiTable2D_getValue(tableID, h, p)
annotation (Library={"ModelicaStandardTables", "ModelicaMatIO", "zlib"});
end cp_p_h;
@@ -16,9 +16,9 @@
function eta_p_h "Dynamic viscosity of molten salt as a function of temperature"
extends Modelica.Icons.Function;
input Modelica.Media.Interfaces.Types.AbsolutePressure p "Pressure";
- input Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
+ input Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
input Modelica.Blocks.Types.ExternalCombiTable2D tableID "Table with the values to interpolate";
- output Modelica.SIunits.DynamicViscosity eta "Dynamic viscosity";
+ output Modelica.Units.SI.DynamicViscosity eta "Dynamic viscosity";
external "C" eta = ModelicaStandardTables_CombiTable2D_getValue(tableID, h, p) annotation(
Library = {"ModelicaStandardTables", "ModelicaMatIO", "zlib"});
@@ -27,9 +27,9 @@
function helmholtz_p_h "Specific Helmholtz energy of CO2"
extends Modelica.Icons.Function;
input Modelica.Media.Interfaces.Types.AbsolutePressure p "Pressure";
- input Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
+ input Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
input Modelica.Blocks.Types.ExternalCombiTable2D tableID "Table with the values to interpolate";
- output Modelica.SIunits.SpecificHelmholtzFreeEnergy helmholtz "Specific Helmholtz energy";
+ output Modelica.Units.SI.SpecificHelmholtzFreeEnergy helmholtz "Specific Helmholtz energy";
external "C" helmholtz = ModelicaStandardTables_CombiTable2D_getValue(tableID, h, p) annotation(
Library = {"ModelicaStandardTables", "ModelicaMatIO", "zlib"});
@@ -39,9 +39,9 @@
import SolarTherm.Media.CO2.CO2_utilities.*;
extends Modelica.Icons.Function;
input Modelica.Media.Interfaces.Types.AbsolutePressure p "Pressure";
- input Modelica.SIunits.SpecificEntropy s "Specific entropy";
+ input Modelica.Units.SI.SpecificEntropy s "Specific entropy";
input Modelica.Blocks.Types.ExternalCombiTable2D tableID "Table with the values to interpolate";
- output Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
+ output Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
external "C" h = ModelicaStandardTables_CombiTable2D_getValue(tableID, s, p) annotation(
Library = {"ModelicaStandardTables", "ModelicaMatIO", "zlib"});
@@ -50,9 +50,9 @@
function h_p_T "Specific enthalpy of molten salt as a function of temperature"
extends Modelica.Icons.Function;
input Modelica.Media.Interfaces.Types.AbsolutePressure p "Pressure";
- input Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.Temperature T "Temperature";
input Modelica.Blocks.Types.ExternalCombiTable2D tableID "Table with the values to interpolate";
- output Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
+ output Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
external "C" h = ModelicaStandardTables_CombiTable2D_getValue(tableID, T, p) annotation(
Library = {"ModelicaStandardTables", "ModelicaMatIO", "zlib"});
@@ -61,9 +61,9 @@
function lambda_p_h "Thermal conductivity of molten salt as a function of temperature"
extends Modelica.Icons.Function;
input Modelica.Media.Interfaces.Types.AbsolutePressure p "Pressure";
- input Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
+ input Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
input Modelica.Blocks.Types.ExternalCombiTable2D tableID "Table with the values to interpolate";
- output Modelica.SIunits.ThermalConductivity lambda "Thermal conductivity";
+ output Modelica.Units.SI.ThermalConductivity lambda "Thermal conductivity";
external "C" lambda = ModelicaStandardTables_CombiTable2D_getValue(tableID, h, p) annotation(
Library = {"ModelicaStandardTables", "ModelicaMatIO", "zlib"});
@@ -73,9 +73,9 @@
function rho_p_h "Density of molten salt as a function of temperature"
extends Modelica.Icons.Function;
input Modelica.Media.Interfaces.Types.AbsolutePressure p "Pressure";
- input Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
+ input Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
input Modelica.Blocks.Types.ExternalCombiTable2D tableID "Table with the values to interpolate";
- output Modelica.SIunits.Density rho "Density";
+ output Modelica.Units.SI.Density rho "Density";
external "C" rho = ModelicaStandardTables_CombiTable2D_getValue(tableID, h, p) annotation(
Library = {"ModelicaStandardTables", "ModelicaMatIO", "zlib"});
@@ -84,9 +84,9 @@
function s_p_h "Specific entropy of molten salt as a function of pressure and enthalpy"
extends Modelica.Icons.Function;
input Modelica.Media.Interfaces.Types.AbsolutePressure p "Pressure";
- input Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
+ input Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
input Modelica.Blocks.Types.ExternalCombiTable2D tableID "Table with the values to interpolate";
- output Modelica.SIunits.SpecificEntropy s "Specific entropy";
+ output Modelica.Units.SI.SpecificEntropy s "Specific entropy";
external "C" s = ModelicaStandardTables_CombiTable2D_getValue(tableID, h, p) annotation(
Library = {"ModelicaStandardTables", "ModelicaMatIO", "zlib"});
@@ -95,9 +95,9 @@
function T_p_h "Temperature of molten salt as a function of pressure and specific enthalpy"
extends Modelica.Icons.Function;
input Modelica.Media.Interfaces.Types.AbsolutePressure p "Pressure";
- input Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
+ input Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
input Modelica.Blocks.Types.ExternalCombiTable2D tableID "Table with the values to interpolate";
- output Modelica.SIunits.Temperature T "Temperature";
+ output Modelica.Units.SI.Temperature T "Temperature";
external "C" T = ModelicaStandardTables_CombiTable2D_getValue(tableID, h, p) annotation(
Library = {"ModelicaStandardTables", "ModelicaMatIO", "zlib"});
@@ -106,9 +106,9 @@
function u_p_h
extends Modelica.Icons.Function;
input Modelica.Media.Interfaces.Types.AbsolutePressure p "Pressure";
- input Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
+ input Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
input Modelica.Blocks.Types.ExternalCombiTable2D tableID "Table with the values to interpolate";
- output Modelica.SIunits.SpecificEnergy u "Specific energy";
+ output Modelica.Units.SI.SpecificEnergy u "Specific energy";
external "C" u = ModelicaStandardTables_CombiTable2D_getValue(tableID, h, p) annotation(
Library = {"ModelicaStandardTables", "ModelicaMatIO", "zlib"});
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/CarbonDioxide/package.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/CarbonDioxide/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/CarbonDioxide/package.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/CarbonDioxide/package.mo" 2022-03-10 09:58:12.852148543 +0000
@@ -85,7 +85,7 @@
h = state.h;
u = SolarTherm.Utilities.CoolProp.stprops("U","P",p,"H",h,"R744");
MM = 0.044;
- R = 8.3144 / MM;
+ R_s = 8.3144 / MM;
end BaseProperties;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_pT/package.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_pT/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_pT/package.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_pT/package.mo" 2022-03-10 09:58:12.820148539 +0000
@@ -79,7 +79,7 @@
h = h_T(T);
u = h - p / d;
MM = 0.07862523372; //Composition: NaCl–KCl–MgCl2 24.5–20.5–55 (% in weight)
- R = 8.3144 / MM;
+ R_s = 8.3144 / MM;
//T = T_h(h);
//h = state.h;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/T_h.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/T_h.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/T_h.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/T_h.mo" 2022-03-10 09:58:12.796148535 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.ChlorideSalt.ChlorideSalt_utilities;
function T_h "Temperature of Chloride Salt as a function of specific enthalpy"
extends Modelica.Icons.Function;
- input Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
- output Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
+ output Modelica.Units.SI.Temperature T "Temperature";
protected
constant Real a = 0.0009793714;
constant Real b = 651.8423145829;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/cp_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/cp_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/cp_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/cp_T.mo" 2022-03-10 09:58:12.792148534 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.ChlorideSalt.ChlorideSalt_utilities;
function cp_T "Specific heat capacity of liquid sodium at constant pressue as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.SpecificHeatCapacity cp "Specific heat capacity";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.SpecificHeatCapacity cp "Specific heat capacity";
protected
constant Real a = -0.448;
constant Real b = 1411.6156444445;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/drho_dT_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/drho_dT_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/drho_dT_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/drho_dT_T.mo" 2022-03-10 09:58:12.784148533 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Media.ChlorideSalt.ChlorideSalt_utilities;
function drho_dT_T "Derivative of density of liquid sodium w.r.t temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.Temperature T "Temperature";
output Real drho "Derivative of density w.r.t temperature";
algorithm
//From interpolation of NREL data
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/eta_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/eta_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/eta_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/eta_T.mo" 2022-03-10 09:58:12.772148532 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.ChlorideSalt.ChlorideSalt_utilities;
function eta_T "Dynamic viscosity of liquid sodium as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.DynamicViscosity eta "Dynamic viscosity";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.DynamicViscosity eta "Dynamic viscosity";
protected
parameter Real a = 3.12354312353038e-14;
parameter Real b = -1.281501061896e-10;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/h_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/h_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/h_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/h_T.mo" 2022-03-10 09:58:12.736148527 +0000
@@ -2,8 +2,8 @@
function h_T "Specific enthalpy of Chloride Salt as a function of temperature"
extends Modelica.Icons.Function;
import SolarTherm.Media.ChlorideSalt.ChlorideSalt_utilities.*;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
protected
constant Real a = -0.2241891775;
constant Real b = 1411.9325606493;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/h_T_der.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/h_T_der.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/h_T_der.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/h_T_der.mo" 2022-03-10 09:58:12.728148526 +0000
@@ -2,7 +2,7 @@
function h_T_der "Derivative of specific enthalpy of Chloride Salt w.r.t. time"
import SolarTherm.Media.Sodium.Sodium_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.Temperature T "Temperature";
input Real der_T;
output Real der_h "h derivative";
algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/lamda_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/lamda_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/lamda_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/lamda_T.mo" 2022-03-10 09:58:12.720148525 +0000
@@ -1,10 +1,10 @@
within SolarTherm.Media.ChlorideSalt.ChlorideSalt_utilities;
function lamda_T "Thermal conductivity of Chloride Salt as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.ThermalConductivity lambda "Thermal conductivity";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.ThermalConductivity lambda "Thermal conductivity";
protected
- Modelica.SIunits.Temp_C T_C = Modelica.SIunits.Conversions.to_degC(T) "Temperature in degree Celsius";
+ Modelica.Units.NonSI.Temperature_degC T_C = Modelica.Units.Conversions.to_degC(T) "Temperature in degree Celsius";
constant Real a = 7.06493506493493e-7;
constant Real b = -0.0014404163;
constant Real c = 1.1483003444;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/rho_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/rho_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/rho_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/rho_T.mo" 2022-03-10 09:58:12.712148525 +0000
@@ -1,10 +1,10 @@
within SolarTherm.Media.ChlorideSalt.ChlorideSalt_utilities;
function rho_T "Density of Chloride Salt as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.Density rho "Density";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.Density rho "Density";
protected
- Modelica.SIunits.Temp_C T_C = Modelica.SIunits.Conversions.to_degC(T) "Temperature in degree Celsius";
+ Modelica.Units.NonSI.Temperature_degC T_C = Modelica.Units.Conversions.to_degC(T) "Temperature in degree Celsius";
constant Real a = -0.5786666667;
constant Real b = 2124.1516888889;
algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/rho_T_der.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/rho_T_der.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/rho_T_der.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/rho_T_der.mo" 2022-03-10 09:58:12.700148524 +0000
@@ -2,7 +2,7 @@
function rho_T_der "Derivative of the density of Chloride Salt w.r.t. time"
import SolarTherm.Media.ChlorideSalt.ChlorideSalt_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.Temperature T "Temperature";
input Real der_T "Derivative of T w.r.t. time";
output Real der_rho "Derivative of density w.r.t time";
algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/s_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/s_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/s_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSalt/ChlorideSalt_utilities/s_T.mo" 2022-03-10 09:58:12.692148523 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.ChlorideSalt.ChlorideSalt_utilities;
function s_T "Specific entropy of Chloride Salt as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.SpecificEntropy s "Specific entropy";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.SpecificEntropy s "Specific entropy";
protected
constant Real a = -0.448;
constant Real b = 1411.6156444445;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_ph/package.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_ph/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_ph/package.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_ph/package.mo" 2022-03-10 09:58:12.672148519 +0000
@@ -85,7 +85,7 @@
h = state.h;
u = h - p / d;
MM = 0.02298977; //Update it, more info needed
- R = 8.3144 / MM;
+ R_s = 8.3144 / MM;
end BaseProperties;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/T_h.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/T_h.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/T_h.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/T_h.mo" 2022-03-10 09:58:12.640148515 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.ChlorideSaltPH.ChlorideSaltPH_utilities;
function T_h "Temperature of Chloride Salt as a function of specific enthalpy"
extends Modelica.Icons.Function;
- input Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
- output Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
+ output Modelica.Units.SI.Temperature T "Temperature";
protected
constant Real a = 0.0009793714;
constant Real b = 651.8423145829;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/T_h_der.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/T_h_der.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/T_h_der.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/T_h_der.mo" 2022-03-10 09:58:12.612148512 +0000
@@ -2,7 +2,7 @@
function T_h_der "Derivative of temperature of Chloride Salt w.r.t. time"
import SolarTherm.Media.SolidParticles.CarboHSP_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
+ input Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
input Real der_h "Derivative of specific enthalpy w.r.t. time";
output Real der_T "Derivative of Temperature w.r.t. time";
algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/T_s.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/T_s.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/T_s.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/T_s.mo" 2022-03-10 09:58:12.608148511 +0000
@@ -2,8 +2,8 @@
function T_s "Temperature of Chloride Salt as a function of Specific entropy"
extends Modelica.Icons.Function;
import Modelica.Math.*;
- input Modelica.SIunits.SpecificEntropy s "Specific entropy";
- output Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.SpecificEntropy s "Specific entropy";
+ output Modelica.Units.SI.Temperature T "Temperature";
protected
constant Real a = 257.5497198499;
constant Real b = 0.0009728881;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/cp_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/cp_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/cp_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/cp_T.mo" 2022-03-10 09:58:12.600148510 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.ChlorideSaltPH.ChlorideSaltPH_utilities;
function cp_T "Specific heat capacity of Chloride Salt as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.SpecificHeatCapacity cp "Specific heat capacity";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.SpecificHeatCapacity cp "Specific heat capacity";
protected
constant Real a = -0.448;
constant Real b = 1411.6156444445;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/dT_dh_h.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/dT_dh_h.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/dT_dh_h.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/dT_dh_h.mo" 2022-03-10 09:58:12.592148510 +0000
@@ -2,10 +2,10 @@
function dT_dh_h "Derivative of temperature of Chloride Salt w.r.t specific enthalpy"
extends Modelica.Icons.Function;
import SolarTherm.Media.SolidParticles.CarboHSP_utilities.*;
- input Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
+ input Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
output Real dT "Derivative of temperature w.r.t specific enthalpy";
protected
- Modelica.SIunits.Temperature T;
+ Modelica.Units.SI.Temperature T;
algorithm
T:=T_h(h);
dT := 1 / dh_dT_T(T);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/dh_dT_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/dh_dT_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/dh_dT_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/dh_dT_T.mo" 2022-03-10 09:58:12.584148508 +0000
@@ -2,7 +2,7 @@
function dh_dT_T "Derivative of specific enthalpy of Chloride Salt w.r.t temperature"
import SolarTherm.Media.SolidParticles.CarboHSP_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.Temperature T "Temperature";
output Real dh "Derivative of specific enthalpy w.r.t temperature";
algorithm
dh := cp_T(T);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/drho_dT_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/drho_dT_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/drho_dT_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/drho_dT_T.mo" 2022-03-10 09:58:12.576148507 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Media.ChlorideSaltPH.ChlorideSaltPH_utilities;
function drho_dT_T "Derivative of density of Chloride Salt w.r.t temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.Temperature T "Temperature";
output Real drho "Derivative of density w.r.t temperature";
algorithm
drho := 0; // Constant density
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/eta_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/eta_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/eta_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/eta_T.mo" 2022-03-10 09:58:12.572148508 +0000
@@ -1,9 +1,9 @@
within SolarTherm.Media.ChlorideSaltPH.ChlorideSaltPH_utilities;
function eta_T "Dynamic viscosity of liquid sodium as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.DynamicViscosity eta "Dynamic viscosity";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.DynamicViscosity eta "Dynamic viscosity";
protected
parameter Real a = 3.12354312353038e-14;
parameter Real b = -1.281501061896e-10;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/h_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/h_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/h_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/h_T.mo" 2022-03-10 09:58:12.564148505 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.ChlorideSaltPH.ChlorideSaltPH_utilities;
function h_T "Specific enthalpy of Chloride Salt as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
protected
constant Real a = -0.2241891775;
constant Real b = 1411.9325606493;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/h_T_der.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/h_T_der.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/h_T_der.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/h_T_der.mo" 2022-03-10 09:58:12.552148504 +0000
@@ -2,7 +2,7 @@
function h_T_der "Derivative of specific enthalpy of Chloride Salt w.r.t. time"
import SolarTherm.Media.SolidParticles.CarboHSP_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.Temperature T "Temperature";
input Real der_T;
output Real der_h "Time derivative of specific enthalpy";
algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/lamda_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/lamda_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/lamda_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/lamda_T.mo" 2022-03-10 09:58:12.544148503 +0000
@@ -1,10 +1,10 @@
within SolarTherm.Media.ChlorideSaltPH.ChlorideSaltPH_utilities;
function lamda_T "Thermal conductivity of Chloride Salt as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.ThermalConductivity lamda "Thermal conductivity";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.ThermalConductivity lamda "Thermal conductivity";
protected
- Modelica.SIunits.Temp_C T_C = Modelica.SIunits.Conversions.to_degC(T) "Temperature in degree Celsius";
+ Modelica.Units.NonSI.Temperature_degC T_C = Modelica.Units.Conversions.to_degC(T) "Temperature in degree Celsius";
constant Real a = 7.06493506493493e-7;
constant Real b = -0.0014404163;
constant Real c = 1.1483003444;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/p_rho.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/p_rho.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/p_rho.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/p_rho.mo" 2022-03-10 09:58:12.536148503 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Media.ChlorideSaltPH.ChlorideSaltPH_utilities;
function p_rho "Pressure of Chloride Salt as a function of density"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Density rho "Density";
+ input Modelica.Units.SI.Density rho "Density";
output Modelica.Media.Interfaces.Types.AbsolutePressure p "Pressure";
algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/rho_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/rho_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/rho_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/rho_T.mo" 2022-03-10 09:58:12.520148500 +0000
@@ -1,10 +1,10 @@
within SolarTherm.Media.ChlorideSaltPH.ChlorideSaltPH_utilities;
function rho_T "Density of Chloride Salt as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.Density rho "Density";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.Density rho "Density";
protected
- Modelica.SIunits.Temp_C T_C = Modelica.SIunits.Conversions.to_degC(T) "Temperature in degree Celsius";
+ Modelica.Units.NonSI.Temperature_degC T_C = Modelica.Units.Conversions.to_degC(T) "Temperature in degree Celsius";
constant Real a = -0.5786666667;
constant Real b = 2124.1516888889;
algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/rho_T_der.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/rho_T_der.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/rho_T_der.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/rho_T_der.mo" 2022-03-10 09:58:12.512148499 +0000
@@ -2,7 +2,7 @@
function rho_T_der "Derivative of the density of Chloride Salt particle w.r.t. time"
import SolarTherm.Media.SolidParticles.CarboHSP_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.Temperature T "Temperature";
input Real der_T "Derivative of temperature w.r.t time";
output Real der_rho "Derivative of density w.r.t time";
algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/s_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/s_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/s_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/ChlorideSaltPH/ChlorideSaltPH_utilities/s_T.mo" 2022-03-10 09:58:12.508148498 +0000
@@ -2,8 +2,8 @@
function s_T "Specific entropy of Chloride Salt as a function of temperature"
extends Modelica.Icons.Function;
import Modelica.Math.*;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.SpecificEntropy s "Specific entropy";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.SpecificEntropy s "Specific entropy";
protected
constant Real a = -0.448;
constant Real b = 1411.6156444445;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_ph/package.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_ph/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_ph/package.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_ph/package.mo" 2022-03-10 09:58:12.492148496 +0000
@@ -81,7 +81,7 @@
h = state.h;
u = h - p/d;
MM = 0.091438;
- R = 8.3144/MM;
+ R_s = 8.3144/MM;
state.p = p;
T = T_h(h);
end BaseProperties;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/T_h.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/T_h.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/T_h.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/T_h.mo" 2022-03-10 09:58:12.456148492 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.MoltenSalt.MoltenSalt_utilities;
function T_h "Temperature of molten salt as a function of specific enthalpy"
extends Modelica.Icons.Function;
- input Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
- output Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
+ output Modelica.Units.SI.Temperature T "Temperature";
protected
Real delta;
algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/T_h_der.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/T_h_der.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/T_h_der.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/T_h_der.mo" 2022-03-10 09:58:12.444148490 +0000
@@ -2,7 +2,7 @@
function T_h_der "Derivative of temperature of molten salt w.r.t. time"
import SolarTherm.Media.MoltenSalt.MoltenSalt_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
+ input Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
input Real der_h "Derivative of specific enthalpy w.r.t. time";
output Real der_T "Derivative of Temperature w.r.t. time";
algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/T_rho.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/T_rho.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/T_rho.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/T_rho.mo" 2022-03-10 09:58:12.436148489 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.MoltenSalt.MoltenSalt_utilities;
function T_rho "Temperature of molten salt as a function of density"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Density rho "Density";
- output Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.Density rho "Density";
+ output Modelica.Units.SI.Temperature T "Temperature";
protected
constant Real p1 = 0.026694736413680;
constant Real p2 = 0.033883173706630;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/T_s.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/T_s.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/T_s.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/T_s.mo" 2022-03-10 09:58:12.396148485 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.MoltenSalt.MoltenSalt_utilities;
function T_s "Temperature of molten salt as a function of Specific entropy"
extends Modelica.Icons.Function;
- input Modelica.SIunits.SpecificEntropy s "Specific entropy";
- output Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.SpecificEntropy s "Specific entropy";
+ output Modelica.Units.SI.Temperature T "Temperature";
protected
constant Real p1 = 1.504093438015698e-08;
constant Real p2 = -1.334046332876201e-07;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/T_sat_p.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/T_sat_p.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/T_sat_p.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/T_sat_p.mo" 2022-03-10 09:58:12.388148483 +0000
@@ -2,7 +2,7 @@
function T_sat_p "Saturation temperature of molten salt as a function of saturated pressure"
extends Modelica.Icons.Function;
input Modelica.Media.Interfaces.Types.AbsolutePressure p "Pressure";
- output Modelica.SIunits.Temperature T "Temperature";
+ output Modelica.Units.SI.Temperature T "Temperature";
algorithm
// Ref: Ferri, R., Cammi, A., & Mazzei, D. (2008). Molten salt mixture properties in RELAP5 code for thermodynamic solar applications. International Journal of Thermal Sciences, 47(12), 1676–1687, pp. 1679
T := 5523.9586 / (17.69185 - log(p));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/beta_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/beta_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/beta_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/beta_T.mo" 2022-03-10 09:58:12.372148481 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Media.MoltenSalt.MoltenSalt_utilities;
function beta_T "Isobaric expansion coefficient of molten salt"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.Temperature T "Temperature";
output Modelica.Media.Interfaces.Types.IsobaricExpansionCoefficient beta_isb "Isobaric expansion coefficient";
algorithm
// Ref: Ferri, R., Cammi, A., & Mazzei, D. (2008). Molten salt mixture properties in RELAP5 code for thermodynamic solar applications. International Journal of Thermal Sciences, 47(12), 1676–1687, pp. 1678
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/cp_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/cp_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/cp_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/cp_T.mo" 2022-03-10 09:58:12.360148480 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.MoltenSalt.MoltenSalt_utilities;
function cp_T "Specific heat capacity of molten salt at constant pressue as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.SpecificHeatCapacity cp "Specific heat capacity";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.SpecificHeatCapacity cp "Specific heat capacity";
algorithm
//Ref: Zavoico, A. B. (2001). Solar Power Tower - Design Basis Document. Technical Report SAND2001-2100. Alburquerque, USA, pp. 23
// Valid from 533.15K to 873.15K liquid on saturation curve:
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/dT_dh_h.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/dT_dh_h.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/dT_dh_h.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/dT_dh_h.mo" 2022-03-10 09:58:12.348148478 +0000
@@ -2,10 +2,10 @@
function dT_dh_h "Derivative of temperature of molten salt w.r.t specific enthalpy"
extends Modelica.Icons.Function;
import SolarTherm.Media.MoltenSalt.MoltenSalt_utilities.*;
- input Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
+ input Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
output Real dT "Derivative of temperature w.r.t specific enthalpy";
protected
- Modelica.SIunits.Temperature T;
+ Modelica.Units.SI.Temperature T;
algorithm
// Ref: Ferri, R., Cammi, A., & Mazzei, D. (2008). Molten salt mixture properties in RELAP5 code for thermodynamic solar applications. International Journal of Thermal Sciences, 47(12), 1676–1687, pp. 1678
// Valid from 533.15K to 873.15K liquid on saturation curve
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/dh_dT_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/dh_dT_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/dh_dT_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/dh_dT_T.mo" 2022-03-10 09:58:12.332148477 +0000
@@ -2,7 +2,7 @@
function dh_dT_T "Derivative of specific enthalpy of molten salt w.r.t temperature"
import SolarTherm.Media.Sodium.Sodium_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.Temperature T "Temperature";
output Real dh "Derivative of specific enthalpy w.r.t temperature";
algorithm
dh := cp_T(T);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/dp_sat_dT_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/dp_sat_dT_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/dp_sat_dT_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/dp_sat_dT_T.mo" 2022-03-10 09:58:12.324148475 +0000
@@ -2,7 +2,7 @@
function dp_sat_dT_T "Derivative of the saturation pressure of molten salt w.r.t temperature"
import SolarTherm.Media.MoltenSalt.MoltenSalt_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.Temperature T "Temperature";
output Real dp_sat "Derivative of the saturation pressure w.r.t temperature";
algorithm
// Ref: Ferri, R., Cammi, A., & Mazzei, D. (2008). Molten salt mixture properties in RELAP5 code for thermodynamic solar applications. International Journal of Thermal Sciences, 47(12), 1676–1687, pp. 1679
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/drho_dT_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/drho_dT_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/drho_dT_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/drho_dT_T.mo" 2022-03-10 09:58:12.312148473 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Media.MoltenSalt.MoltenSalt_utilities;
function drho_dT_T "Derivative of density of molten salt w.r.t temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.Temperature T "Temperature";
output Real drho "Derivative of density w.r.t temperature";
algorithm
// Ref: Zavoico, A. B. (2001). Solar Power Tower - Design Basis Document. Technical Report SAND2001-2100. Alburquerque, USA, pp. 23
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/eta_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/eta_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/eta_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/eta_T.mo" 2022-03-10 09:58:12.300148472 +0000
@@ -1,10 +1,10 @@
within SolarTherm.Media.MoltenSalt.MoltenSalt_utilities;
function eta_T "Dynamic viscosity of molten salt as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature K "Temperature";
- output Modelica.SIunits.DynamicViscosity eta "Dynamic viscosity";
+ input Modelica.Units.SI.Temperature K "Temperature";
+ output Modelica.Units.SI.DynamicViscosity eta "Dynamic viscosity";
protected
- Modelica.SIunits.Temp_C T = Modelica.SIunits.Conversions.to_degC(K) "Temperature in degCelsius";
+ Modelica.Units.NonSI.Temperature_degC T = Modelica.Units.Conversions.to_degC(K) "Temperature in degCelsius";
algorithm
// Ref: Zavoico, A. B. (2001). Solar Power Tower - Design Basis Document. Technical Report SAND2001-2100. Alburquerque, USA, pp. 23
// Valid from 533.15K to 873.15K liquid on saturation curve:
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/gibbs_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/gibbs_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/gibbs_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/gibbs_T.mo" 2022-03-10 09:58:12.276148470 +0000
@@ -2,8 +2,8 @@
function gibbs_T "Specific Gibbs energy of molten salt"
import SolarTherm.Media.MoltenSalt.MoltenSalt_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.SpecificGibbsFreeEnergy gibbs "Specific Gibbs energy";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.SpecificGibbsFreeEnergy gibbs "Specific Gibbs energy";
algorithm
gibbs := h_T(T) - T * s_T(T);
end gibbs_T;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/h_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/h_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/h_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/h_T.mo" 2022-03-10 09:58:12.268148468 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.MoltenSalt.MoltenSalt_utilities;
function h_T "Specific enthalpy of molten salt as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
algorithm
// h is obtained by integrating (cp dT). The integration constant was added such that the h value at T = 0 K becomes zero.
// Ref: Ferri, R., Cammi, A., & Mazzei, D. (2008). Molten salt mixture properties in RELAP5 code for thermodynamic solar applications. International Journal of Thermal Sciences, 47(12), 1676–1687, pp. 1678
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/h_T_der.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/h_T_der.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/h_T_der.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/h_T_der.mo" 2022-03-10 09:58:12.256148467 +0000
@@ -2,7 +2,7 @@
function h_T_der "Derivative of specific enthalpy of molten salt w.r.t. time"
import SolarTherm.Media.MoltenSalt.MoltenSalt_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.Temperature T "Temperature";
input Real der_T;
output Real der_h "Time derivative of specific enthalpy";
algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/h_fg_p.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/h_fg_p.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/h_fg_p.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/h_fg_p.mo" 2022-03-10 09:58:12.244148466 +0000
@@ -2,7 +2,7 @@
function h_fg_p "Specific enthalpy of vaporization of molten salt as a function of pressure"
extends Modelica.Icons.Function;
input Modelica.Media.Interfaces.Types.AbsolutePressure p "Pressure";
- output Modelica.SIunits.SpecificEnthalpy h_fg "Specific enthalpy";
+ output Modelica.Units.SI.SpecificEnthalpy h_fg "Specific enthalpy";
algorithm
// Ref: Ferri, R., Cammi, A., & Mazzei, D. (2008). Molten salt mixture properties in RELAP5 code for thermodynamic solar applications. International Journal of Thermal Sciences, 47(12), 1676–1687, pp. 1679
h_fg := 0.0507 * (1e7 - p);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/h_rho.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/h_rho.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/h_rho.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/h_rho.mo" 2022-03-10 09:58:12.236148464 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.MoltenSalt.MoltenSalt_utilities;
function h_rho "Specific enthalpy of molten salt as a function of density"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Density rho "Density";
- output Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
+ input Modelica.Units.SI.Density rho "Density";
+ output Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
protected
constant Real p1 = 39.713718745914576;
constant Real p2 = 50.407945969307448;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/h_s.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/h_s.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/h_s.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/h_s.mo" 2022-03-10 09:58:12.212148462 +0000
@@ -2,8 +2,8 @@
function h_s "Specific enthalpy of molten salt as a function of Specific entropy"
import SolarTherm.Media.MoltenSalt.MoltenSalt_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.SpecificEntropy s "Specific entropy";
- output Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
+ input Modelica.Units.SI.SpecificEntropy s "Specific entropy";
+ output Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
protected
constant Real p1 = -4.207915256284852e-06;
constant Real p2 = -4.252960376115911e-04;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/helmholtz_pT.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/helmholtz_pT.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/helmholtz_pT.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/helmholtz_pT.mo" 2022-03-10 09:58:12.196148459 +0000
@@ -2,9 +2,9 @@
function helmholtz_pT "Specific Helmholtz energy of molten salt"
import SolarTherm.Media.MoltenSalt.MoltenSalt_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- input Modelica.SIunits.AbsolutePressure p "Pressure";
- output Modelica.SIunits.SpecificHelmholtzFreeEnergy helmholtz "Specific Helmholtz energy";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ input Modelica.Units.SI.AbsolutePressure p "Pressure";
+ output Modelica.Units.SI.SpecificHelmholtzFreeEnergy helmholtz "Specific Helmholtz energy";
algorithm
helmholtz := h_T(T) - p / rho_T(T) - T * s_T(T);
end helmholtz_pT;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/kappa_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/kappa_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/kappa_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/kappa_T.mo" 2022-03-10 09:58:12.192148458 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.MoltenSalt.MoltenSalt_utilities;
function kappa_T "Isothermal compressibility of molten salt"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.IsothermalCompressibility kappa_ist "Isothermal compressibility";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.IsothermalCompressibility kappa_ist "Isothermal compressibility";
algorithm
// Ref: Ferri, R., Cammi, A., & Mazzei, D. (2008). Molten salt mixture properties in RELAP5 code for thermodynamic solar applications. International Journal of Thermal Sciences, 47(12), 1676–1687, pp. 1678
// Valid from 533.15K to 873.15K liquid on saturation curve
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/lamda_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/lamda_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/lamda_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/lamda_T.mo" 2022-03-10 09:58:12.184148457 +0000
@@ -1,10 +1,10 @@
within SolarTherm.Media.MoltenSalt.MoltenSalt_utilities;
function lamda_T "Thermal conductivity of molten salt as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature K "Temperature";
- output Modelica.SIunits.ThermalConductivity lamda "Thermal conductivity";
+ input Modelica.Units.SI.Temperature K "Temperature";
+ output Modelica.Units.SI.ThermalConductivity lamda "Thermal conductivity";
protected
- Modelica.SIunits.Temp_C T = Modelica.SIunits.Conversions.to_degC(K) "Temperature in degCelsius";
+ Modelica.Units.NonSI.Temperature_degC T = Modelica.Units.Conversions.to_degC(K) "Temperature in degCelsius";
algorithm
// Ref: Zavoico, A. B. (2001). Solar Power Tower - Design Basis Document. Technical Report SAND2001-2100. Alburquerque, USA, pp. 23
// Valid from 533.15K to 873.15K liquid on saturation curve:
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/p_rho.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/p_rho.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/p_rho.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/p_rho.mo" 2022-03-10 09:58:12.176148457 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Media.MoltenSalt.MoltenSalt_utilities;
function p_rho "Saturated vapour pressur of molten salt as a function of density"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Density rho "Density";
+ input Modelica.Units.SI.Density rho "Density";
output Modelica.Media.Interfaces.Types.AbsolutePressure p "Pressure";
protected
constant Real p1 = 0.733446745332821;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/p_sat_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/p_sat_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/p_sat_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/p_sat_T.mo" 2022-03-10 09:58:12.148148452 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Media.MoltenSalt.MoltenSalt_utilities;
function p_sat_T "Saturation pressure of molten salt as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.Temperature T "Temperature";
output Modelica.Media.Interfaces.Types.AbsolutePressure p "Pressure";
algorithm
// Ref: Ferri, R., Cammi, A., & Mazzei, D. (2008). Molten salt mixture properties in RELAP5 code for thermodynamic solar applications. International Journal of Thermal Sciences, 47(12), 1676–1687, pp. 1679
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/p_sat_T_der.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/p_sat_T_der.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/p_sat_T_der.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/p_sat_T_der.mo" 2022-03-10 09:58:12.140148452 +0000
@@ -2,7 +2,7 @@
function p_sat_T_der "Derivative of the saturation pressure of molten salt w.r.t. time"
import SolarTherm.Media.MoltenSalt.MoltenSalt_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.Temperature T "Temperature";
input Real der_T "Derivative of T w.r.t. time";
output Real der_p_sat "Derivative of saturation pressure w.r.t time";
algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/rho_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/rho_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/rho_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/rho_T.mo" 2022-03-10 09:58:12.132148451 +0000
@@ -1,10 +1,10 @@
within SolarTherm.Media.MoltenSalt.MoltenSalt_utilities;
function rho_T "Density of molten salt as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature K "Temperature";
- output Modelica.SIunits.Density rho "Density";
+ input Modelica.Units.SI.Temperature K "Temperature";
+ output Modelica.Units.SI.Density rho "Density";
protected
- Modelica.SIunits.Temp_C T = Modelica.SIunits.Conversions.to_degC(K) "Temperature in degCelsius";
+ Modelica.Units.NonSI.Temperature_degC T = Modelica.Units.Conversions.to_degC(K) "Temperature in degCelsius";
algorithm
// Ref: Zavoico, A. B. (2001). Solar Power Tower - Design Basis Document. Technical Report SAND2001-2100. Alburquerque, USA, pp. 23
// Valid from 533.15K to 873.15K liquid on saturation curve:
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/rho_T_der.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/rho_T_der.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/rho_T_der.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/rho_T_der.mo" 2022-03-10 09:58:12.124148451 +0000
@@ -2,7 +2,7 @@
function rho_T_der "Derivative of the density of molten salt w.r.t. time"
import SolarTherm.Media.MoltenSalt.MoltenSalt_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.Temperature T "Temperature";
input Real der_T "Derivative of temperature w.r.t time";
output Real der_rho "Derivative of density w.r.t time";
algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/s_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/s_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/s_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/s_T.mo" 2022-03-10 09:58:12.116148448 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.MoltenSalt.MoltenSalt_utilities;
function s_T "Specific entropy of molten salt as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.SpecificEntropy s "Specific entropy";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.SpecificEntropy s "Specific entropy";
algorithm
// Ref: Ferri, R., Cammi, A., & Mazzei, D. (2008). Molten salt mixture properties in RELAP5 code for thermodynamic solar applications. International Journal of Thermal Sciences, 47(12), 1676–1687, pp. 1678
// Valid from 533.15K to 873.15K liquid on saturation curve
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/s_rho.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/s_rho.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/s_rho.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/MoltenSalt/MoltenSalt_utilities/s_rho.mo" 2022-03-10 09:58:12.104148447 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.MoltenSalt.MoltenSalt_utilities;
function s_rho "Specific entropy of molten salt as a function of density"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Density rho "Density";
- output Modelica.SIunits.SpecificEntropy s "Specific entropy";
+ input Modelica.Units.SI.Density rho "Density";
+ output Modelica.Units.SI.SpecificEntropy s "Specific entropy";
protected
constant Real p1 = 0.074442895162941;
constant Real p2 = 0.094105565955424;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_pT/package.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_pT/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_pT/package.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_pT/package.mo" 2022-03-10 09:58:12.072148443 +0000
@@ -78,7 +78,7 @@
h = h_T(T);
u = h - p / d;
MM = 0.02298977;
- R = 8.3144 / MM;
+ R_s = 8.3144 / MM;
//T = T_h(h);
//h = state.h;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/T_h.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/T_h.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/T_h.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/T_h.mo" 2022-03-10 09:58:12.020148436 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.Sodium.Sodium_utilities;
function T_h "Temperature of liquid sodium as a function of specific enthalpy"
extends Modelica.Icons.Function;
- input Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
- output Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
+ output Modelica.Units.SI.Temperature T "Temperature";
protected
constant Real[8] p={ -0.009242628114334224, -0.2256606342363793, 0.6441022075255126, 2.609381245065044, -12.17897142894775, -21.99755753201832, 498.300362679127, 1204.309372258783};
constant Real p1= p[1];
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/T_p.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/T_p.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/T_p.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/T_p.mo" 2022-03-10 09:58:12.004148435 +0000
@@ -2,7 +2,7 @@
function T_p "Temperature of saturated sodium as a function of saturated vapour pressure"
extends Modelica.Icons.Function;
input Modelica.Media.Interfaces.Types.AbsolutePressure p "Pressure";
- output Modelica.SIunits.Temperature T "Temperature";
+ output Modelica.Units.SI.Temperature T "Temperature";
protected
constant Real a = 170.194;
constant Real b = 0.477502;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/T_rho.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/T_rho.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/T_rho.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/T_rho.mo" 2022-03-10 09:58:11.996148433 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.Sodium.Sodium_utilities;
function T_rho "Temperature of liquid sodium as a function of density"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Density rho "Density";
- output Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.Density rho "Density";
+ output Modelica.Units.SI.Temperature T "Temperature";
protected
constant Real p1 = 2.531e-06;
constant Real p2 = -0.007111;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/T_s.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/T_s.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/T_s.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/T_s.mo" 2022-03-10 09:58:11.984148432 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.Sodium.Sodium_utilities;
function T_s "Temperature of liquid sodium as a function of Specific entropy"
extends Modelica.Icons.Function;
- input Modelica.SIunits.SpecificEntropy s "Specific entropy";
- output Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.SpecificEntropy s "Specific entropy";
+ output Modelica.Units.SI.Temperature T "Temperature";
protected
constant Real p1 = -4.737977188981058;
constant Real p2 = 68.885740341495477;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/beta_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/beta_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/beta_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/beta_T.mo" 2022-03-10 09:58:11.956148428 +0000
@@ -2,7 +2,7 @@
function beta_T "Isobaric expansion coefficient of liquid sodium"
import SolarTherm.Media.Sodium.Sodium_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.Temperature T "Temperature";
output Modelica.Media.Interfaces.Types.IsobaricExpansionCoefficient beta_isb "Isobaric expansion coefficient";
algorithm
//Ref. ANL/RE-95/2, pp. 96
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/cp_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/cp_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/cp_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/cp_T.mo" 2022-03-10 09:58:11.944148427 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.Sodium.Sodium_utilities;
function cp_T "Specific heat capacity of liquid sodium at constant pressue as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.SpecificHeatCapacity cp "Specific heat capacity";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.SpecificHeatCapacity cp "Specific heat capacity";
algorithm
//Ref. ANL/RE-95/2, pp. 29
// 371K to 2000K liquid on saturation curve
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/cs_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/cs_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/cs_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/cs_T.mo" 2022-03-10 09:58:11.932148425 +0000
@@ -2,8 +2,8 @@
function cs_T "Specific heat capacity of liquid sodium along the saturation curve"
import SolarTherm.Media.Sodium.Sodium_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.SpecificHeatCapacity cs "Specific heat capacity along the saturation curve";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.SpecificHeatCapacity cs "Specific heat capacity along the saturation curve";
algorithm
//Ref. ANL/RE-95/2, pp. 19
cs := cp_T(T) - gamma_T(T) / rho_T(T);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/cv_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/cv_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/cv_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/cv_T.mo" 2022-03-10 09:58:11.916148424 +0000
@@ -2,8 +2,8 @@
function cv_T "Specific heat capacity of liquid sodium at constant volume as a function of temperature"
import SolarTherm.Media.Sodium.Sodium_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.SpecificHeatCapacity cv "Specific heat capacity";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.SpecificHeatCapacity cv "Specific heat capacity";
algorithm
//Ref. ANL/RE-95/2, pp. 17
cv := cp_T(T) * (kappa_s_T(T) / kappa_T(T));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/dp_v_dT_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/dp_v_dT_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/dp_v_dT_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/dp_v_dT_T.mo" 2022-03-10 09:58:11.908148422 +0000
@@ -2,7 +2,7 @@
function dp_v_dT_T "Derivative of vapour pressure of saturated sodium w.r.t temperature"
import SolarTherm.Media.Sodium.Sodium_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.Temperature T "Temperature";
output Real dp_v "Derivative of vapor pressure w.r.t temperature";
protected
constant Real b = -12633.7;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/drho_dT_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/drho_dT_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/drho_dT_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/drho_dT_T.mo" 2022-03-10 09:58:11.884148420 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Media.Sodium.Sodium_utilities;
function drho_dT_T "Derivative of density of liquid sodium w.r.t temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.Temperature T "Temperature";
output Real drho "Derivative of density w.r.t temperature";
algorithm
//Ref. ANL/RE-95/2, pp. 20
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/eta_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/eta_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/eta_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/eta_T.mo" 2022-03-10 09:58:11.856148416 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.Sodium.Sodium_utilities;
function eta_T "Dynamic viscosity of liquid sodium as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.DynamicViscosity eta "Dynamic viscosity";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.DynamicViscosity eta "Dynamic viscosity";
algorithm
//Ref. ANL/RE-95/2, pp. 207
eta := exp(-6.4406 - 0.3958 * log(T) + 556.835 / T);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/eta_v_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/eta_v_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/eta_v_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/eta_v_T.mo" 2022-03-10 09:58:11.848148415 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.Sodium.Sodium_utilities;
function eta_v_T "Dynamic viscosity of vapour sodium as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.DynamicViscosity eta_g "Dynamic viscosity";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.DynamicViscosity eta_g "Dynamic viscosity";
protected
constant Real p1 = 7.670352421272374e-08;
constant Real p2 = -1.013685486531908e-07;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/gamma_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/gamma_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/gamma_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/gamma_T.mo" 2022-03-10 09:58:11.840148415 +0000
@@ -2,7 +2,7 @@
function gamma_T "The temperature derivative of the vapour pressure of sodium along the saturation curve"
import SolarTherm.Media.Sodium.Sodium_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.Temperature T "Temperature";
output Real gamma "Derivative of vapor pressure w.r.t temperature along the saturation curve";
algorithm
//Ref. ANL/RE-95/2, pp. 19
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/gibbs_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/gibbs_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/gibbs_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/gibbs_T.mo" 2022-03-10 09:58:11.832148412 +0000
@@ -2,8 +2,8 @@
function gibbs_T "Specific Gibbs energy of liquid sodium"
import SolarTherm.Media.Sodium.Sodium_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.SpecificGibbsFreeEnergy gibbs "Specific Gibbs energy";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.SpecificGibbsFreeEnergy gibbs "Specific Gibbs energy";
algorithm
gibbs := h_T(T) - T * s_T(T);
end gibbs_T;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/h_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/h_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/h_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/h_T.mo" 2022-03-10 09:58:11.824148412 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.Sodium.Sodium_utilities;
function h_T "Specific enthalpy of liquid sodium as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
algorithm
//Ref. ANL/RE-95/2, pp. 4
// 371K to 2000K liquid on saturation curve:
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/h_T_der.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/h_T_der.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/h_T_der.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/h_T_der.mo" 2022-03-10 09:58:11.816148411 +0000
@@ -2,7 +2,7 @@
function h_T_der "Derivative of specific enthalpy of liquid sodium w.r.t. time"
import SolarTherm.Media.Sodium.Sodium_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.Temperature T "Temperature";
input Real der_T;
output Real der_h "h derivative";
algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/h_fg_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/h_fg_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/h_fg_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/h_fg_T.mo" 2022-03-10 09:58:11.800148408 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.Sodium.Sodium_utilities;
function h_fg_T "Specific enthalpy of vaporization of sodium as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.SpecificEnthalpy h_fg "Specific enthalpy";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.SpecificEnthalpy h_fg "Specific enthalpy";
algorithm
//Ref. ANL/RE-95/2, pp. 65
// Valid from 371K to 2503.7K
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/h_rho.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/h_rho.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/h_rho.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/h_rho.mo" 2022-03-10 09:58:11.792148408 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.Sodium.Sodium_utilities;
function h_rho "Specific enthalpy of liquid sodium as a function of density"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Density rho "Density";
- output Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
+ input Modelica.Units.SI.Density rho "Density";
+ output Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
protected
constant Real p1 = -5.536057019701200e-06;
constant Real p2 = 0.010494809843506;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/h_s.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/h_s.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/h_s.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/h_s.mo" 2022-03-10 09:58:11.784148407 +0000
@@ -2,8 +2,8 @@
function h_s "Specific enthalpy of liquid sodium as a function of Specific entropy"
import SolarTherm.Media.Sodium.Sodium_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.SpecificEntropy s "Specific entropy";
- output Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
+ input Modelica.Units.SI.SpecificEntropy s "Specific entropy";
+ output Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
protected
constant Real p1 = 88.104318809257066;
constant Real p2 = -24.209744356889288;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/helmholtz_pT.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/helmholtz_pT.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/helmholtz_pT.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/helmholtz_pT.mo" 2022-03-10 09:58:11.780148406 +0000
@@ -2,9 +2,9 @@
function helmholtz_pT "Specific Helmholtz energy of liquid sodium"
import SolarTherm.Media.Sodium.Sodium_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- input Modelica.SIunits.AbsolutePressure p "Pressure";
- output Modelica.SIunits.SpecificHelmholtzFreeEnergy helmholtz "Specific Helmholtz energy";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ input Modelica.Units.SI.AbsolutePressure p "Pressure";
+ output Modelica.Units.SI.SpecificHelmholtzFreeEnergy helmholtz "Specific Helmholtz energy";
algorithm
helmholtz := h_T(T) - p / rho_T(T) - T * s_T(T);
end helmholtz_pT;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/kappa_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/kappa_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/kappa_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/kappa_T.mo" 2022-03-10 09:58:11.760148404 +0000
@@ -2,8 +2,8 @@
function kappa_T "Isothermal compressibility of lquid sodium"
import SolarTherm.Media.Sodium.Sodium_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.IsothermalCompressibility kappa_ist "Isothermal compressibility";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.IsothermalCompressibility kappa_ist "Isothermal compressibility";
algorithm
//Ref. ANL/RE-95/2, pp. 99
kappa_ist := (kappa_s_T(T) * cs_T(T) + (T / rho_T(T)) * beta_T(T) * (beta_T(T) + kappa_s_T(T) * gamma_T(T))) / (cs_T(T) - (T / rho_T(T)) * gamma_T(T) * (beta_T(T) + kappa_s_T(T) * gamma_T(T)));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/kappa_s_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/kappa_s_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/kappa_s_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/kappa_s_T.mo" 2022-03-10 09:58:11.748148402 +0000
@@ -1,13 +1,13 @@
within SolarTherm.Media.Sodium.Sodium_utilities;
function kappa_s_T "Adiabatic compressibility of liquid sodium"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.Compressibility kappa_s "Adiabatic compressibility";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.Compressibility kappa_s "Adiabatic compressibility";
protected
- constant Modelica.SIunits.Compressibility kappa_sm = 1.717e-10 "Adiabatic compressibility at the melting point";
+ constant Modelica.Units.SI.Compressibility kappa_sm = 1.717e-10 "Adiabatic compressibility at the melting point";
constant Real b = 3.2682;
- constant Modelica.SIunits.Temperature T_m = 371 "Melting temperature";
- constant Modelica.SIunits.Temperature T_c = 2503.7 "Critical temperature";
+ constant Modelica.Units.SI.Temperature T_m = 371 "Melting temperature";
+ constant Modelica.Units.SI.Temperature T_c = 2503.7 "Critical temperature";
Real theta "Temperature ratio";
algorithm
//Ref. ANL/RE-95/2, pp. 122
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/lamda_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/lamda_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/lamda_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/lamda_T.mo" 2022-03-10 09:58:11.736148400 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.Sodium.Sodium_utilities;
function lamda_T "Thermal conductivity of liquid sodium as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.ThermalConductivity lambda "Thermal conductivity";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.ThermalConductivity lambda "Thermal conductivity";
algorithm
//Ref. ANL/RE-95/2, pp. 181
lambda := 124.67 - 0.11381 * T + 5.5226e-5 * T ^ 2 - 1.1842e-8 * T ^ 3;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/lamda_v_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/lamda_v_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/lamda_v_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/lamda_v_T.mo" 2022-03-10 09:58:11.728148400 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.Sodium.Sodium_utilities;
function lamda_v_T "Thermal conductivity of vapour sodium as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.ThermalConductivity lambda_g "Thermal conductivity";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.ThermalConductivity lambda_g "Thermal conductivity";
protected
constant Real p1 = -1.260801088007033e-04;
constant Real p2 = 2.265624999999752e-04;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/p_rho.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/p_rho.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/p_rho.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/p_rho.mo" 2022-03-10 09:58:11.716148398 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Media.Sodium.Sodium_utilities;
function p_rho "Saturated vapour pressur of sodium as a function of density"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Density rho "Density";
+ input Modelica.Units.SI.Density rho "Density";
output Modelica.Media.Interfaces.Types.AbsolutePressure p "Pressure";
protected
constant Real p1 = -0.022364729827730;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/p_v.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/p_v.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/p_v.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/p_v.mo" 2022-03-10 09:58:11.704148396 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Media.Sodium.Sodium_utilities;
function p_v "Vapour pressure of saturated sodium"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.Temperature T "Temperature";
output Modelica.Media.Interfaces.Types.AbsolutePressure p "Pressure";
protected
constant Real a = 11.9463;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/p_v_T_der.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/p_v_T_der.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/p_v_T_der.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/p_v_T_der.mo" 2022-03-10 09:58:11.696148396 +0000
@@ -2,7 +2,7 @@
function p_v_T_der "Derivative of the vapour pressue of saturated sodium w.r.t. time"
import SolarTherm.Media.Sodium.Sodium_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.Temperature T "Temperature";
input Real der_T "Derivative of T w.r.t. time";
output Real der_p_v "Derivative of vapour pressure w.r.t time";
algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/rho_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/rho_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/rho_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/rho_T.mo" 2022-03-10 09:58:11.684148394 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.Sodium.Sodium_utilities;
function rho_T "Density of liquid sodium as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.Density rho "Density";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.Density rho "Density";
algorithm
//Ref. ANL/RE-95/2, pp. 20
// 371K to 2503.7K liquid on saturation curve:
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/rho_T_der.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/rho_T_der.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/rho_T_der.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/rho_T_der.mo" 2022-03-10 09:58:11.664148392 +0000
@@ -2,7 +2,7 @@
function rho_T_der "Derivative of the density of liquid sodium w.r.t. time"
import SolarTherm.Media.Sodium.Sodium_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.Temperature T "Temperature";
input Real der_T "Derivative of T w.r.t. time";
output Real der_rho "Derivative of density w.r.t time";
algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/rho_v_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/rho_v_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/rho_v_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/rho_v_T.mo" 2022-03-10 09:58:11.636148388 +0000
@@ -2,8 +2,8 @@
function rho_v_T "Density of vapour sodium as a function of temperature"
extends Modelica.Icons.Function;
import SolarTherm.Media.Sodium.Sodium_utilities.*;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.Density rho_g "Density";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.Density rho_g "Density";
algorithm
//Ref. ANL/RE-95/2, pp. 86
// Valid from 371K to 2503.7K
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/s_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/s_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/s_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/s_T.mo" 2022-03-10 09:58:11.620148387 +0000
@@ -5,8 +5,8 @@
// Integration constant is added such that s is set to zero at T0 = 298.15 K
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.SpecificEntropy s "Specific entropy";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.SpecificEntropy s "Specific entropy";
algorithm
s := 1000 * (2.22705e-7 * T ^ 2 - 8.4790e-4 * T + 1.6582 * log(T) + 1496.3 / (T ^ 2) - 9.2315830149);
end s_T;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/s_rho.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/s_rho.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/s_rho.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/s_rho.mo" 2022-03-10 09:58:11.568148380 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.Sodium.Sodium_utilities;
function s_rho "Specific entropy of liquid sodium as a function of density"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Density rho "Density";
- output Modelica.SIunits.SpecificEntropy s "Specific entropy";
+ input Modelica.Units.SI.Density rho "Density";
+ output Modelica.Units.SI.SpecificEntropy s "Specific entropy";
protected
constant Real p1 = -0.002225092601524;
constant Real p2 = -0.013184548402316;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/vs_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/vs_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/vs_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/Sodium/Sodium_utilities/vs_T.mo" 2022-03-10 09:58:11.560148378 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.Sodium.Sodium_utilities;
function vs_T "Velocity of sound of liquid sodium as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.VelocityOfSound vs "Velocity of sound";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.VelocityOfSound vs "Velocity of sound";
algorithm
//Ref. ANL/RE-95/2 pp. 21
// 371K to 1773K liquid on saturation curve
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_ph/package.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_ph/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_ph/package.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_ph/package.mo" 2022-03-10 09:58:11.536148376 +0000
@@ -85,7 +85,7 @@
h = state.h;
u = h - p / d;
MM = 0.10313381;
- R = 8.3144 / MM;
+ R_s = 8.3144 / MM;
end BaseProperties;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/T_h.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/T_h.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/T_h.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/T_h.mo" 2022-03-10 09:58:11.508148372 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.SolidParticles.CarboHSP_utilities;
function T_h "Temperature of solid CarboHSP 40/70 particle as a function of specific enthalpy"
extends Modelica.Icons.Function;
- input Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
- output Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
+ output Modelica.Units.SI.Temperature T "Temperature";
protected
constant Real a = 148.2;
constant Real b = 0.3093;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/T_h_der.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/T_h_der.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/T_h_der.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/T_h_der.mo" 2022-03-10 09:58:11.492148371 +0000
@@ -2,7 +2,7 @@
function T_h_der "Derivative of temperature of solid CarboHSP particle w.r.t. time"
import SolarTherm.Media.SolidParticles.CarboHSP_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
+ input Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
input Real der_h "Derivative of specific enthalpy w.r.t. time";
output Real der_T "Derivative of Temperature w.r.t. time";
algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/T_s.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/T_s.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/T_s.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/T_s.mo" 2022-03-10 09:58:11.484148368 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.SolidParticles.CarboHSP_utilities;
function T_s "Temperature of solid CarboHSP 40/70 particle as a function of Specific entropy"
extends Modelica.Icons.Function;
- input Modelica.SIunits.SpecificEntropy s "Specific entropy";
- output Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.SpecificEntropy s "Specific entropy";
+ output Modelica.Units.SI.Temperature T "Temperature";
protected
constant Real a = 148.2;
constant Real b = 0.3093;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/cp_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/cp_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/cp_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/cp_T.mo" 2022-03-10 09:58:11.472148367 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.SolidParticles.CarboHSP_utilities;
function cp_T "Specific heat capacity of solid CarboHSP 40/70 particle as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.SpecificHeatCapacity cp "Specific heat capacity";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.SpecificHeatCapacity cp "Specific heat capacity";
protected
constant Real a = 148.2;
constant Real b = 0.3093;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/dT_dh_h.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/dT_dh_h.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/dT_dh_h.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/dT_dh_h.mo" 2022-03-10 09:58:11.452148364 +0000
@@ -2,10 +2,10 @@
function dT_dh_h "Derivative of temperature of solid CarboHSP particle w.r.t specific enthalpy"
extends Modelica.Icons.Function;
import SolarTherm.Media.SolidParticles.CarboHSP_utilities.*;
- input Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
+ input Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
output Real dT "Derivative of temperature w.r.t specific enthalpy";
protected
- Modelica.SIunits.Temperature T;
+ Modelica.Units.SI.Temperature T;
algorithm
T:=T_h(h);
dT := 1 / dh_dT_T(T);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/dh_dT_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/dh_dT_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/dh_dT_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/dh_dT_T.mo" 2022-03-10 09:58:11.444148364 +0000
@@ -2,7 +2,7 @@
function dh_dT_T "Derivative of specific enthalpy of solid CarboHSP particle w.r.t temperature"
import SolarTherm.Media.SolidParticles.CarboHSP_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.Temperature T "Temperature";
output Real dh "Derivative of specific enthalpy w.r.t temperature";
algorithm
dh := cp_T(T);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/drho_dT_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/drho_dT_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/drho_dT_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/drho_dT_T.mo" 2022-03-10 09:58:11.440148363 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Media.SolidParticles.CarboHSP_utilities;
function drho_dT_T "Derivative of density of solid CarboHSP particle w.r.t temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.Temperature T "Temperature";
output Real drho "Derivative of density w.r.t temperature";
algorithm
drho := 0; // Constant density
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/h_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/h_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/h_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/h_T.mo" 2022-03-10 09:58:11.432148362 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.SolidParticles.CarboHSP_utilities;
function h_T "Specific enthalpy of solid CarboHSP 40/70 particle as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
protected
constant Real a = 148.2;
constant Real b = 0.3093;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/h_T_der.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/h_T_der.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/h_T_der.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/h_T_der.mo" 2022-03-10 09:58:11.420148360 +0000
@@ -2,7 +2,7 @@
function h_T_der "Derivative of specific enthalpy of solid CarboHSP particle w.r.t. time"
import SolarTherm.Media.SolidParticles.CarboHSP_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.Temperature T "Temperature";
input Real der_T;
output Real der_h "Time derivative of specific enthalpy";
algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/lamda_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/lamda_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/lamda_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/lamda_T.mo" 2022-03-10 09:58:11.412148360 +0000
@@ -1,10 +1,10 @@
within SolarTherm.Media.SolidParticles.CarboHSP_utilities;
function lamda_T "Thermal conductivity of solid CarboHSP particle as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.ThermalConductivity lamda "Thermal conductivity";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.ThermalConductivity lamda "Thermal conductivity";
protected
- Modelica.SIunits.Temp_C T_C = Modelica.SIunits.Conversions.to_degC(T) "Temperature in degree Celsius";
+ Modelica.Units.NonSI.Temperature_degC T_C = Modelica.Units.Conversions.to_degC(T) "Temperature in degree Celsius";
algorithm
lamda := 2; // Constant thermal conductivity
end lamda_T;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/p_rho.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/p_rho.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/p_rho.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/p_rho.mo" 2022-03-10 09:58:11.404148359 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Media.SolidParticles.CarboHSP_utilities;
function p_rho "Pressur of solid CarboHSP particle as a function of density"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Density rho "Density";
+ input Modelica.Units.SI.Density rho "Density";
output Modelica.Media.Interfaces.Types.AbsolutePressure p "Pressure";
algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/rho_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/rho_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/rho_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/rho_T.mo" 2022-03-10 09:58:11.392148358 +0000
@@ -1,10 +1,10 @@
within SolarTherm.Media.SolidParticles.CarboHSP_utilities;
function rho_T "Density of solid CarboHSP particle as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.Density rho "Density";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.Density rho "Density";
protected
- Modelica.SIunits.Temp_C T_C = Modelica.SIunits.Conversions.to_degC(T) "Temperature in degree Celsius";
+ Modelica.Units.NonSI.Temperature_degC T_C = Modelica.Units.Conversions.to_degC(T) "Temperature in degree Celsius";
algorithm
rho := 2e3; // Constant bulk density
annotation(derivative=rho_T_der);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/rho_T_der.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/rho_T_der.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/rho_T_der.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/rho_T_der.mo" 2022-03-10 09:58:11.372148355 +0000
@@ -2,7 +2,7 @@
function rho_T_der "Derivative of the density of solid CarboHSP particle w.r.t. time"
import SolarTherm.Media.SolidParticles.CarboHSP_utilities.*;
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
+ input Modelica.Units.SI.Temperature T "Temperature";
input Real der_T "Derivative of temperature w.r.t time";
output Real der_rho "Derivative of density w.r.t time";
algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/s_T.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/s_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/s_T.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Media/SolidParticles/CarboHSP_utilities/s_T.mo" 2022-03-10 09:58:11.364148353 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Media.SolidParticles.CarboHSP_utilities;
function s_T "Specific entropy of solid CarboHSP 40/70 particle as a function of temperature"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Temperature T "Temperature";
- output Modelica.SIunits.SpecificEntropy s "Specific entropy";
+ input Modelica.Units.SI.Temperature T "Temperature";
+ output Modelica.Units.SI.SpecificEntropy s "Specific entropy";
protected
constant Real a = 148.2;
constant Real b = 0.3093;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/fischerTropschCost_m_sg.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/fischerTropschCost_m_sg.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/fischerTropschCost_m_sg.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/fischerTropschCost_m_sg.mo" 2022-03-10 09:58:11.168148328 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.Analysis.Finances;
function fischerTropschCost_m_sg "Capital cost of a fischer tropsch reactor as a function of the nominal inlet mass flow rate of syngas"
extends Modelica.Icons.Function;
- input Modelica.SIunits.MassFlowRate m_flow "Syngas mass flow at design";
+ input Modelica.Units.SI.MassFlowRate m_flow "Syngas mass flow at design";
output SolarTherm.Models.Analysis.Finances.Money C_cap "Capital cost";
output Real fr[8] "Components cost fraction";
protected
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/gasHolderCost_V.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/gasHolderCost_V.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/gasHolderCost_V.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/gasHolderCost_V.mo" 2022-03-10 09:58:11.156148327 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.Analysis.Finances;
function gasHolderCost_V "Capital cost of a gas holder as a function of volume"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Volume V "Tank volume";
+ input Modelica.Units.SI.Volume V "Tank volume";
output SolarTherm.Models.Analysis.Finances.Money C_cap "Capital cost in AUD";
protected
parameter Real ci_present = 556.8 "Chemical engineering plant cost index (CI) at present"; //i.e. 2016 Ref: http://www.chemengonline.com/
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/massCobalt_ft_m_sg.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/massCobalt_ft_m_sg.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/massCobalt_ft_m_sg.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/massCobalt_ft_m_sg.mo" 2022-03-10 09:58:11.152148327 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.Analysis.Finances;
function massCobalt_ft_m_sg "Mass of Cobalt catalyst required in FT for a three-year of operation as a function of the nominal inlet mass flow rate of syngas"
extends Modelica.Icons.Function;
- input Modelica.SIunits.MassFlowRate m_flow "Syngas mass flow at design";
+ input Modelica.Units.SI.MassFlowRate m_flow "Syngas mass flow at design";
output SI.Mass m_cobalt "Mass of Cobalt catalyst required in FT at design";
protected
constant Real p1 = 1.752095084592045;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/massNickel_ft_m_sg.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/massNickel_ft_m_sg.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/massNickel_ft_m_sg.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/massNickel_ft_m_sg.mo" 2022-03-10 09:58:11.140148326 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.Analysis.Finances;
function massNickel_ft_m_sg "Mass of Nickel/Aluminum Oxide catalyst required in FT for a three-year of operation as a function of the nominal inlet mass flow rate of syngas"
extends Modelica.Icons.Function;
- input Modelica.SIunits.MassFlowRate m_flow "Syngas mass flow at design";
+ input Modelica.Units.SI.MassFlowRate m_flow "Syngas mass flow at design";
output SI.Mass m_nickel "Mass of Nickel/Aluminum Oxide catalyst required in FT at design";
protected
constant Real p1 = -0.024312165460329;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/massPlatinum_ft_m_sg.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/massPlatinum_ft_m_sg.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/massPlatinum_ft_m_sg.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/massPlatinum_ft_m_sg.mo" 2022-03-10 09:58:11.120148323 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.Analysis.Finances;
function massPlatinum_ft_m_sg "Mass of Platinum catalyst required in FT for a three-year of operation as a function of the nominal inlet mass flow rate of syngas"
extends Modelica.Icons.Function;
- input Modelica.SIunits.MassFlowRate m_flow "Syngas mass flow at design";
+ input Modelica.Units.SI.MassFlowRate m_flow "Syngas mass flow at design";
output SI.Mass m_platinum "Mass of Cobalt catalyst required in FT at design";
protected
constant Real p1 = -0.020598556194049;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/methanolReactorCost_m_sg.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/methanolReactorCost_m_sg.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/methanolReactorCost_m_sg.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/methanolReactorCost_m_sg.mo" 2022-03-10 09:58:11.112148321 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.Analysis.Finances;
function methanolReactorCost_m_sg "Capital cost of a methanol synthesis reactor as a function of the nominal inlet mass flow rate of syngas"
extends Modelica.Icons.Function;
- input Modelica.SIunits.MassFlowRate m_flow "Syngas mass flow at design";
+ input Modelica.Units.SI.MassFlowRate m_flow "Syngas mass flow at design";
output SolarTherm.Models.Analysis.Finances.Money C_cap "Capital cost";
output Real fr[6] "Components cost fraction";
protected
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/nLabour_m_sg_ft.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/nLabour_m_sg_ft.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/nLabour_m_sg_ft.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/nLabour_m_sg_ft.mo" 2022-03-10 09:58:11.100148321 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.Analysis.Finances;
function nLabour_m_sg_ft "Number of operators required to work at the whole solar fuel plant (with FT) as a function of the nominal inlet mass flow rate of syngas"
extends Modelica.Icons.Function;
- input Modelica.SIunits.MassFlowRate m_flow "Syngas mass flow at design";
+ input Modelica.Units.SI.MassFlowRate m_flow "Syngas mass flow at design";
output Integer n_labour "Number of operators";
protected
constant Real p1 = 18.511986192679021;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/nLabour_m_sg_msr.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/nLabour_m_sg_msr.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/nLabour_m_sg_msr.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/nLabour_m_sg_msr.mo" 2022-03-10 09:58:11.092148319 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.Analysis.Finances;
function nLabour_m_sg_msr "Number of operators required to work at the whole solar fuel plant (with MSR) as a function of the nominal inlet mass flow rate of syngas"
extends Modelica.Icons.Function;
- input Modelica.SIunits.MassFlowRate m_flow "Syngas mass flow at design";
+ input Modelica.Units.SI.MassFlowRate m_flow "Syngas mass flow at design";
output Integer n_labour "Number of operators";
protected
constant Real p1 = 41.697952124521152;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/pressureVesselCost_V.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/pressureVesselCost_V.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/pressureVesselCost_V.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/pressureVesselCost_V.mo" 2022-03-10 09:58:11.084148318 +0000
@@ -1,9 +1,9 @@
within SolarTherm.Models.Analysis.Finances;
function pressureVesselCost_V "Capital cost of a horizontal cylindrical pressure vessel with elipsoidal heads (2:1 semi-elliptical heads) as a function of volume"
- import SI = Modelica.SIunits;
- import nSI = Modelica.SIunits.Conversions.NonSIunits;
+ import Modelica.Units.SI;
+ import nSI = Modelica.Units.NonSI;
import CN = Modelica.Constants;
- import CV = Modelica.SIunits.Conversions;
+ import CV = Modelica.Units.Conversions;
import FI = SolarTherm.Models.Analysis.Finances;
type Pressure_psi = Real(final quantity = "Pressure", final unit = "psi");
@@ -13,7 +13,7 @@
extends Modelica.Icons.Function;
- input Modelica.SIunits.Volume V "Tank volume";
+ input Modelica.Units.SI.Volume V "Tank volume";
input Real f_bm "Bare module factor for the syngas storage tank";
output Integer n_st "Number of tanks required";
output FI.Money C_cap "Capital cost in AUD";
@@ -21,14 +21,14 @@
function volume_d "Tank volume as a function of internal diameter"
extends Modelica.Icons.Function;
input Length_in d1 "Tank internal diameter";
- output Modelica.SIunits.Volume V1 "Tank volume";
+ output Modelica.Units.SI.Volume V1 "Tank volume";
algorithm
V1 := 19.0*CN.pi*((d1*0.0254)^3)/12.0;
end volume_d;
function diameter_v "Tank internal diameter as a function of volume"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Volume V2 "Tank volume";
+ input Modelica.Units.SI.Volume V2 "Tank volume";
output Length_in d6 "Tank internal diameter";
algorithm
d6 := 39.3701 * (((12.0*V2) / (19.0*CN.pi))^(1.0/3.0));
@@ -161,7 +161,7 @@
parameter Real w_ub_check = weight(d_ub, t_d_ub, l_ub, rho) "Weight of the shell and the two heads for the largest tank allowed";
//Variables:
- Modelica.SIunits.Volume V_unit "Volume of each tank";
+ Modelica.Units.SI.Volume V_unit "Volume of each tank";
Length_in d_unit "Internal diameter of each tank";
Length_in l_unit "Length of each tank";
Length_in t_p_unit "Wall thickness of each tank";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/resistiveHeaterCost_P.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/resistiveHeaterCost_P.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/resistiveHeaterCost_P.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Finances/resistiveHeaterCost_P.mo" 2022-03-10 09:58:11.048148313 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.Analysis.Finances;
function resistiveHeaterCost_P "Bare module cost of a resistive hater"
extends Modelica.Icons.Function;
- input Modelica.SIunits.Power P "Power to heater at design";
+ input Modelica.Units.SI.Power P "Power to heater at design";
output SolarTherm.Models.Analysis.Finances.Money C_cap "Capital cost";
protected
constant Real p1 = 0.004112986371710;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Performance.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Performance.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Performance.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Analysis/Performance.mo" 2022-03-10 09:58:11.036148312 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Models.Analysis;
model Performance "Energy performance calculations"
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
parameter Boolean schedule = false;
parameter String pri_file = "" "Electricity price file";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/CatromOE.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/CatromOE.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/CatromOE.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/CatromOE.mo" 2022-03-10 09:58:10.988148307 +0000
@@ -3,7 +3,7 @@
extends SolarTherm.Models.CSP.CRS.HeliostatsField.OptEff(nelem=1);
// Expects data in file to be for a particular location
// Currently only set up to work with a single element
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import SolarTherm.Utilities.Tables;
parameter String file "Optical efficiency table (relative to aperture area)";
parameter Integer n "Number of segments for ecliptic longitude";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/Collector.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/Collector.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/Collector.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/Collector.mo" 2022-03-10 09:58:10.976148304 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Models.CSP.CRS.HeliostatsField;
partial block Collector "Solar concentrator"
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
parameter Integer nelem = 1 "Number of aperture elements";
parameter Boolean orient_north = true "Orient system toward north else south";
parameter SI.Area A "Area of collector aperture";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/FileOE.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/FileOE.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/FileOE.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/FileOE.mo" 2022-03-10 09:58:10.972148304 +0000
@@ -5,14 +5,14 @@
// Expects data in file to be oriented north (i.e. as for system in Southern
// hemisphere). When running simulations in the Northern hemisphere, the
// the field can be turned around be setting orient_north = false.
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import SolarTherm.Types.Solar_angles;
parameter String file "Optical efficiency table (relative to aperture area)";
parameter Solar_angles angles=Solar_angles.ele_azi "Angles used in the lookup table file";
parameter String tableNames[nelem] = {"eff" + String(i) for i in 1:nelem};
- Modelica.Blocks.Tables.CombiTable2D table[nelem](
+ Modelica.Blocks.Tables.CombiTable2Ds table[nelem](
each verboseRead=false,
each tableOnFile=true,
each fileName=file,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/HeliostatsField.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/HeliostatsField.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/HeliostatsField.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/HeliostatsField.mo" 2022-03-10 09:58:10.964148303 +0000
@@ -65,7 +65,7 @@
SI.Power W_loss2;
//SI.Time t_start=30*60;
parameter SI.Time t_start=3600 "Start-up traking delay";
- discrete Modelica.SIunits.Time t_on(start=0, fixed=true) "Sunrise time instant";
+ discrete Modelica.Units.SI.Time t_on(start=0, fixed=true) "Sunrise time instant";
Modelica.Blocks.Interfaces.BooleanInput on_internal
"Needed to connect to conditional connector";
Modelica.Blocks.Interfaces.BooleanInput defocus_internal
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/HeliostatsFieldSAM.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/HeliostatsFieldSAM.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/HeliostatsFieldSAM.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/HeliostatsFieldSAM.mo" 2022-03-10 09:58:10.940148300 +0000
@@ -71,7 +71,7 @@
SI.Power W_loss2;
//SI.Time t_start=30*60;
parameter SI.Time t_start=3600 "Start-up traking delay";
- discrete Modelica.SIunits.Time t_on(start=0, fixed=true) "Sunrise time instant";
+ discrete Modelica.Units.SI.Time t_on(start=0, fixed=true) "Sunrise time instant";
Modelica.Blocks.Interfaces.BooleanInput on_internal
"Needed to connect to conditional connector";
Modelica.Blocks.Interfaces.BooleanInput defocus_internal
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/HeliostatsFieldSolstice.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/HeliostatsFieldSolstice.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/HeliostatsFieldSolstice.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/HeliostatsFieldSolstice.mo" 2022-03-10 09:58:10.916148296 +0000
@@ -88,7 +88,7 @@
SI.Power W_loss2;
//SI.Time t_start=30*60;
parameter SI.Time t_start=3600 "Start-up traking delay";
- discrete Modelica.SIunits.Time t_on(start=0, fixed=true) "Sunrise time instant";
+ discrete Modelica.Units.SI.Time t_on(start=0, fixed=true) "Sunrise time instant";
Modelica.Blocks.Interfaces.BooleanInput on_internal
"Needed to connect to conditional connector";
Modelica.Blocks.Interfaces.BooleanInput defocus_internal
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/IdealIncOE.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/IdealIncOE.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/IdealIncOE.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/IdealIncOE.mo" 2022-03-10 09:58:10.876148292 +0000
@@ -1,9 +1,9 @@
within SolarTherm.Models.CSP.CRS.HeliostatsField;
block IdealIncOE "Collector with fixed incline that tracks sun azimuth"
extends SolarTherm.Models.CSP.CRS.HeliostatsField.OptEff;
- import SI = Modelica.SIunits;
- import nSI = Modelica.SIunits.Conversions.NonSIunits;
- import Modelica.SIunits.Conversions.from_deg;
+ import Modelica.Units.SI;
+ import nSI = Modelica.Units.NonSI;
+ import Modelica.Units.Conversions.from_deg;
import Modelica.Math.cos;
parameter nSI.Angle_deg alt_fixed = 45 "Fixed concentrator altitude";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/OptEff.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/OptEff.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/OptEff.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/OptEff.mo" 2022-03-10 09:58:10.836148287 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Models.CSP.CRS.HeliostatsField;
partial block OptEff "Map from sun postition to optical efficiency"
// Optical efficiency is relative to a field aperture
- import SI = Modelica.SIunits;
- import nSI = Modelica.SIunits.Conversions.NonSIunits;
+ import Modelica.Units.SI;
+ import nSI = Modelica.Units.NonSI;
parameter Boolean orient_north = true "Orient system toward north else south";
parameter Integer nelem = 1 "Number of aperture elements";
input SolarTherm.Interfaces.Connectors.WeatherBus wbus;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/Optical/SolsticeOELT.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/Optical/SolsticeOELT.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/Optical/SolsticeOELT.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/Optical/SolsticeOELT.mo" 2022-03-10 09:58:10.764148277 +0000
@@ -2,7 +2,7 @@
model SolsticeOELT "Lookup table generated by Solstice"
extends OpticalEfficiency;
import SolarTherm.Models.CSP.CRS.HeliostatsField.Optical.SolsticePyFunc;
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
//import nSI = Modelica.SIunits.Conversions.NonSIunits;
//import SI = Modelica.SIunits;
@@ -48,7 +48,7 @@
SI.Angle angle1;
SI.Angle angle2;
- Modelica.Blocks.Tables.CombiTable2D nu_table(
+ Modelica.Blocks.Tables.CombiTable2Ds nu_table(
tableOnFile=true,
tableName="optics",
smoothness=Modelica.Blocks.Types.Smoothness.ContinuousDerivative,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/Optical/Table.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/Optical/Table.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/Optical/Table.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/Optical/Table.mo" 2022-03-10 09:58:10.728148274 +0000
@@ -11,7 +11,7 @@
annotation (Dialog(group="Table data interpretation"));
SI.Angle angle1;
SI.Angle angle2;
- Modelica.Blocks.Tables.CombiTable2D nu_table(
+ Modelica.Blocks.Tables.CombiTable2Ds nu_table(
tableOnFile=true,
tableName="optics",
smoothness=Modelica.Blocks.Types.Smoothness.ContinuousDerivative,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/SteeredCL.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/SteeredCL.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/SteeredCL.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/SteeredCL.mo" 2022-03-10 09:58:10.712148271 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.CSP.CRS.HeliostatsField;
block SteeredCL "Collector that can be partially steered on sun"
extends SolarTherm.Models.CSP.CRS.HeliostatsField.Collector;
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
replaceable model OptEff =
SolarTherm.Models.CSP.CRS.HeliostatsField.OptEff; // should replace
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/SwitchedCL.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/SwitchedCL.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/SwitchedCL.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/SwitchedCL.mo" 2022-03-10 09:58:10.700148269 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.CSP.CRS.HeliostatsField;
block SwitchedCL "Collector that can be switched on/off sun"
extends SolarTherm.Models.CSP.CRS.HeliostatsField.Collector;
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
replaceable model OptEff =
SolarTherm.Models.CSP.CRS.HeliostatsField.OptEff; // should replace
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/SwitchedCL_2.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/SwitchedCL_2.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/SwitchedCL_2.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/HeliostatsField/SwitchedCL_2.mo" 2022-03-10 09:58:10.684148268 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.CSP.CRS.HeliostatsField;
block SwitchedCL_2 "Collector with on/off switch, defocus and warm-up and cool-down delay features"
extends SolarTherm.Models.CSP.CRS.HeliostatsField.Collector;
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
parameter SI.Irradiance dni_stop = 300 "DNI at which concentrator stops";
parameter SI.Irradiance dni_start = 300 "DNI at which concentrator starts";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Reactors/GenericFT.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Reactors/GenericFT.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Reactors/GenericFT.mo" 2022-03-10 09:57:37.732144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Reactors/GenericFT.mo" 2022-03-10 09:58:10.652148264 +0000
@@ -2,7 +2,7 @@
model GenericFT
"A simple Fischer–Tropsch process"
// FT efficiency has been assumed to be fixed at 90%, which should change later as a function of inlet syngas
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import CN = Modelica.Constants;
import FI = SolarTherm.Models.Analysis.Finances;
@@ -104,7 +104,7 @@
SI.MassFlowRate m_flow_water_waste(min=0) "Mass flow rate of water supply wasted at FT";
SI.MassFlowRate m_flow_CO2_waste(min=0) "Mass flow rate of CO2 dumped/released from FT when the products are rubbish";
- // Ramping-related variables:
+// Ramping-related variables:
SolarTherm.Utilities.Transition.Ramp ramp_up_sg(ramp_order=ramp_order_sg, t_dur= t_ft_on_delay, up=true);
SolarTherm.Utilities.Transition.Ramp ramp_down_sg(ramp_order=ramp_order_sg, t_dur= t_ft_off_delay, up=false);
Real fr_ramp_sg(min=0, max=1) "Ramping transition rate for syngas supply to FT";
@@ -129,7 +129,7 @@
SolarTherm.Utilities.Transition.Ramp ramp_down_prod(ramp_order=ramp_order_prod, t_dur= t_ft_off_delay, up=false);
Real fr_ramp_prod(min=0, max=1) "Ramping transition rate for products production from FT";
- // Transitioning-related variables:
+// Transitioning-related variables:
SolarTherm.Utilities.Transition.Ramp trans_up_sg(ramp_order=trans_order_sg, t_dur= t_ft_trans_delay, up=true);
SolarTherm.Utilities.Transition.Ramp trans_down_sg(ramp_order=trans_order_sg, t_dur= t_ft_trans_delay, up=false);
Real fr_trans_sg(min=0, max=1) "Transitioning rate for syngas supply to FT while FT is on";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Reactors/GenericMSR.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Reactors/GenericMSR.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Reactors/GenericMSR.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Reactors/GenericMSR.mo" 2022-03-10 09:58:10.496148244 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.CSP.CRS.Reactors;
model GenericMSR
"A simple methanol synthesis reactor"
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import CN = Modelica.Constants;
import FI = SolarTherm.Models.Analysis.Finances;
@@ -73,7 +73,7 @@
SI.MassFlowRate m_flow_CO2_waste(min=0) "Mass flow rate of CO2 dumped/released from MSR when the products are rubbish";
- // Ramping-related variables:
+// Ramping-related variables:
SolarTherm.Utilities.Transition.Ramp ramp_up_sg(ramp_order=ramp_order_sg, t_dur= t_msr_on_delay, up=true);
SolarTherm.Utilities.Transition.Ramp ramp_down_sg(ramp_order=ramp_order_sg, t_dur= t_msr_off_delay, up=false);
Real fr_ramp_sg(min=0, max=1) "Ramping transition rate for syngas supply to MSR";
@@ -90,7 +90,7 @@
SolarTherm.Utilities.Transition.Ramp ramp_down_prod(ramp_order=ramp_order_prod, t_dur= t_msr_off_delay, up=false);
Real fr_ramp_prod(min=0, max=1) "Ramping transition rate for products production from MSR";
- // Transitioning-related variables:
+// Transitioning-related variables:
SolarTherm.Utilities.Transition.Ramp trans_up_sg(ramp_order=trans_order_sg, t_dur= t_msr_trans_delay, up=true);
SolarTherm.Utilities.Transition.Ramp trans_down_sg(ramp_order=trans_order_sg, t_dur= t_msr_trans_delay, up=false);
Real fr_trans_sg(min=0, max=1) "Transitioning rate for syngas supply to MSR while MSR is on";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Reactors/GenericRX.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Reactors/GenericRX.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Reactors/GenericRX.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Reactors/GenericRX.mo" 2022-03-10 09:58:10.464148240 +0000
@@ -2,7 +2,7 @@
model GenericRX
"A simple cavity reactor consisting of supercritical water gasification (SCWG) and steam methane reforming (SMR) processes"
extends SolarTherm.Models.CSP.CRS.Receivers.Receiver;
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import CN = Modelica.Constants;
type MoleFraction = Real (unit="1", min=0, max=1) "Type for mole fraction";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/AvgTElem.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/AvgTElem.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/AvgTElem.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/AvgTElem.mo" 2022-03-10 09:58:10.408148232 +0000
@@ -4,7 +4,7 @@
Fluid.Flows.LosslessFlow, port_b(h_outflow(start=0.0)));
// port_b.h_outflow is used as iteration variable, so we should find a good
// initial guess for it. Setting to zero here to silence warning.
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import CN = Modelica.Constants;
parameter Real ab "Absorbtivity";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/ChlorideSaltReceiver.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/ChlorideSaltReceiver.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/ChlorideSaltReceiver.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/ChlorideSaltReceiver.mo" 2022-03-10 09:58:10.400148232 +0000
@@ -81,7 +81,7 @@
parameter SI.MassFlowRate m_flow_rec_des = 2425 "Receiver mass flow rate at design point";
parameter SI.Efficiency eta_pump = 0.85 "Design point efficiency of the tower/receiver pump";
SI.Efficiency eta_pump_adj "Adjusted efficiency of the tower/receiver pump";
- Modelica.SIunits.Power W_dot_pump "Pumping loss of the receiver/tower";
+ Modelica.Units.SI.Power W_dot_pump "Pumping loss of the receiver/tower";
parameter SI.Temperature T_0=from_degC(500) "Start value of temperature";
parameter Medium.ThermodynamicState state_0=Medium.setState_pTX(1e5,T_0);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/Elem.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/Elem.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/Elem.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/Elem.mo" 2022-03-10 09:58:10.356148227 +0000
@@ -2,7 +2,7 @@
partial model Elem "Flat receiver element used to build up geometry"
extends Modelica.Fluid.Interfaces.PartialTwoPort(
allowFlowReversal=false);
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
replaceable model FlowModel =
SolarTherm.Models.Fluid.Flows.LosslessFlow constrainedby
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/EndTElem.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/EndTElem.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/EndTElem.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/EndTElem.mo" 2022-03-10 09:58:10.312148221 +0000
@@ -4,7 +4,7 @@
Fluid.Flows.LosslessFlow, port_b(h_outflow(start=0.0)));
// port_b.h_outflow is used as iteration variable, so we should find a good
// initial guess for it. Setting to zero here to silence warning.
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import CN = Modelica.Constants;
parameter Real ab "Absorbtivity";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/EnergyRC.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/EnergyRC.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/EnergyRC.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/EnergyRC.mo" 2022-03-10 09:58:10.308148220 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Models.CSP.CRS.Receivers;
partial model EnergyRC "Solar receiver with energy interface"
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
extends SolarTherm.Models.CSP.CRS.Receivers.Receiver;
SolarTherm.Models.Fluid.Interfaces.EnergyPort p;
end EnergyRC;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/FixedEffRC.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/FixedEffRC.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/FixedEffRC.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/FixedEffRC.mo" 2022-03-10 09:58:10.296148218 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.CSP.CRS.Receivers;
model FixedEffRC "Solar receiver with fixed efficiency"
extends SolarTherm.Models.CSP.CRS.Receivers.EnergyRC;
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
// Port output is forced, so have to connect to something otherwise
// p.p = 0 equation is invoked on unconnected flow variable
parameter SI.Efficiency eff = 1.0 "Efficiency of receiver";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/FluidRC.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/FluidRC.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/FluidRC.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/FluidRC.mo" 2022-03-10 09:58:10.288148217 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Models.CSP.CRS.Receivers;
partial model FluidRC "Solar receiver with fluid interface"
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
extends SolarTherm.Models.CSP.CRS.Receivers.Receiver;
extends Modelica.Fluid.Interfaces.PartialTwoPort(
allowFlowReversal=false);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/GenericRC.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/GenericRC.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/GenericRC.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/GenericRC.mo" 2022-03-10 09:58:10.280148217 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.CSP.CRS.Receivers;
model GenericRC "Polynomial factors around design point"
extends SolarTherm.Models.CSP.CRS.Receivers.Receiver;
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import CN = Modelica.Constants;
parameter Boolean match_sam = false "Configure to match SAM output";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/HeatTransfer/HTC_receiver.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/HeatTransfer/HTC_receiver.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/HeatTransfer/HTC_receiver.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/HeatTransfer/HTC_receiver.mo" 2022-03-10 09:58:10.228148209 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Models.CSP.CRS.Receivers.HeatTransfer;
function HTC_receiver
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import CN = Modelica.Constants;
import MA = Modelica.Math;
import SolarTherm.{Models,Media};
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/HeatedFluid.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/HeatedFluid.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/HeatedFluid.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/HeatedFluid.mo" 2022-03-10 09:58:10.188148204 +0000
@@ -2,7 +2,7 @@
model HeatedFluid "Section of fluid that is heated"
extends Modelica.Fluid.Interfaces.PartialTwoPort(
allowFlowReversal=false);
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
replaceable model FlowModel =
SolarTherm.Models.Fluid.Flows.LosslessFlow constrainedby
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/OnePipeRC.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/OnePipeRC.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/OnePipeRC.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/OnePipeRC.mo" 2022-03-10 09:58:10.180148204 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.CSP.CRS.Receivers;
model OnePipeRC "Receiver with single pipe"
extends SolarTherm.Models.CSP.CRS.Receivers.FluidRC;
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import CN = Modelica.Constants;
replaceable model Elem = SolarTherm.Models.CSP.CRS.Receivers.Elem;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/PlateMassRC.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/PlateMassRC.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/PlateMassRC.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/PlateMassRC.mo" 2022-03-10 09:58:10.168148202 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.CSP.CRS.Receivers;
model PlateMassRC "Single element plate receiver with fluid interface"
extends SolarTherm.Models.CSP.CRS.Receivers.FluidRC;
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import CN = Modelica.Constants;
parameter SI.Area A "Area of aperture";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/PlateRC.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/PlateRC.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/PlateRC.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/PlateRC.mo" 2022-03-10 09:58:10.160148202 +0000
@@ -3,7 +3,7 @@
extends SolarTherm.Models.CSP.CRS.Receivers.FluidRC(port_b.h_outflow(start=0.0));
// port_b.h_outflow is used as iteration variable, so we should find a good
// initial guess for it. Setting to zero here to silence warning.
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import CN = Modelica.Constants;
parameter SI.Area A "Area of aperture";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/Receiver.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/Receiver.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/Receiver.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/CSP/CRS/Receivers/Receiver.mo" 2022-03-10 09:58:10.152148200 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Models.CSP.CRS.Receivers;
partial model Receiver "Partial receiver model"
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
parameter Integer nelem = 1 "Number of aperture elements";
input SolarTherm.Interfaces.Connectors.WeatherBus wbus;
input SI.RadiantPower R[nelem] "Radiant power on aperture";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/HX_Control.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/HX_Control.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/HX_Control.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/HX_Control.mo" 2022-03-10 09:58:09.980148178 +0000
@@ -32,7 +32,7 @@
Tt = 1,
uMax=m_flow_max_rec,
uMin=m_flow_min_rec,
- initType=Modelica.Blocks.Types.InitPID.InitialOutput,
+ initType=Modelica.Blocks.Types.Init.InitialOutput,
y_start=y_start_rec,
Ti=Ti_rec,
Kp=Kp_rec)
@@ -102,7 +102,7 @@
Kp = Kp_HX,
Ti = Ti_HX,
Tt = 1,
- initType = Modelica.Blocks.Types.InitPID.InitialOutput,
+ initType = Modelica.Blocks.Types.Init.InitialOutput,
uMax = m_flow_max_HX,
uMin = m_flow_min_HX,
y_start = y_start_HX)
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/IdealMassflowBlockCalculation.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/IdealMassflowBlockCalculation.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/IdealMassflowBlockCalculation.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/IdealMassflowBlockCalculation.mo" 2022-03-10 09:58:09.896148168 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.Control;
model IdealMassflowBlockCalculation
-import SI = Modelica.SIunits;
+import Modelica.Units.SI;
import Util = SolarTherm.Media.ChlorideSalt.ChlorideSalt_utilities;
parameter Real y_start = 500;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/PID_AW_reset3.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/PID_AW_reset3.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/PID_AW_reset3.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/PID_AW_reset3.mo" 2022-03-10 09:58:09.828148159 +0000
@@ -1,23 +1,22 @@
within SolarTherm.Models.Control;
block PID_AW_reset3 "PI-with anti-windup and reset"
- import Modelica.Blocks.Types.InitPID;
import Modelica.Blocks.Types.Init;
extends Modelica.Blocks.Interfaces.SISO;
//parameter Real k(unit="1")=1 "Gain";
- parameter Modelica.SIunits.Time Ti(min=Modelica.Constants.small, start=0.5)
+ parameter Modelica.Units.SI.Time Ti(min=Modelica.Constants.small, start=0.5)
"Time Constant of Integrator";
- parameter Modelica.Blocks.Types.InitPID initType= Modelica.Blocks.Types.InitPID.InitialOutput
+ parameter Modelica.Blocks.Types.Init initType= Modelica.Blocks.Types.Init.InitialOutput
"Type of initialization (1: no init, 2: steady state, 3: initial state, 4: initial output)"
annotation(Evaluate=true,
Dialog(group="Initialization"));
parameter Real y_start=0 "Initial value of output"
annotation(Dialog(enable=initType == InitPID.InitialOutput, group=
"Initialization"));
- constant Modelica.SIunits.Time unitTime=1 annotation (HideResult=true);
+ constant Modelica.Units.SI.Time unitTime=1 annotation (HideResult=true);
parameter Real Kp, uMax, uMin;
- parameter Modelica.SIunits.Time Tt;
+ parameter Modelica.Units.SI.Time Tt;
Modelica.Blocks.Math.Gain P(k=Kp) "Proportional part of PID controller"
annotation (Placement(transformation(extent={{-60,60},{-40,80}}, rotation=0)));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/PowerBlockControl.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/PowerBlockControl.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/PowerBlockControl.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/PowerBlockControl.mo" 2022-03-10 09:58:09.780148154 +0000
@@ -1,9 +1,9 @@
within SolarTherm.Models.Control;
model PowerBlockControl
extends SolarTherm.Icons.Control;
- parameter Modelica.SIunits.MassFlowRate m_flow_on=1400
+ parameter Modelica.Units.SI.MassFlowRate m_flow_on=1400
"Constant mass flow rate on";
- parameter Modelica.SIunits.MassFlowRate m_flow_off=0
+ parameter Modelica.Units.SI.MassFlowRate m_flow_off=0
"Constant mass flow rate off";
parameter Real L_on=90 "Level of start discharge";
parameter Real L_off=10 "Level of stop discharge";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/ReceiverControl.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/ReceiverControl.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/ReceiverControl.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/ReceiverControl.mo" 2022-03-10 09:58:09.728148146 +0000
@@ -22,7 +22,7 @@
PID_AW_reset3 PI( Tt = 1,
uMax=m_flow_max,
uMin=m_flow_min,
- initType=Modelica.Blocks.Types.InitPID.InitialOutput,
+ initType=Modelica.Blocks.Types.Init.InitialOutput,
y_start=y_start,
Ti=Ti,
Kp=Kp) annotation(Placement(transformation(extent={{14,18},
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/StartUpLogic5.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/StartUpLogic5.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/StartUpLogic5.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/StartUpLogic5.mo" 2022-03-10 09:58:09.708148144 +0000
@@ -6,8 +6,8 @@
Modelica.Blocks.Interfaces.RealOutput m_flow
annotation (Placement(transformation(extent={{90,-20},{130,20}})));
- parameter Modelica.SIunits.Time t_start=0.5*3600;
- parameter Modelica.SIunits.Time t_standby=2*3600;
+ parameter Modelica.Units.SI.Time t_start=0.5*3600;
+ parameter Modelica.Units.SI.Time t_standby=2*3600;
parameter Real m_flow_max;
parameter Real m_flow_startup;
parameter Real m_flow_standby;
@@ -18,8 +18,8 @@
Boolean on_charge;
Boolean on_discharge;
- discrete Modelica.SIunits.Time t_off;
- discrete Modelica.SIunits.Time t_on;
+ discrete Modelica.Units.SI.Time t_off;
+ discrete Modelica.Units.SI.Time t_on;
public
Modelica.Blocks.Interfaces.RealInput m_flow_in annotation (Placement(
transformation(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/m_flow_calculations.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/m_flow_calculations.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/m_flow_calculations.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/m_flow_calculations.mo" 2022-03-10 09:58:09.652148136 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Models.Control;
model m_flow_calculations
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import CN = Modelica.Constants;
import MA = Modelica.Math;
replaceable package Medium1 = Media.Sodium.Sodium_pT "Medium props for Sodium";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/m_flow_calculations_simple.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/m_flow_calculations_simple.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/m_flow_calculations_simple.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/m_flow_calculations_simple.mo" 2022-03-10 09:58:09.620148132 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Models.Control;
model m_flow_calculations_simple
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import CN = Modelica.Constants;
import MA = Modelica.Math;
replaceable package Medium1 = Media.Sodium.Sodium_pT "Medium props for Sodium";
@@ -100,9 +100,8 @@
// else
// m_flow_rec_internal:=Q_out_rec/(h_Na1-h_Na2);
// m_flow_hs_internal:=Q_out_rec/(h_CS2-h_CS1);
-// end if;
+// end if;
// end if;
-
m_flow_rec_internal_lim_min=max(m_flow_min_Na, m_flow_rec_internal);
// m_flow_rec_internal_lim_max=min(m_flow_max_Na, m_flow_rec_internal_lim_min);
m_flow_hs_internal_lim_min=max(m_flow_min_CS, m_flow_hs_internal);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/m_flow_calculations_simple_2.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/m_flow_calculations_simple_2.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/m_flow_calculations_simple_2.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/m_flow_calculations_simple_2.mo" 2022-03-10 09:58:09.592148130 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Models.Control;
model m_flow_calculations_simple_2
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import CN = Modelica.Constants;
import MA = Modelica.Math;
replaceable package Medium1 = Media.Sodium.Sodium_pT "Medium props for Sodium";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/m_flow_calculations_simple_alg.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/m_flow_calculations_simple_alg.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/m_flow_calculations_simple_alg.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Control/m_flow_calculations_simple_alg.mo" 2022-03-10 09:58:09.572148127 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Models.Control;
model m_flow_calculations_simple_alg
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import CN = Modelica.Constants;
import MA = Modelica.Math;
replaceable package Medium1 = Media.Sodium.Sodium_pT "Medium props for Sodium";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/Flows/DarcyFrictionFactor.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/Flows/DarcyFrictionFactor.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/Flows/DarcyFrictionFactor.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/Flows/DarcyFrictionFactor.mo" 2022-03-10 09:58:09.548148124 +0000
@@ -1,9 +1,9 @@
within SolarTherm.Models.Fluid.Flows;
function DarcyFrictionFactor "Computes the Darcy friction factor from mass flow rate"
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import Modelica.Math;
import Modelica.Constants.pi;
- // Inputs
+ // Inputs
input SI.MassFlowRate m_flow;
input SI.Area area;
input SI.Density rho;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/Flows/DarcyWeisbachFlow.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/Flows/DarcyWeisbachFlow.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/Flows/DarcyWeisbachFlow.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/Flows/DarcyWeisbachFlow.mo" 2022-03-10 09:58:09.528148122 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.Fluid.Flows;
model DarcyWeisbachFlow "Darcy-Weisbach flow equations"
extends SolarTherm.Models.Fluid.Flows.Flow;
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import CN = Modelica.Constants;
parameter SI.Length L = 1 "Length of pipe";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/Flows/Flow.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/Flows/Flow.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/Flows/Flow.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/Flows/Flow.mo" 2022-03-10 09:58:09.520148120 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Models.Fluid.Flows;
partial model Flow "A flow model representing the mass flow rate, density and pressure change within a control volume"
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
SI.MassFlowRate m_flow;
SI.Density d_avg "Average density";
SI.Pressure dp "Pressure change";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/BasicHE.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/BasicHE.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/BasicHE.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/BasicHE.mo" 2022-03-10 09:58:09.500148117 +0000
@@ -2,7 +2,7 @@
model BasicHE "Basic counterflow heat exchanger model"
extends SolarTherm.Models.Fluid.HeatExchangers.HeatExchanger(allowFlowReversal=
false);
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import CN = Modelica.Constants;
import Modelica.Math;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Extractor.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Extractor.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Extractor.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Extractor.mo" 2022-03-10 09:58:09.488148116 +0000
@@ -2,7 +2,7 @@
model Extractor "Ideal heat extractor"
extends Modelica.Fluid.Interfaces.PartialTwoPort(
allowFlowReversal=false);
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import CN = Modelica.Constants;
parameter SI.Efficiency eff = 1.0 "Efficiency of conversion";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/HX.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/HX.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/HX.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/HX.mo" 2022-03-10 09:58:09.480148115 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.Fluid.HeatExchangers;
model HX
extends SolarTherm.Interfaces.Models.HeatExchangerFluid;
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import CN = Modelica.Constants;
import MA = Modelica.Math;
import SolarTherm.{Models,Media};
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/HX_designonly.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/HX_designonly.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/HX_designonly.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/HX_designonly.mo" 2022-03-10 09:58:09.436148109 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Models.Fluid.HeatExchangers;
model HX_designonly
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import CN = Modelica.Constants;
import MA = Modelica.Math;
import SolarTherm.{Models,Media};
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/HX_designonly_Qs.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/HX_designonly_Qs.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/HX_designonly_Qs.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/HX_designonly_Qs.mo" 2022-03-10 09:58:09.344148099 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Models.Fluid.HeatExchangers;
model HX_designonly_Qs
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import CN = Modelica.Constants;
import MA = Modelica.Math;
import SolarTherm.{Models,Media};
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/HX_standalone_noF.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/HX_standalone_noF.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/HX_standalone_noF.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/HX_standalone_noF.mo" 2022-03-10 09:58:09.320148095 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Models.Fluid.HeatExchangers;
model HX_standalone_noF
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import CN = Modelica.Constants;
import MA = Modelica.Math;
import SolarTherm.{Models,Media};
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/HeatExchanger.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/HeatExchanger.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/HeatExchanger.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/HeatExchanger.mo" 2022-03-10 09:58:09.292148091 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.Fluid.HeatExchangers;
partial model HeatExchanger "Four port heat exchanger partial model"
import CN = Modelica.Constants;
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
outer Modelica.Fluid.System system;
replaceable package Medium1 = Modelica.Media.Interfaces.PartialMedium;
replaceable package Medium2 = Modelica.Media.Interfaces.PartialMedium;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/ResistiveHeater.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/ResistiveHeater.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/ResistiveHeater.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/ResistiveHeater.mo" 2022-03-10 09:58:09.272148088 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.Fluid.HeatExchangers;
model ResistiveHeater "Resistive heater with ramp features"
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
//Parameters:
//****************
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/SimpleHeatExchanger.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/SimpleHeatExchanger.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/SimpleHeatExchanger.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/SimpleHeatExchanger.mo" 2022-03-10 09:58:09.224148083 +0000
@@ -5,7 +5,7 @@
replaceable package Medium_B = Media.ChlorideSalt.ChlorideSalt_pT "Medium props for Molten Salt";
import CN = Modelica.Constants;
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import Modelica.Math;
parameter SI.Area A = 1 "Heat transfer surface area";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/BaffleThickness.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/BaffleThickness.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/BaffleThickness.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/BaffleThickness.mo" 2022-03-10 09:58:09.200148080 +0000
@@ -1,79 +1,77 @@
within SolarTherm.Models.Fluid.HeatExchangers.Utilities;
+
function BaffleThickness
input SI.Length D_s "Shell Diameter";
input SI.Length l_b "Baffle Spacing";
output SI.Length t_baffle "Baffle thickness";
-
algorithm
//TEMA Standards - Minimum Baffle Thickness
-if noEvent(l_b<=0.61) then
- if noEvent(D_s<=0.356) then
- t_baffle:=3.2e-3;
- elseif noEvent(D_s>0.356 and D_s<=0.711) then
- t_baffle:=4.8e-3;
- elseif noEvent(D_s>0.711 and D_s<=0.965) then
- t_baffle:=6.4e-3;
- elseif noEvent(D_s>0.965 and D_s<=1.524) then
- t_baffle:=6.4e-3;
- elseif noEvent(D_s>1.524) then
- t_baffle:=9.5e-3;
- end if;
-elseif noEvent(l_b>0.61 and l_b<=0.914) then
- if noEvent(D_s<=0.356) then
- t_baffle:=4.8e-3;
- elseif noEvent(D_s>0.356 and D_s<=0.711) then
- t_baffle:=6.4e-3;
- elseif noEvent(D_s>0.711 and D_s<=0.965) then
- t_baffle:=7.5e-3;
- elseif noEvent(D_s>0.965 and D_s<=1.524) then
- t_baffle:=9.5e-3;
- elseif noEvent(D_s>1.524) then
- t_baffle:=12.7e-3;
- end if;
-elseif noEvent(l_b>0.914 and l_b<=1.219) then
- if noEvent(D_s<=0.356) then
- t_baffle:=6.4e-3;
- elseif noEvent(D_s>0.356 and D_s<=0.711) then
- t_baffle:=9.5e-3;
- elseif noEvent(D_s>0.711 and D_s<=0.965) then
- t_baffle:=9.5e-3;
- elseif noEvent(D_s>0.965 and D_s<=1.524) then
- t_baffle:=12.7e-3;
- elseif noEvent(D_s>1.524) then
- t_baffle:=15.9e-3;
- end if;
-elseif noEvent(l_b>1.219 and l_b<=1.524) then
- if noEvent(D_s<=0.356) then
- t_baffle:=9.5e-3;
- elseif noEvent(D_s>0.356 and D_s<=0.711) then
- t_baffle:=9.5e-3;
- elseif noEvent(D_s>0.711 and D_s<=0.965) then
- t_baffle:=12.7e-3;
- elseif noEvent(D_s>0.965 and D_s<=1.524) then
- t_baffle:=15.9e-3;
- elseif noEvent(D_s>1.524) then
- t_baffle:=19.1e-3;
- end if;
-elseif noEvent(l_b>1.524) then
- if noEvent(D_s<=0.356) then
- t_baffle:=9.5e-3;
- elseif noEvent(D_s>0.356 and D_s<=0.711) then
- t_baffle:=12.7e-3;
- elseif noEvent(D_s>0.711 and D_s<=0.965) then
- t_baffle:=15.9e-3;
- elseif noEvent(D_s>0.965 and D_s<=1.524) then
- t_baffle:=15.9e-3;
- elseif noEvent(D_s>1.524) then
- t_baffle:=19.1e-3;
+ if noEvent(l_b <= 0.61) then
+ if noEvent(D_s <= 0.356) then
+ t_baffle := 3.2e-3;
+ elseif noEvent(D_s > 0.356 and D_s <= 0.711) then
+ t_baffle := 4.8e-3;
+ elseif noEvent(D_s > 0.711 and D_s <= 0.965) then
+ t_baffle := 6.4e-3;
+ elseif noEvent(D_s > 0.965 and D_s <= 1.524) then
+ t_baffle := 6.4e-3;
+ elseif noEvent(D_s > 1.524) then
+ t_baffle := 9.5e-3;
+ end if;
+ elseif noEvent(l_b > 0.61 and l_b <= 0.914) then
+ if noEvent(D_s <= 0.356) then
+ t_baffle := 4.8e-3;
+ elseif noEvent(D_s > 0.356 and D_s <= 0.711) then
+ t_baffle := 6.4e-3;
+ elseif noEvent(D_s > 0.711 and D_s <= 0.965) then
+ t_baffle := 7.5e-3;
+ elseif noEvent(D_s > 0.965 and D_s <= 1.524) then
+ t_baffle := 9.5e-3;
+ elseif noEvent(D_s > 1.524) then
+ t_baffle := 12.7e-3;
+ end if;
+ elseif noEvent(l_b > 0.914 and l_b <= 1.219) then
+ if noEvent(D_s <= 0.356) then
+ t_baffle := 6.4e-3;
+ elseif noEvent(D_s > 0.356 and D_s <= 0.711) then
+ t_baffle := 9.5e-3;
+ elseif noEvent(D_s > 0.711 and D_s <= 0.965) then
+ t_baffle := 9.5e-3;
+ elseif noEvent(D_s > 0.965 and D_s <= 1.524) then
+ t_baffle := 12.7e-3;
+ elseif noEvent(D_s > 1.524) then
+ t_baffle := 15.9e-3;
+ end if;
+ elseif noEvent(l_b > 1.219 and l_b <= 1.524) then
+ if noEvent(D_s <= 0.356) then
+ t_baffle := 9.5e-3;
+ elseif noEvent(D_s > 0.356 and D_s <= 0.711) then
+ t_baffle := 9.5e-3;
+ elseif noEvent(D_s > 0.711 and D_s <= 0.965) then
+ t_baffle := 12.7e-3;
+ elseif noEvent(D_s > 0.965 and D_s <= 1.524) then
+ t_baffle := 15.9e-3;
+ elseif noEvent(D_s > 1.524) then
+ t_baffle := 19.1e-3;
+ end if;
+ elseif noEvent(l_b > 1.524) then
+ if noEvent(D_s <= 0.356) then
+ t_baffle := 9.5e-3;
+ elseif noEvent(D_s > 0.356 and D_s <= 0.711) then
+ t_baffle := 12.7e-3;
+ elseif noEvent(D_s > 0.711 and D_s <= 0.965) then
+ t_baffle := 15.9e-3;
+ elseif noEvent(D_s > 0.965 and D_s <= 1.524) then
+ t_baffle := 15.9e-3;
+ elseif noEvent(D_s > 1.524) then
+ t_baffle := 19.1e-3;
+ end if;
end if;
-end if;
-
//Fixed Baffle Thickness
//t_baffle:=19.1e-3;
-
//TEMA Standards - Minimum Baffle Thickness - Approximated Function
//if l_b<=0.61 then
-// if D_s<=0.356 then
+// if D_s<=0.356 then
// t_baffle:=3.2e-3;
// elseif D_s>0.356 and D_s<=1.254 then
// t_baffle:=0.004332389*log(D_s) + 0.007674598;
@@ -81,7 +79,7 @@
// t_baffle:=9.5e-3;
// end if;
//elseif l_b>0.61 and l_b<=0.914 then
-// if D_s<=0.356 then
+// if D_s<=0.356 then
// t_baffle:=0.0048;
// elseif D_s>0.356 and D_s<=1.254 then
// t_baffle:=0.005432678*log(D_s) + 0.010411;
@@ -89,7 +87,7 @@
// t_baffle:=0.0127;
// end if;
//elseif l_b>0.914 and l_b<=1.219 then
-// if D_s<=0.356 then
+// if D_s<=0.356 then
// t_baffle:=0.0066;
// elseif D_s>0.356 and D_s<=1.254 then
// t_baffle:=0.0064457*log(D_s) + 0.01326375;
@@ -97,7 +95,7 @@
// t_baffle:=0.0160;
// end if;
//elseif l_b>1.219 and l_b<=1.524 then
-// if D_s<=0.356 then
+// if D_s<=0.356 then
// t_baffle:=0.0095;
// elseif D_s>0.356 and D_s<=1.254 then
// t_baffle:=0.006601736*log(D_s) + 0.01631843;
@@ -105,14 +103,12 @@
// t_baffle:=0.0191;
// end if;
//elseif l_b>1.524 then
-// if D_s<=0.356 then
+// if D_s<=0.356 then
// t_baffle:=0.0098;
// elseif D_s>0.356 and D_s<=1.254 then
// t_baffle:=0.006591127*log(D_s) + 0.01663412;
// else
// t_baffle:=0.0194;
// end if;
-//end if;
-
-
+//end if;
end BaffleThickness;
\ No newline at end of file
Only in converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities: BaffleThickness.mo.after
Only in converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities: BaffleThickness.mo.before
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/Design_HX.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/Design_HX.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/Design_HX.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/Design_HX.mo" 2022-03-10 09:58:09.164148075 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Models.Fluid.HeatExchangers.Utilities;
function Design_HX
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import CN = Modelica.Constants;
import MA = Modelica.Math;
import SolarTherm.{Models,Media};
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/Dp_losses.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/Dp_losses.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/Dp_losses.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/Dp_losses.mo" 2022-03-10 09:58:09.088148065 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Models.Fluid.HeatExchangers.Utilities;
function Dp_losses
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import CN = Modelica.Constants;
import MA = Modelica.Math;
import SolarTherm.{Models,Media};
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/HTCs.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/HTCs.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/HTCs.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/HTCs.mo" 2022-03-10 09:58:09.052148060 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Models.Fluid.HeatExchangers.Utilities;
function HTCs
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import CN = Modelica.Constants;
import MA = Modelica.Math;
import SolarTherm.{Models,Media};
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/Haynes230_BaseProperties.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/Haynes230_BaseProperties.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/Haynes230_BaseProperties.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/Haynes230_BaseProperties.mo" 2022-03-10 09:58:09.024148058 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Models.Fluid.HeatExchangers.Utilities;
function Haynes230_BaseProperties
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
input SI.Temperature T "HX operating Temperature";
output SI.ThermalConductivity k_wall "Tube Thermal Conductivity";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/Inconel800H_BaseProperties.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/Inconel800H_BaseProperties.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/Inconel800H_BaseProperties.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/Inconel800H_BaseProperties.mo" 2022-03-10 09:58:09.016148057 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Models.Fluid.HeatExchangers.Utilities;
function Inconel800H_BaseProperties
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
input SI.Temperature T "HX operating Temperature";
output SI.ThermalConductivity k_wall "Tube Thermal Conductivity";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/Optimize_HX.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/Optimize_HX.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/Optimize_HX.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/Optimize_HX.mo" 2022-03-10 09:58:09.008148055 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Models.Fluid.HeatExchangers.Utilities;
function Optimize_HX
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import CN = Modelica.Constants;
import MA = Modelica.Math;
import SolarTherm.{Models,Media};
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/ShellThickness.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/ShellThickness.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/ShellThickness.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities/ShellThickness.mo" 2022-03-10 09:58:08.968148050 +0000
@@ -1,36 +1,33 @@
within SolarTherm.Models.Fluid.HeatExchangers.Utilities;
+
function ShellThickness
input SI.Length D_s "Shell Diameter";
output SI.Length t_shell "Shell thickness";
-
algorithm
-
//TEMA Standards - Minimum Shell Thickness
- if noEvent(D_s<=0.15) then
- t_shell:=3.2e-3;
- elseif noEvent(D_s>0.15 and D_s<=0.3) then
- t_shell:=3.2e-3;
- elseif noEvent(D_s>0.3 and D_s<=0.58) then
- t_shell:=3.2e-3;
- elseif noEvent(D_s>0.58 and D_s<=0.74) then
- t_shell:=4.8e-3;
- elseif noEvent(D_s>0.74 and D_s<=0.99) then
- t_shell:=6.4e-3;
- elseif noEvent(D_s>0.99 and D_s<=1.52) then
- t_shell:=6.4e-3;
- elseif noEvent(D_s>1.52 and D_s<=2.03) then
- t_shell:=7.9e-3;
- elseif noEvent(D_s>2.03) then
- t_shell:=9.5e-3;
+ if noEvent(D_s <= 0.15) then
+ t_shell := 3.2e-3;
+ elseif noEvent(D_s > 0.15 and D_s <= 0.3) then
+ t_shell := 3.2e-3;
+ elseif noEvent(D_s > 0.3 and D_s <= 0.58) then
+ t_shell := 3.2e-3;
+ elseif noEvent(D_s > 0.58 and D_s <= 0.74) then
+ t_shell := 4.8e-3;
+ elseif noEvent(D_s > 0.74 and D_s <= 0.99) then
+ t_shell := 6.4e-3;
+ elseif noEvent(D_s > 0.99 and D_s <= 1.52) then
+ t_shell := 6.4e-3;
+ elseif noEvent(D_s > 1.52 and D_s <= 2.03) then
+ t_shell := 7.9e-3;
+ elseif noEvent(D_s > 2.03) then
+ t_shell := 9.5e-3;
end if;
-
//TEMA Standards - Minimum Shell Thickness - Approximated Function
-// if D_s<=0.15 then
+// if D_s<=0.15 then
// t_shell:=3.2e-3;
// elseif D_s>0.15 and D_s<=2.03 then
// t_shell:=0.006560749*D_s^0.3821246;
// else
// t_shell:=9.5e-3;
// end if;
-
end ShellThickness;
\ No newline at end of file
Only in converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities: ShellThickness.mo.after
Only in converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/Utilities: ShellThickness.mo.before
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/test_HX.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/test_HX.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/test_HX.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/HeatExchangers/test_HX.mo" 2022-03-10 09:58:08.932148045 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.Fluid.HeatExchangers;
model test_HX
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import CN = Modelica.Constants;
import MA = .Modelica.Math;
import SolarTherm.{Models,Media};
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/Interfaces/EnergyPort.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/Interfaces/EnergyPort.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/Interfaces/EnergyPort.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/Interfaces/EnergyPort.mo" 2022-03-10 09:58:08.896148042 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Models.Fluid.Interfaces;
connector EnergyPort "Energy Port"
// Will through warnings because it has no "potential" variable
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
flow SI.Power P;
end EnergyPort;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/Pumps/EnergyPump.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/Pumps/EnergyPump.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/Pumps/EnergyPump.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/Pumps/EnergyPump.mo" 2022-03-10 09:58:08.872148039 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Models.Fluid.Pumps;
model EnergyPump "Pumps power from inlet to outlet"
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
parameter SI.Power P_max(min=0);
input Real frac(min=0, max=1) "Fraction of maximum throughput";
SolarTherm.Models.Fluid.Interfaces.EnergyPort p_i;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/Pumps/IdealPump.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/Pumps/IdealPump.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/Pumps/IdealPump.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/Pumps/IdealPump.mo" 2022-03-10 09:58:08.864148038 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.Fluid.Pumps;
model IdealPump "Solar receiver with fluid interface"
extends Modelica.Fluid.Interfaces.PartialTwoPort;
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
parameter Boolean cont_m_flow = true "Control m_flow else control dp";
parameter Boolean use_input = true "Use input else parameter";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/Valves/EnergySplitter.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/Valves/EnergySplitter.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/Valves/EnergySplitter.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Fluid/Valves/EnergySplitter.mo" 2022-03-10 09:58:08.784148027 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Models.Fluid.Valves;
model EnergySplitter "Splits input between two output ports"
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
input Real frac(min=0, max=1) "Fraction to output port 1";
SolarTherm.Models.Fluid.Interfaces.EnergyPort p_i;
SolarTherm.Models.Fluid.Interfaces.EnergyPort p_o1;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/Cooling/NREL.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/Cooling/NREL.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/Cooling/NREL.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/Cooling/NREL.mo" 2022-03-10 09:58:08.588148003 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.PowerBlocks.Cooling;
model NREL "sCO2 NREL Nieses SAM"
extends Cooling;
- import Modelica.SIunits.Conversions.*;
+ import Modelica.Units.Conversions.*;
parameter SI.Temperature T_in_ref=720+273.15 "HTF inlet temperature at design" annotation (Dialog(enable=false,group="Design"));
input SI.Temperature T_in "HTF inlet temperature";
input Real load "Load fraction";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/Correlation/Cycle.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/Correlation/Cycle.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/Correlation/Cycle.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/Correlation/Cycle.mo" 2022-03-10 09:58:08.560147998 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Models.PowerBlocks.Correlation;
partial model Cycle
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
parameter SI.Temperature T_in_ref "HTF inlet temperature at design" annotation (Dialog(enable=false,group="Design"));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/Correlation/Rankine.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/Correlation/Rankine.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/Correlation/Rankine.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/Correlation/Rankine.mo" 2022-03-10 09:58:08.552147997 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Models.PowerBlocks.Correlation;
model Rankine "Rankine cycle regresion model"
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
extends Cycle;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/Correlation/sCO2NREL.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/Correlation/sCO2NREL.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/Correlation/sCO2NREL.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/Correlation/sCO2NREL.mo" 2022-03-10 09:58:08.536147996 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.PowerBlocks.Correlation;
model sCO2NREL "A sCO2 cycle regression model based on the table provided by Chad Agustine"
extends Cycle;
- import Modelica.SIunits.Conversions.*;
+ import Modelica.Units.Conversions.*;
input SI.Temperature T_amb;
equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/EnergyPB.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/EnergyPB.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/EnergyPB.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/EnergyPB.mo" 2022-03-10 09:58:08.528147994 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.PowerBlocks;
model EnergyPB "Generator with fixed efficiency"
extends SolarTherm.Models.PowerBlocks.PowerBlock;
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
parameter SI.Efficiency eff = 1.0 "Efficiency of generator";
parameter SI.Power P_max "Generator maximum electrical power";
SolarTherm.Models.Fluid.Interfaces.EnergyPort p;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/FixedOutletPB.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/FixedOutletPB.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/FixedOutletPB.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/FixedOutletPB.mo" 2022-03-10 09:58:08.520147993 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.PowerBlocks;
model FixedOutletPB "Basic power block model"
extends SolarTherm.Models.PowerBlocks.FluidPB;
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
parameter SI.Pressure p_set_outlet = 100000 "Set point p of outlet";
parameter SI.Temperature T_set_outlet = 300 "Set point T of outlet";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/FluidPB.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/FluidPB.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/FluidPB.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/FluidPB.mo" 2022-03-10 09:58:08.504147992 +0000
@@ -3,7 +3,7 @@
extends Modelica.Fluid.Interfaces.PartialTwoPort(
allowFlowReversal=false);
extends SolarTherm.Models.PowerBlocks.PowerBlock;
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
equation
port_a.m_flow + port_b.m_flow = 0;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/GenericPB.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/GenericPB.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/GenericPB.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/GenericPB.mo" 2022-03-10 09:58:08.492147991 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.PowerBlocks;
model GenericPB "Generic power block model"
extends SolarTherm.Models.PowerBlocks.PowerBlock;
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
parameter SI.Efficiency eff_des = 0.5 "Power cycle efficiency at design";
parameter SI.HeatFlowRate Q_flow_des
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/GenericParasitics.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/GenericParasitics.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/GenericParasitics.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/GenericParasitics.mo" 2022-03-10 09:58:08.480147989 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Models.PowerBlocks;
model GenericParasitics "Generic parasitics model"
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
parameter SI.Power P_par_des "Parasitic power at design";
parameter SI.Power P_gross_des "Gross power at design";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/GenericStartPB.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/GenericStartPB.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/GenericStartPB.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/GenericStartPB.mo" 2022-03-10 09:58:08.468147987 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.PowerBlocks;
model GenericStartPB "Generic power block model"
extends SolarTherm.Models.PowerBlocks.PowerBlock;
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
parameter SI.Efficiency eff_des = 0.5 "Power cycle efficiency at design";
parameter SI.HeatFlowRate Q_flow_des
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/HeatPB.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/HeatPB.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/HeatPB.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/HeatPB.mo" 2022-03-10 09:58:08.452147984 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.PowerBlocks;
model HeatPB "Basic power block that takes input heat at a temperature"
extends SolarTherm.Models.PowerBlocks.PowerBlock;
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
replaceable package Medium = Modelica.Media.Interfaces.PartialMedium;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/PowerBlock.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/PowerBlock.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/PowerBlock.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/PowerBlock.mo" 2022-03-10 09:58:08.444147983 +0000
@@ -1,5 +1,5 @@
within SolarTherm.Models.PowerBlocks;
partial model PowerBlock "Power block model"
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
output SI.Power P "Electrical output power";
end PowerBlock;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/CompressorOnShaft.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/CompressorOnShaft.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/CompressorOnShaft.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/CompressorOnShaft.mo" 2022-03-10 09:58:08.408147979 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Models.PowerBlocks.sCO2Cycle.DirectDesign;
model CompressorOnShaft "0D model of a compressor on the same shaft as the turbine"
extends SolarTherm.Interfaces.Models.Compressor;
- import SI = Modelica.SIunits;
- import Modelica.SIunits.Conversions.*;
+ import Modelica.Units.SI;
+ import Modelica.Units.Conversions.*;
replaceable package Medium = SolarTherm.Media.CarbonDioxide;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/CompressorToDiscuss.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/CompressorToDiscuss.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/CompressorToDiscuss.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/CompressorToDiscuss.mo" 2022-03-10 09:58:08.380147975 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Models.PowerBlocks.sCO2Cycle.DirectDesign;
model CompressorToDiscuss
extends SolarTherm.Media.CO2.PropCO2;
- import SI= Modelica.SIunits;
- import CV = Modelica.SIunits.Conversions;
+ import Modelica.Units.SI;
+ import CV = Modelica.Units.Conversions;
replaceable package MedPB = SolarTherm.Media.CO2.CO2_ph;
Modelica.Fluid.Interfaces.FluidPort_a port_a(redeclare package Medium = MedPB) annotation(
Placement(visible = true, transformation(origin = {-60, 50}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {-78, 42}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/Cooler.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/Cooler.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/Cooler.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/Cooler.mo" 2022-03-10 09:58:08.360147974 +0000
@@ -1,38 +1,38 @@
within SolarTherm.Models.PowerBlocks.sCO2Cycle.DirectDesign;
model Cooler
extends SolarTherm.Icons.HeatExchangerIcon;
- import Modelica.SIunits.Conversions.*;
+ import Modelica.Units.Conversions.*;
input Boolean m_sup;
- input Modelica.SIunits.ThermodynamicTemperature T_amb "Ambiant temperature in Kelvin";
+ input Modelica.Units.SI.ThermodynamicTemperature T_amb "Ambiant temperature in Kelvin";
replaceable package Medium = SolarTherm.Media.CarbonDioxide;
- parameter Modelica.SIunits.Temperature T_amb_des = from_degC(40) "Ambient temperature in Kelvin at design point";
- parameter Modelica.SIunits.ThermalConductance UA_cooler(fixed = false) "Conductance of the cooler in W/K";
- parameter Modelica.SIunits.Temperature T_low = from_degC(55);
- parameter Modelica.SIunits.Power P_nom_des = 164000;
+ parameter Modelica.Units.SI.Temperature T_amb_des = from_degC(40) "Ambient temperature in Kelvin at design point";
+ parameter Modelica.Units.SI.ThermalConductance UA_cooler(fixed = false) "Conductance of the cooler in W/K";
+ parameter Modelica.Units.SI.Temperature T_low = from_degC(55);
+ parameter Modelica.Units.SI.Power P_nom_des = 164000;
parameter Integer N_cool = 15;
- parameter Modelica.SIunits.TemperatureDifference deltaT_design = 15 "Difference between ambient and outlet CO2 temperature";
- parameter Modelica.SIunits.ThermalConductance UA_dis[N_cool - 1](each fixed = false) "Conductance of the cooler per sub-HX";
- parameter Modelica.SIunits.Power P_cool_des(fixed = false, start = 0.01 * P_nom_des) "power necessary to cool down at design point";
- parameter Modelica.SIunits.SpecificEnthalpy h_in_des(fixed = false), h_out_des(fixed = false);
- parameter Modelica.SIunits.AbsolutePressure p_in_des(fixed = false);
- parameter Modelica.SIunits.AbsolutePressure p_out_des(fixed = false);
- parameter Modelica.SIunits.MassFlowRate m_des(fixed = false);
- parameter Modelica.SIunits.HeatFlowRate Q_cooler_des(fixed = false, start = 1e6);
+ parameter Modelica.Units.SI.TemperatureDifference deltaT_design = 15 "Difference between ambient and outlet CO2 temperature";
+ parameter Modelica.Units.SI.ThermalConductance UA_dis[N_cool - 1](each fixed = false) "Conductance of the cooler per sub-HX";
+ parameter Modelica.Units.SI.Power P_cool_des(fixed = false, start = 0.01 * P_nom_des) "power necessary to cool down at design point";
+ parameter Modelica.Units.SI.SpecificEnthalpy h_in_des(fixed = false), h_out_des(fixed = false);
+ parameter Modelica.Units.SI.AbsolutePressure p_in_des(fixed = false);
+ parameter Modelica.Units.SI.AbsolutePressure p_out_des(fixed = false);
+ parameter Modelica.Units.SI.MassFlowRate m_des(fixed = false);
+ parameter Modelica.Units.SI.HeatFlowRate Q_cooler_des(fixed = false, start = 1e6);
parameter Medium.ThermodynamicState[N_cool] state_des(each p.fixed = false, each h.fixed = false) "Thermodynamic State at the i-th position";
- parameter Modelica.SIunits.SpecificEnthalpy[N_cool] h_CO2_des(each fixed = false, start = {600000 - i / N_cool * 150000 for i in 1:N_cool});
+ parameter Modelica.Units.SI.SpecificEnthalpy[N_cool] h_CO2_des(each fixed = false, start = {600000 - i / N_cool * 150000 for i in 1:N_cool});
parameter Real[N_cool] deltaT_des(each fixed = false, each start = 25) "difference with the ambiant air at the inlet and outlet";
- parameter Modelica.SIunits.HeatFlowRate Q_dis_des(fixed = false, start = 1e5) "Heat flow rate dispatched per sub-HX in the cooler";
- parameter Modelica.SIunits.Temperature[N_cool] T_CO2_des(each fixed = false, each start = from_degC(75));
+ parameter Modelica.Units.SI.HeatFlowRate Q_dis_des(fixed = false, start = 1e5) "Heat flow rate dispatched per sub-HX in the cooler";
+ parameter Modelica.Units.SI.Temperature[N_cool] T_CO2_des(each fixed = false, each start = from_degC(75));
Medium.ThermodynamicState state_a "Thermodynamic State at the entrance";
Medium.ThermodynamicState state_b "Thermodynamic State at the outlet";
- Modelica.SIunits.TemperatureDifference[2] deltaT;
+ Modelica.Units.SI.TemperatureDifference[2] deltaT;
- Modelica.SIunits.HeatFlowRate Q_cooler;
- Modelica.SIunits.Power P_cooling;
+ Modelica.Units.SI.HeatFlowRate Q_cooler;
+ Modelica.Units.SI.Power P_cooling;
Modelica.Fluid.Interfaces.FluidPort_a port_a(redeclare package Medium = Medium, m_flow.start=P_nom_des/1e5) annotation(
Placement(visible = true, transformation(origin = {-26, 38}, extent = {{-6, -6}, {6, 6}}, rotation = 0),
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/Exchanger.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/Exchanger.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/Exchanger.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/Exchanger.mo" 2022-03-10 09:58:08.336147970 +0000
@@ -1,42 +1,42 @@
within SolarTherm.Models.PowerBlocks.sCO2Cycle.DirectDesign;
model Exchanger
- import Modelica.SIunits.Conversions.*;
+ import Modelica.Units.Conversions.*;
extends SolarTherm.Interfaces.Models.HeatExchangerInterface;
replaceable package MedPB = SolarTherm.Media.CarbonDioxide;
replaceable package MedRec = SolarTherm.Media.ChlorideSaltPH.ChlorideSaltPH_ph;
- parameter Modelica.SIunits.Temperature T_out_CO2_des = from_degC(715);
- parameter Modelica.SIunits.Power P_nom_des = 164000;
+ parameter Modelica.Units.SI.Temperature T_out_CO2_des = from_degC(715);
+ parameter Modelica.Units.SI.Power P_nom_des = 164000;
parameter Real ratio_m_des = 1 "ratio of m_CO2_des/m_HTF_des at design point";
parameter Integer N_exch = 8;
- parameter Modelica.SIunits.HeatFlowRate Q_HX_des(fixed = false);
- parameter Modelica.SIunits.MassFlowRate m_CO2_des(fixed = false);
- parameter Modelica.SIunits.MassFlowRate m_HTF_des(fixed = false);
- parameter Modelica.SIunits.ThermalConductance UA_HX(fixed = false) "on-design conductance of the overall exchanger";
- parameter Modelica.SIunits.ThermalConductance[N_exch-1] UA_HX_dis(each fixed = false) "on-design conductance of the exchanger";
- parameter Modelica.SIunits.SpecificEnthalpy h_in_HTF_des(fixed = false, start = 855e3);
- parameter Modelica.SIunits.SpecificEnthalpy h_in_CO2_des(fixed = false, start = 9e5);
- parameter Modelica.SIunits.SpecificEnthalpy h_out_HTF_des(fixed = false);
- parameter Modelica.SIunits.SpecificEnthalpy h_out_CO2_des(fixed = false, start = 1.2e6);
+ parameter Modelica.Units.SI.HeatFlowRate Q_HX_des(fixed = false);
+ parameter Modelica.Units.SI.MassFlowRate m_CO2_des(fixed = false);
+ parameter Modelica.Units.SI.MassFlowRate m_HTF_des(fixed = false);
+ parameter Modelica.Units.SI.ThermalConductance UA_HX(fixed = false) "on-design conductance of the overall exchanger";
+ parameter Modelica.Units.SI.ThermalConductance[N_exch-1] UA_HX_dis(each fixed = false) "on-design conductance of the exchanger";
+ parameter Modelica.Units.SI.SpecificEnthalpy h_in_HTF_des(fixed = false, start = 855e3);
+ parameter Modelica.Units.SI.SpecificEnthalpy h_in_CO2_des(fixed = false, start = 9e5);
+ parameter Modelica.Units.SI.SpecificEnthalpy h_out_HTF_des(fixed = false);
+ parameter Modelica.Units.SI.SpecificEnthalpy h_out_CO2_des(fixed = false, start = 1.2e6);
parameter Real[N_exch] deltaT_des(each fixed = false, each start = 75);
- parameter Modelica.SIunits.AbsolutePressure p_in_CO2_des(fixed = false);
- parameter Modelica.SIunits.AbsolutePressure p_in_HTF_des(fixed = false);
- parameter Modelica.SIunits.AbsolutePressure p_out_CO2_des(fixed = false);
- parameter Modelica.SIunits.AbsolutePressure p_out_HTF_des(fixed = false);
- parameter Modelica.SIunits.Temperature[N_exch] T_CO2_des(each fixed = false, start={from_degC(600) + 120*(i/N_exch) for i in 1:N_exch});
- parameter Modelica.SIunits.Temperature[N_exch] T_HTF_des(each fixed = false, start = {from_degC(650) + 120*(i/N_exch) for i in 1:N_exch});
+ parameter Modelica.Units.SI.AbsolutePressure p_in_CO2_des(fixed = false);
+ parameter Modelica.Units.SI.AbsolutePressure p_in_HTF_des(fixed = false);
+ parameter Modelica.Units.SI.AbsolutePressure p_out_CO2_des(fixed = false);
+ parameter Modelica.Units.SI.AbsolutePressure p_out_HTF_des(fixed = false);
+ parameter Modelica.Units.SI.Temperature[N_exch] T_CO2_des(each fixed = false, start={from_degC(600) + 120*(i/N_exch) for i in 1:N_exch});
+ parameter Modelica.Units.SI.Temperature[N_exch] T_HTF_des(each fixed = false, start = {from_degC(650) + 120*(i/N_exch) for i in 1:N_exch});
parameter MedPB.ThermodynamicState[N_exch] state_CO2_des(each p.fixed = false, each h.fixed = false, each p.start = 25e6, each h.start = 1e6);
parameter MedPB.ThermodynamicState[N_exch] state_HTF_des(each p.fixed = false, each h.fixed = false, each p.start = 1e5, each h.start = 855004);
MedPB.ThermodynamicState[N_exch] state_CO2;
MedPB.ThermodynamicState[N_exch] state_HTF;
- Modelica.SIunits.SpecificEnthalpy[N_exch] h_CO2(start = {9.9e5 + (i/N_exch)*2e5 for i in 1:N_exch});
- Modelica.SIunits.SpecificEnthalpy[N_exch] h_HTF(start={6e5 + (i/N_exch)*2e5 for i in 1:N_exch});
- Modelica.SIunits.TemperatureDifference[N_exch] deltaT "Temperature difference in the heat exchangers";
- Modelica.SIunits.HeatFlowRate Q_HX;
- Modelica.SIunits.Temperature T_CO2_out;
- Modelica.SIunits.Temperature T_HTF_out;
- Modelica.SIunits.TemperatureDifference deltaTAve;
- Modelica.SIunits.MassFlowRate m_HTF_bis (start=P_nom_des/1e5);
+ Modelica.Units.SI.SpecificEnthalpy[N_exch] h_CO2(start = {9.9e5 + (i/N_exch)*2e5 for i in 1:N_exch});
+ Modelica.Units.SI.SpecificEnthalpy[N_exch] h_HTF(start={6e5 + (i/N_exch)*2e5 for i in 1:N_exch});
+ Modelica.Units.SI.TemperatureDifference[N_exch] deltaT "Temperature difference in the heat exchangers";
+ Modelica.Units.SI.HeatFlowRate Q_HX;
+ Modelica.Units.SI.Temperature T_CO2_out;
+ Modelica.Units.SI.Temperature T_HTF_out;
+ Modelica.Units.SI.TemperatureDifference deltaTAve;
+ Modelica.Units.SI.MassFlowRate m_HTF_bis (start=P_nom_des/1e5);
input Boolean m_sup "when m_sup=false, m_HTF=m_HTF_design and P_elec=0 -> allows switching off the PB";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/FlowSplitter.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/FlowSplitter.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/FlowSplitter.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/FlowSplitter.mo" 2022-03-10 09:58:08.308147967 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Models.PowerBlocks.sCO2Cycle.DirectDesign;
model FlowSplitter
replaceable package MedRec = SolarTherm.Media.CarbonDioxide;
- parameter Modelica.SIunits.Efficiency gamma;
- Modelica.SIunits.Efficiency gamma_var;
+ parameter Modelica.Units.SI.Efficiency gamma;
+ Modelica.Units.SI.Efficiency gamma_var;
Modelica.Fluid.Interfaces.FluidPort_a port_a(redeclare package Medium = MedRec) annotation(
Placement(visible = true, transformation(origin = {60, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0),
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/HeatRecuperatorDTAve.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/HeatRecuperatorDTAve.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/HeatRecuperatorDTAve.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/HeatRecuperatorDTAve.mo" 2022-03-10 09:58:08.288147963 +0000
@@ -6,26 +6,26 @@
parameter Integer N_q = 15 "Number of subdivision of the HX";
parameter Real ratio_m_des = 1 "ratio of m_comp_des/m_turb_des; we suppose m_turb_des=1, and then scale-up";
parameter Real pinchRecuperator = 5 "pinch of the recuperator. Imposed as a closing equation for on-design";
- parameter Modelica.SIunits.ThermalConductance UA_HTR(fixed = false) "Conductance of the overall HX";
- parameter Modelica.SIunits.Power P_nom_des = 1e5;
- parameter Modelica.SIunits.ThermalConductance UA_dis[N_q - 1](each fixed = false, each start = 0.04 * P_nom_des) "on-design conductance of the heat recuperator";
+ parameter Modelica.Units.SI.ThermalConductance UA_HTR(fixed = false) "Conductance of the overall HX";
+ parameter Modelica.Units.SI.Power P_nom_des = 1e5;
+ parameter Modelica.Units.SI.ThermalConductance UA_dis[N_q - 1](each fixed = false, each start = 0.04 * P_nom_des) "on-design conductance of the heat recuperator";
parameter Medium.ThermodynamicState[N_q] state_turb_des(each p.fixed = false, each h.fixed = false,h.start = {530000 + i / N_q * 500000 for i in 1:N_q});
parameter Medium.ThermodynamicState[N_q] state_comp_des(each p.fixed = false, each h.fixed = false, h.start = {500000 + i / N_q * 500000 for i in 1:N_q});
parameter Medium.Temperature[N_q] T_turb_des(each fixed = false, start = {140 + 273.15 + i / N_q * 300 for i in 1:N_q});
parameter Medium.Temperature[N_q] T_comp_des(each fixed = false, start = {120 + 273.15 + i / N_q * 300 for i in 1:N_q});
- parameter Modelica.SIunits.TemperatureDifference[N_q] deltaT_des(each fixed = false, each start = 25);
- parameter Modelica.SIunits.MassFlowRate m_comp_des(fixed = false, start = P_nom_des / 1e5) "on-design mass flow from the compressor";
- parameter Modelica.SIunits.MassFlowRate m_turb_des(fixed = false, start = P_nom_des / 1e5) "on-design mass flow from the turbine";
- parameter Modelica.SIunits.HeatFlowRate Q_HX_des(fixed = false);
- parameter Modelica.SIunits.HeatFlowRate Q_dis_des(fixed = false, start=18600);
- parameter Modelica.SIunits.SpecificEnthalpy h_in_turb_des(fixed = false);
- parameter Modelica.SIunits.SpecificEnthalpy h_out_turb_des(fixed = false, start=5.5e5);
- parameter Modelica.SIunits.SpecificEnthalpy h_in_comp_des(fixed = false);
- parameter Modelica.SIunits.SpecificEnthalpy h_out_comp_des(fixed = false, start=8e5);
- parameter Modelica.SIunits.AbsolutePressure p_in_turb_des(fixed = false, start=8e6);
- parameter Modelica.SIunits.AbsolutePressure p_out_turb_des(fixed = false, start=8e6);
- parameter Modelica.SIunits.AbsolutePressure p_in_comp_des(fixed = false, start=22e6);
- parameter Modelica.SIunits.AbsolutePressure p_out_comp_des(fixed = false, start=22e6);
+ parameter Modelica.Units.SI.TemperatureDifference[N_q] deltaT_des(each fixed = false, each start = 25);
+ parameter Modelica.Units.SI.MassFlowRate m_comp_des(fixed = false, start = P_nom_des / 1e5) "on-design mass flow from the compressor";
+ parameter Modelica.Units.SI.MassFlowRate m_turb_des(fixed = false, start = P_nom_des / 1e5) "on-design mass flow from the turbine";
+ parameter Modelica.Units.SI.HeatFlowRate Q_HX_des(fixed = false);
+ parameter Modelica.Units.SI.HeatFlowRate Q_dis_des(fixed = false, start=18600);
+ parameter Modelica.Units.SI.SpecificEnthalpy h_in_turb_des(fixed = false);
+ parameter Modelica.Units.SI.SpecificEnthalpy h_out_turb_des(fixed = false, start=5.5e5);
+ parameter Modelica.Units.SI.SpecificEnthalpy h_in_comp_des(fixed = false);
+ parameter Modelica.Units.SI.SpecificEnthalpy h_out_comp_des(fixed = false, start=8e5);
+ parameter Modelica.Units.SI.AbsolutePressure p_in_turb_des(fixed = false, start=8e6);
+ parameter Modelica.Units.SI.AbsolutePressure p_out_turb_des(fixed = false, start=8e6);
+ parameter Modelica.Units.SI.AbsolutePressure p_in_comp_des(fixed = false, start=22e6);
+ parameter Modelica.Units.SI.AbsolutePressure p_out_comp_des(fixed = false, start=22e6);
Modelica.Fluid.Interfaces.FluidPort_a from_comp_port_a(redeclare package Medium = Medium)
annotation (Placement(visible = true,transformation(origin = {-8, 25}, extent = {{-6, -6}, {6, 6}}, rotation = 0),
@@ -40,16 +40,16 @@
annotation (Placement(visible = true,transformation(origin = {-26, 11}, extent = {{-6, -6}, {6, 6}}, rotation = 0),
iconTransformation(origin = {-26, 11}, extent = {{-2.5, -2.5}, {2.5, 2.5}}, rotation = 0)));
- Modelica.SIunits.SpecificEnthalpy[N_q] h_from_turb(start = {500000 + (i - 1) / N_q * 200000 for i in 1:N_q});
+ Modelica.Units.SI.SpecificEnthalpy[N_q] h_from_turb(start = {500000 + (i - 1) / N_q * 200000 for i in 1:N_q});
Medium.Temperature[N_q] T_from_turb(start = {350 + (i - 1) / N_q * 150 for i in 1:N_q});
Medium.Temperature[N_q] T_from_comp(start = {320 + (i - 1) / N_q * 150 for i in 1:N_q});
- Modelica.SIunits.SpecificEnthalpy[N_q] h_from_comp(start = {480000 + (i - 1) / N_q * 200000 for i in 1:N_q});
+ Modelica.Units.SI.SpecificEnthalpy[N_q] h_from_comp(start = {480000 + (i - 1) / N_q * 200000 for i in 1:N_q});
Real[N_q] deltaT(start = {150 for i in 1:N_q});
- Modelica.SIunits.HeatFlowRate Q_HX;
+ Modelica.Units.SI.HeatFlowRate Q_HX;
protected
Medium.ThermodynamicState[N_q] state_from_turb, state_from_comp;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/RecompressionCycle.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/RecompressionCycle.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/RecompressionCycle.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/RecompressionCycle.mo" 2022-03-10 09:58:08.224147955 +0000
@@ -3,12 +3,12 @@
model RecompressionCycle
extends Modelica.Icons.Example;
import FI = SolarTherm.Models.Analysis.Finances;
- import Modelica.SIunits.Conversions.*;
+ import Modelica.Units.Conversions.*;
replaceable package MedPB = SolarTherm.Media.CarbonDioxide;
replaceable package MedRec = SolarTherm.Media.SolidParticles.CarboHSP_ph;
- Modelica.SIunits.Power W_net "Net electric power output";
+ Modelica.Units.SI.Power W_net "Net electric power output";
// PB parameters
parameter Real nu_min = 0.25 "Minimum turbine operation";
@@ -16,25 +16,25 @@
Modelica.Blocks.Sources.RealExpression T_amb(y = from_degC(45));
//Cycle parameters
- parameter Modelica.SIunits.AbsolutePressure p_high = 20e6 "high pressure of the cycle";
- parameter Modelica.SIunits.ThermodynamicTemperature T_high = from_degC(715) "inlet temperature of the turbine";
- parameter Modelica.SIunits.ThermodynamicTemperature T_amb_des = from_degC(30) "ambient temperature";
- parameter Modelica.SIunits.Efficiency PR = 2.5 "Pressure ratio";
- parameter Modelica.SIunits.Power P_gro = 100e6 "first guess of power outlet";
- parameter Modelica.SIunits.Power P_nom (fixed=false) "Electrical power at design point";
- parameter Modelica.SIunits.MassFlowRate m_HTF_des = 1000 "Mass flow rate at design point";
- parameter Modelica.SIunits.Efficiency gamma = 0.28 "Part of the mass flow going to the recompression directly";
- parameter Modelica.SIunits.AngularVelocity[4] choiceN = {75000,30000,10000,3600}*0.10471975512 ;
- parameter Modelica.SIunits.AngularVelocity N_shaft=(choiceN[integer(Modelica.Math.log(P_gro/1e6)/Modelica.Math.log(10))+2]);
+ parameter Modelica.Units.SI.AbsolutePressure p_high = 20e6 "high pressure of the cycle";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_high = from_degC(715) "inlet temperature of the turbine";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_amb_des = from_degC(30) "ambient temperature";
+ parameter Modelica.Units.SI.Efficiency PR = 2.5 "Pressure ratio";
+ parameter Modelica.Units.SI.Power P_gro = 100e6 "first guess of power outlet";
+ parameter Modelica.Units.SI.Power P_nom (fixed=false) "Electrical power at design point";
+ parameter Modelica.Units.SI.MassFlowRate m_HTF_des = 1000 "Mass flow rate at design point";
+ parameter Modelica.Units.SI.Efficiency gamma = 0.28 "Part of the mass flow going to the recompression directly";
+ parameter Modelica.Units.SI.AngularVelocity[4] choiceN = {75000,30000,10000,3600}*0.10471975512 ;
+ parameter Modelica.Units.SI.AngularVelocity N_shaft=(choiceN[integer(Modelica.Math.log(P_gro/1e6)/Modelica.Math.log(10))+2]);
// main Compressor parameters
- parameter Modelica.SIunits.Efficiency eta_comp_main = 0.89 "Maximal isentropic efficiency of the compressors";
+ parameter Modelica.Units.SI.Efficiency eta_comp_main = 0.89 "Maximal isentropic efficiency of the compressors";
// reCompressor parameters
- parameter Modelica.SIunits.Efficiency eta_comp_re = 0.89 "Maximal isentropic efficiency of the compressors";
+ parameter Modelica.Units.SI.Efficiency eta_comp_re = 0.89 "Maximal isentropic efficiency of the compressors";
//Turbine parameters
- parameter Modelica.SIunits.Efficiency eta_turb = 0.93 "Maximal isentropic efficiency of the turbine";
+ parameter Modelica.Units.SI.Efficiency eta_turb = 0.93 "Maximal isentropic efficiency of the turbine";
//HTR Heat recuperator parameters
parameter Integer N_HTR = 15;
@@ -44,10 +44,10 @@
parameter Real ratio_m_des = 1 - gamma;
//Cooler parameters
- parameter Modelica.SIunits.ThermodynamicTemperature T_low = from_degC(45) "Outlet temperature of the cooler";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_low = from_degC(45) "Outlet temperature of the cooler";
//Exchanger parameters
- parameter Modelica.SIunits.ThermodynamicTemperature T_HTF_in_des = from_degC(800);
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_HTF_in_des = from_degC(800);
parameter Integer N_exch = 5;
@@ -64,9 +64,9 @@
parameter FI.Money pri_exchanger = 150 "price of the primary exchanger in $/(kW_th). Objective for next-gen CSP with particles";
//Results
- Modelica.SIunits.Efficiency eta_cycle;
+ Modelica.Units.SI.Efficiency eta_cycle;
- Modelica.SIunits.Energy E_net(final start=0, fixed=true, displayUnit="MW.h");
+ Modelica.Units.SI.Energy E_net(final start=0, fixed=true, displayUnit="MW.h");
Boolean m_sup "Disconnect the production of electricity when the outlet pressure of the turbine is close to the critical pressure";
//Components instanciation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/TestTransient.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/TestTransient.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/TestTransient.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/TestTransient.mo" 2022-03-10 09:58:08.188147952 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.PowerBlocks.sCO2Cycle.DirectDesign;
model TestTransient
import FI = SolarTherm.Models.Analysis.Finances;
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
extends SolarTherm.Media.CO2.PropCO2;
replaceable package MedPB = SolarTherm.Media.CO2.CO2_ph;
replaceable package MedRec = SolarTherm.Media.SolidParticles.CarboHSP_ph;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/Turbine.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/Turbine.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/Turbine.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/Turbine.mo" 2022-03-10 09:58:08.164147949 +0000
@@ -1,20 +1,20 @@
within SolarTherm.Models.PowerBlocks.sCO2Cycle.DirectDesign;
model Turbine "OD model of a turbine"
extends SolarTherm.Interfaces.Models.Turbine;
- import Modelica.SIunits.Conversions.*;
+ import Modelica.Units.Conversions.*;
replaceable package Medium = SolarTherm.Media.CarbonDioxide;
- parameter Modelica.SIunits.Efficiency eta_design = 0.9 "isentropic efficiency of the turbine";
- parameter Modelica.SIunits.Efficiency PR = 3 "Pressure ratio";
- parameter Modelica.SIunits.Temperature T_amb = from_degC(40) "Outlet temperature";
- parameter Modelica.SIunits.Area A_nozzle(fixed = false);
- parameter Modelica.SIunits.AngularVelocity N_shaft = 3358;
- parameter Modelica.SIunits.Diameter diam_turb(fixed = false);
- parameter Modelica.SIunits.Velocity tipSpeed_des(fixed = false);
+ parameter Modelica.Units.SI.Efficiency eta_design = 0.9 "isentropic efficiency of the turbine";
+ parameter Modelica.Units.SI.Efficiency PR = 3 "Pressure ratio";
+ parameter Modelica.Units.SI.Temperature T_amb = from_degC(40) "Outlet temperature";
+ parameter Modelica.Units.SI.Area A_nozzle(fixed = false);
+ parameter Modelica.Units.SI.AngularVelocity N_shaft = 3358;
+ parameter Modelica.Units.SI.Diameter diam_turb(fixed = false);
+ parameter Modelica.Units.SI.Velocity tipSpeed_des(fixed = false);
- Modelica.SIunits.Efficiency eta_turb "efficiency of the turbine";
- Modelica.SIunits.Density d_outlet;
- Modelica.SIunits.Velocity C_spouting(start = C_spouting_des);
+ Modelica.Units.SI.Efficiency eta_turb "efficiency of the turbine";
+ Modelica.Units.SI.Density d_outlet;
+ Modelica.Units.SI.Velocity C_spouting(start = C_spouting_des);
Medium.ThermodynamicState state_a (h.start=h_in_des) "thermodynamic state at the entrance";
Medium.ThermodynamicState state_isen "thermodynamic state at the end of the isentropic decompression";
Medium.ThermodynamicState state_b "thermodynamic state at the end of the real decompresssion";
@@ -22,18 +22,18 @@
parameter Medium.ThermodynamicState state_in_des(p.fixed = false, h.fixed = false, h.start = 1.2e6);
parameter Medium.ThermodynamicState state_isen_des(p.fixed = false, h.fixed = false);
parameter Medium.ThermodynamicState state_out_des(p.fixed = false, h.fixed = false, h.start = 9e5);
- parameter Modelica.SIunits.SpecificEnthalpy h_in_des(fixed = false);
- parameter Modelica.SIunits.SpecificEnthalpy h_out_des(fixed = false);
- parameter Modelica.SIunits.AbsolutePressure p_in_des(fixed = false);
- parameter Modelica.SIunits.AbsolutePressure p_out_des(fixed = false, start = 80e5);
- parameter Modelica.SIunits.Velocity C_spouting_des(fixed = false, start = 500);
- parameter Modelica.SIunits.MassFlowRate m_des(fixed = false);
- parameter Modelica.SIunits.Power W_turb_des(fixed = false);
- Modelica.SIunits.Power W_turb "Outlet power";
- Modelica.SIunits.AbsolutePressure p_out(start = p_out_des);
- Modelica.SIunits.SpecificEntropy s_entrance " entropy at the entrance of the turbine";
+ parameter Modelica.Units.SI.SpecificEnthalpy h_in_des(fixed = false);
+ parameter Modelica.Units.SI.SpecificEnthalpy h_out_des(fixed = false);
+ parameter Modelica.Units.SI.AbsolutePressure p_in_des(fixed = false);
+ parameter Modelica.Units.SI.AbsolutePressure p_out_des(fixed = false, start = 80e5);
+ parameter Modelica.Units.SI.Velocity C_spouting_des(fixed = false, start = 500);
+ parameter Modelica.Units.SI.MassFlowRate m_des(fixed = false);
+ parameter Modelica.Units.SI.Power W_turb_des(fixed = false);
+ Modelica.Units.SI.Power W_turb "Outlet power";
+ Modelica.Units.SI.AbsolutePressure p_out(start = p_out_des);
+ Modelica.Units.SI.SpecificEntropy s_entrance " entropy at the entrance of the turbine";
initial equation
state_in_des = Medium.setState_phX(p_in_des, h_in_des);
state_isen_des = Medium.setState_psX(p_in_des / PR, Medium.specificEntropy(state_in_des));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/recompPB.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/recompPB.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/recompPB.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/recompPB.mo" 2022-03-10 09:58:08.144147947 +0000
@@ -1,9 +1,9 @@
within SolarTherm.Models.PowerBlocks.sCO2Cycle.DirectDesign;
model recompPB
extends SolarTherm.Media.CO2.PropCO2;
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import FI = SolarTherm.Models.Analysis.Finances;
- import Modelica.SIunits.Conversions.*;
+ import Modelica.Units.Conversions.*;
replaceable package MedPB = SolarTherm.Media.CO2.CO2_ph;
replaceable package MedRec = SolarTherm.Media.SolidParticles.CarboHSP_ph;
extends Icons.PowerBlock;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/simpleRecupPB.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/simpleRecupPB.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/simpleRecupPB.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/simpleRecupPB.mo" 2022-03-10 09:58:08.092147939 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Models.PowerBlocks.sCO2Cycle.DirectDesign;
model simpleRecupPB
import FI = SolarTherm.Models.Analysis.Finances;
- import SI = Modelica.SIunits;
- import Modelica.SIunits.Conversions.*;
+ import Modelica.Units.SI;
+ import Modelica.Units.Conversions.*;
extends SolarTherm.Media.CO2.PropCO2;
replaceable package MedPB = SolarTherm.Media.CO2.CO2_ph;
replaceable package MedRec = SolarTherm.Media.SolidParticles.CarboHSP_ph;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/test.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/test.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/test.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/test.mo" 2022-03-10 09:58:08.004147927 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.PowerBlocks.sCO2Cycle.DirectDesign;
model test
extends SolarTherm.Media.CO2.PropCO2;
- import CV = Modelica.SIunits.Conversions;
+ import CV = Modelica.Units.Conversions;
replaceable package MedPB = SolarTherm.Media.CO2.CO2_ph;
replaceable package MedRec = SolarTherm.Media.SolidParticles.CarboHSP_ph;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/testBis.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/testBis.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/testBis.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/DirectDesign/testBis.mo" 2022-03-10 09:58:07.996147927 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.PowerBlocks.sCO2Cycle.DirectDesign;
model testBis
extends SolarTherm.Media.CO2.PropCO2;
- import CV = Modelica.SIunits.Conversions;
+ import CV = Modelica.Units.Conversions;
replaceable package MedPB = SolarTherm.Media.CO2.CO2_ph;
replaceable package MedRec = SolarTherm.Media.SolidParticles.CarboHSP_ph;
parameter MedPB.ThermodynamicState state_CO2_in_des(p.fixed = false, h.fixed = false);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/CO2PB.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/CO2PB.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/CO2PB.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/CO2PB.mo" 2022-03-10 09:58:07.956147923 +0000
@@ -4,20 +4,20 @@
replaceable package MedPB = SolarTherm.Media.CO2.CO2_ph;
replaceable package MedRec = SolarTherm.Media.SolidParticles.CarboHSP_ph;
//Cycle parameters
- parameter Modelica.SIunits.AbsolutePressure p_high = 250 * 10 ^ 5 "high pressure of the cycle";
- parameter Modelica.SIunits.ThermodynamicTemperature T_high = 600 + 273.15 "inlet temperature of the turbine";
- parameter Modelica.SIunits.ThermodynamicTemperature T_amb = 30 + 273.15 "ambiant temperature";
+ parameter Modelica.Units.SI.AbsolutePressure p_high = 250 * 10 ^ 5 "high pressure of the cycle";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_high = 600 + 273.15 "inlet temperature of the turbine";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_amb = 30 + 273.15 "ambiant temperature";
parameter Real PR = 3 "Pressure ratio";
- parameter Modelica.SIunits.Power P_nom = 164000 "Nominal electrical power";
- parameter Modelica.SIunits.MassFlowRate m_flow_design = 1.48 "Design mass flow rate in kg/s";
+ parameter Modelica.Units.SI.Power P_nom = 164000 "Nominal electrical power";
+ parameter Modelica.Units.SI.MassFlowRate m_flow_design = 1.48 "Design mass flow rate in kg/s";
// Compressor parameters
- parameter Modelica.SIunits.Efficiency eta_comp = 0.87 "Maximal isentropic efficiency of the compressors";
+ parameter Modelica.Units.SI.Efficiency eta_comp = 0.87 "Maximal isentropic efficiency of the compressors";
parameter Real diam_rotor = 0.039 "On-design diameter of the compressor's rotor";
parameter Real N_design = 6545 "On-design rotationnal speed in rad/s";
parameter Real psi_des = 2.73 "On-design adimensionned head";
//Turbine parameters
- parameter Modelica.SIunits.Efficiency eta_turb = 0.93 "Maximal isentropic efficiency of the turbine";
- parameter Modelica.SIunits.Area A_nozzle = 4.420 * 10 ^ (-5) "Nozzle area of the turbine, in m2";
+ parameter Modelica.Units.SI.Efficiency eta_turb = 0.93 "Maximal isentropic efficiency of the turbine";
+ parameter Modelica.Units.SI.Area A_nozzle = 4.420 * 10 ^ (-5) "Nozzle area of the turbine, in m2";
parameter Real N_shaft = 6545 "On-design rotationnal speed in rad/s";
parameter Real diam_turb = 0.129 "On-design diameter of the turbine's rotor";
//Heat recuperator parameters
@@ -25,19 +25,19 @@
//parameter SolarTherm.Types.Conductance UA_dis[N_q-1]={2317.31,1602.02,1227.35,998.003,843.919,733.841,651.637,588.14,537.786,497.038,463.489,435.471,411.781,391.529,374.072,358.888,345.606,333.899,323.526,314.311,306.059,298.627,291.93,285.879,280.373,275.365,270.776,266.572,262.709,259.167,255.894,252.856,250.055,247.456,245.04,242.78,240.681,238.699,236.859};
parameter Integer N_q = 15;
parameter SolarTherm.Types.Conductance[N_q - 1] UA_dis = {5201.28, 2519.91, 1731.07, 1360.73, 1150.91, 1018.64, 929.279, 865.836, 818.941, 783.311, 755.569, 733.446, 715.599, 700.851};
- parameter Modelica.SIunits.MassFlowRate m_des_comp = 1.48;
- parameter Modelica.SIunits.MassFlowRate m_des_turb = 1.48;
+ parameter Modelica.Units.SI.MassFlowRate m_des_comp = 1.48;
+ parameter Modelica.Units.SI.MassFlowRate m_des_turb = 1.48;
//Exchanger parameters
parameter SolarTherm.Types.Conductance UA_exch = 58694 "Conductance per sub-heat exchanger";
- parameter Modelica.SIunits.SpecificEnthalpy h_HTF_design = 293902 "Inlet enthalpy of the HTF. For convergence when m_flow too low";
- parameter Modelica.SIunits.MassFlowRate m_des_CO2 = 1.48;
- parameter Modelica.SIunits.MassFlowRate m_des_HTF = 1.48;
+ parameter Modelica.Units.SI.SpecificEnthalpy h_HTF_design = 293902 "Inlet enthalpy of the HTF. For convergence when m_flow too low";
+ parameter Modelica.Units.SI.MassFlowRate m_des_CO2 = 1.48;
+ parameter Modelica.Units.SI.MassFlowRate m_des_HTF = 1.48;
//Cooler parameters
parameter SolarTherm.Types.Conductance UA_cooler = 4745 "Conductance of the cooler in W/K";
- parameter Modelica.SIunits.ThermodynamicTemperature T_low = 45 + 273.15 "Outlet temperature of the cooler";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_low = 45 + 273.15 "Outlet temperature of the cooler";
//Results
- Modelica.SIunits.Efficiency eta_cycle;
- Modelica.SIunits.Power P_elec;
+ Modelica.Units.SI.Efficiency eta_cycle;
+ Modelica.Units.SI.Power P_elec;
Boolean m_sup "Disconnect the production of electricity when the outlet pressure of the turbine is close to the critical pressure";
//Components instanciation
SolarTherm.Models.PowerBlocks.sCO2Cycle.OffDesign.HeatRecuperatorTLMD recuperator(N_q = N_q, UA_dis = UA_dis, m_des_comp = m_des_comp, m_des_turb = m_des_turb) annotation(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/CompressorOnShaft.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/CompressorOnShaft.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/CompressorOnShaft.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/CompressorOnShaft.mo" 2022-03-10 09:58:07.928147918 +0000
@@ -10,18 +10,18 @@
parameter Real diam_rotor = 0.18 "on-design diameter of the rotor";
parameter Real N_design = 3358 "Design rotationnal speed in rad/s";
parameter Real psi_des = 2.63 "on-design adimensionned head";
- Modelica.SIunits.AbsolutePressure p_out(start = 250 * 10 ^ 5) "outlet pressure";
+ Modelica.Units.SI.AbsolutePressure p_out(start = 250 * 10 ^ 5) "outlet pressure";
MedPB.ThermodynamicState state_a "thermodynamic state at the entrance";
MedPB.ThermodynamicState state_isen "thermodynamic state at the end of the isentropic compression";
MedPB.ThermodynamicState state_b "thermodynamic state at the end of the real compresssion";
- Modelica.SIunits.Power W_comp "power used for compression";
- Modelica.SIunits.SpecificEntropy s_entrance "entropy at the entrance of the compressor";
+ Modelica.Units.SI.Power W_comp "power used for compression";
+ Modelica.Units.SI.SpecificEntropy s_entrance "entropy at the entrance of the compressor";
Real phi "adimensionned mass flow rate";
Real psi "adimensionned head";
Real tipSpeed "tip Speed of the rotor";
Real d_entrance(start = 267) "desity at the inlet";
- Modelica.SIunits.Efficiency eta_comp(start = eta_design) "isentropic efficiency of the compressor";
- equation
+
+ Modelica.Units.SI.Efficiency eta_comp(start = eta_design) "isentropic efficiency of the compressor"; equation
state_a = MedPB.setState_phX(port_a.p, inStream(port_a.h_outflow));
s_entrance = MedPB.specificEntropy(state_a);
state_isen = MedPB.setState_psX(p_out, s_entrance);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/CompressorToDiscuss.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/CompressorToDiscuss.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/CompressorToDiscuss.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/CompressorToDiscuss.mo" 2022-03-10 09:58:07.912147917 +0000
@@ -8,15 +8,15 @@
Placement(visible = true, transformation(origin = {42, -54}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {30, -74}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
parameter Real eta_design = 0.87 "Maximal isentropic efficiency of the compressor";
parameter Real PR = 2.313 "Pressure ratio";
- parameter Modelica.SIunits.AbsolutePressure p_out = 250 * 10 ^ 5 "outlet pressure";
- parameter Modelica.SIunits.ThermodynamicTemperature T_amb = 273.15 + 40 "Outlet temperature in Kelvin";
+ parameter Modelica.Units.SI.AbsolutePressure p_out = 250 * 10 ^ 5 "outlet pressure";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_amb = 273.15 + 40 "Outlet temperature in Kelvin";
parameter Real flowGuess = 1000;
MedPB.ThermodynamicState state_a "thermodynamic state at the entrance";
MedPB.ThermodynamicState state_isen "thermodynamic state at the end of the isentropic compression";
MedPB.ThermodynamicState state_b "thermodynamic state at the end of the real compresssion";
- Modelica.SIunits.Power W_comp "power used for compression";
+ Modelica.Units.SI.Power W_comp "power used for compression";
//SolarTherm.Types.SpecificExergy ex_d "destroyed exergy";
- Modelica.SIunits.SpecificEntropy s_entrance "exergy at the entrance of the compressor";
+ Modelica.Units.SI.SpecificEntropy s_entrance "exergy at the entrance of the compressor";
// Real phi;
// Real psi;
parameter Real diam_rotor = 0.18;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/Cooler.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/Cooler.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/Cooler.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/Cooler.mo" 2022-03-10 09:58:07.876147911 +0000
@@ -2,20 +2,20 @@
model Cooler
extends SolarTherm.Media.CO2.PropCO2;
replaceable package MedPB = SolarTherm.Media.CO2.CO2_ph;
- input Modelica.SIunits.ThermodynamicTemperature T_amb "Ambiant temperature in Kelvin";
+ input Modelica.Units.SI.ThermodynamicTemperature T_amb "Ambiant temperature in Kelvin";
Modelica.Fluid.Interfaces.FluidPort_a port_a(redeclare package Medium = MedPB) annotation(
Placement(visible = true, transformation(origin = {0, -78}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {2, -80}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Fluid.Interfaces.FluidPort_b port_b(redeclare package Medium = MedPB) annotation(
Placement(visible = true, transformation(origin = {-2, 80}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {0, 80}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
parameter SolarTherm.Types.Conductance UA_cooler "Conductance of the cooler in W/K";
- parameter Modelica.SIunits.ThermodynamicTemperature T_low = 55 + 273.15;
- parameter Modelica.SIunits.Power P_cool_design = 1.49*10^6 "power necessary to cool down at design point";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_low = 55 + 273.15;
+ parameter Modelica.Units.SI.Power P_cool_design = 1.49*10^6 "power necessary to cool down at design point";
parameter Real deltaT_design = 15 "Difference between ambient and outlet CO2 temperature";
MedPB.ThermodynamicState state_a "Thermodynamic State at the entrance";
MedPB.ThermodynamicState state_b "Thermodynamic State at the outlet";
Real[2] deltaT;
- Modelica.SIunits.HeatFlowRate Q_cooler;
- Modelica.SIunits.Power P_cooling;
+ Modelica.Units.SI.HeatFlowRate Q_cooler;
+ Modelica.Units.SI.Power P_cooling;
Real deltaT_ave "average difference of temperature with the ambiant";
equation
deltaT = {MedPB.temperature(state_a) - T_amb, MedPB.temperature(state_b) - T_amb};
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/Exchanger.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/Exchanger.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/Exchanger.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/Exchanger.mo" 2022-03-10 09:58:07.860147911 +0000
@@ -3,10 +3,10 @@
extends SolarTherm.Media.CO2.PropCO2;
replaceable package MedPB = SolarTherm.Media.CO2.CO2_ph;
replaceable package MedRec = SolarTherm.Media.Sodium.ConstSodium;
- parameter Modelica.SIunits.MassFlowRate m_des_CO2 = 1.56;
- parameter Modelica.SIunits.MassFlowRate m_des_HTF = 1.56;
+ parameter Modelica.Units.SI.MassFlowRate m_des_CO2 = 1.56;
+ parameter Modelica.Units.SI.MassFlowRate m_des_HTF = 1.56;
parameter SolarTherm.Types.Conductance UA_HTR = 30000 "on-design conductance of the exchanger";
- parameter Modelica.SIunits.SpecificEnthalpy h_HTF_design = 272193;
+ parameter Modelica.Units.SI.SpecificEnthalpy h_HTF_design = 272193;
Modelica.Fluid.Interfaces.FluidPort_a HTF_port_a(redeclare package Medium = MedRec) annotation(
Placement(visible = true, transformation(origin = {60, 54}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {62, 38}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Fluid.Interfaces.FluidPort_a CO2_port_a(redeclare package Medium = MedPB) annotation(
@@ -17,17 +17,17 @@
Placement(visible = true, transformation(origin = {58, -48}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {62, -58}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
MedPB.ThermodynamicState[2] state_CO2;
MedRec.ThermodynamicState[2] state_HTF;
- Modelica.SIunits.SpecificEnthalpy[2] h_CO2(start = {990000, 1100000});
- Modelica.SIunits.SpecificEnthalpy[2] h_HTF;
+ Modelica.Units.SI.SpecificEnthalpy[2] h_CO2(start = {990000, 1100000});
+ Modelica.Units.SI.SpecificEnthalpy[2] h_HTF;
Real[2] deltaT "Temperature difference in the heat exchangers";
- Modelica.SIunits.HeatFlowRate Q_HX_HTR;
- Modelica.SIunits.ThermodynamicTemperature T_CO2_out;
- Modelica.SIunits.ThermodynamicTemperature T_HTF_out;
+ Modelica.Units.SI.HeatFlowRate Q_HX_HTR;
+ Modelica.Units.SI.ThermodynamicTemperature T_CO2_out;
+ Modelica.Units.SI.ThermodynamicTemperature T_HTF_out;
input Boolean m_sup;
//Real deltaT_lm;
Real deltaTAve;
- Modelica.SIunits.MassFlowRate m_HTF_bis;
- equation
+
+ Modelica.Units.SI.MassFlowRate m_HTF_bis; equation
for i in 1:2 loop
deltaT[i] = if m_sup then MedRec.temperature(state_HTF[i]) - MedPB.temperature(state_CO2[i]) else 80 + i;
state_CO2[i] = MedPB.setState_phX(CO2_port_a.p, h_CO2[i]);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/HeatRecuperatorDTAve.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/HeatRecuperatorDTAve.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/HeatRecuperatorDTAve.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/HeatRecuperatorDTAve.mo" 2022-03-10 09:58:07.840147907 +0000
@@ -3,8 +3,8 @@
extends SolarTherm.Media.CO2.PropCO2;
replaceable package MedPB = SolarTherm.Media.CO2.CO2_ph;
parameter Integer N_q = 15 "Number of subdivision of the HX";
- parameter Modelica.SIunits.MassFlowRate m_des_comp = 1.5 "on-design mass flow from the compressor";
- parameter Modelica.SIunits.MassFlowRate m_des_turb = 1.5 "on-design mass-flow from the turbine";
+ parameter Modelica.Units.SI.MassFlowRate m_des_comp = 1.5 "on-design mass flow from the compressor";
+ parameter Modelica.Units.SI.MassFlowRate m_des_turb = 1.5 "on-design mass-flow from the turbine";
parameter SolarTherm.Types.Conductance UA_dis[N_q - 1] "on-design conductance of the heat recuperator";
Modelica.Fluid.Interfaces.FluidPort_a from_comp_port_a(redeclare package Medium = MedPB) annotation(
Placement(visible = true, transformation(origin = {-60, 50}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {-78, 42}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
@@ -14,10 +14,10 @@
Placement(visible = true, transformation(origin = {60, 50}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {62, 44}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Fluid.Interfaces.FluidPort_b from_turb_port_b(redeclare package Medium = MedPB) annotation(
Placement(visible = true, transformation(origin = {-60, -50}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {-72, -58}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
- Modelica.SIunits.SpecificEnthalpy[N_q] h_from_turb(start = {500000 + (i - 1) / N_q * 200000 for i in 1:N_q});
- Modelica.SIunits.ThermodynamicTemperature[N_q] T_from_turb(start = {350 + (i - 1) / N_q * 150 for i in 1:N_q});
- Modelica.SIunits.SpecificEnthalpy[N_q] h_from_comp(start = {480000 + (i - 1) / N_q * 200000 for i in 1:N_q});
- Modelica.SIunits.ThermodynamicTemperature[N_q] T_from_comp(start = {320 + (i - 1) / N_q * 150 for i in 1:N_q});
+ Modelica.Units.SI.SpecificEnthalpy[N_q] h_from_turb(start = {500000 + (i - 1) / N_q * 200000 for i in 1:N_q});
+ Modelica.Units.SI.ThermodynamicTemperature[N_q] T_from_turb(start = {350 + (i - 1) / N_q * 150 for i in 1:N_q});
+ Modelica.Units.SI.SpecificEnthalpy[N_q] h_from_comp(start = {480000 + (i - 1) / N_q * 200000 for i in 1:N_q});
+ Modelica.Units.SI.ThermodynamicTemperature[N_q] T_from_comp(start = {320 + (i - 1) / N_q * 150 for i in 1:N_q});
Real[N_q] deltaT(start = {150 for i in 1:N_q});
protected
MedPB.ThermodynamicState[N_q] state_from_turb;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/HeatRecuperatorTLMD.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/HeatRecuperatorTLMD.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/HeatRecuperatorTLMD.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/HeatRecuperatorTLMD.mo" 2022-03-10 09:58:07.816147905 +0000
@@ -3,8 +3,8 @@
extends SolarTherm.Media.CO2.PropCO2;
replaceable package MedPB = SolarTherm.Media.CO2.CO2_ph;
parameter Integer N_q = 15;
- parameter Modelica.SIunits.MassFlowRate m_des_comp = 1.5 "on-design mass flow from the compressor";
- parameter Modelica.SIunits.MassFlowRate m_des_turb = 1.5 "on-design mass-flow from the turbine";
+ parameter Modelica.Units.SI.MassFlowRate m_des_comp = 1.5 "on-design mass flow from the compressor";
+ parameter Modelica.Units.SI.MassFlowRate m_des_turb = 1.5 "on-design mass-flow from the turbine";
parameter SolarTherm.Types.Conductance[N_q - 1] UA_dis = {835.068, 541.013, 401.981, 321.684, 269.787, 233.732, 207.392, 187.424, 171.843, 159.408, 149.301, 140.953, 133.968, 128.056};
Modelica.Fluid.Interfaces.FluidPort_a from_comp_port_a(redeclare package Medium = MedPB) annotation(
Placement(visible = true, transformation(origin = {-60, 50}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {-78, 42}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
@@ -14,10 +14,10 @@
Placement(visible = true, transformation(origin = {60, 50}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {62, 44}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Fluid.Interfaces.FluidPort_b from_turb_port_b(redeclare package Medium = MedPB) annotation(
Placement(visible = true, transformation(origin = {-60, -50}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {-72, -58}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
- Modelica.SIunits.SpecificEnthalpy[N_q] h_from_turb(start = {500000 for i in 1:N_q});
- Modelica.SIunits.ThermodynamicTemperature[N_q] T_from_turb(start = {500 for i in 1:N_q});
- Modelica.SIunits.SpecificEnthalpy[N_q] h_from_comp(start = {500000 for i in 1:N_q});
- Modelica.SIunits.ThermodynamicTemperature[N_q] T_from_comp(start = {350 for i in 1:N_q});
+ Modelica.Units.SI.SpecificEnthalpy[N_q] h_from_turb(start = {500000 for i in 1:N_q});
+ Modelica.Units.SI.ThermodynamicTemperature[N_q] T_from_turb(start = {500 for i in 1:N_q});
+ Modelica.Units.SI.SpecificEnthalpy[N_q] h_from_comp(start = {500000 for i in 1:N_q});
+ Modelica.Units.SI.ThermodynamicTemperature[N_q] T_from_comp(start = {350 for i in 1:N_q});
Real[N_q] deltaT(start = {150 for i in 1:N_q});
SolarTherm.Types.Conductance UA_HTR;
Real[N_q - 1] deltaT_lm;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/Heater.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/Heater.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/Heater.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/Heater.mo" 2022-03-10 09:58:07.800147902 +0000
@@ -2,9 +2,9 @@
model Heater
extends SolarTherm.Media.CO2.PropCO2;
replaceable package MedPB = SolarTherm.Media.CO2.CO2_ph;
- parameter Modelica.SIunits.ThermodynamicTemperature T_high = 273.15 + 715 "Outlet temperature in Kelvin";
- parameter Modelica.SIunits.ThermodynamicTemperature T_amb = 273.15 + 40 "Outlet temperature in Kelvin";
- Modelica.SIunits.HeatFlowRate Q_heater "heat transfer in the heater";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_high = 273.15 + 715 "Outlet temperature in Kelvin";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_amb = 273.15 + 40 "Outlet temperature in Kelvin";
+ Modelica.Units.SI.HeatFlowRate Q_heater "heat transfer in the heater";
MedPB.ThermodynamicState state_a "Thermodynamic State at the entrance";
MedPB.ThermodynamicState state_b "Thermodynamic State at the outlet";
Modelica.Fluid.Interfaces.FluidPort_a port_a(redeclare package Medium = MedPB) annotation(
@@ -12,8 +12,8 @@
Modelica.Fluid.Interfaces.FluidPort_b port_b(redeclare package Medium = MedPB) annotation(
Placement(visible = true, transformation(origin = {-2, 80}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {0, 80}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
SolarTherm.Types.SpecificExergy ex_d "destroyed exergy";
- Modelica.SIunits.ThermodynamicTemperature T_real;
- equation
+
+ Modelica.Units.SI.ThermodynamicTemperature T_real; equation
T_real = T_high;
state_a = MedPB.setState_phX(port_a.p, inStream(port_a.h_outflow));
state_b = MedPB.setState_pTX(port_a.p, T_real);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/Turbine.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/Turbine.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/Turbine.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/Turbine.mo" 2022-03-10 09:58:07.792147902 +0000
@@ -8,15 +8,15 @@
Placement(visible = true, transformation(origin = {60, -42}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {60, -46}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
parameter Real eta_design = 0.9 "isentropic efficiency of the turbine";
parameter Real PR = 2.313 "Pressure ratio";
- parameter Modelica.SIunits.ThermodynamicTemperature T_amb = 273.15 + 40 "Outlet temperature in Kelvin";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_amb = 273.15 + 40 "Outlet temperature in Kelvin";
MedPB.ThermodynamicState state_a "thermodynamic state at the entrance";
MedPB.ThermodynamicState state_isen "thermodynamic state at the end of the isentropic decompression";
MedPB.ThermodynamicState state_b "thermodynamic state at the end of the real decompresssion";
- Modelica.SIunits.Power W_turb "Outlet power";
- Modelica.SIunits.AbsolutePressure p_out(start = 83.3 * 10 ^ 5);
+ Modelica.Units.SI.Power W_turb "Outlet power";
+ Modelica.Units.SI.AbsolutePressure p_out(start = 83.3 * 10 ^ 5);
//SolarTherm.Types.SpecificExergy ex_d "destroyed exergy";
- Modelica.SIunits.SpecificEntropy s_entrance " entropy at the entrance of the turbine";
- parameter Modelica.SIunits.Area A_nozzle = 0.00257;
+ Modelica.Units.SI.SpecificEntropy s_entrance " entropy at the entrance of the turbine";
+ parameter Modelica.Units.SI.Area A_nozzle = 0.00257;
parameter Real N_shaft = 10000 * 5 / 6 * 2 * 3.14159 / 60;
Real d_outlet;
Real C_spouting(start = 577);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/recompPB.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/recompPB.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/recompPB.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OffDesign/recompPB.mo" 2022-03-10 09:58:07.776147899 +0000
@@ -6,50 +6,50 @@
input SolarTherm.Interfaces.Connectors.WeatherBus wbus;
//Cycle parameters
- parameter Modelica.SIunits.AbsolutePressure p_high = 200 * 10 ^ 5 "high pressure of the cycle";
- parameter Modelica.SIunits.ThermodynamicTemperature T_high = 715 + 273.15 "inlet temperature of the turbine";
- parameter Modelica.SIunits.ThermodynamicTemperature T_amb = 30 + 273.15 "ambiant temperature";
+ parameter Modelica.Units.SI.AbsolutePressure p_high = 200 * 10 ^ 5 "high pressure of the cycle";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_high = 715 + 273.15 "inlet temperature of the turbine";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_amb = 30 + 273.15 "ambiant temperature";
parameter Real PR = 2.5 "Pressure ratio";
- parameter Modelica.SIunits.Power P_nom = 100 * 10 ^ 6 "Nominal electrical power";
- parameter Modelica.SIunits.MassFlowRate m_flow_design = 747.5 "Design mass flow rate in kg/s";
+ parameter Modelica.Units.SI.Power P_nom = 100 * 10 ^ 6 "Nominal electrical power";
+ parameter Modelica.Units.SI.MassFlowRate m_flow_design = 747.5 "Design mass flow rate in kg/s";
parameter Real gamma = 0.28 "Part of the mass flow going to the recompression directly";
// main Compressor parameters
- parameter Modelica.SIunits.Efficiency eta_comp_main = 0.89 "Maximal isentropic efficiency of the compressors";
+ parameter Modelica.Units.SI.Efficiency eta_comp_main = 0.89 "Maximal isentropic efficiency of the compressors";
parameter Real diam_comp_main = 0.78 "On-design diameter of the compressor's rotor";
parameter Real N_shaft_main = 314 "On-design rotationnal speed in rad/s";
parameter Real psi_des_main = 2.41 "On-design adimensionned head";
// reCompressor parameters
- parameter Modelica.SIunits.Efficiency eta_comp_re = 0.89 "Maximal isentropic efficiency of the compressors";
+ parameter Modelica.Units.SI.Efficiency eta_comp_re = 0.89 "Maximal isentropic efficiency of the compressors";
parameter Real diam_comp_re = 0.707 "On-design diameter of the compressor's rotor";
parameter Real N_shaft_re = 314 "On-design rotationnal speed in rad/s";
parameter Real psi_des_re = 5.338 "On-design adimensionned head";
//Turbine parameters
- parameter Modelica.SIunits.Efficiency eta_turb = 0.93 "Maximal isentropic efficiency of the turbine";
- parameter Modelica.SIunits.Area A_nozzle = 0.026683 "Nozzle area of the turbine, in m2";
+ parameter Modelica.Units.SI.Efficiency eta_turb = 0.93 "Maximal isentropic efficiency of the turbine";
+ parameter Modelica.Units.SI.Area A_nozzle = 0.026683 "Nozzle area of the turbine, in m2";
parameter Real N_shaft = 314 "On-design rotationnal speed in rad/s";
parameter Real diam_turb = 2.564 "On-design diameter of the turbine's rotor";
//HTR Heat recuperator parameters
parameter Integer N_HTR = 15;
parameter SolarTherm.Types.Conductance[N_HTR - 1] UA_HTR = {3236960, 2150140, 1676220, 1413500, 1247490, 1134060, 1052000, 990283, 942490, 904248, 873103, 847405, 825941, 807725};
- parameter Modelica.SIunits.MassFlowRate m_des_comp_HTR = 737.48;
- parameter Modelica.SIunits.MassFlowRate m_des_turb_HTR = 737.48;
+ parameter Modelica.Units.SI.MassFlowRate m_des_comp_HTR = 737.48;
+ parameter Modelica.Units.SI.MassFlowRate m_des_turb_HTR = 737.48;
//LTR Heat recuperator parameters
parameter Integer N_LTR = 15;
parameter SolarTherm.Types.Conductance[N_LTR - 1] UA_LTR = {743598, 670176, 621226, 589684, 571589, 564709, 568161, 581906, 606949, 645701, 702309, 784284, 905788, 1095910};
- parameter Modelica.SIunits.MassFlowRate m_des_comp_LTR = 530.986;
- parameter Modelica.SIunits.MassFlowRate m_des_turb_LTR = 737.48;
+ parameter Modelica.Units.SI.MassFlowRate m_des_comp_LTR = 530.986;
+ parameter Modelica.Units.SI.MassFlowRate m_des_turb_LTR = 737.48;
//Exchanger parameters
parameter SolarTherm.Types.Conductance UA_exch = 1694670 "Conductance per sub-heat exchanger";
- parameter Modelica.SIunits.SpecificEnthalpy h_HTF_design = 995164 "Inlet enthalpy of the HTF. For convergence when m_flow too low";
- parameter Modelica.SIunits.MassFlowRate m_des_CO2 = 737.48;
- parameter Modelica.SIunits.MassFlowRate m_des_HTF = 730;
+ parameter Modelica.Units.SI.SpecificEnthalpy h_HTF_design = 995164 "Inlet enthalpy of the HTF. For convergence when m_flow too low";
+ parameter Modelica.Units.SI.MassFlowRate m_des_CO2 = 737.48;
+ parameter Modelica.Units.SI.MassFlowRate m_des_HTF = 730;
//Cooler parameters
parameter SolarTherm.Types.Conductance UA_cooler = 1584500 "Conductance of the cooler in W/K";
- parameter Modelica.SIunits.ThermodynamicTemperature T_low = 45 + 273.15 "Outlet temperature of the cooler";
- parameter Modelica.SIunits.Power P_cool_design = 10^6 "electricity needed for cooling";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_low = 45 + 273.15 "Outlet temperature of the cooler";
+ parameter Modelica.Units.SI.Power P_cool_design = 10^6 "electricity needed for cooling";
//Results
- Modelica.SIunits.Efficiency eta_cycle;
- Modelica.SIunits.Power P_elec;
+ Modelica.Units.SI.Efficiency eta_cycle;
+ Modelica.Units.SI.Power P_elec;
Boolean m_sup "Disconnect the production of electricity when the outlet pressure of the turbine is close to the critical pressure";
//Components instanciation
SolarTherm.Models.PowerBlocks.sCO2Cycle.OffDesign.HeatRecuperatorDTAve HTR(N_q = N_HTR, UA_dis = UA_HTR, m_des_comp = m_des_comp_HTR, m_des_turb = m_des_turb_HTR) annotation(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/CompressorNVarying.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/CompressorNVarying.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/CompressorNVarying.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/CompressorNVarying.mo" 2022-03-10 09:58:07.692147888 +0000
@@ -8,15 +8,15 @@
Placement(visible = true, transformation(origin = {42, -54}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {30, -74}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
parameter Real eta_comp = 0.87 "isentropic efficiency of the compressor";
parameter Real PR = 2.313 "Pressure ratio";
- parameter Modelica.SIunits.AbsolutePressure p_out = 250 * 10 ^ 5 "outlet pressure";
- parameter Modelica.SIunits.ThermodynamicTemperature T_amb = 273.15 + 40 "Outlet temperature in Kelvin";
+ parameter Modelica.Units.SI.AbsolutePressure p_out = 250 * 10 ^ 5 "outlet pressure";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_amb = 273.15 + 40 "Outlet temperature in Kelvin";
parameter Real flowGuess = 1000;
MedPB.ThermodynamicState state_a "thermodynamic state at the entrance";
MedPB.ThermodynamicState state_isen "thermodynamic state at the end of the isentropic compression";
MedPB.ThermodynamicState state_b "thermodynamic state at the end of the real compresssion";
- Modelica.SIunits.Power W_comp "power used for compression";
+ Modelica.Units.SI.Power W_comp "power used for compression";
SolarTherm.Types.SpecificExergy ex_d "destroyed exergy";
- Modelica.SIunits.SpecificEntropy s_entrance "exergy at the entrance of the compressor";
+ Modelica.Units.SI.SpecificEntropy s_entrance "exergy at the entrance of the compressor";
Real d_entrance;
parameter Real phi_opt = 0.0297035;
parameter Real psi_opt = 0.461819;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/CompressorOnShaft.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/CompressorOnShaft.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/CompressorOnShaft.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/CompressorOnShaft.mo" 2022-03-10 09:58:07.676147886 +0000
@@ -8,15 +8,15 @@
Placement(visible = true, transformation(origin = {42, -54}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {30, -74}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
parameter Real eta_comp = 0.87 "isentropic efficiency of the compressor";
parameter Real PR = 2.313 "Pressure ratio";
- parameter Modelica.SIunits.AbsolutePressure p_out = 250 * 10 ^ 5 "outlet pressure";
- parameter Modelica.SIunits.ThermodynamicTemperature T_amb = 273.15 + 40 "Outlet temperature in Kelvin";
+ parameter Modelica.Units.SI.AbsolutePressure p_out = 250 * 10 ^ 5 "outlet pressure";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_amb = 273.15 + 40 "Outlet temperature in Kelvin";
parameter Real flowGuess = 1000;
MedPB.ThermodynamicState state_a "thermodynamic state at the entrance";
MedPB.ThermodynamicState state_isen "thermodynamic state at the end of the isentropic compression";
MedPB.ThermodynamicState state_b "thermodynamic state at the end of the real compresssion";
- Modelica.SIunits.Power W_comp "power used for compression";
+ Modelica.Units.SI.Power W_comp "power used for compression";
SolarTherm.Types.SpecificExergy ex_d "destroyed exergy";
- Modelica.SIunits.SpecificEntropy s_entrance "entropy at the entrance of the compressor";
+ Modelica.Units.SI.SpecificEntropy s_entrance "entropy at the entrance of the compressor";
Real d_entrance;
parameter Real phi_opt = 0.0297035;
parameter Real psi_opt = 0.461819;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/Cooler.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/Cooler.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/Cooler.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/Cooler.mo" 2022-03-10 09:58:07.660147884 +0000
@@ -3,28 +3,28 @@
extends SolarTherm.Media.CO2.PropCO2;
replaceable package MedPB = SolarTherm.Media.CO2.CO2_ph;
outer Modelica.Fluid.System system;
- parameter Modelica.SIunits.ThermodynamicTemperature T_amb = 313.15 "Outlet temperature in Kelvin";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_amb = 313.15 "Outlet temperature in Kelvin";
parameter Real deltaT_cooler = 15 "Approach difference of temperature at the outlet";
- parameter Modelica.SIunits.Power P_nom = 10 ^ 6;
+ parameter Modelica.Units.SI.Power P_nom = 10 ^ 6;
parameter Integer N_cool = 15 "Number of discretization of the cooler";
Modelica.Fluid.Interfaces.FluidPort_a port_a(redeclare package Medium = MedPB) annotation(
Placement(visible = true, transformation(origin = {0, -78}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {2, -80}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Fluid.Interfaces.FluidPort_b port_b(redeclare package Medium = MedPB) annotation(
Placement(visible = true, transformation(origin = {-2, 80}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {0, 80}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
SolarTherm.Types.Conductance UA_dis[N_cool-1] "Conductance of the cooler per sub-HX";
- Modelica.SIunits.HeatFlowRate Q_dis (start=10^7/N_cool)"Heat flow rate dispatched per sub-HX in the cooler";
- Modelica.SIunits.ThermodynamicTemperature[N_cool] T_CO2;
- Modelica.SIunits.HeatFlowRate Q_cooler (start=10^7) "Heat flow rate in the cooler";
+ Modelica.Units.SI.HeatFlowRate Q_dis (start=10^7/N_cool)"Heat flow rate dispatched per sub-HX in the cooler";
+ Modelica.Units.SI.ThermodynamicTemperature[N_cool] T_CO2;
+ Modelica.Units.SI.HeatFlowRate Q_cooler (start=10^7) "Heat flow rate in the cooler";
SolarTherm.Types.Conductance UA_cooler "Overall conductance of the cooler";
SolarTherm.Types.SpecificExergy ex_d "destroyed exergy";
Real[N_cool-1] deltaT_lm "logarithmic temperature difference";
Real[N_cool] deltaT "difference with the ambiant air at the inlet and outlet";
- Modelica.SIunits.Power P_cooling "Power used by the fans to cool the fluid";
+ Modelica.Units.SI.Power P_cooling "Power used by the fans to cool the fluid";
Real deltaT_ave "average difference of temperature with the ambiant";
protected
MedPB.ThermodynamicState[N_cool] state "Thermodynamic State at the i-th position";
- Modelica.SIunits.SpecificEnthalpy[N_cool] h_CO2;
- equation
+
+ Modelica.Units.SI.SpecificEnthalpy[N_cool] h_CO2; equation
for i in 1:N_cool loop
state[i]=MedPB.setState_pTX(port_a.p,T_CO2[i]);
h_CO2[i]=state[i].h;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/Cycles.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/Cycles.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/Cycles.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/Cycles.mo" 2022-03-10 09:58:07.644147882 +0000
@@ -4,17 +4,17 @@
extends SolarTherm.Media.CO2.PropCO2;
replaceable package MedPB = SolarTherm.Media.CO2.CO2_ph;
//Parameters
- parameter Modelica.SIunits.AbsolutePressure p_high = 250 * 10 ^ 5 "high pressure of the cycle";
- parameter Modelica.SIunits.ThermodynamicTemperature T_high = 775 + 273.15 "inlet temperature of the turbine";
- parameter Modelica.SIunits.ThermodynamicTemperature T_amb = 40 + 273.15 "ambiant temperature";
+ parameter Modelica.Units.SI.AbsolutePressure p_high = 250 * 10 ^ 5 "high pressure of the cycle";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_high = 775 + 273.15 "inlet temperature of the turbine";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_amb = 40 + 273.15 "ambiant temperature";
parameter Real PR = 2.313 "Pressure ratio";
- parameter Modelica.SIunits.Power P_nom = 10 ^ 8 "Nominal electrical power";
- parameter Modelica.SIunits.Efficiency eta_comp = 0.87 "Isentropic efficiency of the compressors";
- parameter Modelica.SIunits.Efficiency eta_turb = 0.9 "Isentropic efficiency of the turbine";
+ parameter Modelica.Units.SI.Power P_nom = 10 ^ 8 "Nominal electrical power";
+ parameter Modelica.Units.SI.Efficiency eta_comp = 0.87 "Isentropic efficiency of the compressors";
+ parameter Modelica.Units.SI.Efficiency eta_turb = 0.9 "Isentropic efficiency of the turbine";
parameter Real gamma = 0.2 "Part of the mass flow going to the recompression directly";
parameter Integer N_q = 15 "Number of discretization of the heat recuperators";
// Variables to investigate the cycle and its simulation.
- Modelica.SIunits.Efficiency efficiencyCycle "Efficiency of the cycle";
+ Modelica.Units.SI.Efficiency efficiencyCycle "Efficiency of the cycle";
Real E_bal_check;
SolarTherm.Types.SpecificWork W_out "Specific Work of the cycle";
// Instanciation of the components
@@ -96,14 +96,14 @@
//Parameters
- parameter Modelica.SIunits.AbsolutePressure p_high = 250 * 10 ^ 5 "high pressure of the cycle";
- parameter Modelica.SIunits.ThermodynamicTemperature T_high = 800 + 273.15 "inlet temperature of the turbine";
- parameter Modelica.SIunits.ThermodynamicTemperature T_amb = 30 + 273.15 "ambiant temperature";
+ parameter Modelica.Units.SI.AbsolutePressure p_high = 250 * 10 ^ 5 "high pressure of the cycle";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_high = 800 + 273.15 "inlet temperature of the turbine";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_amb = 30 + 273.15 "ambiant temperature";
parameter Real PR = 2.77 "Pressure ratio";
- parameter Modelica.SIunits.Power P_nom =10*10^6 "Nominal electrical power";
+ parameter Modelica.Units.SI.Power P_nom =10*10^6 "Nominal electrical power";
- parameter Modelica.SIunits.Efficiency eta_comp = 0.89 "Isentropic efficiency of the compressors";
- parameter Modelica.SIunits.Efficiency eta_turb = 0.93 "Isentropic efficiency of the turbine";
+ parameter Modelica.Units.SI.Efficiency eta_comp = 0.89 "Isentropic efficiency of the compressors";
+ parameter Modelica.Units.SI.Efficiency eta_turb = 0.93 "Isentropic efficiency of the turbine";
parameter Real gamma = 0.18 "Part of the mass flow going to the recompression directly";
parameter Integer N_q = 15 "Number of discretization of the heat recuperators";
parameter Real pinchRecuperator = 5;
@@ -136,7 +136,7 @@
// Variables to investigate the cycle and its simulation.
- Modelica.SIunits.Efficiency efficiencyCycle "Efficiency of the cycle";
+ Modelica.Units.SI.Efficiency efficiencyCycle "Efficiency of the cycle";
Real E_bal_check;
SolarTherm.Types.SpecificWork W_out "Specific Work of the cycle";
SolarTherm.Models.Analysis.Finances.Money C_LTR "cost of the low-temperature recuperator";
@@ -149,7 +149,7 @@
SolarTherm.Models.Analysis.Finances.Money C_cooler "cost of the cooler";
SolarTherm.Models.Analysis.Finances.Money C_PB "Overall cost of the power block";
- Modelica.SIunits.Efficiency eta_carnot;
+ Modelica.Units.SI.Efficiency eta_carnot;
// Exergy analysis
Real ex_d_percent_mainCompressor "MainCompressor exergy destruction";
Real ex_d_percent_LTR "LTR exergy destruction";
@@ -160,7 +160,7 @@
Real ex_d_percent_cooler "cooler exergy destruction";
SolarTherm.Types.SpecificExergy ex_d_tot "Total exergy destruction";
SolarTherm.Types.SpecificExergy ex_in "Inlet of exergy at the heater";
- Modelica.SIunits.Efficiency eta_ex "Exergetic efficiency = P_nom/ex_in";
+ Modelica.Units.SI.Efficiency eta_ex "Exergetic efficiency = P_nom/ex_in";
Exchanger exchanger (T_amb=T_amb, redeclare package MedRec=SolarTherm.Media.SolidParticles.CarboHSP_ph) annotation(
Placement(visible = true, transformation(origin = {46, 22}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
SolarTherm.Models.PowerBlocks.sCO2Cycle.SourceFlow src(T_out = T_high - 273.15, use_m_parameter = false, m_flow =730, p_out = 10 ^ 5, redeclare package MedPB = SolarTherm.Media.SolidParticles.CarboHSP_ph) annotation(
@@ -254,13 +254,13 @@
replaceable package MedPB = SolarTherm.Media.CO2.CO2_ph;
//Parameters
parameter Real deltaT_cooler = 15 "Approach difference of temperature at the outlet of the cooler";
- parameter Modelica.SIunits.AbsolutePressure p_high = 200 * 10 ^ 5 "high pressure of the cycle";
- parameter Modelica.SIunits.ThermodynamicTemperature T_high = 715 + 273.15 "inlet temperature of the turbine";
- parameter Modelica.SIunits.ThermodynamicTemperature T_amb = 40 + 273.15 "ambiant temperature";
+ parameter Modelica.Units.SI.AbsolutePressure p_high = 200 * 10 ^ 5 "high pressure of the cycle";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_high = 715 + 273.15 "inlet temperature of the turbine";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_amb = 40 + 273.15 "ambiant temperature";
parameter Real PR = 2.371 "Pressure ratio";
- parameter Modelica.SIunits.Power P_nom = 10 ^ 8 "Nominal electrical power";
- parameter Modelica.SIunits.Efficiency eta_comp = 0.87 "Isentropic efficiency of the compressors";
- parameter Modelica.SIunits.Efficiency eta_turb = 0.9 "Isentropic efficiency of the turbine";
+ parameter Modelica.Units.SI.Power P_nom = 10 ^ 8 "Nominal electrical power";
+ parameter Modelica.Units.SI.Efficiency eta_comp = 0.87 "Isentropic efficiency of the compressors";
+ parameter Modelica.Units.SI.Efficiency eta_turb = 0.9 "Isentropic efficiency of the turbine";
parameter Real gamma = 0.3 "Part of the mass flow going to the recompression directly";
parameter Integer N_q = 15 "Number of discretization of the heat recuperators";
// Instanciation of the components
@@ -279,7 +279,7 @@
SolarTherm.Models.PowerBlocks.sCO2Cycle.OnDesign.HeatRecuperator HTRecuperator(N_q = N_q, flowGuess = P_nom / 10 ^ 5, T_amb = T_amb) annotation(
Placement(visible = true, transformation(origin = {-2, -8}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
// Variables to investigate the cycle and its simulation.
- Modelica.SIunits.Efficiency efficiencyCycle;
+ Modelica.Units.SI.Efficiency efficiencyCycle;
Real E_bal_check;
//Exergy analysis
Real ex_d_percent_compressor1 "First compressor exergy destruction";
@@ -291,7 +291,7 @@
Real ex_d_percent_cooler2 "Second cooler exergy destruction";
SolarTherm.Types.SpecificExergy ex_d_tot "Total exergy destruction";
SolarTherm.Types.SpecificExergy ex_in;
- Modelica.SIunits.Efficiency eta_ex "Exergetic efficiency";
+ Modelica.Units.SI.Efficiency eta_ex "Exergetic efficiency";
equation
//Connectors
connect(compressor2.port_b, HTRecuperator.from_comp_port_a) annotation(
@@ -331,13 +331,13 @@
extends SolarTherm.Media.CO2.PropCO2;
replaceable package MedPB = SolarTherm.Media.CO2.CO2_ph;
//Parameters
- parameter Modelica.SIunits.AbsolutePressure p_high = 250 * 10 ^ 5 "high pressure of the cycle";
- parameter Modelica.SIunits.ThermodynamicTemperature T_high = 800 + 273.15 "inlet temperature of the HTF";
- parameter Modelica.SIunits.ThermodynamicTemperature T_amb = 30 + 273.15 "ambiant temperature";
+ parameter Modelica.Units.SI.AbsolutePressure p_high = 250 * 10 ^ 5 "high pressure of the cycle";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_high = 800 + 273.15 "inlet temperature of the HTF";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_amb = 30 + 273.15 "ambiant temperature";
parameter Real PR = 2.5 "Pressure ratio";
- parameter Modelica.SIunits.Power P_nom = 100*10^6 "Nominal electrical power";
- parameter Modelica.SIunits.Efficiency eta_comp = 0.89 "Isentropic efficiency of the compressors";
- parameter Modelica.SIunits.Efficiency eta_turb = 0.93 "Isentropic efficiency of the turbine";
+ parameter Modelica.Units.SI.Power P_nom = 100*10^6 "Nominal electrical power";
+ parameter Modelica.Units.SI.Efficiency eta_comp = 0.89 "Isentropic efficiency of the compressors";
+ parameter Modelica.Units.SI.Efficiency eta_turb = 0.93 "Isentropic efficiency of the turbine";
parameter Integer N_q = 15 "Number of discretization of the heat recuperators";
parameter SolarTherm.Models.Analysis.Finances.Money pri_turbomachinery = 1000 "price of the turbomachinery in $/kWe";
parameter SolarTherm.Models.Analysis.Finances.Money pri_recuperators = 2500 "price of the heat recuperators in $/(kW_th/K) ";
@@ -358,7 +358,7 @@
SolarTherm.Models.PowerBlocks.sCO2Cycle.SinkFlow sinkMS annotation(
Placement(visible = true, transformation(origin = {-2, 30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
// Variables to investigate the cycle and its simulation.
- Modelica.SIunits.Efficiency efficiencyCycle;
+ Modelica.Units.SI.Efficiency efficiencyCycle;
Real E_bal_check;
SolarTherm.Models.Analysis.Finances.Money C_recuperators "cost of the recuperators";
SolarTherm.Models.Analysis.Finances.Money C_turbomachinery "cost of the turbomachinery";
@@ -373,7 +373,7 @@
Real ex_d_percent_cooler "cooler exergy destruction";
SolarTherm.Types.SpecificExergy ex_d_tot "Total exergy destruction";
SolarTherm.Types.SpecificExergy ex_in;
- Modelica.SIunits.Efficiency eta_ex "Exergetic efficiency";
+ Modelica.Units.SI.Efficiency eta_ex "Exergetic efficiency";
SolarTherm.Models.PowerBlocks.sCO2Cycle.SourceFlow srcMS(T_out = T_high - 273.15, use_m_parameter = false, m_flow = 1.48, p_out = 10 ^ 5, redeclare package MedPB = SolarTherm.Media.Sodium.ConstSodium) annotation(
Placement(visible = true, transformation(origin = {60, 40}, extent = {{-10, -10}, {10, 10}}, rotation = 180)));
equation
@@ -435,13 +435,13 @@
model ModifiedRecompCycle "Model of the sCO2 recompression cycle. Convergence can get hard with higher power (interpolation + min(h_from_turb) as closing equation are probably the issues). This was overpassed by specifying a starting value for the mass flow"
extends SolarTherm.Media.CO2.PropCO2;
//Parameters
- parameter Modelica.SIunits.AbsolutePressure p_high = 250 * 10 ^ 5 "high pressure of the cycle";
- parameter Modelica.SIunits.ThermodynamicTemperature T_high = 715 + 273.15 "inlet temperature of the turbine";
- parameter Modelica.SIunits.ThermodynamicTemperature T_amb = 40 + 273.15 "ambiant temperature";
+ parameter Modelica.Units.SI.AbsolutePressure p_high = 250 * 10 ^ 5 "high pressure of the cycle";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_high = 715 + 273.15 "inlet temperature of the turbine";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_amb = 40 + 273.15 "ambiant temperature";
parameter Real PR = 2.371 "Pressure ratio";
- parameter Modelica.SIunits.Power P_nom = 10 ^ 8 "Nominal electrical power";
- parameter Modelica.SIunits.Efficiency eta_comp = 0.87 "Isentropic efficiency of the compressors";
- parameter Modelica.SIunits.Efficiency eta_turb = 0.9 "Isentropic efficiency of the turbine";
+ parameter Modelica.Units.SI.Power P_nom = 10 ^ 8 "Nominal electrical power";
+ parameter Modelica.Units.SI.Efficiency eta_comp = 0.87 "Isentropic efficiency of the compressors";
+ parameter Modelica.Units.SI.Efficiency eta_turb = 0.9 "Isentropic efficiency of the turbine";
parameter Real gamma = 0.7 "Part of the mass flow going to the recompression directly";
parameter Integer N_q = 15 "Number of discretization of the heat recuperators";
// Instanciation of the components
@@ -460,7 +460,7 @@
SolarTherm.Models.PowerBlocks.sCO2Cycle.FlowMixer mixer annotation(
Placement(visible = true, transformation(origin = {-2, -8}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
// Variables to investigate the cycle and its simulation.
- Modelica.SIunits.Efficiency efficiencyCycle "Efficiency of the cycle";
+ Modelica.Units.SI.Efficiency efficiencyCycle "Efficiency of the cycle";
Real E_bal_check;
SolarTherm.Types.SpecificWork W_out "Specific Work of the cycle";
SolarTherm.Types.Conductance UA_LTR(start = 2 * 10 ^ 6);
@@ -556,13 +556,13 @@
extends SolarTherm.Media.CO2.PropCO2;
replaceable package MedPB = SolarTherm.Media.CO2.CO2_ph;
//Parameters
- parameter Modelica.SIunits.AbsolutePressure p_high = 250 * 10 ^ 5 "high pressure of the cycle";
- parameter Modelica.SIunits.ThermodynamicTemperature T_high = 600 + 273.15 "inlet temperature of the turbine";
- parameter Modelica.SIunits.ThermodynamicTemperature T_amb = 30 + 273.15 "ambiant temperature";
+ parameter Modelica.Units.SI.AbsolutePressure p_high = 250 * 10 ^ 5 "high pressure of the cycle";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_high = 600 + 273.15 "inlet temperature of the turbine";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_amb = 30 + 273.15 "ambiant temperature";
parameter Real PR = 3 "Pressure ratio";
- parameter Modelica.SIunits.Power P_nom = 57000 "Nominal electrical power";
- parameter Modelica.SIunits.Efficiency eta_comp = 0.89 "Isentropic efficiency of the compressors";
- parameter Modelica.SIunits.Efficiency eta_turb = 0.93 "Isentropic efficiency of the turbine";
+ parameter Modelica.Units.SI.Power P_nom = 57000 "Nominal electrical power";
+ parameter Modelica.Units.SI.Efficiency eta_comp = 0.89 "Isentropic efficiency of the compressors";
+ parameter Modelica.Units.SI.Efficiency eta_turb = 0.93 "Isentropic efficiency of the turbine";
parameter Integer N_q = 15 "Number of discretization of the heat recuperators";
// Instanciation of the components
SolarTherm.Models.PowerBlocks.sCO2Cycle.OnDesign.Turbine turbine(PR = PR, eta_turb = eta_turb, T_amb = T_amb) annotation(
@@ -576,7 +576,7 @@
SolarTherm.Models.PowerBlocks.sCO2Cycle.OnDesign.Heater heater(T_high = T_high, T_amb = T_amb) annotation(
Placement(visible = true, transformation(origin = {30, 6}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
// Variables to investigate the cycle and its simulation.
- Modelica.SIunits.Efficiency efficiencyCycle;
+ Modelica.Units.SI.Efficiency efficiencyCycle;
Real E_bal_check;
//Exergy analysis
Real ex_d_percent_Compressor "Compressor exergy destruction";
@@ -586,7 +586,7 @@
Real ex_d_percent_cooler "cooler exergy destruction";
SolarTherm.Types.SpecificExergy ex_d_tot "Total exergy destruction";
SolarTherm.Types.SpecificExergy ex_in;
- Modelica.SIunits.Efficiency eta_ex "Exergetic efficiency";
+ Modelica.Units.SI.Efficiency eta_ex "Exergetic efficiency";
equation
//Connections
connect(heater.port_b, turbine.port_a) annotation(
@@ -625,13 +625,13 @@
extends SolarTherm.Media.CO2.PropCO2;
replaceable package MedPB = SolarTherm.Media.CO2.CO2_ph;
//Parameters
- parameter Modelica.SIunits.AbsolutePressure p_high = 250 * 10 ^ 5 "high pressure of the cycle";
- parameter Modelica.SIunits.ThermodynamicTemperature T_high = 690 + 273.15 "inlet temperature of the turbine";
- parameter Modelica.SIunits.ThermodynamicTemperature T_amb = 30 + 273.15 "ambiant temperature";
+ parameter Modelica.Units.SI.AbsolutePressure p_high = 250 * 10 ^ 5 "high pressure of the cycle";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_high = 690 + 273.15 "inlet temperature of the turbine";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_amb = 30 + 273.15 "ambiant temperature";
parameter Real PR = 2.777 "Pressure ratio";
- parameter Modelica.SIunits.Power P_nom = 10 * 10 ^ 6 "Nominal electrical power";
- parameter Modelica.SIunits.Efficiency eta_comp = 0.89 "Isentropic efficiency of the compressors";
- parameter Modelica.SIunits.Efficiency eta_turb = 0.93 "Isentropic efficiency of the turbine";
+ parameter Modelica.Units.SI.Power P_nom = 10 * 10 ^ 6 "Nominal electrical power";
+ parameter Modelica.Units.SI.Efficiency eta_comp = 0.89 "Isentropic efficiency of the compressors";
+ parameter Modelica.Units.SI.Efficiency eta_turb = 0.93 "Isentropic efficiency of the turbine";
parameter Real gamma = 0.284 "Part of the mass flow going to the recompression directly";
parameter Integer N_q = 40 "Number of discretization of the heat recuperators";
parameter Real pinchRecuperator = 5;
@@ -655,12 +655,12 @@
SolarTherm.Models.PowerBlocks.sCO2Cycle.FlowMixer mixer annotation(
Placement(visible = true, transformation(origin = {-2, -8}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
// Variables to investigate the cycle and its simulation.
- Modelica.SIunits.Efficiency efficiencyCycle "Efficiency of the cycle";
+ Modelica.Units.SI.Efficiency efficiencyCycle "Efficiency of the cycle";
Real E_bal_check;
SolarTherm.Types.SpecificWork W_out "Specific Work of the cycle";
//SolarTherm.Types.Conductance UA_LTR(start = 2 * 10 ^ 6);
//SolarTherm.Types.Conductance UA_HTR(start = 2 * 10 ^ 6);
- Modelica.SIunits.Efficiency eta_carnot;
+ Modelica.Units.SI.Efficiency eta_carnot;
// Exergy analysis
Real ex_d_percent_mainCompressor "MainCompressor exergy destruction";
Real ex_d_percent_LTRecuperator "LTRecuperator exergy destruction";
@@ -671,7 +671,7 @@
Real ex_d_percent_cooler "cooler exergy destruction";
SolarTherm.Types.SpecificExergy ex_d_tot "Total exergy destruction";
SolarTherm.Types.SpecificExergy ex_in "Inlet of exergy at the heater";
- Modelica.SIunits.Efficiency eta_ex "Exergetic efficiency = P_nom/ex_in";
+ Modelica.Units.SI.Efficiency eta_ex "Exergetic efficiency = P_nom/ex_in";
equation
// Connectors
connect(splitter.one_gamma_port_b, cooler.port_a) annotation(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/Exchanger.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/Exchanger.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/Exchanger.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/Exchanger.mo" 2022-03-10 09:58:06.564147745 +0000
@@ -5,7 +5,7 @@
replaceable package MedRec = SolarTherm.Media.SolidParticles.CarboHSP_ph;
outer Modelica.Fluid.System system;
parameter Real pinch = 10;
- parameter Modelica.SIunits.ThermodynamicTemperature T_amb = 40 + 273.15;
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_amb = 40 + 273.15;
Modelica.Fluid.Interfaces.FluidPort_a HTF_port_a(redeclare package Medium = MedRec) annotation(
Placement(visible = true, transformation(origin = {60, 54}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {62, 38}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Fluid.Interfaces.FluidPort_a CO2_port_a(redeclare package Medium = MedPB) annotation(
@@ -16,14 +16,14 @@
Placement(visible = true, transformation(origin = {58, -48}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {62, -58}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
MedPB.ThermodynamicState[2] state_CO2;
MedRec.ThermodynamicState[2] state_HTF;
- Modelica.SIunits.SpecificEnthalpy[2] h_CO2 (start={1000000,1200000});
- Modelica.SIunits.SpecificEnthalpy[2] h_HTF;
+ Modelica.Units.SI.SpecificEnthalpy[2] h_CO2 (start={1000000,1200000});
+ Modelica.Units.SI.SpecificEnthalpy[2] h_HTF;
SolarTherm.Types.Conductance UA_TLMD "Conductance of the overall HX";
Real[2] deltaT "Temperature difference in the heat exchangers";
Real deltaT_lm;
- Modelica.SIunits.HeatFlowRate Q_HX_HTR;
- Modelica.SIunits.ThermodynamicTemperature T_CO2_out;
- Modelica.SIunits.ThermodynamicTemperature T_HTF_out;
+ Modelica.Units.SI.HeatFlowRate Q_HX_HTR;
+ Modelica.Units.SI.ThermodynamicTemperature T_CO2_out;
+ Modelica.Units.SI.ThermodynamicTemperature T_HTF_out;
SolarTherm.Types.SpecificExergy ex_d;
protected
equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/HeatRecuperatorDTAve.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/HeatRecuperatorDTAve.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/HeatRecuperatorDTAve.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/HeatRecuperatorDTAve.mo" 2022-03-10 09:58:06.516147740 +0000
@@ -5,7 +5,7 @@
parameter Integer N_q = 15 "Number of discretisation of the heat exchanger";
parameter Real flowGuess = 100 "guess value for the mass flow; given as Pnom/10^5 in the cycles";
parameter Real pinchRecuperator = 5 "pinch of the recuperator. Imposed as a closing equation";
- parameter Modelica.SIunits.ThermodynamicTemperature T_amb = 40 + 273.15;
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_amb = 40 + 273.15;
Modelica.Fluid.Interfaces.FluidPort_a from_comp_port_a(redeclare package Medium = MedPB) annotation(
Placement(visible = true, transformation(origin = {-60, 50}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {-78, 42}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Fluid.Interfaces.FluidPort_a from_turb_port_a(redeclare package Medium = MedPB) annotation(
@@ -14,16 +14,16 @@
Placement(visible = true, transformation(origin = {60, 50}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {62, 44}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Fluid.Interfaces.FluidPort_b from_turb_port_b(redeclare package Medium = MedPB) annotation(
Placement(visible = true, transformation(origin = {-60, -50}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {-72, -58}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
- Modelica.SIunits.SpecificEnthalpy[N_q] h_from_turb(start = {500000 for i in 1:N_q});
- Modelica.SIunits.ThermodynamicTemperature[N_q] T_from_turb(start = {500 for i in 1:N_q});
- Modelica.SIunits.SpecificEnthalpy[N_q] h_from_comp(start = {500000 for i in 1:N_q});
- Modelica.SIunits.ThermodynamicTemperature[N_q] T_from_comp(start = {500 for i in 1:N_q});
+ Modelica.Units.SI.SpecificEnthalpy[N_q] h_from_turb(start = {500000 for i in 1:N_q});
+ Modelica.Units.SI.ThermodynamicTemperature[N_q] T_from_turb(start = {500 for i in 1:N_q});
+ Modelica.Units.SI.SpecificEnthalpy[N_q] h_from_comp(start = {500000 for i in 1:N_q});
+ Modelica.Units.SI.ThermodynamicTemperature[N_q] T_from_comp(start = {500 for i in 1:N_q});
Real[N_q] deltaT "Temperature difference in the heat exchangers";
SolarTherm.Types.Conductance UA_dis[N_q - 1] "Conductance per sub-heat exchanger";
SolarTherm.Types.Conductance UA_HTR "Conductance of the overall HX";
//Real deltaT_TLMD "overall logarithmic temperature difference for the price estiamtes";
- Modelica.SIunits.HeatFlowRate Q_HX_HTR;
- Modelica.SIunits.HeatFlowRate Q_HX_HTR_dis;
+ Modelica.Units.SI.HeatFlowRate Q_HX_HTR;
+ Modelica.Units.SI.HeatFlowRate Q_HX_HTR_dis;
// gives a start value to the mass flow, taken as P_nom/10⁵; allows easier convergence
SolarTherm.Types.SpecificExergy ex_d "destroyed exergy";
protected
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/HeatRecuperatorTLMD.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/HeatRecuperatorTLMD.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/HeatRecuperatorTLMD.mo" 2022-03-10 09:57:37.736144092 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/HeatRecuperatorTLMD.mo" 2022-03-10 09:58:06.488147735 +0000
@@ -6,7 +6,7 @@
parameter Integer N_q = 15 "Number of discretisation of the heat exchanger";
parameter Real flowGuess = 100 "guess value for the mass flow; given as Pnom/10^5 in the cycles";
parameter Real pinchRecuperator = 5 "pinch of the recuperator. Imposed as a closing equation";
- parameter Modelica.SIunits.ThermodynamicTemperature T_amb = 40 + 273.15;
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_amb = 40 + 273.15;
Modelica.Fluid.Interfaces.FluidPort_a from_comp_port_a(redeclare package Medium = MedPB) annotation(
Placement(visible = true, transformation(origin = {-60, 50}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {-78, 42}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Fluid.Interfaces.FluidPort_a from_turb_port_a(redeclare package Medium = MedPB) annotation(
@@ -15,16 +15,16 @@
Placement(visible = true, transformation(origin = {60, 50}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {62, 44}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Fluid.Interfaces.FluidPort_b from_turb_port_b(redeclare package Medium = MedPB) annotation(
Placement(visible = true, transformation(origin = {-60, -50}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {-72, -58}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
- Modelica.SIunits.SpecificEnthalpy[N_q] h_from_turb(start = {500000 for i in 1:N_q});
- Modelica.SIunits.ThermodynamicTemperature[N_q] T_from_turb(start = {500 for i in 1:N_q});
- Modelica.SIunits.SpecificEnthalpy[N_q] h_from_comp(start = {500000 for i in 1:N_q});
- Modelica.SIunits.ThermodynamicTemperature[N_q] T_from_comp(start = {500 for i in 1:N_q});
+ Modelica.Units.SI.SpecificEnthalpy[N_q] h_from_turb(start = {500000 for i in 1:N_q});
+ Modelica.Units.SI.ThermodynamicTemperature[N_q] T_from_turb(start = {500 for i in 1:N_q});
+ Modelica.Units.SI.SpecificEnthalpy[N_q] h_from_comp(start = {500000 for i in 1:N_q});
+ Modelica.Units.SI.ThermodynamicTemperature[N_q] T_from_comp(start = {500 for i in 1:N_q});
Real[N_q] deltaT "Temperature difference in the heat exchangers";
Real deltaT_lmBis "Overall logarithmic temperature difference";
SolarTherm.Types.Conductance UA_HTR "Overall conductance from the overall LMTD";
SolarTherm.Types.Conductance[N_q - 1] UA_dis "Conductance per sub-heat exchanger";
- Modelica.SIunits.HeatFlowRate Q_T_HTR "Overall exchanged energy";
- Modelica.SIunits.HeatFlowRate Q_HX_HTR_dis(start = flowGuess * 10 ^ 4) "Constant energy exchanged in each sub-heat exchanger";
+ Modelica.Units.SI.HeatFlowRate Q_T_HTR "Overall exchanged energy";
+ Modelica.Units.SI.HeatFlowRate Q_HX_HTR_dis(start = flowGuess * 10 ^ 4) "Constant energy exchanged in each sub-heat exchanger";
// gives a start value to the mass flow, taken as P_nom/10⁵; allows easier convergence
SolarTherm.Types.SpecificExergy ex_d "destroyed exergy";
Real[N_q - 1] deltaT_lm;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/Heater.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/Heater.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/Heater.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/Heater.mo" 2022-03-10 09:58:06.456147731 +0000
@@ -2,9 +2,9 @@
model Heater "Simple heater model"
extends SolarTherm.Media.CO2.PropCO2;
replaceable package MedPB = SolarTherm.Media.CO2.CO2_ph;
- parameter Modelica.SIunits.ThermodynamicTemperature T_high = 273.15 + 715 "Outlet temperature in Kelvin";
- parameter Modelica.SIunits.ThermodynamicTemperature T_amb = 273.15 + 40 "Outlet temperature in Kelvin";
- Modelica.SIunits.HeatFlowRate Q_heater "heat transfer in the heater";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_high = 273.15 + 715 "Outlet temperature in Kelvin";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_amb = 273.15 + 40 "Outlet temperature in Kelvin";
+ Modelica.Units.SI.HeatFlowRate Q_heater "heat transfer in the heater";
MedPB.ThermodynamicState state_a "Thermodynamic State at the entrance";
MedPB.ThermodynamicState state_b "Thermodynamic State at the outlet";
Modelica.Fluid.Interfaces.FluidPort_a port_a(redeclare package Medium = MedPB) annotation(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/Turbine.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/Turbine.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/Turbine.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/OnDesign/Turbine.mo" 2022-03-10 09:58:06.436147729 +0000
@@ -9,26 +9,26 @@
Placement(visible = true, transformation(origin = {60, -42}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {60, -46}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
parameter Real eta_turb = 0.9 "isentropic efficiency of the turbine";
parameter Real PR = 2.313 "Pressure ratio";
- parameter Modelica.SIunits.ThermodynamicTemperature T_amb = 273.15 + 40 "Outlet temperature in Kelvin";
+ parameter Modelica.Units.SI.ThermodynamicTemperature T_amb = 273.15 + 40 "Outlet temperature in Kelvin";
parameter Boolean is_second_turbine = false;
- parameter Modelica.SIunits.MassFlowRate flowGuess=100;
+ parameter Modelica.Units.SI.MassFlowRate flowGuess=100;
// This last parameter, when put to true, adds a mass_flow equality equation. Reason is, you need one and only one component in the cycle without mass flow or else you will have too much equation and circular equality issues. therefore, when adding turbines, this equation should be present (or when it's an open-cycle).
MedPB.ThermodynamicState state_a "thermodynamic state at the entrance";
MedPB.ThermodynamicState state_isen "thermodynamic state at the end of the isentropic decompression";
MedPB.ThermodynamicState state_b "thermodynamic state at the end of the real decompresssion";
- Modelica.SIunits.Power W_turb "Outlet power";
+ Modelica.Units.SI.Power W_turb "Outlet power";
SolarTherm.Types.SpecificExergy ex_d "destroyed exergy";
- Modelica.SIunits.SpecificEntropy s_entrance " entropy at the entrance of the turbine";
- Modelica.SIunits.Area A_nozzle (start=10^(-3));
+ Modelica.Units.SI.SpecificEntropy s_entrance " entropy at the entrance of the turbine";
+ Modelica.Units.SI.Area A_nozzle (start=10^(-3));
parameter Real N_shaft = 75000 * 5 / 6 * 2 * 3.14159 / 60;
Real d_outlet;
Real C_spouting (start=500);
Real diam_turb;
Real tipSpeed (start=400);
protected
- Modelica.SIunits.MassFlowRate mStart (start=flowGuess);
- equation
+
+ Modelica.Units.SI.MassFlowRate mStart (start=flowGuess); equation
state_a = MedPB.setState_phX(port_a.p, inStream(port_a.h_outflow));
s_entrance = MedPB.specificEntropy(state_a);
state_isen = MedPB.setState_psX(state_a.p / PR, s_entrance);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/CompressorOnShaft.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/CompressorOnShaft.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/CompressorOnShaft.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/CompressorOnShaft.mo" 2022-03-10 09:58:06.304147712 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Models.PowerBlocks.sCO2Cycle.QuickCO2PB;
model CompressorOnShaft "0D model of a compressor on the same shaft as the turbine"
extends SolarTherm.Media.CO2.PropCO2;
- import SI = Modelica.SIunits;
- import CV = Modelica.SIunits.Conversions;
+ import Modelica.Units.SI;
+ import CV = Modelica.Units.Conversions;
replaceable package MedPB = SolarTherm.Media.CO2.CO2_ph;
parameter Real eta_design = 0.89 "Maximal isentropic efficiency of the compressor";
parameter SI.AngularVelocity N_design = 40000 * 0.104 "Design rotationnal speed in rad/s";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/Cooler.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/Cooler.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/Cooler.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/Cooler.mo" 2022-03-10 09:58:06.284147710 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.PowerBlocks.sCO2Cycle.QuickCO2PB;
model Cooler
extends SolarTherm.Media.CO2.PropCO2;
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
replaceable package MedPB = SolarTherm.Media.CO2.CO2_ph;
input Boolean m_sup;
input SI.ThermodynamicTemperature T_amb "Ambiant temperature in Kelvin";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/Exchanger.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/Exchanger.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/Exchanger.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/Exchanger.mo" 2022-03-10 09:58:06.236147703 +0000
@@ -3,7 +3,7 @@
extends SolarTherm.Media.CO2.PropCO2;
replaceable package MedPB = SolarTherm.Media.CO2.CO2_ph;
replaceable package MedRec = SolarTherm.Media.SolidParticles.CarboHSP_ph;
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
parameter SI.ThermodynamicTemperature T_out_CO2_des = 715 + 273.15;
parameter SI.Power P_nom_des = 164000;
input Boolean m_sup "when m_sup=false, m_HTF=m_HTF_design and P_elec=0 -> allows switching off the PB";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/HeatRecuperatorDTAve.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/HeatRecuperatorDTAve.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/HeatRecuperatorDTAve.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/HeatRecuperatorDTAve.mo" 2022-03-10 09:58:06.176147696 +0000
@@ -2,7 +2,7 @@
model HeatRecuperatorDTAve "The heat recuperator is subdivised in N_q segments in order to accurately represent the CO2 properties variation."
extends SolarTherm.Media.CO2.PropCO2;
replaceable package MedPB = SolarTherm.Media.CO2.CO2_ph;
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
parameter Integer N_q = 15 "Number of subdivision of the HX";
parameter Real ratio_m_des = 1 "ratio of m_comp_des/m_turb_des; we suppose m_turb_des=1, and then scale-up";
parameter Real pinchRecuperator = 5 "pinch of the recuperator. Imposed as a closing equation for on-design";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/Turbine.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/Turbine.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/Turbine.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/Turbine.mo" 2022-03-10 09:58:06.144147692 +0000
@@ -2,7 +2,7 @@
model Turbine "OD model of a turbine"
extends SolarTherm.Media.CO2.PropCO2;
replaceable package MedPB = SolarTherm.Media.CO2.CO2_ph;
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
parameter SI.Efficiency eta_design = 0.9 "isentropic efficiency of the turbine";
parameter SI.Efficiency PR = 3 "Pressure ratio";
parameter SI.AngularVelocity N_shaft = 3358;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/correlRecompPB.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/correlRecompPB.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/correlRecompPB.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/correlRecompPB.mo" 2022-03-10 09:58:06.120147689 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.PowerBlocks.sCO2Cycle.QuickCO2PB;
model correlRecompPB
- import SI = Modelica.SIunits;
- import CV = Modelica.SIunits.Conversions;
+ import Modelica.Units.SI;
+ import CV = Modelica.Units.Conversions;
extends SolarTherm.Media.CO2.PropCO2;
replaceable package MedPB = SolarTherm.Media.CO2.CO2_ph;
replaceable package MedRec = SolarTherm.Media.SolidParticles.CarboHSP_ph;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/interpolSimplePB.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/interpolSimplePB.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/interpolSimplePB.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/interpolSimplePB.mo" 2022-03-10 09:58:06.088147685 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.PowerBlocks.sCO2Cycle.QuickCO2PB;
model interpolSimplePB "This model calculates a few off-design points as initial equation and after interpolate over them"
- import SI = Modelica.SIunits;
- import CV = Modelica.SIunits.Conversions;
+ import Modelica.Units.SI;
+ import CV = Modelica.Units.Conversions;
import FI = SolarTherm.Models.Analysis.Finances;
extends SolarTherm.Media.CO2.PropCO2;
extends Icons.PowerBlock;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/recompPB.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/recompPB.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/recompPB.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/recompPB.mo" 2022-03-10 09:58:06.024147677 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.PowerBlocks.sCO2Cycle.QuickCO2PB;
model recompPB
extends SolarTherm.Media.CO2.PropCO2;
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import FI = SolarTherm.Models.Analysis.Finances;
replaceable package MedPB = SolarTherm.Media.CO2.CO2_ph;
replaceable package MedRec = SolarTherm.Media.SolidParticles.CarboHSP_ph;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/test.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/test.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/test.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/PowerBlocks/sCO2Cycle/QuickCO2PB/test.mo" 2022-03-10 09:58:05.980147671 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Models.PowerBlocks.sCO2Cycle.QuickCO2PB;
model test
extends SolarTherm.Media.CO2.PropCO2;
- import CV = Modelica.SIunits.Conversions;
+ import CV = Modelica.Units.Conversions;
replaceable package MedPB = SolarTherm.Media.CO2.CO2_ph;
replaceable package MedRec = SolarTherm.Media.SolidParticles.CarboHSP_ph;
SolarTherm.Models.PowerBlocks.sCO2Cycle.QuickCO2PB.interpolSimplePB PB annotation(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Sources/DataTable_obsolete.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Sources/DataTable_obsolete.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Sources/DataTable_obsolete.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Sources/DataTable_obsolete.mo" 2022-03-10 09:58:05.808147650 +0000
@@ -1,9 +1,9 @@
within SolarTherm.Models.Sources;
package DataTable_obsolete
extends Modelica.Icons.ObsoleteModel;
-import SI = Modelica.SIunits;
-import nSI = Modelica.SIunits.Conversions.NonSIunits;
-import Modelica.SIunits.Conversions.from_degC;
+import Modelica.Units.SI;
+import nSI = Modelica.Units.NonSI;
+import Modelica.Units.Conversions.from_degC;
// Should technically be defined as impure but have errors so ignoring
@@ -84,7 +84,7 @@
end WeatherSource;
block WeatherTable "Weather data stored in table"
- extends Modelica.Blocks.Tables.CombiTable1D(verboseRead=false);
+ extends Modelica.Blocks.Tables.CombiTable1Dv(verboseRead=false);
// The interpolation for things like wdir can be bad
parameter SI.Time delay[:] = zeros(size(columns, 1)) "Delay in table time";
equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Sources/Date/package.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Sources/Date/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Sources/Date/package.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Sources/Date/package.mo" 2022-03-10 09:58:05.744147642 +0000
@@ -1,8 +1,9 @@
within SolarTherm.Models.Sources;
package Date
-import SI = Modelica.SIunits;
+import Modelica.Units.SI;
// Class or component 'unit' not found in Integer
// type DayOfWeek = Integer(min=1, max=7, unit="dow");
// type MonOfYear = Integer(min=1, max=12, unit="moy");
+
end Date;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Sources/Schedule/package.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Sources/Schedule/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Sources/Schedule/package.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Sources/Schedule/package.mo" 2022-03-10 09:58:05.704147636 +0000
@@ -1,5 +1,6 @@
within SolarTherm.Models.Sources;
package Schedule
-import SI = Modelica.SIunits;
+import Modelica.Units.SI;
+
end Schedule;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Sources/Solar/package.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Sources/Solar/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Sources/Solar/package.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Sources/Solar/package.mo" 2022-03-10 09:58:05.608147624 +0000
@@ -1,9 +1,9 @@
within SolarTherm.Models.Sources;
package Solar
-import SI = Modelica.SIunits;
-import nSI = Modelica.SIunits.Conversions.NonSIunits;
-import Modelica.SIunits.Conversions.*;
+import Modelica.Units.SI;
+import nSI = Modelica.Units.NonSI;
+import Modelica.Units.Conversions.*;
import Modelica.Math.sin;
import Modelica.Math.cos;
import Modelica.Math.asin;
@@ -14,4 +14,5 @@
import Modelica.Constants.pi;
import Modelica.Blocks.Math.Sign;
+
end Solar;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Sources/Weather/WeatherTable.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Sources/Weather/WeatherTable.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Sources/Weather/WeatherTable.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Sources/Weather/WeatherTable.mo" 2022-03-10 09:58:05.376147595 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Models.Sources.Weather;
block WeatherTable "Weather data stored in table"
- extends Modelica.Blocks.Tables.CombiTable1D(verboseRead=false);
+ extends Modelica.Blocks.Tables.CombiTable1Dv(verboseRead=false);
// The interpolation for things like wdir can be bad
parameter SI.Time delay[:] = zeros(size(columns, 1)) "Delay in table time";
equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Sources/Weather/package.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Sources/Weather/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Sources/Weather/package.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Sources/Weather/package.mo" 2022-03-10 09:58:05.400147598 +0000
@@ -1,9 +1,9 @@
within SolarTherm.Models.Sources;
package Weather
-import SI = Modelica.SIunits;
-import nSI = Modelica.SIunits.Conversions.NonSIunits;
-import Modelica.SIunits.Conversions.from_degC;
+import Modelica.Units.SI;
+import nSI = Modelica.Units.NonSI;
+import Modelica.Units.Conversions.from_degC;
// Should technically be defined as impure but have errors so ignoring
@@ -11,4 +11,5 @@
// Should technically be defined as impure but have errors so ignoring
+
end Weather;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Storage/Tank/EnergyST.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Storage/Tank/EnergyST.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Storage/Tank/EnergyST.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Storage/Tank/EnergyST.mo" 2022-03-10 09:58:05.300147585 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Models.Storage.Tank;
model EnergyST "Energy storage tank"
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
parameter SI.Energy E_max "Maximum energy";
parameter SI.Energy E_0 = 0 "Starting energy";
SI.Energy E(start=E_0, fixed=true, min=0, max=E_max) "Energy in tank";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Storage/Tank/FluidST.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Storage/Tank/FluidST.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Storage/Tank/FluidST.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Storage/Tank/FluidST.mo" 2022-03-10 09:58:05.280147583 +0000
@@ -2,7 +2,7 @@
model FluidST "Fluid storage tank"
extends Modelica.Fluid.Interfaces.PartialTwoPort(
allowFlowReversal=false);
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
import FI = SolarTherm.Models.Analysis.Finances;
parameter SI.Mass m_max = 0 "Maximum mass";
parameter SI.Mass m_start = 0 "Starting mass";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Storage/Tank/GenericST.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Storage/Tank/GenericST.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Storage/Tank/GenericST.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Storage/Tank/GenericST.mo" 2022-03-10 09:58:05.272147582 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Models.Storage.Tank;
model GenericST "Generic energy storage tank"
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
parameter SI.Energy E_max = 1000 "Maximum energy";
parameter SI.Energy E_0 = 0 "Starting energy";
parameter SI.HeatFlowRate Q_flow_loss_des "Design point heat loss";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Storage/Tank/SimpleST.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Storage/Tank/SimpleST.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Storage/Tank/SimpleST.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Models/Storage/Tank/SimpleST.mo" 2022-03-10 09:58:05.260147580 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Models.Storage.Tank;
model SimpleST "A simple energy model for a storage tank"
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
parameter SI.Energy E_max = 1000 "Maximum energy";
parameter SI.Energy E_0 = 0 "Starting energy";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Systems/GenericSystem.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Systems/GenericSystem.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Systems/GenericSystem.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Systems/GenericSystem.mo" 2022-03-10 09:58:05.184147571 +0000
@@ -1,9 +1,9 @@
within SolarTherm.Systems;
model GenericSystem
- import SI = Modelica.SIunits;
- import nSI = Modelica.SIunits.Conversions.NonSIunits;
+ import Modelica.Units.SI;
+ import nSI = Modelica.Units.NonSI;
import CN = Modelica.Constants;
- import CV = Modelica.SIunits.Conversions;
+ import CV = Modelica.Units.Conversions;
import FI = SolarTherm.Models.Analysis.Finances;
import SolarTherm.Types.Solar_angles;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Types/from_MWh.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Types/from_MWh.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Types/from_MWh.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Types/from_MWh.mo" 2022-03-10 09:58:05.000147548 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Types;
function from_MWh "Convert from mega Watt hour to Joule"
- extends Modelica.SIunits.Icons.Conversion;
+ extends Modelica.Units.Icons.Conversion;
input SolarTherm.Types.Energy_MWh MWh "MWh value";
output SI.Energy J "Joule value";
algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Types/from_dollarperMWh.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Types/from_dollarperMWh.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Types/from_dollarperMWh.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Types/from_dollarperMWh.mo" 2022-03-10 09:58:04.992147547 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Types;
function from_dollarperMWh
"Convert from dollar per mega Watt hour to dollar per Joule"
- extends Modelica.SIunits.Icons.Conversion;
+ extends Modelica.Units.Icons.Conversion;
input SolarTherm.Types.EnergyPrice_MWh dpMWh "Dollar per MWh value";
output SolarTherm.Types.EnergyPrice dpJ "Dollar per Joule value";
algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Types/from_year.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Types/from_year.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Types/from_year.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Types/from_year.mo" 2022-03-10 09:58:04.984147545 +0000
@@ -1,8 +1,8 @@
within SolarTherm.Types;
function from_year "Convert from year to second"
- extends Modelica.SIunits.Icons.Conversion;
+ extends Modelica.Units.Icons.Conversion;
input SolarTherm.Types.Time_year year "year value";
- output Modelica.SIunits.Time s "second value";
+ output Modelica.Units.SI.Time s "second value";
algorithm
s := (60*60*24*365)*year;
annotation (Inline=true,Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Types/to_MWh.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Types/to_MWh.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Types/to_MWh.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Types/to_MWh.mo" 2022-03-10 09:58:04.932147539 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Types;
function to_MWh "Convert from Joule to mega Watt hour"
- extends Modelica.SIunits.Icons.Conversion;
+ extends Modelica.Units.Icons.Conversion;
input SI.Energy J "Joule value";
output SolarTherm.Types.Energy_MWh MWh "MWh value";
algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Types/to_dollarperMWh.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Types/to_dollarperMWh.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Types/to_dollarperMWh.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Types/to_dollarperMWh.mo" 2022-03-10 09:58:04.908147535 +0000
@@ -1,7 +1,7 @@
within SolarTherm.Types;
function to_dollarperMWh
"Convert from dollar per Joule to dollar per mega Watt hour"
- extends Modelica.SIunits.Icons.Conversion;
+ extends Modelica.Units.Icons.Conversion;
input SolarTherm.Types.EnergyPrice dpJ "Dollar per Joule value";
output SolarTherm.Types.EnergyPrice_kWh dpMWh "Dollar per MWh value";
algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Types/to_year.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Types/to_year.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Types/to_year.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Types/to_year.mo" 2022-03-10 09:58:04.900147535 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Types;
function to_year "Convert from second to year"
- extends Modelica.SIunits.Icons.Conversion;
+ extends Modelica.Units.Icons.Conversion;
input SI.Time s "second value";
output SolarTherm.Types.Time_year year "year value";
algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Utilities/LinProgFunc.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Utilities/LinProgFunc.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Utilities/LinProgFunc.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Utilities/LinProgFunc.mo" 2022-03-10 09:58:04.676147506 +0000
@@ -26,10 +26,6 @@
,Ahelio
);
annotation(Library="st_linprog");
-// annotation(IncludeDirectory="modelica://SolarTherm/Resources/Include",
-// Include="#include \"st_linprog.c\"",
-// Library = "glpk");
-
end LinProgFunc;
// vim: ts=4:sw=4:et:tw=80
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Utilities/Tables/STMotab.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Utilities/Tables/STMotab.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Utilities/Tables/STMotab.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Utilities/Tables/STMotab.mo" 2022-03-10 09:58:04.608147498 +0000
@@ -69,6 +69,4 @@
external "C" loc = motab_get_meta_loc(table) annotation(Library="st_motab");
end getMetaLoc;
-end STMotab;
-
-// vim: ts=4:sw=4:et:tw=80
+end STMotab;
\ No newline at end of file
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Utilities/Tables/tableCatromInterp.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Utilities/Tables/tableCatromInterp.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Utilities/Tables/tableCatromInterp.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Utilities/Tables/tableCatromInterp.mo" 2022-03-10 09:58:04.584147495 +0000
@@ -7,7 +7,5 @@
input Real y_step;
output Real p;
external "C" p = st_table_catrom_interp(table, x, y, x_step, y_step)
- //annotation(IncludeDirectory="modelica://SolarTherm/Resources/Include",
- // Include="#include \"st_tables.c\"");
- annotation(Library="st_tables");
+annotation(Library="st_tables");
end tableCatromInterp;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Utilities/Tables/tableGrid.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Utilities/Tables/tableGrid.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Utilities/Tables/tableGrid.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Utilities/Tables/tableGrid.mo" 2022-03-10 09:58:04.576147494 +0000
@@ -6,7 +6,5 @@
input String sym;
output Integer res;
external "C" res = st_table_grid_transform(table, n, m, sym)
- //annotation(IncludeDirectory="modelica://SolarTherm/Resources/Include",
- // Include="#include \"st_tables.c\"");
- annotation(Library="st_tables");
+annotation(Library="st_tables");
end tableGrid;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Utilities/Transition/Ramp.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Utilities/Transition/Ramp.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Utilities/Transition/Ramp.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/Utilities/Transition/Ramp.mo" 2022-03-10 09:58:04.540147489 +0000
@@ -1,6 +1,6 @@
within SolarTherm.Utilities.Transition;
block Ramp "Ramp transition model"
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
parameter Integer ramp_order(min=0, max=2) "Ramping filter order"; // e.g. 0: step function, 1: linear, 2: second order, etc.
parameter SI.Time t_dur(min=0) "Duration of the ramp event";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/openmodelica.metadata.json" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/openmodelica.metadata.json"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/openmodelica.metadata.json" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/openmodelica.metadata.json" 2022-03-10 09:58:13.900148676 +0000
@@ -1 +1 @@
-{"path":"SolarTherm", "sha":"24d3e5cdc2bfe684db340be394b4aebfad1a4a51", "support":"noSupport", "uses":{"Modelica":"3.2.3"}, "version":"0.2.0-master", "zipfile":"https://github.com/SolarTherm/SolarTherm/archive/24d3e5cdc2bfe684db340be394b4aebfad1a4a51.zip"}
+{"path": "SolarTherm", "sha": "24d3e5cdc2bfe684db340be394b4aebfad1a4a51", "support": "noSupport", "uses": {"Modelica": "4.0.0"}, "version": "0.2.0-master", "zipfile": "https://github.com/SolarTherm/SolarTherm/archive/24d3e5cdc2bfe684db340be394b4aebfad1a4a51.zip", "extraInfo": "Conversion script /home/hudson/saved_omc/libraries/.openmodelica/libraries/Modelica 4.0.0+maint.om//Resources/Scripts/Conversion/ConvertModelica_from_3.2.3_to_4.0.0.mos was applied"}
\ No newline at end of file
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/package.mo" "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/package.mo" 2022-03-10 09:57:37.740144093 +0000
+++ "converted-libraries/.openmodelica/libraries/SolarTherm 0.2.0-master/package.mo" 2022-03-10 09:58:13.896148674 +0000
@@ -1,9 +1,9 @@
within ;
package SolarTherm
extends SolarTherm.Icons.SolarThermPackage;
- import SI = Modelica.SIunits;
- import nSI = Modelica.SIunits.Conversions.NonSIunits;
- import Modelica.SIunits.Conversions.*;
+ import Modelica.Units.SI;
+ import nSI = Modelica.Units.NonSI;
+ import Modelica.Units.Conversions.*;
import Modelica.Math.sin;
import Modelica.Math.cos;
import Modelica.Math.asin;
@@ -15,7 +15,7 @@
import Modelica.Constants.g_n;
import Modelica.Constants.sigma;
import Modelica.Blocks.Math.Sign;
- import Modelica.SIunits.Conversions.from_degC;
+ import Modelica.Units.Conversions.from_degC;
@@ -26,12 +26,19 @@
+
+
+
+
+
+
+
annotation (
preferredView="info",
version="0.2",
versionBuild=1,
versionDate="2016-04-26",
- uses(Modelica(version="3.2.3")),
+ uses(Modelica(version= "4.0.0")),
Documentation(info="
Welcome to SolarTherm library!!
SolarTherm was created under the Astralian Solar Thermal Research Iniciative (ASTRI) program with the aim to provide solar thermal community with an easy tool to simulate and optimise Concentrating Solar Thermal (CST) power plants. The focus of this tool is the annual performance and the economic assessment of novel designs of solar thermal plants.