Last active
July 2, 2021 08:56
-
-
Save sjoelund/b7574f7aaf052500b0835f14e4b25d95 to your computer and use it in GitHub Desktop.
OpenModelica conversion script 2021-04-26
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff -ur "/home/martin/.openmodelica/libraries/AdvancedNoise 1.0.0/Examples/InterpolateRandomNumbers.mo" "converted-libraries/AdvancedNoise 1.0.0/Examples/InterpolateRandomNumbers.mo" | |
| --- "/home/martin/.openmodelica/libraries/AdvancedNoise 1.0.0/Examples/InterpolateRandomNumbers.mo" 2021-03-15 12:05:59.791863741 +0100 | |
| +++ "converted-libraries/AdvancedNoise 1.0.0/Examples/InterpolateRandomNumbers.mo" 2021-04-26 11:50:28.062565134 +0200 | |
| @@ -3,7 +3,7 @@ | |
| "Interpolate random numbers with the various interpolators" | |
| extends Modelica.Icons.Example; | |
| - parameter Modelica.SIunits.Time samplePeriod = 1.0 | |
| + parameter Modelica.Units.SI.Time samplePeriod = 1.0 | |
| "Sample period for the generation of random numbers"; | |
| parameter Integer seed = 614657 "Seed to initialize random number generator"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AdvancedNoise 1.0.0/Examples/RailIrregularities/Comparisons/FilterAndConvolution.mo" "converted-libraries/AdvancedNoise 1.0.0/Examples/RailIrregularities/Comparisons/FilterAndConvolution.mo" | |
| --- "/home/martin/.openmodelica/libraries/AdvancedNoise 1.0.0/Examples/RailIrregularities/Comparisons/FilterAndConvolution.mo" 2021-03-15 12:05:59.791863741 +0100 | |
| +++ "converted-libraries/AdvancedNoise 1.0.0/Examples/RailIrregularities/Comparisons/FilterAndConvolution.mo" 2021-04-26 11:50:28.042565106 +0200 | |
| @@ -11,7 +11,7 @@ | |
| parameter Boolean doFilter = true "Calculate state space phase filter?"; | |
| parameter Boolean doTime = false "Calculate time-based noise?"; | |
| - parameter Modelica.SIunits.Duration samplePeriod = 0.2 "Common sample period"; | |
| + parameter Modelica.Units.SI.Duration samplePeriod = 0.2 "Common sample period"; | |
| inner Modelica.Blocks.Noise.GlobalSeed globalSeed(useAutomaticSeed=false) | |
| annotation (Placement(transformation(extent={{60,60},{80,80}}))); | |
| diff -ur "/home/martin/.openmodelica/libraries/AdvancedNoise 1.0.0/Examples/SignalBasedNoise.mo" "converted-libraries/AdvancedNoise 1.0.0/Examples/SignalBasedNoise.mo" | |
| --- "/home/martin/.openmodelica/libraries/AdvancedNoise 1.0.0/Examples/SignalBasedNoise.mo" 2021-03-15 12:05:59.791863741 +0100 | |
| +++ "converted-libraries/AdvancedNoise 1.0.0/Examples/SignalBasedNoise.mo" 2021-04-26 11:50:27.850564837 +0200 | |
| @@ -1,7 +1,7 @@ | |
| within AdvancedNoise.Examples; | |
| model SignalBasedNoise "Demonstrates the a simple case of signal based noise" | |
| extends Modelica.Icons.Example; | |
| - parameter Modelica.SIunits.Radius r = 1 "Radius of circle"; | |
| + parameter Modelica.Units.SI.Radius r = 1 "Radius of circle"; | |
| constant Real pi = Modelica.Constants.pi "Constant pi"; | |
| inner Modelica.Blocks.Noise.GlobalSeed globalSeed | |
| annotation (Placement(transformation(extent={{-20,40},{0,60}}))); | |
| diff -ur "/home/martin/.openmodelica/libraries/AdvancedNoise 1.0.0/Examples/TimeBasedNoise.mo" "converted-libraries/AdvancedNoise 1.0.0/Examples/TimeBasedNoise.mo" | |
| --- "/home/martin/.openmodelica/libraries/AdvancedNoise 1.0.0/Examples/TimeBasedNoise.mo" 2021-03-15 12:05:59.791863741 +0100 | |
| +++ "converted-libraries/AdvancedNoise 1.0.0/Examples/TimeBasedNoise.mo" 2021-04-26 11:50:27.810564782 +0200 | |
| @@ -1,7 +1,7 @@ | |
| within AdvancedNoise.Examples; | |
| model TimeBasedNoise "Demonstrates the a simple case of a timel based noise" | |
| extends Modelica.Icons.Example; | |
| - parameter Modelica.SIunits.Radius r = 1 "Radius of circle"; | |
| + parameter Modelica.Units.SI.Radius r = 1 "Radius of circle"; | |
| constant Real pi = Modelica.Constants.pi "Constant pi"; | |
| inner Modelica.Blocks.Noise.GlobalSeed globalSeed | |
| annotation (Placement(transformation(extent={{-20,40},{0,60}}))); | |
| diff -ur "/home/martin/.openmodelica/libraries/AdvancedNoise 1.0.0/Interpolators/FirstOrder/package.mo" "converted-libraries/AdvancedNoise 1.0.0/Interpolators/FirstOrder/package.mo" | |
| --- "/home/martin/.openmodelica/libraries/AdvancedNoise 1.0.0/Interpolators/FirstOrder/package.mo" 2021-03-15 12:05:59.791863741 +0100 | |
| +++ "converted-libraries/AdvancedNoise 1.0.0/Interpolators/FirstOrder/package.mo" 2021-04-26 11:50:27.706564635 +0200 | |
| @@ -7,7 +7,7 @@ | |
| suggestedSamplePeriod=0.1); | |
| constant Real k=1 "Gain"; | |
| - constant Modelica.SIunits.Period T=0.01 "Time Constant"; | |
| + constant Modelica.Units.SI.Period T=0.01 "Time Constant"; | |
| redeclare function extends kernel | |
| diff -ur "/home/martin/.openmodelica/libraries/AdvancedNoise 1.0.0/Interpolators/SmoothIdealLowPass/der_kernel_offset.mo" "converted-libraries/AdvancedNoise 1.0.0/Interpolators/SmoothIdealLowPass/der_kernel_offset.mo" | |
| --- "/home/martin/.openmodelica/libraries/AdvancedNoise 1.0.0/Interpolators/SmoothIdealLowPass/der_kernel_offset.mo" 2021-03-15 12:05:59.791863741 +0100 | |
| +++ "converted-libraries/AdvancedNoise 1.0.0/Interpolators/SmoothIdealLowPass/der_kernel_offset.mo" 2021-04-26 11:50:27.654564562 +0200 | |
| @@ -1,7 +1,7 @@ | |
| within AdvancedNoise.Interpolators.SmoothIdealLowPass; | |
| function der_kernel_offset | |
| input Real t "The (scaled) time for sampling period=1"; | |
| - input Modelica.SIunits.Frequency f=1/2 "The cut-off frequency of the filter"; | |
| + input Modelica.Units.SI.Frequency f=1/2 "The cut-off frequency of the filter"; | |
| output Real h "The impulse response of the convolution filter"; | |
| protected | |
| function d = der(kernel, t); | |
| diff -ur "/home/martin/.openmodelica/libraries/AdvancedNoise 1.0.0/Interpolators/SmoothIdealLowPass/kernel.mo" "converted-libraries/AdvancedNoise 1.0.0/Interpolators/SmoothIdealLowPass/kernel.mo" | |
| --- "/home/martin/.openmodelica/libraries/AdvancedNoise 1.0.0/Interpolators/SmoothIdealLowPass/kernel.mo" 2021-03-15 12:05:59.791863741 +0100 | |
| +++ "converted-libraries/AdvancedNoise 1.0.0/Interpolators/SmoothIdealLowPass/kernel.mo" 2021-04-26 11:50:27.634564534 +0200 | |
| @@ -3,7 +3,7 @@ | |
| import Modelica.Math.Special.sinc; | |
| import Modelica.Constants.pi; | |
| input Real t "The (scaled) time for sampling period=1"; | |
| - input Modelica.SIunits.Frequency f=1/2 "The cut-off frequency of the filter"; | |
| + input Modelica.Units.SI.Frequency f=1/2 "The cut-off frequency of the filter"; | |
| output Real h "The impulse response of the convolution filter"; | |
| algorithm | |
| h := 2*f*sinc(2*pi*f*t); | |
| diff -ur "/home/martin/.openmodelica/libraries/AdvancedNoise 1.0.0/openmodelica.metadata.json" "converted-libraries/AdvancedNoise 1.0.0/openmodelica.metadata.json" | |
| --- "/home/martin/.openmodelica/libraries/AdvancedNoise 1.0.0/openmodelica.metadata.json" 2021-03-15 12:05:59.795863744 +0100 | |
| +++ "converted-libraries/AdvancedNoise 1.0.0/openmodelica.metadata.json" 2021-04-26 11:50:28.238565380 +0200 | |
| @@ -1 +1 @@ | |
| -{"path":"AdvancedNoise 1.0.0", "sha":"bb172f98d01e1b26873b4411b2119285bdcdb7cf", "support":"obsolete", "uses":{"Modelica":"3.2.2"}, "version":"1.0.0", "zipfile":"https://github.com/DLR-SR/AdvancedNoise/archive/bb172f98d01e1b26873b4411b2119285bdcdb7cf.zip"} | |
| +{"path": "AdvancedNoise 1.0.0", "sha": "bb172f98d01e1b26873b4411b2119285bdcdb7cf", "support": "obsolete", "uses": {"Modelica": "4.0.0"}, "version": "1.0.0", "zipfile": "https://github.com/DLR-SR/AdvancedNoise/archive/bb172f98d01e1b26873b4411b2119285bdcdb7cf.zip", "extraInfo": "Conversion script /home/martin/.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/martin/.openmodelica/libraries/AdvancedNoise 1.0.0/package.mo" "converted-libraries/AdvancedNoise 1.0.0/package.mo" | |
| --- "/home/martin/.openmodelica/libraries/AdvancedNoise 1.0.0/package.mo" 2021-03-15 12:05:59.795863744 +0100 | |
| +++ "converted-libraries/AdvancedNoise 1.0.0/package.mo" 2021-04-26 11:50:28.234565375 +0200 | |
| @@ -6,7 +6,7 @@ | |
| version = "1.0.0", | |
| versionDate = "2016-05-03", | |
| versionBuild = 1, | |
| - uses(Modelica(version="3.2.2")), | |
| + uses(Modelica(version= "4.0.0")), | |
| Icon(graphics={ Line( | |
| points={{-84,0},{-54,0},{-54,40},{-24,40},{-24,-70},{6,-70},{6,80},{36,80}, | |
| {36,-20},{66,-20},{66,60}})}), | |
| diff -ur "/home/martin/.openmodelica/libraries/AdvancedNoise 1.0.0/Sources/TimeBasedNoise.mo" "converted-libraries/AdvancedNoise 1.0.0/Sources/TimeBasedNoise.mo" | |
| --- "/home/martin/.openmodelica/libraries/AdvancedNoise 1.0.0/Sources/TimeBasedNoise.mo" 2021-03-15 12:05:59.795863744 +0100 | |
| +++ "converted-libraries/AdvancedNoise 1.0.0/Sources/TimeBasedNoise.mo" 2021-04-26 11:50:27.386564187 +0200 | |
| @@ -8,7 +8,7 @@ | |
| extends Modelica.Blocks.Interfaces.SO; | |
| // Main dialog menu | |
| - parameter Modelica.SIunits.Time samplePeriod(start=0.01) | |
| + parameter Modelica.Units.SI.Time samplePeriod(start=0.01) | |
| "Period for sampling the raw random numbers" | |
| annotation(Dialog(enable=enableNoise)); | |
| @@ -122,7 +122,7 @@ | |
| end when; | |
| public | |
| - parameter Modelica.SIunits.Time startTime = 0.0 | |
| + parameter Modelica.Units.SI.Time startTime = 0.0 | |
| "Start time for sampling the raw random numbers" | |
| annotation(Dialog(tab="Advanced", group="Initialization",enable=enableNoise)); | |
| diff -ur "/home/martin/.openmodelica/libraries/AdvancedNoise 1.0.0/Statistics/AutoCorrelationTest.mo" "converted-libraries/AdvancedNoise 1.0.0/Statistics/AutoCorrelationTest.mo" | |
| --- "/home/martin/.openmodelica/libraries/AdvancedNoise 1.0.0/Statistics/AutoCorrelationTest.mo" 2021-03-15 12:05:59.795863744 +0100 | |
| +++ "converted-libraries/AdvancedNoise 1.0.0/Statistics/AutoCorrelationTest.mo" 2021-04-26 11:50:27.342564126 +0200 | |
| @@ -3,7 +3,7 @@ | |
| "Tests the null hypothesis that a signal is uncorrelated with a given offset" | |
| extends Modelica.Blocks.Interfaces.SISO; | |
| - parameter Modelica.SIunits.Time delta_t(min=0) = 0.1 | |
| + parameter Modelica.Units.SI.Time delta_t(min=0) = 0.1 | |
| "Time delay for auto-correlation of signal"; | |
| CorrelationTest correlationTest(correlation(delta_t=delta_t)) | |
| diff -ur "/home/martin/.openmodelica/libraries/AdvancedNoise 1.0.0/Statistics/Correlation.mo" "converted-libraries/AdvancedNoise 1.0.0/Statistics/Correlation.mo" | |
| --- "/home/martin/.openmodelica/libraries/AdvancedNoise 1.0.0/Statistics/Correlation.mo" 2021-03-15 12:05:59.795863744 +0100 | |
| +++ "converted-libraries/AdvancedNoise 1.0.0/Statistics/Correlation.mo" 2021-04-26 11:50:27.330564108 +0200 | |
| @@ -4,7 +4,7 @@ | |
| // Parameters | |
| public | |
| - parameter Modelica.SIunits.Time delta_t(min=0) = 0.0 | |
| + parameter Modelica.Units.SI.Time delta_t(min=0) = 0.0 | |
| "Time delay for auto-correlation of signal"; | |
| // The start time of the simulation | |
| diff -ur "/home/martin/.openmodelica/libraries/AdvancedNoise 1.0.0/Tests/Derivatives.mo" "converted-libraries/AdvancedNoise 1.0.0/Tests/Derivatives.mo" | |
| --- "/home/martin/.openmodelica/libraries/AdvancedNoise 1.0.0/Tests/Derivatives.mo" 2021-03-15 12:05:59.795863744 +0100 | |
| +++ "converted-libraries/AdvancedNoise 1.0.0/Tests/Derivatives.mo" 2021-04-26 11:50:27.262564012 +0200 | |
| @@ -105,7 +105,7 @@ | |
| redeclare function distribution = | |
| Modelica.Math.Distributions.Uniform.quantile (y_min=-1, y_max=3)) | |
| annotation (Placement(transformation(extent={{0,-100},{20,-80}}))); | |
| - Modelica.Blocks.Sources.Sine sine(freqHz=0.3) | |
| + Modelica.Blocks.Sources.Sine sine(f =0.3) | |
| annotation (Placement(transformation(extent={{-96,-20},{-76,0}}))); | |
| Modelica.Blocks.Continuous.Der der1 | |
| annotation (Placement(transformation(extent={{-32,16},{-24,24}}))); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/AirCurtain/AirCurtainSimplified.mo" "converted-libraries/AixLib 0.9.1-master/Airflow/AirCurtain/AirCurtainSimplified.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/AirCurtain/AirCurtainSimplified.mo" 2021-03-15 12:05:56.587860810 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Airflow/AirCurtain/AirCurtainSimplified.mo" 2021-04-26 11:51:25.294644610 +0200 | |
| @@ -1,19 +1,19 @@ | |
| within AixLib.Airflow.AirCurtain; | |
| model AirCurtainSimplified | |
| "Ideal model for the usage of an air curtain in the context of low order retail zones" | |
| - parameter Modelica.SIunits.VolumeFlowRate V_flowAirCur = 5 | |
| + parameter Modelica.Units.SI.VolumeFlowRate V_flowAirCur = 5 | |
| "Design volume flow rate of the air curtain"; | |
| - parameter Modelica.SIunits.TemperatureDifference TAddAirCur = 5 | |
| + parameter Modelica.Units.SI.TemperatureDifference TAddAirCur = 5 | |
| "Temperature increase over the air curtain"; | |
| parameter Real etaAirCur = 0.73 | |
| "Efficiency of the air curtain"; | |
| - parameter Modelica.SIunits.Density rho = 1.25 | |
| + parameter Modelica.Units.SI.Density rho = 1.25 | |
| "Air density"; | |
| - parameter Modelica.SIunits.SpecificHeatCapacity c = 1000 | |
| + parameter Modelica.Units.SI.SpecificHeatCapacity c = 1000 | |
| "Specific heat capacity of air"; | |
| - parameter Modelica.SIunits.Temperature TBou = 287.15 | |
| + parameter Modelica.Units.SI.Temperature TBou = 287.15 | |
| "Threshold of the ambient temperature when aircurtain becomes active"; | |
| - parameter Modelica.SIunits.Power PAirCur = 27500 | |
| + parameter Modelica.Units.SI.Power PAirCur = 27500 | |
| "The thermal Power of the air curtain, simplified use"; | |
| Utilities.Psychrometrics.MixedTemperature mixedTemperature | |
| annotation (Placement(transformation(extent={{-6,-10},{14,10}}))); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/AirHandlingUnit/AHU.mo" "converted-libraries/AixLib 0.9.1-master/Airflow/AirHandlingUnit/AHU.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/AirHandlingUnit/AHU.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Airflow/AirHandlingUnit/AHU.mo" 2021-04-26 11:51:25.254644554 +0200 | |
| @@ -43,57 +43,57 @@ | |
| "efficiency of HRS in the AHU modes when HRS is disabled"; | |
| inner Real phi_t(start=0.5); | |
| - inner Modelica.SIunits.Temp_K T_oda;//(start=288.15); | |
| - inner Modelica.SIunits.Temp_K T_1(start=290.15); | |
| - inner Modelica.SIunits.Temp_K T_5(start=293.15); | |
| - inner Modelica.SIunits.Temp_K T_sup(start=295.15); | |
| - inner Modelica.SIunits.Temp_K T_eta(start=296.15); | |
| - inner Modelica.SIunits.Temp_K T_6;//(start=296.15); | |
| - | |
| - inner Modelica.SIunits.MassFraction X_oda(start=0.007); | |
| - Modelica.SIunits.MassFraction X_odaSat(start=0.007); | |
| - Modelica.SIunits.MassFraction X_odaRaw(start=0.007); | |
| - inner Modelica.SIunits.MassFraction X_sup(start=0.008); | |
| - Modelica.SIunits.MassFraction X_supplyMin(start=0.006); | |
| - Modelica.SIunits.MassFraction X_supplyMax(start=0.010); | |
| - inner Modelica.SIunits.MassFraction X_supMin(start=0.006); | |
| - inner Modelica.SIunits.MassFraction X_supMax(start=0.010); | |
| - Modelica.SIunits.MassFraction X_extractAir(start=0.008); | |
| - Modelica.SIunits.MassFraction X_eta(start=0.008); | |
| + inner Modelica.Units.SI.Temperature T_oda;//(start=288.15); | |
| + inner Modelica.Units.SI.Temperature T_1(start=290.15); | |
| + inner Modelica.Units.SI.Temperature T_5(start=293.15); | |
| + inner Modelica.Units.SI.Temperature T_sup(start=295.15); | |
| + inner Modelica.Units.SI.Temperature T_eta(start=296.15); | |
| + inner Modelica.Units.SI.Temperature T_6;//(start=296.15); | |
| + | |
| + inner Modelica.Units.SI.MassFraction X_oda(start=0.007); | |
| + Modelica.Units.SI.MassFraction X_odaSat(start=0.007); | |
| + Modelica.Units.SI.MassFraction X_odaRaw(start=0.007); | |
| + inner Modelica.Units.SI.MassFraction X_sup(start=0.008); | |
| + Modelica.Units.SI.MassFraction X_supplyMin(start=0.006); | |
| + Modelica.Units.SI.MassFraction X_supplyMax(start=0.010); | |
| + inner Modelica.Units.SI.MassFraction X_supMin(start=0.006); | |
| + inner Modelica.Units.SI.MassFraction X_supMax(start=0.010); | |
| + Modelica.Units.SI.MassFraction X_extractAir(start=0.008); | |
| + Modelica.Units.SI.MassFraction X_eta(start=0.008); | |
| Real phi_sup(start=0.5); | |
| - inner Modelica.SIunits.HeatFlowRate Q_dot_C(start=1e-3); | |
| - inner Modelica.SIunits.HeatFlowRate Q_dot_H(start=1e-3); | |
| - Modelica.SIunits.Power P_el_sup(start=1e-3); | |
| - Modelica.SIunits.Power P_el_eta(start=1e-3); | |
| - inner Modelica.SIunits.VolumeFlowRate V_dot_sup(start=1e-3); | |
| - inner Modelica.SIunits.VolumeFlowRate V_dot_eta(start=1e-3); | |
| + inner Modelica.Units.SI.HeatFlowRate Q_dot_C(start=1e-3); | |
| + inner Modelica.Units.SI.HeatFlowRate Q_dot_H(start=1e-3); | |
| + Modelica.Units.SI.Power P_el_sup(start=1e-3); | |
| + Modelica.Units.SI.Power P_el_eta(start=1e-3); | |
| + inner Modelica.Units.SI.VolumeFlowRate V_dot_sup(start=1e-3); | |
| + inner Modelica.Units.SI.VolumeFlowRate V_dot_eta(start=1e-3); | |
| // Constants from formulas collection of Thermodynamik (institute: LTT) | |
| - constant Modelica.SIunits.SpecificHeatCapacityAtConstantPressure c_pL_iG=1E3; | |
| - constant Modelica.SIunits.SpecificHeatCapacityAtConstantPressure c_pW_iG=1.86E3; | |
| - constant Modelica.SIunits.SpecificEnthalpy r_0=2465E3 | |
| + constant Modelica.Units.SI.SpecificHeatCapacityAtConstantPressure c_pL_iG=1E3; | |
| + constant Modelica.Units.SI.SpecificHeatCapacityAtConstantPressure c_pW_iG=1.86E3; | |
| + constant Modelica.Units.SI.SpecificEnthalpy r_0=2465E3 | |
| "enthalpy of vaporization at temperature between T_dew(X_sup=0.008)=11 degC and T_sup = 22 degC"; | |
| - constant Modelica.SIunits.Density rho=1.2; | |
| - constant Modelica.SIunits.Pressure p_0=101325; | |
| - constant Modelica.SIunits.SpecificEnthalpy dhV=2501.3E3; | |
| - constant Modelica.SIunits.Temp_K T_0=273.15; | |
| + constant Modelica.Units.SI.Density rho=1.2; | |
| + constant Modelica.Units.SI.Pressure p_0=101325; | |
| + constant Modelica.Units.SI.SpecificEnthalpy dhV=2501.3E3; | |
| + constant Modelica.Units.SI.Temperature T_0=273.15; | |
| constant Real molarMassRatio=Modelica.Media.IdealGases.Common.SingleGasesData.H2O.MM | |
| /Modelica.Media.Air.SimpleAir.MM_const; | |
| // auxiliary variable | |
| - Modelica.SIunits.TemperatureDifference dTFan; | |
| - Modelica.SIunits.Temp_K TsupplyAirOut(start=295.15); | |
| + Modelica.Units.SI.TemperatureDifference dTFan; | |
| + Modelica.Units.SI.Temperature TsupplyAirOut(start=295.15); | |
| // Sampler (time-continous to time-discrete variables) | |
| - Modelica_Synchronous.RealSignals.Sampler.SampleVectorizedAndClocked sample(n=9) | |
| + Modelica.Clocked.RealSignals.Sampler.SampleVectorizedAndClocked sample(n=9) | |
| annotation (Placement(transformation( | |
| extent={{-10,-10},{10,10}}, | |
| rotation=-90, | |
| origin={-66,14}))); | |
| - Modelica_Synchronous.ClockSignals.Clocks.PeriodicRealClock periodicClock( | |
| + Modelica.Clocked.ClockSignals.Clocks.PeriodicRealClock periodicClock( | |
| solverMethod="ExplicitRungeKutta4", | |
| useSolver=true, | |
| period=clockPeriodGeneric) | |
| @@ -107,9 +107,9 @@ | |
| //Start State | |
| block StartState | |
| - outer output Modelica.SIunits.HeatFlowRate Q_dot_C; | |
| - outer output Modelica.SIunits.HeatFlowRate Q_dot_H; | |
| + outer output Modelica.Units.SI.HeatFlowRate Q_dot_C; | |
| + outer output Modelica.Units.SI.HeatFlowRate Q_dot_H; | |
| equation | |
| Q_dot_C = previous(Q_dot_C); | |
| Q_dot_H = previous(Q_dot_H); | |
| @@ -138,31 +138,31 @@ | |
| // Dehumidification | |
| block DeHuHRS_true | |
| - outer output Modelica.SIunits.HeatFlowRate Q_dot_C; | |
| - outer output Modelica.SIunits.HeatFlowRate Q_dot_H; | |
| - outer input Modelica.SIunits.Temp_K T_oda; | |
| - outer input Modelica.SIunits.Temp_K T_1; | |
| - Modelica.SIunits.Temp_K T_2(start=290); | |
| - Modelica.SIunits.Temp_K T_3(start=282); | |
| - Modelica.SIunits.Temp_K T_4(start=282); | |
| - outer input Modelica.SIunits.Temp_K T_5; | |
| - outer input Modelica.SIunits.Temp_K T_6; | |
| - outer input Modelica.SIunits.MassFraction X_oda; | |
| - outer input Modelica.SIunits.MassFraction X_supMax; | |
| - outer output Modelica.SIunits.MassFraction X_sup; | |
| - outer input Modelica.SIunits.VolumeFlowRate V_dot_sup; | |
| + outer output Modelica.Units.SI.HeatFlowRate Q_dot_C; | |
| + outer output Modelica.Units.SI.HeatFlowRate Q_dot_H; | |
| + outer input Modelica.Units.SI.Temperature T_oda; | |
| + outer input Modelica.Units.SI.Temperature T_1; | |
| + Modelica.Units.SI.Temperature T_2(start=290); | |
| + Modelica.Units.SI.Temperature T_3(start=282); | |
| + Modelica.Units.SI.Temperature T_4(start=282); | |
| + outer input Modelica.Units.SI.Temperature T_5; | |
| + outer input Modelica.Units.SI.Temperature T_6; | |
| + outer input Modelica.Units.SI.MassFraction X_oda; | |
| + outer input Modelica.Units.SI.MassFraction X_supMax; | |
| + outer output Modelica.Units.SI.MassFraction X_sup; | |
| + outer input Modelica.Units.SI.VolumeFlowRate V_dot_sup; | |
| outer output Real phi_t; | |
| outer input Real phi_t_withHRS; | |
| outer parameter Real BPF_DeHu; | |
| - Modelica.SIunits.SpecificEnthalpy h_2(start=0.003) "h_in of cooler"; | |
| - Modelica.SIunits.SpecificEnthalpy h_surface(start=0.002) | |
| - "h_surface of cooler"; | |
| - Modelica.SIunits.SpecificEnthalpy h_CoilOut(start=0.001) "h_out of cooler"; | |
| - Modelica.SIunits.Pressure p_sat_surface(start=2300); | |
| - Modelica.SIunits.MassFraction X_surface(start=0.005); | |
| - Modelica.SIunits.Temp_K T_surface(start=280); | |
| - Modelica.SIunits.Temp_K T_CoilOut(start=278); | |
| + Modelica.Units.SI.SpecificEnthalpy h_2(start=0.003) "h_in of cooler"; | |
| + Modelica.Units.SI.SpecificEnthalpy h_surface(start=0.002) | |
| + "h_surface of cooler"; | |
| + Modelica.Units.SI.SpecificEnthalpy h_CoilOut(start=0.001) "h_out of cooler"; | |
| + Modelica.Units.SI.Pressure p_sat_surface(start=2300); | |
| + Modelica.Units.SI.MassFraction X_surface(start=0.005); | |
| + Modelica.Units.SI.Temperature T_surface(start=280); | |
| + Modelica.Units.SI.Temperature T_CoilOut(start=278); | |
| equation | |
| phi_t = phi_t_withHRS "heat recovery system is enabled"; | |
| X_sup = previous(X_supMax); | |
| @@ -223,31 +223,31 @@ | |
| // | |
| block DeHuHRS_false | |
| - outer output Modelica.SIunits.HeatFlowRate Q_dot_C; | |
| - outer output Modelica.SIunits.HeatFlowRate Q_dot_H; | |
| - outer input Modelica.SIunits.Temp_K T_oda; | |
| - outer input Modelica.SIunits.Temp_K T_1; | |
| - Modelica.SIunits.Temp_K T_2(start=290); | |
| - Modelica.SIunits.Temp_K T_3(start=282); | |
| - Modelica.SIunits.Temp_K T_4(start=282); | |
| - outer input Modelica.SIunits.Temp_K T_5; | |
| - outer input Modelica.SIunits.Temp_K T_6; | |
| - outer input Modelica.SIunits.MassFraction X_oda; | |
| - outer input Modelica.SIunits.MassFraction X_supMax; | |
| - outer output Modelica.SIunits.MassFraction X_sup; | |
| - outer input Modelica.SIunits.VolumeFlowRate V_dot_sup; | |
| + outer output Modelica.Units.SI.HeatFlowRate Q_dot_C; | |
| + outer output Modelica.Units.SI.HeatFlowRate Q_dot_H; | |
| + outer input Modelica.Units.SI.Temperature T_oda; | |
| + outer input Modelica.Units.SI.Temperature T_1; | |
| + Modelica.Units.SI.Temperature T_2(start=290); | |
| + Modelica.Units.SI.Temperature T_3(start=282); | |
| + Modelica.Units.SI.Temperature T_4(start=282); | |
| + outer input Modelica.Units.SI.Temperature T_5; | |
| + outer input Modelica.Units.SI.Temperature T_6; | |
| + outer input Modelica.Units.SI.MassFraction X_oda; | |
| + outer input Modelica.Units.SI.MassFraction X_supMax; | |
| + outer output Modelica.Units.SI.MassFraction X_sup; | |
| + outer input Modelica.Units.SI.VolumeFlowRate V_dot_sup; | |
| outer output Real phi_t; | |
| outer input Real phi_t_withoutHRS; | |
| outer parameter Real BPF_DeHu; | |
| - Modelica.SIunits.SpecificEnthalpy h_2(start=0.003) "h_in of cooler"; | |
| - Modelica.SIunits.SpecificEnthalpy h_surface(start=0.002) | |
| - "h_surface of cooler"; | |
| - Modelica.SIunits.SpecificEnthalpy h_CoilOut(start=0.001) "h_out of cooler"; | |
| - Modelica.SIunits.Pressure p_sat_surface(start=2300); | |
| - Modelica.SIunits.MassFraction X_surface(start=0.005); | |
| - Modelica.SIunits.Temp_K T_surface(start=280); | |
| - Modelica.SIunits.Temp_K T_CoilOut(start=278); | |
| + Modelica.Units.SI.SpecificEnthalpy h_2(start=0.003) "h_in of cooler"; | |
| + Modelica.Units.SI.SpecificEnthalpy h_surface(start=0.002) | |
| + "h_surface of cooler"; | |
| + Modelica.Units.SI.SpecificEnthalpy h_CoilOut(start=0.001) "h_out of cooler"; | |
| + Modelica.Units.SI.Pressure p_sat_surface(start=2300); | |
| + Modelica.Units.SI.MassFraction X_surface(start=0.005); | |
| + Modelica.Units.SI.Temperature T_surface(start=280); | |
| + Modelica.Units.SI.Temperature T_CoilOut(start=278); | |
| equation | |
| phi_t = phi_t_withoutHRS "heat recovery system is disabled"; | |
| X_sup = previous(X_supMax); | |
| @@ -309,16 +309,16 @@ | |
| // Humidification | |
| block HuPreHHRS_true | |
| - outer output Modelica.SIunits.HeatFlowRate Q_dot_C; | |
| - outer output Modelica.SIunits.HeatFlowRate Q_dot_H; | |
| - outer input Modelica.SIunits.Temp_K T_oda; | |
| - outer input Modelica.SIunits.Temp_K T_1; | |
| - outer input Modelica.SIunits.Temp_K T_5; | |
| - outer input Modelica.SIunits.Temp_K T_6; | |
| - outer input Modelica.SIunits.MassFraction X_oda; | |
| - outer input Modelica.SIunits.MassFraction X_supMin; | |
| - outer output Modelica.SIunits.MassFraction X_sup; | |
| - outer input Modelica.SIunits.VolumeFlowRate V_dot_sup; | |
| + outer output Modelica.Units.SI.HeatFlowRate Q_dot_C; | |
| + outer output Modelica.Units.SI.HeatFlowRate Q_dot_H; | |
| + outer input Modelica.Units.SI.Temperature T_oda; | |
| + outer input Modelica.Units.SI.Temperature T_1; | |
| + outer input Modelica.Units.SI.Temperature T_5; | |
| + outer input Modelica.Units.SI.Temperature T_6; | |
| + outer input Modelica.Units.SI.MassFraction X_oda; | |
| + outer input Modelica.Units.SI.MassFraction X_supMin; | |
| + outer output Modelica.Units.SI.MassFraction X_sup; | |
| + outer input Modelica.Units.SI.VolumeFlowRate V_dot_sup; | |
| outer output Real phi_t; | |
| outer input Real phi_t_withHRS; | |
| @@ -356,16 +356,16 @@ | |
| // | |
| block HuPreHHRS_false | |
| - outer output Modelica.SIunits.HeatFlowRate Q_dot_C; | |
| - outer output Modelica.SIunits.HeatFlowRate Q_dot_H; | |
| - outer input Modelica.SIunits.Temp_K T_oda; | |
| - outer input Modelica.SIunits.Temp_K T_1; | |
| - outer input Modelica.SIunits.Temp_K T_5; | |
| - outer input Modelica.SIunits.Temp_K T_6; | |
| - outer input Modelica.SIunits.MassFraction X_oda; | |
| - outer input Modelica.SIunits.MassFraction X_supMin; | |
| - outer output Modelica.SIunits.MassFraction X_sup; | |
| - outer input Modelica.SIunits.VolumeFlowRate V_dot_sup; | |
| + outer output Modelica.Units.SI.HeatFlowRate Q_dot_C; | |
| + outer output Modelica.Units.SI.HeatFlowRate Q_dot_H; | |
| + outer input Modelica.Units.SI.Temperature T_oda; | |
| + outer input Modelica.Units.SI.Temperature T_1; | |
| + outer input Modelica.Units.SI.Temperature T_5; | |
| + outer input Modelica.Units.SI.Temperature T_6; | |
| + outer input Modelica.Units.SI.MassFraction X_oda; | |
| + outer input Modelica.Units.SI.MassFraction X_supMin; | |
| + outer output Modelica.Units.SI.MassFraction X_sup; | |
| + outer input Modelica.Units.SI.VolumeFlowRate V_dot_sup; | |
| outer output Real phi_t; | |
| outer input Real phi_t_withoutHRS; | |
| @@ -403,19 +403,19 @@ | |
| // | |
| block HuCHRS_true | |
| - outer output Modelica.SIunits.HeatFlowRate Q_dot_C; | |
| - outer output Modelica.SIunits.HeatFlowRate Q_dot_H; | |
| - outer input Modelica.SIunits.Temp_K T_oda; | |
| - outer input Modelica.SIunits.Temp_K T_1; | |
| - Modelica.SIunits.Temp_K T_2; | |
| - Modelica.SIunits.Temp_K T_3; | |
| - Modelica.SIunits.Temp_K T_4; | |
| - outer input Modelica.SIunits.Temp_K T_5; | |
| - outer input Modelica.SIunits.Temp_K T_6; | |
| - outer input Modelica.SIunits.MassFraction X_oda; | |
| - outer input Modelica.SIunits.MassFraction X_supMin; | |
| - outer output Modelica.SIunits.MassFraction X_sup; | |
| - outer input Modelica.SIunits.VolumeFlowRate V_dot_sup; | |
| + outer output Modelica.Units.SI.HeatFlowRate Q_dot_C; | |
| + outer output Modelica.Units.SI.HeatFlowRate Q_dot_H; | |
| + outer input Modelica.Units.SI.Temperature T_oda; | |
| + outer input Modelica.Units.SI.Temperature T_1; | |
| + Modelica.Units.SI.Temperature T_2; | |
| + Modelica.Units.SI.Temperature T_3; | |
| + Modelica.Units.SI.Temperature T_4; | |
| + outer input Modelica.Units.SI.Temperature T_5; | |
| + outer input Modelica.Units.SI.Temperature T_6; | |
| + outer input Modelica.Units.SI.MassFraction X_oda; | |
| + outer input Modelica.Units.SI.MassFraction X_supMin; | |
| + outer output Modelica.Units.SI.MassFraction X_sup; | |
| + outer input Modelica.Units.SI.VolumeFlowRate V_dot_sup; | |
| outer output Real phi_t; | |
| outer input Real phi_t_withHRS; | |
| @@ -456,19 +456,19 @@ | |
| // | |
| block HuCHRS_false | |
| - outer output Modelica.SIunits.HeatFlowRate Q_dot_C; | |
| - outer output Modelica.SIunits.HeatFlowRate Q_dot_H; | |
| - outer input Modelica.SIunits.Temp_K T_oda; | |
| - outer input Modelica.SIunits.Temp_K T_1; | |
| - Modelica.SIunits.Temp_K T_2; | |
| - Modelica.SIunits.Temp_K T_3; | |
| - Modelica.SIunits.Temp_K T_4; | |
| - outer input Modelica.SIunits.Temp_K T_5; | |
| - outer input Modelica.SIunits.Temp_K T_6; | |
| - outer input Modelica.SIunits.MassFraction X_oda; | |
| - outer input Modelica.SIunits.MassFraction X_supMin; | |
| - outer output Modelica.SIunits.MassFraction X_sup; | |
| - outer input Modelica.SIunits.VolumeFlowRate V_dot_sup; | |
| + outer output Modelica.Units.SI.HeatFlowRate Q_dot_C; | |
| + outer output Modelica.Units.SI.HeatFlowRate Q_dot_H; | |
| + outer input Modelica.Units.SI.Temperature T_oda; | |
| + outer input Modelica.Units.SI.Temperature T_1; | |
| + Modelica.Units.SI.Temperature T_2; | |
| + Modelica.Units.SI.Temperature T_3; | |
| + Modelica.Units.SI.Temperature T_4; | |
| + outer input Modelica.Units.SI.Temperature T_5; | |
| + outer input Modelica.Units.SI.Temperature T_6; | |
| + outer input Modelica.Units.SI.MassFraction X_oda; | |
| + outer input Modelica.Units.SI.MassFraction X_supMin; | |
| + outer output Modelica.Units.SI.MassFraction X_sup; | |
| + outer input Modelica.Units.SI.VolumeFlowRate V_dot_sup; | |
| outer output Real phi_t; | |
| outer input Real phi_t_withoutHRS; | |
| @@ -509,18 +509,18 @@ | |
| // Only Heating | |
| block OnlyHeatingHRS_true | |
| - outer output Modelica.SIunits.HeatFlowRate Q_dot_C; | |
| - outer output Modelica.SIunits.HeatFlowRate Q_dot_H; | |
| - outer input Modelica.SIunits.Temp_K T_oda; | |
| - outer input Modelica.SIunits.Temp_K T_1; | |
| - Modelica.SIunits.Temp_K T_2; | |
| - Modelica.SIunits.Temp_K T_3; | |
| - Modelica.SIunits.Temp_K T_4; | |
| - outer input Modelica.SIunits.Temp_K T_5; | |
| - outer input Modelica.SIunits.Temp_K T_6; | |
| - outer input Modelica.SIunits.MassFraction X_oda; | |
| - outer output Modelica.SIunits.MassFraction X_sup; | |
| - outer input Modelica.SIunits.VolumeFlowRate V_dot_sup; | |
| + outer output Modelica.Units.SI.HeatFlowRate Q_dot_C; | |
| + outer output Modelica.Units.SI.HeatFlowRate Q_dot_H; | |
| + outer input Modelica.Units.SI.Temperature T_oda; | |
| + outer input Modelica.Units.SI.Temperature T_1; | |
| + Modelica.Units.SI.Temperature T_2; | |
| + Modelica.Units.SI.Temperature T_3; | |
| + Modelica.Units.SI.Temperature T_4; | |
| + outer input Modelica.Units.SI.Temperature T_5; | |
| + outer input Modelica.Units.SI.Temperature T_6; | |
| + outer input Modelica.Units.SI.MassFraction X_oda; | |
| + outer output Modelica.Units.SI.MassFraction X_sup; | |
| + outer input Modelica.Units.SI.VolumeFlowRate V_dot_sup; | |
| outer output Real phi_t; | |
| outer input Real phi_t_withHRS; | |
| @@ -559,18 +559,18 @@ | |
| // | |
| block OnlyHeatingHRS_false | |
| - outer output Modelica.SIunits.HeatFlowRate Q_dot_C; | |
| - outer output Modelica.SIunits.HeatFlowRate Q_dot_H; | |
| - outer input Modelica.SIunits.Temp_K T_oda; | |
| - outer input Modelica.SIunits.Temp_K T_1; | |
| - Modelica.SIunits.Temp_K T_2; | |
| - Modelica.SIunits.Temp_K T_3; | |
| - Modelica.SIunits.Temp_K T_4; | |
| - outer input Modelica.SIunits.Temp_K T_5; | |
| - outer input Modelica.SIunits.Temp_K T_6; | |
| - outer input Modelica.SIunits.MassFraction X_oda; | |
| - outer output Modelica.SIunits.MassFraction X_sup; | |
| - outer input Modelica.SIunits.VolumeFlowRate V_dot_sup; | |
| + outer output Modelica.Units.SI.HeatFlowRate Q_dot_C; | |
| + outer output Modelica.Units.SI.HeatFlowRate Q_dot_H; | |
| + outer input Modelica.Units.SI.Temperature T_oda; | |
| + outer input Modelica.Units.SI.Temperature T_1; | |
| + Modelica.Units.SI.Temperature T_2; | |
| + Modelica.Units.SI.Temperature T_3; | |
| + Modelica.Units.SI.Temperature T_4; | |
| + outer input Modelica.Units.SI.Temperature T_5; | |
| + outer input Modelica.Units.SI.Temperature T_6; | |
| + outer input Modelica.Units.SI.MassFraction X_oda; | |
| + outer output Modelica.Units.SI.MassFraction X_sup; | |
| + outer input Modelica.Units.SI.VolumeFlowRate V_dot_sup; | |
| outer output Real phi_t; | |
| outer input Real phi_t_withoutHRS; | |
| @@ -609,18 +609,18 @@ | |
| // Only Cooling | |
| block OnlyCoolingHRS_true | |
| - outer output Modelica.SIunits.HeatFlowRate Q_dot_C; | |
| - outer output Modelica.SIunits.HeatFlowRate Q_dot_H; | |
| - outer input Modelica.SIunits.Temp_K T_oda; | |
| - outer input Modelica.SIunits.Temp_K T_1; | |
| - Modelica.SIunits.Temp_K T_2; | |
| - Modelica.SIunits.Temp_K T_3; | |
| - Modelica.SIunits.Temp_K T_4; | |
| - outer input Modelica.SIunits.Temp_K T_5; | |
| - outer input Modelica.SIunits.Temp_K T_6; | |
| - outer input Modelica.SIunits.MassFraction X_oda; | |
| - outer output Modelica.SIunits.MassFraction X_sup; | |
| - outer input Modelica.SIunits.VolumeFlowRate V_dot_sup; | |
| + outer output Modelica.Units.SI.HeatFlowRate Q_dot_C; | |
| + outer output Modelica.Units.SI.HeatFlowRate Q_dot_H; | |
| + outer input Modelica.Units.SI.Temperature T_oda; | |
| + outer input Modelica.Units.SI.Temperature T_1; | |
| + Modelica.Units.SI.Temperature T_2; | |
| + Modelica.Units.SI.Temperature T_3; | |
| + Modelica.Units.SI.Temperature T_4; | |
| + outer input Modelica.Units.SI.Temperature T_5; | |
| + outer input Modelica.Units.SI.Temperature T_6; | |
| + outer input Modelica.Units.SI.MassFraction X_oda; | |
| + outer output Modelica.Units.SI.MassFraction X_sup; | |
| + outer input Modelica.Units.SI.VolumeFlowRate V_dot_sup; | |
| outer output Real phi_t; | |
| outer input Real phi_t_withHRS; | |
| @@ -659,18 +659,18 @@ | |
| // | |
| block OnlyCoolingHRS_false | |
| - outer output Modelica.SIunits.HeatFlowRate Q_dot_C; | |
| - outer output Modelica.SIunits.HeatFlowRate Q_dot_H; | |
| - outer input Modelica.SIunits.Temp_K T_oda; | |
| - outer input Modelica.SIunits.Temp_K T_1; | |
| - Modelica.SIunits.Temp_K T_2; | |
| - Modelica.SIunits.Temp_K T_3; | |
| - Modelica.SIunits.Temp_K T_4; | |
| - outer input Modelica.SIunits.Temp_K T_5; | |
| - outer input Modelica.SIunits.Temp_K T_6; | |
| - outer input Modelica.SIunits.MassFraction X_oda; | |
| - outer output Modelica.SIunits.MassFraction X_sup; | |
| - outer input Modelica.SIunits.VolumeFlowRate V_dot_sup; | |
| + outer output Modelica.Units.SI.HeatFlowRate Q_dot_C; | |
| + outer output Modelica.Units.SI.HeatFlowRate Q_dot_H; | |
| + outer input Modelica.Units.SI.Temperature T_oda; | |
| + outer input Modelica.Units.SI.Temperature T_1; | |
| + Modelica.Units.SI.Temperature T_2; | |
| + Modelica.Units.SI.Temperature T_3; | |
| + Modelica.Units.SI.Temperature T_4; | |
| + outer input Modelica.Units.SI.Temperature T_5; | |
| + outer input Modelica.Units.SI.Temperature T_6; | |
| + outer input Modelica.Units.SI.MassFraction X_oda; | |
| + outer output Modelica.Units.SI.MassFraction X_sup; | |
| + outer input Modelica.Units.SI.VolumeFlowRate V_dot_sup; | |
| outer output Real phi_t; | |
| outer input Real phi_t_withoutHRS; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/AirHandlingUnit/BaseClasses/PartialAHU.mo" "converted-libraries/AixLib 0.9.1-master/Airflow/AirHandlingUnit/BaseClasses/PartialAHU.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/AirHandlingUnit/BaseClasses/PartialAHU.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Airflow/AirHandlingUnit/BaseClasses/PartialAHU.mo" 2021-04-26 11:51:24.890644054 +0200 | |
| @@ -47,16 +47,16 @@ | |
| (in case that a HRS is physically installed in the AHU)" | |
| annotation (Dialog(group="Settings AHU Value", enable=HRS)); | |
| // assumed increase in ventilator pressure | |
| - parameter Modelica.SIunits.Pressure dp_sup=800 | |
| + parameter Modelica.Units.SI.Pressure dp_sup=800 | |
| "pressure difference over supply fan" | |
| annotation (Dialog(tab="Fans", group="Constant Assumptions")); | |
| - parameter Modelica.SIunits.Pressure dp_eta=800 | |
| + parameter Modelica.Units.SI.Pressure dp_eta=800 | |
| "pressure difference over extract fan" | |
| annotation (Dialog(tab="Fans", group="Constant Assumptions")); | |
| // assumed efficiencies of the ventilators | |
| - parameter Modelica.SIunits.Efficiency eta_sup=0.7 "efficiency of supply fan" | |
| + parameter Modelica.Units.SI.Efficiency eta_sup=0.7 "efficiency of supply fan" | |
| annotation (Dialog(tab="Fans", group="Constant Assumptions")); | |
| - parameter Modelica.SIunits.Efficiency eta_eta=0.7 "efficiency of extract fan" | |
| + parameter Modelica.Units.SI.Efficiency eta_eta=0.7 "efficiency of extract fan" | |
| annotation (Dialog(tab="Fans", group="Constant Assumptions")); | |
| Modelica.Blocks.Interfaces.RealInput Vflow_in(unit="m3/s") "m3/s" | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/AirHandlingUnit/Examples/AHU.mo" "converted-libraries/AixLib 0.9.1-master/Airflow/AirHandlingUnit/Examples/AHU.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/AirHandlingUnit/Examples/AHU.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Airflow/AirHandlingUnit/Examples/AHU.mo" 2021-04-26 11:51:24.846643992 +0200 | |
| @@ -5,7 +5,7 @@ | |
| Modelica.Blocks.Sources.Sine tempOutside( | |
| amplitude=10, | |
| - freqHz=1/86400, | |
| +f =1/86400, | |
| phase=-3.1415/2, | |
| offset=292) | |
| annotation (Placement(transformation(extent={{-100,-16},{-80,4}}))); | |
| @@ -24,7 +24,7 @@ | |
| annotation (Placement(transformation(extent={{98,-56},{78,-36}}))); | |
| Modelica.Blocks.Sources.Sine waterLoadOutside( | |
| - freqHz=1/86400, | |
| + f =1/86400, | |
| offset=0.008, | |
| amplitude=0.002, | |
| phase=-0.054829518451402) | |
| @@ -32,7 +32,7 @@ | |
| Modelica.Blocks.Sources.Constant phi_RoomExtractAir(k=0.6) | |
| annotation (Placement(transformation(extent={{98,-24},{78,-4}}))); | |
| Modelica.Blocks.Sources.Sine tempAddInRoom( | |
| - freqHz=1/86400, | |
| + f =1/86400, | |
| amplitude=2, | |
| phase=-3.1415/4, | |
| offset=1.7) | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/FacadeVentilationUnit/BaseClasses/SetPower.mo" "converted-libraries/AixLib 0.9.1-master/Airflow/FacadeVentilationUnit/BaseClasses/SetPower.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/FacadeVentilationUnit/BaseClasses/SetPower.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Airflow/FacadeVentilationUnit/BaseClasses/SetPower.mo" 2021-04-26 11:51:24.790643916 +0200 | |
| @@ -5,17 +5,17 @@ | |
| extends Modelica.Fluid.Interfaces.PartialTwoPort; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.05 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.05 | |
| "Nominal mass flow rate of fan"; | |
| parameter Medium.AbsolutePressure p_start=Medium.p_default | |
| "Start value of pressure"; | |
| parameter Integer noUnits=1 "Number of identical FVU units"; | |
| - parameter Modelica.SIunits.PressureDifference dp_nominal=500 | |
| + parameter Modelica.Units.SI.PressureDifference dp_nominal=500 | |
| "Initial pressure difference"; | |
| parameter Medium.Temperature T_start=Medium.T_default | |
| "Start value of temperature"; | |
| - Modelica.Blocks.Tables.CombiTable1D volumeFlow(table=[0,1; 0.1,25; 0.2,40; | |
| + Modelica.Blocks.Tables.CombiTable1Dv volumeFlow(table=[0,1; 0.1,25; 0.2,40; | |
| 0.3,60; 0.4,90; 0.5,100; 0.6,140; 0.7,175; 0.8,200; 0.9,225; 1,260]) | |
| "Correlates the relative input signal and a volume flow rate" | |
| annotation (Placement(transformation( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/FacadeVentilationUnit/DataBase/FVUBaseRecord.mo" "converted-libraries/AixLib 0.9.1-master/Airflow/FacadeVentilationUnit/DataBase/FVUBaseRecord.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/FacadeVentilationUnit/DataBase/FVUBaseRecord.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Airflow/FacadeVentilationUnit/DataBase/FVUBaseRecord.mo" 2021-04-26 11:51:24.754643865 +0200 | |
| @@ -4,39 +4,39 @@ | |
| extends Modelica.Icons.Record; | |
| parameter Integer noUnits=1 "Number of identical FVUs"; | |
| - parameter Modelica.SIunits.ThermalConductance UA_heater=120 | |
| + | |
| + parameter Modelica.Units.SI.ThermalConductance UA_heater=120 | |
| "Thermal conductance of heater at nominal flow, used to compute heat | |
| capacity"; | |
| - parameter Modelica.SIunits.ThermalConductance UA_cooler=65 | |
| + parameter Modelica.Units.SI.ThermalConductance UA_cooler=65 | |
| "Thermal conductance of cooler at nominal flow, used to compute heat | |
| capacity"; | |
| - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal_heater=0.1 | |
| + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal_heater=0.1 | |
| "Nominal mass flow rate on water side of heater"; | |
| - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal_heater=0.1 | |
| + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal_heater=0.1 | |
| "Nominal mass flow rate on air side of heater"; | |
| - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal_cooler=0.1 | |
| + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal_cooler=0.1 | |
| "Nominal mass flow rate on water side of cooler"; | |
| - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal_cooler=0.05 | |
| + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal_cooler=0.05 | |
| "Nominal mass flow rate on air side of cooler"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal_damper=0.1 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal_damper=0.1 | |
| "Nominal mass flow rate of damper"; | |
| - parameter Modelica.SIunits.Pressure dp1_nominal_heater=1000 | |
| + parameter Modelica.Units.SI.Pressure dp1_nominal_heater=1000 | |
| "Nominal pressure loss on water side of heater"; | |
| - parameter Modelica.SIunits.Pressure dp2_nominal_heater=100 | |
| + parameter Modelica.Units.SI.Pressure dp2_nominal_heater=100 | |
| "Nominal pressure loss on air side of heater"; | |
| - parameter Modelica.SIunits.Pressure dp1_nominal_cooler=1000 | |
| + parameter Modelica.Units.SI.Pressure dp1_nominal_cooler=1000 | |
| "Nominal pressure loss on water side of cooler"; | |
| - parameter Modelica.SIunits.Pressure dp2_nominal_cooler=100 | |
| + parameter Modelica.Units.SI.Pressure dp2_nominal_cooler=100 | |
| "Nominal pressure loss on air side of cooler"; | |
| - parameter Modelica.SIunits.Pressure p_default=101300 | |
| + parameter Modelica.Units.SI.Pressure p_default=101300 | |
| "Default static pressure at outlet"; | |
| - parameter Modelica.SIunits.Pressure dp_nominal_damper=500 | |
| + parameter Modelica.Units.SI.Pressure dp_nominal_damper=500 | |
| "Nominal pressure loss in dampers"; | |
| - parameter Modelica.SIunits.Time damperRiseTimeLong = 90 "Rising time of the | |
| + parameter Modelica.Units.SI.Time damperRiseTimeLong = 90 "Rising time of the | |
| slowly moving dampers"; | |
| - parameter Modelica.SIunits.Time damperRiseTimeShort = 20 "Rising time of the | |
| + parameter Modelica.Units.SI.Time damperRiseTimeShort = 20 "Rising time of the | |
| slowly moving dampers"; | |
| - | |
| annotation (Documentation(info="<html> | |
| <p><b><span style=\"color: #008000;\">Overview</span></b> </p> | |
| <p>This is the base definition of the paramter record that can be used for the | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/FacadeVentilationUnit/Examples/FacadeVentilationUnit.mo" "converted-libraries/AixLib 0.9.1-master/Airflow/FacadeVentilationUnit/Examples/FacadeVentilationUnit.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/FacadeVentilationUnit/Examples/FacadeVentilationUnit.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Airflow/FacadeVentilationUnit/Examples/FacadeVentilationUnit.mo" 2021-04-26 11:51:24.730643832 +0200 | |
| @@ -88,14 +88,14 @@ | |
| annotation (Placement(transformation(extent={{120,-54},{140,-34}}))); | |
| Modelica.Blocks.Sources.Sine roomTemperature( | |
| amplitude=5, | |
| - freqHz=1/86400, | |
| +f =1/86400, | |
| phase=3.1415926535898, | |
| offset=273.15 + 20) | |
| "Provides a test value of the room temperature" | |
| annotation (Placement(transformation(extent={{-100,40},{-80,60}}))); | |
| Modelica.Blocks.Sources.Sine roomSetTemperature( | |
| amplitude=5, | |
| - freqHz=1/86400, | |
| +f =1/86400, | |
| phase=1.5707963267949, | |
| offset=273.15 + 20) | |
| "Provides a test value of the room set temperature" | |
| @@ -105,7 +105,7 @@ | |
| annotation (Placement(transformation(extent={{-100,-80},{-80,-60}}))); | |
| Modelica.Blocks.Sources.Sine outdoorTemperature( | |
| amplitude=5, | |
| - freqHz=1/86400, | |
| +f =1/86400, | |
| offset=273.15 + 10) "Provides a test value of the outdoor temperature" | |
| annotation (Placement(transformation(extent={{-100,6},{-80,26}}))); | |
| AixLib.Controls.Interfaces.FVUControlBus fVUControlBus | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/FacadeVentilationUnit/FacadeVentilationUnit.mo" "converted-libraries/AixLib 0.9.1-master/Airflow/FacadeVentilationUnit/FacadeVentilationUnit.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/FacadeVentilationUnit/FacadeVentilationUnit.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Airflow/FacadeVentilationUnit/FacadeVentilationUnit.mo" 2021-04-26 11:51:24.690643778 +0200 | |
| @@ -11,7 +11,7 @@ | |
| fVUParam=AixLib.Airflow.FacadeVentilationUnit.DataBase.FVUBaseRecord() | |
| "Record containing the characteristic parameters of the unit"; | |
| - parameter Modelica.SIunits.ThermodynamicTemperature T_start=273.15 + 20 | |
| + parameter Modelica.Units.SI.ThermodynamicTemperature T_start=273.15 + 20 | |
| "Initial temperature in unit"; | |
| AixLib.Airflow.FacadeVentilationUnit.BaseClasses.SetPower fanExhaustAir( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/DoorDiscretized.mo" "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/DoorDiscretized.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/DoorDiscretized.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/DoorDiscretized.mo" 2021-04-26 11:51:24.602643656 +0200 | |
| @@ -5,25 +5,25 @@ | |
| parameter Integer nCom=10 "Number of compartments for the discretization"; | |
| - parameter Modelica.SIunits.PressureDifference dp_turbulent(min=0) = 0.01 | |
| + parameter Modelica.Units.SI.PressureDifference dp_turbulent(min=0) = 0.01 | |
| "Pressure difference where laminar and turbulent flow relation coincide. Recommended: 0.01"; | |
| - Modelica.SIunits.PressureDifference dpAB[nCom](each nominal=1) | |
| + Modelica.Units.SI.PressureDifference dpAB[nCom](each nominal=1) | |
| "Pressure difference between compartments"; | |
| - Modelica.SIunits.Velocity v[nCom](each nominal=0.01) | |
| + Modelica.Units.SI.Velocity v[nCom](each nominal=0.01) | |
| "Velocity in compartment from A to B"; | |
| - Modelica.SIunits.Velocity vTop "Velocity at top of opening from A to B"; | |
| - Modelica.SIunits.Velocity vBot "Velocity at bottom of opening from A to B"; | |
| + Modelica.Units.SI.Velocity vTop "Velocity at top of opening from A to B"; | |
| + Modelica.Units.SI.Velocity vBot "Velocity at bottom of opening from A to B"; | |
| protected | |
| - parameter Modelica.SIunits.Length dh=hOpe/nCom "Height of each compartment"; | |
| + parameter Modelica.Units.SI.Length dh=hOpe/nCom "Height of each compartment"; | |
| parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX( | |
| T=Medium.T_default, | |
| p=Medium.p_default, | |
| X=Medium.X_default); | |
| - parameter Modelica.SIunits.Density rho_default=Medium.density(sta_default) | |
| + parameter Modelica.Units.SI.Density rho_default=Medium.density(sta_default) | |
| "Density, used to compute fluid volume"; | |
| parameter Real hAg[nCom](each unit="m2/s2")= | |
| @@ -33,23 +33,23 @@ | |
| parameter Real hBg[nCom](each unit="m2/s2")= | |
| {Modelica.Constants.g_n*(hB - (i - 0.5)*dh) for i in 1:nCom} | |
| "Product g*h_i for each compartment"; | |
| - Modelica.SIunits.AbsolutePressure pA[nCom](each nominal=101325) | |
| + Modelica.Units.SI.AbsolutePressure pA[nCom](each nominal=101325) | |
| "Pressure in compartments of room A"; | |
| - Modelica.SIunits.AbsolutePressure pB[nCom](each nominal=101325) | |
| + Modelica.Units.SI.AbsolutePressure pB[nCom](each nominal=101325) | |
| "Pressure in compartments of room B"; | |
| - Modelica.SIunits.VolumeFlowRate dV_flow[nCom] | |
| + Modelica.Units.SI.VolumeFlowRate dV_flow[nCom] | |
| "Volume flow rate through compartment from A to B"; | |
| - Modelica.SIunits.VolumeFlowRate dVAB_flow[nCom] | |
| + Modelica.Units.SI.VolumeFlowRate dVAB_flow[nCom] | |
| "Volume flow rate through compartment from A to B if positive"; | |
| - Modelica.SIunits.VolumeFlowRate dVBA_flow[nCom] | |
| + Modelica.Units.SI.VolumeFlowRate dVBA_flow[nCom] | |
| "Volume flow rate through compartment from B to A if positive"; | |
| - Modelica.SIunits.VolumeFlowRate VZerCom_flow = VZer_flow/nCom | |
| + Modelica.Units.SI.VolumeFlowRate VZerCom_flow = VZer_flow/nCom | |
| "Small flow rate for regularization"; | |
| Real m(min=0.5, max=1) "Flow exponent, m=0.5 for turbulent, m=1 for laminar"; | |
| Real kVal "Flow coefficient for each compartment, k = V_flow/ dp^m"; | |
| - Modelica.SIunits.Area dA "Compartment area"; | |
| + Modelica.Units.SI.Area dA "Compartment area"; | |
| Real gaiFlo[nCom] "Gain to sum up the positive flows and set the negative to zero in a differentiable way"; | |
| equation | |
| dA = A/nCom; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/Examples/PowerLawFixedM.mo" "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/Examples/PowerLawFixedM.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/Examples/PowerLawFixedM.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/Examples/PowerLawFixedM.mo" 2021-04-26 11:51:24.562643602 +0200 | |
| @@ -5,13 +5,13 @@ | |
| constant Real m(min=0.5, max=1) = 0.5 | |
| "Flow exponent, m=0.5 for turbulent, m=1 for laminar"; | |
| - parameter Modelica.SIunits.PressureDifference dp_turbulent(min=0)=5 | |
| + parameter Modelica.Units.SI.PressureDifference dp_turbulent(min=0)=5 | |
| "Pressure difference where regularization starts"; | |
| - Modelica.SIunits.PressureDifference dp "Pressure difference"; | |
| - Modelica.SIunits.VolumeFlowRate V_flow | |
| + Modelica.Units.SI.PressureDifference dp "Pressure difference"; | |
| + Modelica.Units.SI.VolumeFlowRate V_flow | |
| "Volume flow rate computed with model powerLaw"; | |
| - Modelica.SIunits.VolumeFlowRate VFixed_flow | |
| + Modelica.Units.SI.VolumeFlowRate VFixed_flow | |
| "Volume flow rate computed with model powerLawFixed"; | |
| constant Real gamma(min=1) = 1.5 | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/Examples/PowerLaw.mo" "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/Examples/PowerLaw.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/Examples/PowerLaw.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/Examples/PowerLaw.mo" 2021-04-26 11:51:24.570643612 +0200 | |
| @@ -5,11 +5,11 @@ | |
| parameter Real m(min=0.5, max=1) = 0.5 | |
| "Flow exponent, m=0.5 for turbulent, m=1 for laminar"; | |
| - parameter Modelica.SIunits.PressureDifference dp_turbulent(min=0)=5 | |
| + parameter Modelica.Units.SI.PressureDifference dp_turbulent(min=0)=5 | |
| "Pressure difference where regularization starts"; | |
| - Modelica.SIunits.PressureDifference dp "Pressure difference"; | |
| - Modelica.SIunits.VolumeFlowRate V_flow "Volume flow rate"; | |
| + Modelica.Units.SI.PressureDifference dp "Pressure difference"; | |
| + Modelica.Units.SI.VolumeFlowRate V_flow "Volume flow rate"; | |
| equation | |
| dp = 10*(-1+2*time); | |
| V_flow = AixLib.Airflow.Multizone.BaseClasses.powerLaw( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/Examples/WindPressureLowRise.mo" "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/Examples/WindPressureLowRise.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/Examples/WindPressureLowRise.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/Examples/WindPressureLowRise.mo" 2021-04-26 11:51:24.550643584 +0200 | |
| @@ -3,7 +3,7 @@ | |
| extends Modelica.Icons.Example; | |
| parameter Real Cp0 = 0.6 | |
| "Wind pressure coefficient for normal wind incidence angle"; | |
| - Modelica.SIunits.Angle incAng "Wind incidence angle (0: normal to wall)"; | |
| + Modelica.Units.SI.Angle incAng "Wind incidence angle (0: normal to wall)"; | |
| parameter Real G = Modelica.Math.log(0.5) "Natural logarithm of side ratio"; | |
| Real Cp "Wind pressure coefficient"; | |
| equation | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" 2021-04-26 11:51:24.466643469 +0200 | |
| @@ -2,16 +2,16 @@ | |
| function powerLawFixedM | |
| "Power law used in orifice equations when m is constant" | |
| input Real k "Flow coefficient, k = V_flow/ dp^m"; | |
| - input Modelica.SIunits.PressureDifference dp(displayUnit="Pa") "Pressure difference"; | |
| + input Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure difference"; | |
| input Real m(min=0.5, max=1) | |
| "Flow exponent, m=0.5 for turbulent, m=1 for laminar"; | |
| input Real a "Polynomial coefficient"; | |
| input Real b "Polynomial coefficient"; | |
| input Real c "Polynomial coefficient"; | |
| input Real d "Polynomial coefficient"; | |
| - input Modelica.SIunits.PressureDifference dp_turbulent(min=0)=0.001 | |
| + input Modelica.Units.SI.PressureDifference dp_turbulent(min=0)=0.001 | |
| "Pressure difference where regularization starts"; | |
| - output Modelica.SIunits.VolumeFlowRate V_flow "Volume flow rate"; | |
| + output Modelica.Units.SI.VolumeFlowRate V_flow "Volume flow rate"; | |
| protected | |
| constant Real gamma(min=1) = 1.5 | |
| "Normalized flow rate where dphi(0)/dpi intersects phi(1)"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/powerLaw.mo" "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/powerLaw.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/powerLaw.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/powerLaw.mo" 2021-04-26 11:51:24.482643492 +0200 | |
| @@ -1,13 +1,13 @@ | |
| within AixLib.Airflow.Multizone.BaseClasses; | |
| function powerLaw "Power law used in orifice equations" | |
| input Real k "Flow coefficient, k = V_flow/ dp^m"; | |
| - input Modelica.SIunits.PressureDifference dp(displayUnit="Pa") "Pressure difference"; | |
| + input Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure difference"; | |
| input Real m(min=0.5, max=1) | |
| "Flow exponent, m=0.5 for turbulent, m=1 for laminar"; | |
| - input Modelica.SIunits.PressureDifference dp_turbulent(min=0, | |
| + input Modelica.Units.SI.PressureDifference dp_turbulent(min=0, | |
| displayUnit="Pa")=0.001 | |
| "Pressure difference where regularization starts"; | |
| - output Modelica.SIunits.VolumeFlowRate V_flow "Volume flow rate"; | |
| + output Modelica.Units.SI.VolumeFlowRate V_flow "Volume flow rate"; | |
| protected | |
| constant Real gamma(min=1) = 1.5 | |
| "Normalized flow rate where dphi(0)/dpi intersects phi(1)"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/PowerLawResistance.mo" "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/PowerLawResistance.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/PowerLawResistance.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/PowerLawResistance.mo" 2021-04-26 11:51:24.542643574 +0200 | |
| @@ -10,17 +10,17 @@ | |
| parameter Boolean useDefaultProperties=true | |
| "Set to false to use density and viscosity based on actual medium state, rather than using default values" | |
| annotation(Evaluate=true, Dialog(tab="Advanced")); | |
| - parameter Modelica.SIunits.PressureDifference dp_turbulent(min=0, displayUnit="Pa") = 0.1 | |
| + parameter Modelica.Units.SI.PressureDifference dp_turbulent(min=0, displayUnit="Pa") = 0.1 | |
| "Pressure difference where laminar and turbulent flow relation coincide. Recommended = 0.1" | |
| annotation(Dialog(tab="Advanced")); | |
| parameter Boolean homotopyInitialization = true "= true, use homotopy method" | |
| annotation(Evaluate=true, Dialog(tab="Advanced")); | |
| - Modelica.SIunits.VolumeFlowRate V_flow | |
| + Modelica.Units.SI.VolumeFlowRate V_flow | |
| "Volume flow rate through the component"; | |
| - Modelica.SIunits.Velocity v(nominal=1) "Average velocity"; | |
| - Modelica.SIunits.Density rho "Fluid density at port_a"; | |
| + Modelica.Units.SI.Velocity v(nominal=1) "Average velocity"; | |
| + Modelica.Units.SI.Density rho "Fluid density at port_a"; | |
| protected | |
| constant Real gamma(min=1) = 1.5 | |
| @@ -33,9 +33,9 @@ | |
| p=Medium.p_default, | |
| X=Medium.X_default) | |
| "State of the medium at the medium default properties"; | |
| - parameter Modelica.SIunits.Density rho_default=Medium.density(sta_default) | |
| + parameter Modelica.Units.SI.Density rho_default=Medium.density(sta_default) | |
| "Density at the medium default properties"; | |
| - parameter Modelica.SIunits.DynamicViscosity dynVis_default= | |
| + parameter Modelica.Units.SI.DynamicViscosity dynVis_default= | |
| Medium.dynamicViscosity(sta_default) | |
| "Dynamic viscosity at the medium default properties"; | |
| @@ -49,7 +49,7 @@ | |
| "Polynomial coefficient for regularized implementation of flow resistance"; | |
| Medium.ThermodynamicState sta "State of the medium in the component"; | |
| - Modelica.SIunits.DynamicViscosity dynVis "Dynamic viscosity"; | |
| + Modelica.Units.SI.DynamicViscosity dynVis "Dynamic viscosity"; | |
| Real mExc(quantity="Mass", final unit="kg") | |
| "Air mass exchanged (for purpose of error control only)"; | |
| initial equation | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/TwoWayFlowElementBuoyancy.mo" "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/TwoWayFlowElementBuoyancy.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/TwoWayFlowElementBuoyancy.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/TwoWayFlowElementBuoyancy.mo" 2021-04-26 11:51:24.506643525 +0200 | |
| @@ -3,18 +3,18 @@ | |
| "Flow resistance that uses the power law" | |
| extends AixLib.Airflow.Multizone.BaseClasses.TwoWayFlowElement; | |
| - parameter Modelica.SIunits.Length wOpe=0.9 "Width of opening" | |
| + | |
| + parameter Modelica.Units.SI.Length wOpe=0.9 "Width of opening" | |
| annotation (Dialog(group="Geometry")); | |
| - parameter Modelica.SIunits.Length hOpe=2.1 "Height of opening" | |
| + parameter Modelica.Units.SI.Length hOpe=2.1 "Height of opening" | |
| annotation (Dialog(group="Geometry")); | |
| - parameter Modelica.SIunits.Length hA=2.7/2 | |
| + parameter Modelica.Units.SI.Length hA=2.7/2 | |
| "Height of reference pressure zone A" | |
| annotation (Dialog(group="Geometry")); | |
| - parameter Modelica.SIunits.Length hB=2.7/2 | |
| + parameter Modelica.Units.SI.Length hB=2.7/2 | |
| "Height of reference pressure zone B" | |
| annotation (Dialog(group="Geometry")); | |
| - | |
| annotation (Documentation(info="<html> | |
| <p> | |
| This is a partial model for models that describe the bi-directional | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/TwoWayFlowElement.mo" "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/TwoWayFlowElement.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/TwoWayFlowElement.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/TwoWayFlowElement.mo" 2021-04-26 11:51:24.522643546 +0200 | |
| @@ -14,34 +14,34 @@ | |
| annotation (choices( | |
| choice(redeclare package Medium = AixLib.Media.Air "Moist air"))); | |
| - parameter Modelica.SIunits.Velocity vZer=0.001 | |
| + parameter Modelica.Units.SI.Velocity vZer=0.001 | |
| "Minimum velocity to prevent zero flow. Recommended: 0.001"; | |
| - Modelica.SIunits.VolumeFlowRate VAB_flow(nominal=0.001) | |
| + Modelica.Units.SI.VolumeFlowRate VAB_flow(nominal=0.001) | |
| "Volume flow rate from A to B if positive"; | |
| - Modelica.SIunits.VolumeFlowRate VBA_flow(nominal=0.001) | |
| + Modelica.Units.SI.VolumeFlowRate VBA_flow(nominal=0.001) | |
| "Volume flow rate from B to A if positive"; | |
| - Modelica.SIunits.MassFlowRate mAB_flow(nominal=0.001) | |
| + Modelica.Units.SI.MassFlowRate mAB_flow(nominal=0.001) | |
| "Mass flow rate from A to B if positive"; | |
| - Modelica.SIunits.MassFlowRate mBA_flow(nominal=0.001) | |
| + Modelica.Units.SI.MassFlowRate mBA_flow(nominal=0.001) | |
| "Mass flow rate from B to A if positive"; | |
| - Modelica.SIunits.Velocity vAB(nominal=0.01) "Average velocity from A to B"; | |
| - Modelica.SIunits.Velocity vBA(nominal=0.01) "Average velocity from B to A"; | |
| + Modelica.Units.SI.Velocity vAB(nominal=0.01) "Average velocity from A to B"; | |
| + Modelica.Units.SI.Velocity vBA(nominal=0.01) "Average velocity from B to A"; | |
| - Modelica.SIunits.Density rho_a1_inflow | |
| + Modelica.Units.SI.Density rho_a1_inflow | |
| "Density of air flowing in from port_a1"; | |
| - Modelica.SIunits.Density rho_a2_inflow | |
| + Modelica.Units.SI.Density rho_a2_inflow | |
| "Density of air flowing in from port_a2"; | |
| - Modelica.SIunits.Area A "Face area"; | |
| + Modelica.Units.SI.Area A "Face area"; | |
| protected | |
| - Modelica.SIunits.VolumeFlowRate VZer_flow(fixed=false) | |
| + Modelica.Units.SI.VolumeFlowRate VZer_flow(fixed=false) | |
| "Minimum net volume flow rate to prevent zero flow"; | |
| - Modelica.SIunits.Mass mExcAB(start=0, fixed=true) | |
| + Modelica.Units.SI.Mass mExcAB(start=0, fixed=true) | |
| "Air mass exchanged (for purpose of error control only)"; | |
| - Modelica.SIunits.Mass mExcBA(start=0, fixed=true) | |
| + Modelica.Units.SI.Mass mExcBA(start=0, fixed=true) | |
| "Air mass exchanged (for purpose of error control only)"; | |
| Medium.MassFraction Xi_a1_inflow[Medium1.nXi] | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" 2021-04-26 11:51:24.454643454 +0200 | |
| @@ -2,24 +2,24 @@ | |
| function windPressureLowRise "Wind pressure coefficient for low-rise buildings" | |
| input Real Cp0(min=0) | |
| "Wind pressure coefficient for normal wind incidence angle"; | |
| - input Modelica.SIunits.Angle incAng | |
| + input Modelica.Units.SI.Angle incAng | |
| "Wind incidence angle (0: normal to wall)"; | |
| input Real G "Natural logarithm of side ratio"; | |
| output Real Cp "Wind pressure coefficient"; | |
| protected | |
| - constant Modelica.SIunits.Angle pi2 = 2*Modelica.Constants.pi; | |
| - constant Modelica.SIunits.Angle aRDel = 5*Modelica.Constants.pi/180 | |
| + constant Modelica.Units.SI.Angle pi2 = 2*Modelica.Constants.pi; | |
| + constant Modelica.Units.SI.Angle aRDel = 5*Modelica.Constants.pi/180 | |
| "Lower bound where transition occurs"; | |
| - constant Modelica.SIunits.Angle aRDel2 = aRDel/2 | |
| + constant Modelica.Units.SI.Angle aRDel2 = aRDel/2 | |
| "Half-width of transition interval"; | |
| - constant Modelica.SIunits.Angle aRMax = 175*Modelica.Constants.pi/180 | |
| + constant Modelica.Units.SI.Angle aRMax = 175*Modelica.Constants.pi/180 | |
| "Upper bound where transition occurs"; | |
| Real a180 = Modelica.Math.log(1.248 - 0.703 + | |
| 0.131*Modelica.Math.sin(2*Modelica.Constants.pi*G)^3 | |
| + 0.071*G^2) "Attenuation factor at 180 degree incidence angle"; | |
| - Modelica.SIunits.Angle aR "alpha, restricted to 0...pi"; | |
| - Modelica.SIunits.Angle incAng2 "0.5*wind incidence angle"; | |
| + Modelica.Units.SI.Angle aR "alpha, restricted to 0...pi"; | |
| + Modelica.Units.SI.Angle incAng2 "0.5*wind incidence angle"; | |
| Real sinA2 "=sin(alpha/2)"; | |
| Real cosA2 "=cos(alpha/2)"; | |
| Real a "Attenuation factor"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/DoorDiscretizedOperable.mo" "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/DoorDiscretizedOperable.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/DoorDiscretizedOperable.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/DoorDiscretizedOperable.mo" 2021-04-26 11:51:24.418643403 +0200 | |
| @@ -3,7 +3,7 @@ | |
| "Door model using discretization along height coordinate" | |
| extends AixLib.Airflow.Multizone.BaseClasses.DoorDiscretized; | |
| - parameter Modelica.SIunits.PressureDifference dpCloRat(min=0, | |
| + parameter Modelica.Units.SI.PressureDifference dpCloRat(min=0, | |
| displayUnit="Pa") = 4 | |
| "Pressure drop at rating condition of closed door" | |
| annotation (Dialog(group="Rating conditions")); | |
| @@ -12,7 +12,7 @@ | |
| "Discharge coefficient at rating conditions of closed door" | |
| annotation (Dialog(group="Rating conditions")); | |
| - parameter Modelica.SIunits.Area LClo(min=0) | |
| + parameter Modelica.Units.SI.Area LClo(min=0) | |
| "Effective leakage area of closed door" | |
| annotation (Dialog(group="Closed door")); | |
| @@ -30,8 +30,8 @@ | |
| "Opening signal, 0=closed, 1=open" | |
| annotation (Placement(transformation(extent={{-120,-10},{-100,10}}), iconTransformation(extent={{-120,-10},{-100,10}}))); | |
| protected | |
| - parameter Modelica.SIunits.Area AOpe=wOpe*hOpe "Open aperture area"; | |
| - parameter Modelica.SIunits.Area AClo(fixed=false) "Closed aperture area"; | |
| + parameter Modelica.Units.SI.Area AOpe=wOpe*hOpe "Open aperture area"; | |
| + parameter Modelica.Units.SI.Area AClo(fixed=false) "Closed aperture area"; | |
| Real kOpe "Open aperture flow coefficient, k = V_flow/ dp^m"; | |
| Real kClo "Closed aperture flow coefficient, k = V_flow/ dp^m"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/EffectiveAirLeakageArea.mo" "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/EffectiveAirLeakageArea.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/EffectiveAirLeakageArea.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/EffectiveAirLeakageArea.mo" 2021-04-26 11:51:24.402643382 +0200 | |
| @@ -4,7 +4,7 @@ | |
| m=0.65, | |
| final k=L * CDRat * sqrt(2.0/rho_default) * dpRat^(0.5-m)); | |
| - parameter Modelica.SIunits.PressureDifference dpRat( | |
| + parameter Modelica.Units.SI.PressureDifference dpRat( | |
| min=0, | |
| displayUnit="Pa") = 4 "Pressure drop" | |
| annotation (Dialog(group="Rating conditions")); | |
| @@ -13,8 +13,8 @@ | |
| max=1) = 1 "Discharge coefficient" | |
| annotation (Dialog(group="Rating conditions")); | |
| - parameter Modelica.SIunits.Area L(min=0) "Effective leakage area"; | |
| + parameter Modelica.Units.SI.Area L(min=0) "Effective leakage area"; | |
| equation | |
| v = V_flow/L; | |
| annotation (Icon(graphics={ | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/Examples/ClosedDoors.mo" "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/Examples/ClosedDoors.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/Examples/ClosedDoors.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/Examples/ClosedDoors.mo" 2021-04-26 11:51:24.310643255 +0200 | |
| @@ -27,7 +27,7 @@ | |
| annotation (Placement(transformation(extent={{40,40},{60,60}}))); | |
| Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow PrescribedHeatFlow1 | |
| annotation (Placement(transformation(extent={{4,40},{24,60}}))); | |
| - Modelica.Blocks.Sources.Sine Sine1(freqHz=1/3600) annotation (Placement( | |
| + Modelica.Blocks.Sources.Sine Sine1(f =1/3600) annotation (Placement( | |
| transformation(extent={{-68,40},{-48,60}}))); | |
| Modelica.Blocks.Math.Gain Gain1(k=100) annotation (Placement(transformation( | |
| extent={{-28,40},{-8,60}}))); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" 2021-04-26 11:51:24.274643204 +0200 | |
| @@ -21,7 +21,7 @@ | |
| annotation (Placement(transformation(extent={{70,20},{90,40}}))); | |
| Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHeaFlo | |
| annotation (Placement(transformation(extent={{0,20},{20,40}}))); | |
| - Modelica.Blocks.Sources.Sine Sine1(freqHz=1/3600) annotation (Placement( | |
| + Modelica.Blocks.Sources.Sine Sine1(f =1/3600) annotation (Placement( | |
| transformation(extent={{-80,20},{-60,40}}))); | |
| Modelica.Blocks.Math.Gain Gain1(k=100) annotation (Placement(transformation( | |
| extent={{-40,20},{-20,40}}))); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/Examples/OneOpenDoor.mo" "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/Examples/OneOpenDoor.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/Examples/OneOpenDoor.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/Examples/OneOpenDoor.mo" 2021-04-26 11:51:24.258643183 +0200 | |
| @@ -26,7 +26,7 @@ | |
| annotation (Placement(transformation(extent={{60,60},{80,80}}))); | |
| Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHeaFlo | |
| annotation (Placement(transformation(extent={{14,60},{34,80}}))); | |
| - Modelica.Blocks.Sources.Sine heaSou(freqHz=1/3600) annotation (Placement( | |
| + Modelica.Blocks.Sources.Sine heaSou(f =1/3600) annotation (Placement( | |
| transformation(extent={{-60,60},{-40,80}}))); | |
| Modelica.Blocks.Math.Gain Gain1(k=100) annotation (Placement(transformation( | |
| extent={{-20,60},{0,80}}))); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/Examples/ZonalFlow.mo" "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/Examples/ZonalFlow.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/Examples/ZonalFlow.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/Examples/ZonalFlow.mo" 2021-04-26 11:51:24.174643068 +0200 | |
| @@ -2,8 +2,8 @@ | |
| model ZonalFlow "Model with prescribed air exchange between two volumes" | |
| extends Modelica.Icons.Example; | |
| package Medium = AixLib.Media.Air; | |
| - parameter Modelica.SIunits.Volume volA=100 "Volume of room A"; | |
| - parameter Modelica.SIunits.Volume volB=1 "Volume of room B"; | |
| + parameter Modelica.Units.SI.Volume volA=100 "Volume of room A"; | |
| + parameter Modelica.Units.SI.Volume volB=1 "Volume of room B"; | |
| AixLib.Fluid.MixingVolumes.MixingVolume rooA( | |
| V=volA, | |
| redeclare package Medium = Medium, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/MediumColumnDynamic.mo" "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/MediumColumnDynamic.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/MediumColumnDynamic.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/MediumColumnDynamic.mo" 2021-04-26 11:51:24.126643002 +0200 | |
| @@ -8,7 +8,7 @@ | |
| annotation (choices( | |
| choice(redeclare package Medium = AixLib.Media.Air "Moist air"))); | |
| - parameter Modelica.SIunits.Length h(min=0) = 3 "Height of shaft"; | |
| + parameter Modelica.Units.SI.Length h(min=0) = 3 "Height of shaft"; | |
| Modelica.Fluid.Interfaces.FluidPort_a port_a( | |
| redeclare final package Medium = Medium, | |
| @@ -22,7 +22,7 @@ | |
| "Fluid connector b (positive design flow direction is from port_a to port_b)" | |
| annotation (Placement(transformation(extent={{10,-110},{-10,-90}}), iconTransformation(extent={{10,-110},{-10,-90}}))); | |
| - parameter Modelica.SIunits.Volume V "Volume in medium shaft"; | |
| + parameter Modelica.Units.SI.Volume V "Volume in medium shaft"; | |
| // Heat transfer through boundary | |
| parameter Boolean use_HeatTransfer = false | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/MediumColumn.mo" "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/MediumColumn.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/MediumColumn.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/MediumColumn.mo" 2021-04-26 11:51:24.154643040 +0200 | |
| @@ -7,7 +7,7 @@ | |
| annotation (choices( | |
| choice(redeclare package Medium = AixLib.Media.Air "Moist air"))); | |
| - parameter Modelica.SIunits.Length h(min=0) = 3 "Height of shaft"; | |
| + parameter Modelica.Units.SI.Length h(min=0) = 3 "Height of shaft"; | |
| parameter AixLib.Airflow.Multizone.Types.densitySelection densitySelection | |
| "Select how to pick density" annotation (Evaluate=true); | |
| @@ -24,13 +24,13 @@ | |
| "Fluid connector b (positive design flow direction is from port_a to port_b)" | |
| annotation (Placement(transformation(extent={{10,-110},{-10,-90}}), iconTransformation(extent={{10,-110},{-10,-90}}))); | |
| - Modelica.SIunits.VolumeFlowRate V_flow | |
| + Modelica.Units.SI.VolumeFlowRate V_flow | |
| "Volume flow rate at inflowing port (positive when flow from port_a to port_b)"; | |
| - Modelica.SIunits.MassFlowRate m_flow | |
| + Modelica.Units.SI.MassFlowRate m_flow | |
| "Mass flow rate from port_a to port_b (m_flow > 0 is design flow direction)"; | |
| - Modelica.SIunits.PressureDifference dp(displayUnit="Pa") | |
| + Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") | |
| "Pressure difference between port_a and port_b"; | |
| - Modelica.SIunits.Density rho "Density in medium column"; | |
| + Modelica.Units.SI.Density rho "Density in medium column"; | |
| protected | |
| Medium.ThermodynamicState sta_a=Medium.setState_phX( | |
| port_a.p, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/Orifice.mo" "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/Orifice.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/Orifice.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/Orifice.mo" 2021-04-26 11:51:24.098642964 +0200 | |
| @@ -4,7 +4,7 @@ | |
| m=0.5, | |
| k=CD*A*sqrt(2.0/rho_default)); | |
| - parameter Modelica.SIunits.Area A "Area of orifice" | |
| + parameter Modelica.Units.SI.Area A "Area of orifice" | |
| annotation (Dialog(group="Orifice characteristics")); | |
| parameter Real CD=0.65 "Discharge coefficient" | |
| annotation (Dialog(group="Orifice characteristics")); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/ZonalFlow_ACS.mo" "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/ZonalFlow_ACS.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Airflow/Multizone/ZonalFlow_ACS.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Airflow/Multizone/ZonalFlow_ACS.mo" 2021-04-26 11:51:24.042642885 +0200 | |
| @@ -4,18 +4,18 @@ | |
| parameter Boolean useDefaultProperties = false | |
| "Set to true to use constant density"; | |
| - parameter Modelica.SIunits.Volume V "Volume of room"; | |
| + parameter Modelica.Units.SI.Volume V "Volume of room"; | |
| Modelica.Blocks.Interfaces.RealInput ACS | |
| "Air change per seconds, relative to the smaller of the two volumes" | |
| annotation (Placement(transformation(extent={{-120,90},{-100,110}}))); | |
| protected | |
| - Modelica.SIunits.VolumeFlowRate V_flow | |
| + Modelica.Units.SI.VolumeFlowRate V_flow | |
| "Volume flow rate at standard pressure"; | |
| - Modelica.SIunits.MassFlowRate m_flow "Mass flow rate"; | |
| + Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate"; | |
| parameter Medium.ThermodynamicState sta_default = Medium.setState_pTX(T=Medium.T_default, | |
| p=Medium.p_default, X=Medium.X_default); | |
| - parameter Modelica.SIunits.Density rho_default=Medium.density(sta_default) | |
| + parameter Modelica.Units.SI.Density rho_default=Medium.density(sta_default) | |
| "Density, used to compute fluid volume"; | |
| Medium.ThermodynamicState sta_a1_inflow= | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/GroundTemperature/GroundTemperatureKusuda.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/GroundTemperature/GroundTemperatureKusuda.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/GroundTemperature/GroundTemperatureKusuda.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/GroundTemperature/GroundTemperatureKusuda.mo" 2021-04-26 11:51:23.990642814 +0200 | |
| @@ -1,12 +1,12 @@ | |
| within AixLib.BoundaryConditions.GroundTemperature; | |
| model GroundTemperatureKusuda "Model for undisturbed ground temperature" | |
| - parameter Modelica.SIunits.Temperature T_mean "Average air temperature over the year"; | |
| - parameter Modelica.SIunits.TemperatureDifference T_amp | |
| + parameter Modelica.Units.SI.Temperature T_mean "Average air temperature over the year"; | |
| + parameter Modelica.Units.SI.TemperatureDifference T_amp | |
| "Amplitude of surface temperature [(maximum air temperature - minimum air temperature)/2]"; | |
| - parameter Modelica.SIunits.Distance D "Depth of ground temperature"; | |
| - parameter Modelica.SIunits.ThermalDiffusivity alpha=0.04 "Thermal diffusivity of the ground. Declare in m2/day!"; | |
| - parameter Modelica.SIunits.Time t_shift "Time of the year with minimum air temperature. Declare in days!"; | |
| + parameter Modelica.Units.SI.Distance D "Depth of ground temperature"; | |
| + parameter Modelica.Units.SI.ThermalDiffusivity alpha=0.04 "Thermal diffusivity of the ground. Declare in m2/day!"; | |
| + parameter Modelica.Units.SI.Time t_shift "Time of the year with minimum air temperature. Declare in days!"; | |
| Modelica.Thermal.HeatTransfer.Sources.PrescribedTemperature | |
| prescribedTemperature "Transfers computed ground temperature to heat port" | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SkyTemperature/BlackBody.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SkyTemperature/BlackBody.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SkyTemperature/BlackBody.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SkyTemperature/BlackBody.mo" 2021-04-26 11:51:23.966642780 +0200 | |
| @@ -31,8 +31,8 @@ | |
| nominal=100) "Horizontal infrared irradiation" | |
| annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}))); | |
| protected | |
| - Modelica.SIunits.Temperature TDewPoiK "Dewpoint temperature"; | |
| - Modelica.SIunits.Emissivity epsSky "Black-body absorptivity of sky"; | |
| + Modelica.Units.SI.Temperature TDewPoiK "Dewpoint temperature"; | |
| + Modelica.Units.SI.Emissivity epsSky "Black-body absorptivity of sky"; | |
| Real nOpa10(min=0, max=10) "Opaque sky cover in [0, 10]"; | |
| equation | |
| if calTSky == AixLib.BoundaryConditions.Types.SkyTemperatureCalculation.TemperaturesAndSkyCover then | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" 2021-04-26 11:51:23.870642650 +0200 | |
| @@ -1,7 +1,7 @@ | |
| within AixLib.BoundaryConditions.SolarGeometry.BaseClasses.Examples; | |
| model SolarAzimuth "Test model for zenith angle" | |
| extends Modelica.Icons.Example; | |
| - parameter Modelica.SIunits.Angle lat= 41.98*Modelica.Constants.pi/180 | |
| + parameter Modelica.Units.SI.Angle lat= 41.98*Modelica.Constants.pi/180 | |
| "Latitude"; | |
| AixLib.BoundaryConditions.SolarGeometry.BaseClasses.SolarHourAngle | |
| solHouAng "Solar hour angle" | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" 2021-04-26 11:51:23.830642594 +0200 | |
| @@ -17,7 +17,7 @@ | |
| AixLib.BoundaryConditions.SolarGeometry.BaseClasses.AltitudeAngle altAng | |
| "Altitude angle" | |
| annotation (Placement(transformation(extent={{-20,20},{0,40}}))); | |
| - parameter Modelica.SIunits.Angle lat=41.98*Modelica.Constants.pi/180 | |
| + parameter Modelica.Units.SI.Angle lat=41.98*Modelica.Constants.pi/180 | |
| "Latitude"; | |
| equation | |
| connect(weaDat.weaBus, weaBus) annotation (Line( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" 2021-04-26 11:51:23.806642561 +0200 | |
| @@ -1,10 +1,10 @@ | |
| within AixLib.BoundaryConditions.SolarGeometry.BaseClasses; | |
| block IncidenceAngle "The solar incidence angle on a tilted surface" | |
| extends Modelica.Blocks.Icons.Block; | |
| - parameter Modelica.SIunits.Angle lat "Latitude"; | |
| - parameter Modelica.SIunits.Angle azi(displayUnit="deg") | |
| + parameter Modelica.Units.SI.Angle lat "Latitude"; | |
| + parameter Modelica.Units.SI.Angle azi(displayUnit="deg") | |
| "Surface azimuth. azi=-90 degree if surface outward unit normal points toward east; azi=0 if it points toward south"; | |
| - parameter Modelica.SIunits.Angle til(displayUnit="deg") | |
| + parameter Modelica.Units.SI.Angle til(displayUnit="deg") | |
| "Surface tilt. til=90 degree for walls; til=0 for ceilings; til=180 for roof"; | |
| Modelica.Blocks.Interfaces.RealInput solHouAng(quantity="Angle", unit="rad") | |
| "Solar hour angle" | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" 2021-04-26 11:51:23.790642538 +0200 | |
| @@ -1,7 +1,7 @@ | |
| within AixLib.BoundaryConditions.SolarGeometry.BaseClasses; | |
| block SolarAzimuth "Solar azimuth" | |
| extends Modelica.Blocks.Icons.Block; | |
| - parameter Modelica.SIunits.Angle lat "Latitude"; | |
| + parameter Modelica.Units.SI.Angle lat "Latitude"; | |
| Modelica.Blocks.Interfaces.RealInput zen(quantity="Angle", unit="rad") | |
| "Zenith angle" | |
| annotation (Placement(transformation(extent={{-140,40},{-100,80}}))); | |
| @@ -22,8 +22,8 @@ | |
| Real tmp "cos(solAzi) before data validity check"; | |
| Real solAziTem "Temporary variable for solar azimuth"; | |
| - constant Modelica.SIunits.Time day=86400 "Number of seconds in a day"; | |
| - constant Modelica.SIunits.Angle polarCircle = 1.1617 | |
| + constant Modelica.Units.SI.Time day=86400 "Number of seconds in a day"; | |
| + constant Modelica.Units.SI.Angle polarCircle = 1.1617 | |
| "Latitude of polar circle (66 degree 33 min 44 sec)"; | |
| final parameter Boolean outsidePolarCircle = lat < polarCircle and lat > -polarCircle | |
| "Flag, true if latitude is outside polar region"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" 2021-04-26 11:51:23.738642466 +0200 | |
| @@ -20,9 +20,9 @@ | |
| "Angle between projection of sun's rays and normal to vertical surface" | |
| annotation (Placement(transformation(extent={{100,-10},{120,10}}))); | |
| protected | |
| - constant Modelica.SIunits.Angle delta = 1*Modelica.Constants.pi/180 | |
| + constant Modelica.Units.SI.Angle delta = 1*Modelica.Constants.pi/180 | |
| "Small angle"; | |
| - constant Modelica.SIunits.Angle ninety= Modelica.Constants.pi/2-delta | |
| + constant Modelica.Units.SI.Angle ninety= Modelica.Constants.pi/2-delta | |
| "+89 degree"; | |
| constant Real deltaX = 1E-4 "Small number used for smoothing"; | |
| Real alt_c "Cosine of altitude, bounded away from zero"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" 2021-04-26 11:51:23.726642451 +0200 | |
| @@ -1,7 +1,7 @@ | |
| within AixLib.BoundaryConditions.SolarGeometry.BaseClasses; | |
| block ZenithAngle "Zenith angle" | |
| extends Modelica.Blocks.Icons.Block; | |
| - parameter Modelica.SIunits.Angle lat "Latitude"; | |
| + parameter Modelica.Units.SI.Angle lat "Latitude"; | |
| Modelica.Blocks.Interfaces.RealInput solHouAng(quantity="Angle", unit="rad") | |
| "Solar hour angle" | |
| annotation (Placement(transformation(extent={{-140,-68},{-100,-28}}))); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" 2021-04-26 11:51:23.690642400 +0200 | |
| @@ -1,9 +1,9 @@ | |
| within AixLib.BoundaryConditions.SolarGeometry; | |
| block IncidenceAngle "Solar incidence angle on a tilted surface" | |
| extends Modelica.Blocks.Icons.Block; | |
| - parameter Modelica.SIunits.Angle lat "Latitude"; | |
| - parameter Modelica.SIunits.Angle azi "Surface azimuth"; | |
| - parameter Modelica.SIunits.Angle til "Surface tilt"; | |
| + parameter Modelica.Units.SI.Angle lat "Latitude"; | |
| + parameter Modelica.Units.SI.Angle azi "Surface azimuth"; | |
| + parameter Modelica.Units.SI.Angle til "Surface tilt"; | |
| Modelica.Blocks.Interfaces.RealOutput y( | |
| final quantity="Angle", | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/ZenithAngle.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/ZenithAngle.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/ZenithAngle.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarGeometry/ZenithAngle.mo" 2021-04-26 11:51:23.674642379 +0200 | |
| @@ -1,7 +1,7 @@ | |
| within AixLib.BoundaryConditions.SolarGeometry; | |
| block ZenithAngle "Zenith angle" | |
| extends Modelica.Blocks.Icons.Block; | |
| - parameter Modelica.SIunits.Angle lat "Latitude"; | |
| + parameter Modelica.Units.SI.Angle lat "Latitude"; | |
| Modelica.Blocks.Interfaces.RealOutput y( | |
| final quantity="Angle", | |
| final unit="rad", | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" 2021-04-26 11:51:23.638642329 +0200 | |
| @@ -3,7 +3,7 @@ | |
| "Diffuse solar irradiation on a tilted surface with an isotropic model" | |
| extends Modelica.Blocks.Icons.Block; | |
| parameter Real rho=0.2 "Ground reflectance"; | |
| - parameter Modelica.SIunits.Angle til(displayUnit="deg") "Surface tilt angle"; | |
| + parameter Modelica.Units.SI.Angle til(displayUnit="deg") "Surface tilt angle"; | |
| Modelica.Blocks.Interfaces.RealInput HDifHor(quantity= | |
| "RadiantEnergyFluenceRate", unit="W/m2") | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" 2021-04-26 11:51:23.622642308 +0200 | |
| @@ -3,7 +3,7 @@ | |
| "Hemispherical diffuse irradiation on a tilted surface with Perez's anisotropic model" | |
| extends Modelica.Blocks.Icons.Block; | |
| parameter Real rho=0.2 "Ground reflectance"; | |
| - parameter Modelica.SIunits.Angle til(displayUnit="deg") "Surface tilt angle"; | |
| + parameter Modelica.Units.SI.Angle til(displayUnit="deg") "Surface tilt angle"; | |
| Modelica.Blocks.Interfaces.RealInput briCof1 "Brightening Coeffcient F1" | |
| annotation (Placement(transformation(extent={{-140,0},{-100,40}}))); | |
| Modelica.Blocks.Interfaces.RealInput briCof2 "Brightening Coeffcient F2" | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" 2021-04-26 11:51:23.526642175 +0200 | |
| @@ -2,7 +2,7 @@ | |
| partial block PartialSolarIrradiation | |
| "Partial model that is used to compute the direct and diffuse solar irradiation" | |
| extends Modelica.Blocks.Icons.Block; | |
| - parameter Modelica.SIunits.Angle til(displayUnit="deg") "Surface tilt"; | |
| + parameter Modelica.Units.SI.Angle til(displayUnit="deg") "Surface tilt"; | |
| Modelica.Blocks.Interfaces.RealOutput H( | |
| final quantity="RadiantEnergyFluenceRate", | |
| final unit="W/m2") "Radiation per unit area" | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo" 2021-04-26 11:51:23.490642125 +0200 | |
| @@ -20,13 +20,13 @@ | |
| annotation (Placement(transformation(extent={{100,-10},{120,10}}))); | |
| // Set hSmall so that hSmall + deltaX < 1E-4. See info section. | |
| protected | |
| - constant Modelica.SIunits.Irradiance hSmall = 0.5e-4 | |
| + constant Modelica.Units.SI.Irradiance hSmall = 0.5e-4 | |
| "Small radiation for regularization"; | |
| - constant Modelica.SIunits.Irradiance deltaX = hSmall/2 | |
| + constant Modelica.Units.SI.Irradiance deltaX = hSmall/2 | |
| "Small radiation for regularization"; | |
| constant Real k = 5.534e-6*(180/Modelica.Constants.pi)^3 "Constant factor"; | |
| Real tmp1 "Intermediate variable"; | |
| - Modelica.SIunits.Irradiance HDifHorBou | |
| + Modelica.Units.SI.Irradiance HDifHorBou | |
| "Diffuse horizontal irradiation, bounded away from zero"; | |
| equation | |
| tmp1 = k*zen^3; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" 2021-04-26 11:51:23.466642093 +0200 | |
| @@ -5,8 +5,8 @@ | |
| AixLib.BoundaryConditions.SolarIrradiation.BaseClasses.PartialSolarIrradiation; | |
| parameter Real rho(min=0, max=1, final unit="1")=0.2 "Ground reflectance"; | |
| - parameter Modelica.SIunits.Angle lat "Latitude"; | |
| - parameter Modelica.SIunits.Angle azi "Surface azimuth"; | |
| + parameter Modelica.Units.SI.Angle lat "Latitude"; | |
| + parameter Modelica.Units.SI.Angle azi "Surface azimuth"; | |
| parameter Boolean outSkyCon=false | |
| "Output contribution of diffuse irradiation from sky"; | |
| parameter Boolean outGroCon=false | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" 2021-04-26 11:51:23.430642043 +0200 | |
| @@ -3,8 +3,8 @@ | |
| extends | |
| AixLib.BoundaryConditions.SolarIrradiation.BaseClasses.PartialSolarIrradiation; | |
| - parameter Modelica.SIunits.Angle lat "Latitude"; | |
| - parameter Modelica.SIunits.Angle azi "Surface azimuth"; | |
| + parameter Modelica.Units.SI.Angle lat "Latitude"; | |
| + parameter Modelica.Units.SI.Angle azi "Surface azimuth"; | |
| Modelica.Blocks.Interfaces.RealOutput inc( | |
| final quantity="Angle", | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" 2021-04-26 11:51:23.398641999 +0200 | |
| @@ -2,9 +2,9 @@ | |
| model DiffusePerez | |
| "Test model for diffuse solar irradiation on a tilted surface using the Perez model" | |
| extends Modelica.Icons.Example; | |
| - parameter Modelica.SIunits.Angle lat=37/180*Modelica.Constants.pi "Latitude"; | |
| - parameter Modelica.SIunits.Angle azi=0.3 "Azi angle"; | |
| - parameter Modelica.SIunits.Angle til=0.5 "Tilted angle"; | |
| + parameter Modelica.Units.SI.Angle lat=37/180*Modelica.Constants.pi "Latitude"; | |
| + parameter Modelica.Units.SI.Angle azi=0.3 "Azi angle"; | |
| + parameter Modelica.Units.SI.Angle til=0.5 "Tilted angle"; | |
| AixLib.BoundaryConditions.WeatherData.ReaderTMY3 weaDat(filNam= | |
| Modelica.Utilities.Files.loadResource("modelica://AixLib/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos")) | |
| annotation (Placement(transformation(extent={{-40,0},{-20,20}}))); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" 2021-04-26 11:51:23.382641976 +0200 | |
| @@ -2,7 +2,7 @@ | |
| model DirectTiltedSurface | |
| "Test model for direct solar irradiation on a tilted surface" | |
| extends Modelica.Icons.Example; | |
| - parameter Modelica.SIunits.Angle lat=37/180*Modelica.Constants.pi "Latitude"; | |
| + parameter Modelica.Units.SI.Angle lat=37/180*Modelica.Constants.pi "Latitude"; | |
| AixLib.BoundaryConditions.WeatherData.ReaderTMY3 weaDat(filNam= | |
| Modelica.Utilities.Files.loadResource("modelica://AixLib/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos")) | |
| annotation (Placement(transformation(extent={{-60,20},{-40,40}}))); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" 2021-04-26 11:51:23.342641922 +0200 | |
| @@ -13,11 +13,11 @@ | |
| displayUnit="degC") "Black-body sky temperature" | |
| annotation (Placement(transformation(extent={{100,-10},{120,10}}))); | |
| - parameter Modelica.SIunits.Temperature TMin(displayUnit="degC") = 203.15 | |
| + | |
| + parameter Modelica.Units.SI.Temperature TMin(displayUnit="degC") = 203.15 | |
| "Minimum allowed temperature"; | |
| - parameter Modelica.SIunits.Temperature TMax(displayUnit="degC") = 343.15 | |
| + parameter Modelica.Units.SI.Temperature TMax(displayUnit="degC") = 343.15 | |
| "Maximum allowed temperature"; | |
| - | |
| equation | |
| TOut = TIn; | |
| assert(TOut > TMin, "Temperature out of bounds.\n" + " TOut = " + String( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/CheckCeilingHeight.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/CheckCeilingHeight.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/CheckCeilingHeight.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/CheckCeilingHeight.mo" 2021-04-26 11:51:23.330641905 +0200 | |
| @@ -10,7 +10,7 @@ | |
| final quantity="Height", | |
| final unit="m") "Ceiling height" | |
| annotation (Placement(transformation(extent={{100,-10},{120,10}}))); | |
| - constant Modelica.SIunits.Height ceiHeiMin=0 "Minimum allowed ceiling height"; | |
| + constant Modelica.Units.SI.Height ceiHeiMin=0 "Minimum allowed ceiling height"; | |
| equation | |
| ceiHeiOut = AixLib.Utilities.Math.Functions.smoothMax( | |
| ceiHeiIn, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/CheckIRRadiation.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/CheckIRRadiation.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/CheckIRRadiation.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/CheckIRRadiation.mo" 2021-04-26 11:51:23.322641894 +0200 | |
| @@ -10,7 +10,7 @@ | |
| final unit="W/m2") "Horizontal infrared irradiation" | |
| annotation (Placement(transformation(extent={{100,-10},{120,10}}))); | |
| - constant Modelica.SIunits.RadiantEnergyFluenceRate HMin=0.0001 | |
| + constant Modelica.Units.SI.RadiantEnergyFluenceRate HMin=0.0001 | |
| "Minimum value for radiation"; | |
| equation | |
| HOut = AixLib.Utilities.Math.Functions.smoothMax( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" 2021-04-26 11:51:23.310641877 +0200 | |
| @@ -10,8 +10,8 @@ | |
| final quantity="Pressure", | |
| final unit="Pa") "Atmospheric pressure" | |
| annotation (Placement(transformation(extent={{100,-10},{120,10}}))); | |
| - constant Modelica.SIunits.Pressure PMin=3100 "Minimum allowed pressure"; | |
| - constant Modelica.SIunits.Pressure PMax=120000 "Maximum allowed pressure"; | |
| + constant Modelica.Units.SI.Pressure PMin=3100 "Minimum allowed pressure"; | |
| + constant Modelica.Units.SI.Pressure PMax=120000 "Maximum allowed pressure"; | |
| equation | |
| assert(PIn > PMin, "Pressure out of bounds.\n" + " PIn = " + String(PIn)); | |
| assert(PIn < PMax, "Pressure out of bounds.\n" + " PIn = " + String(PIn)); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/CheckRadiation.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/CheckRadiation.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/CheckRadiation.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/CheckRadiation.mo" 2021-04-26 11:51:23.302641867 +0200 | |
| @@ -10,7 +10,7 @@ | |
| final unit="W/m2") "Radiation" | |
| annotation (Placement(transformation(extent={{100,-10},{120,10}}))); | |
| - constant Modelica.SIunits.RadiantEnergyFluenceRate HMin=0.0001 | |
| + constant Modelica.Units.SI.RadiantEnergyFluenceRate HMin=0.0001 | |
| "Minimum value for radiation"; | |
| equation | |
| HOut = AixLib.Utilities.Math.Functions.smoothMax( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/CheckTemperature.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/CheckTemperature.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/CheckTemperature.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/CheckTemperature.mo" 2021-04-26 11:51:23.274641828 +0200 | |
| @@ -12,11 +12,11 @@ | |
| displayUnit="degC") "Output temperature" | |
| annotation (Placement(transformation(extent={{100,-10},{120,10}}))); | |
| - parameter Modelica.SIunits.Temperature TMin(displayUnit="degC") = 203.15 | |
| + | |
| + parameter Modelica.Units.SI.Temperature TMin(displayUnit="degC") = 203.15 | |
| "Minimum allowed temperature"; | |
| - parameter Modelica.SIunits.Temperature TMax(displayUnit="degC") = 343.15 | |
| + parameter Modelica.Units.SI.Temperature TMax(displayUnit="degC") = 343.15 | |
| "Maximum allowed temperature"; | |
| - | |
| equation | |
| TOut = TIn; | |
| assert(TOut > TMin, "Temperature out of bounds.\n" + " TOut = " + String( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/CheckWindSpeed.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/CheckWindSpeed.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/CheckWindSpeed.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/CheckWindSpeed.mo" 2021-04-26 11:51:23.258641806 +0200 | |
| @@ -7,7 +7,7 @@ | |
| Modelica.Blocks.Interfaces.RealOutput winSpeOut(final quantity="Velocity", | |
| final unit="m/s") "Wind speed" | |
| annotation (Placement(transformation(extent={{100,-10},{120,10}}))); | |
| - constant Modelica.SIunits.Velocity winSpeMin=1e-6 | |
| + constant Modelica.Units.SI.Velocity winSpeMin=1e-6 | |
| "Minimum allowed wind speed"; | |
| equation | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/ConvertRadiation.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/ConvertRadiation.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/ConvertRadiation.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/ConvertRadiation.mo" 2021-04-26 11:51:23.246641790 +0200 | |
| @@ -11,10 +11,10 @@ | |
| annotation (Placement(transformation(extent={{100,-10},{120,10}}))); | |
| protected | |
| - constant Modelica.SIunits.Time Hou=3600 "1 hour"; | |
| + constant Modelica.Units.SI.Time Hou=3600 "1 hour"; | |
| equation | |
| - HOut = HIn/Modelica.SIunits.Conversions.to_hour(Hou); | |
| + HOut = HIn/Modelica.Units.Conversions.to_hour(Hou); | |
| annotation ( | |
| defaultComponentName="conRad", | |
| Documentation(info="<html> | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" 2021-04-26 11:51:23.230641767 +0200 | |
| @@ -3,8 +3,8 @@ | |
| "Converts the simulation time to calendar time in scale of 1 year (365 days), or a multiple of a year" | |
| extends Modelica.Blocks.Icons.Block; | |
| - parameter Modelica.SIunits.Time weaDatStaTim(displayUnit="d") "Start time of weather data"; | |
| - parameter Modelica.SIunits.Time weaDatEndTim(displayUnit="d") "End time of weather data"; | |
| + parameter Modelica.Units.SI.Time weaDatStaTim(displayUnit="d") "Start time of weather data"; | |
| + parameter Modelica.Units.SI.Time weaDatEndTim(displayUnit="d") "End time of weather data"; | |
| Modelica.Blocks.Interfaces.RealInput modTim( | |
| final quantity="Time", | |
| @@ -16,14 +16,14 @@ | |
| annotation (Placement(transformation(extent={{100,-10},{120,10}}))); | |
| protected | |
| - constant Modelica.SIunits.Time shiftSolarRad=1800 "Number of seconds for the shift for solar radiation calculation"; | |
| - parameter Modelica.SIunits.Time lenWea = weaDatEndTim-weaDatStaTim "Length of weather data"; | |
| + constant Modelica.Units.SI.Time shiftSolarRad=1800 "Number of seconds for the shift for solar radiation calculation"; | |
| + parameter Modelica.Units.SI.Time lenWea = weaDatEndTim-weaDatStaTim "Length of weather data"; | |
| parameter Boolean canRepeatWeatherFile = abs(mod(lenWea, 365*24*3600)) < 1E-2 | |
| "=true, if the weather file can be repeated, since it has the length of a year or a multiple of it"; | |
| - discrete Modelica.SIunits.Time tNext(start=0, fixed=true) "Start time of next period"; | |
| + discrete Modelica.Units.SI.Time tNext(start=0, fixed=true) "Start time of next period"; | |
| equation | |
| when {initial(), canRepeatWeatherFile and modTim > pre(tNext)} then | |
| // simulation time stamp went over the end time of the weather file | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" 2021-04-26 11:51:23.042641509 +0200 | |
| @@ -1,11 +1,11 @@ | |
| within AixLib.BoundaryConditions.WeatherData.BaseClasses.Examples; | |
| model GetHeaderElement "Test model to get header element" | |
| extends Modelica.Icons.Example; | |
| - parameter Modelica.SIunits.Angle longitude(fixed=false, displayUnit="deg") | |
| + parameter Modelica.Units.SI.Angle longitude(fixed=false, displayUnit="deg") | |
| "Longitude"; | |
| - parameter Modelica.SIunits.Angle latitude(fixed=false, displayUnit="deg") | |
| + parameter Modelica.Units.SI.Angle latitude(fixed=false, displayUnit="deg") | |
| "Latitude"; | |
| - parameter Modelica.SIunits.Time timeZone(fixed=false, displayUnit="h") | |
| + parameter Modelica.Units.SI.Time timeZone(fixed=false, displayUnit="h") | |
| "Time zone"; | |
| parameter String filNam = Modelica.Utilities.Files.loadResource("modelica://AixLib/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos") | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3.mo" 2021-04-26 11:51:23.030641492 +0200 | |
| @@ -7,13 +7,13 @@ | |
| "Name of weather data file"; | |
| parameter String tabNam = "tab1" "Name of table on weather file"; | |
| - parameter Modelica.SIunits.Time[2] timeSpan(each fixed=false) | |
| + parameter Modelica.Units.SI.Time[2] timeSpan(each fixed=false) | |
| "Start time, end time of weather data"; | |
| protected | |
| - constant Modelica.SIunits.Time endTim = 365*24*3600.; | |
| - constant Modelica.SIunits.Time staTim = 0.; | |
| + constant Modelica.Units.SI.Time endTim = 365*24*3600.; | |
| + constant Modelica.Units.SI.Time staTim = 0.; | |
| initial equation | |
| timeSpan = AixLib.BoundaryConditions.WeatherData.BaseClasses.getTimeSpanTMY3( | |
| filNam, tabNam); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo" 2021-04-26 11:51:22.962641399 +0200 | |
| @@ -5,7 +5,7 @@ | |
| annotation (Dialog( | |
| loadSelector(filter="Weather files (*.mos)", caption= | |
| "Select weather file"))); | |
| - output Modelica.SIunits.Angle lat "Latitude from the weather file"; | |
| + output Modelica.Units.SI.Angle lat "Latitude from the weather file"; | |
| protected | |
| Integer nexInd "Next index, used for error handling"; | |
| String element "String representation of the returned element"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo" 2021-04-26 11:51:22.954641387 +0200 | |
| @@ -5,7 +5,7 @@ | |
| annotation (Dialog( | |
| loadSelector(filter="Weather files (*.mos)", caption= | |
| "Select weather file"))); | |
| - output Modelica.SIunits.Angle lon "Longitude from the weather file"; | |
| + output Modelica.Units.SI.Angle lon "Longitude from the weather file"; | |
| protected | |
| Integer nexInd "Next index, used for error handling"; | |
| String element "String representation of the returned element"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/getTimeSpanTMY3.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/getTimeSpanTMY3.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/getTimeSpanTMY3.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/getTimeSpanTMY3.mo" 2021-04-26 11:51:22.938641366 +0200 | |
| @@ -5,7 +5,7 @@ | |
| input String filNam "Name of weather data file"; | |
| input String tabNam "Name of table on weather file"; | |
| - output Modelica.SIunits.Time[2] timeSpan "Start time, end time of weather data"; | |
| + output Modelica.Units.SI.Time[2] timeSpan "Start time, end time of weather data"; | |
| external "C" getTimeSpan(filNam, tabNam, timeSpan) | |
| annotation ( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo" 2021-04-26 11:51:22.930641354 +0200 | |
| @@ -5,7 +5,7 @@ | |
| annotation (Dialog( | |
| loadSelector(filter="Weather files (*.mos)", caption= | |
| "Select weather file"))); | |
| - output Modelica.SIunits.Time timZon "Time zone from the weather file"; | |
| + output Modelica.Units.SI.Time timZon "Time zone from the weather file"; | |
| protected | |
| Integer nexInd "Next index, used for error handling"; | |
| String element "String representation of the returned element"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" 2021-03-15 12:05:56.591860814 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" 2021-04-26 11:51:22.998641448 +0200 | |
| @@ -5,14 +5,14 @@ | |
| final quantity="Time", | |
| final unit="s") "Clock time" | |
| annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); | |
| - parameter Modelica.SIunits.Time timZon(displayUnit="h") "Time zone"; | |
| - parameter Modelica.SIunits.Angle lon(displayUnit="deg") "Longitude"; | |
| + parameter Modelica.Units.SI.Time timZon(displayUnit="h") "Time zone"; | |
| + parameter Modelica.Units.SI.Angle lon(displayUnit="deg") "Longitude"; | |
| Modelica.Blocks.Interfaces.RealOutput locTim( | |
| final quantity="Time", | |
| final unit="s") "Local civil time" | |
| annotation (Placement(transformation(extent={{100,-10},{120,10}}))); | |
| protected | |
| - final parameter Modelica.SIunits.Time diff = - timZon + lon*43200/Modelica.Constants.pi | |
| + final parameter Modelica.Units.SI.Time diff = - timZon + lon*43200/Modelica.Constants.pi | |
| "Difference between local and clock time"; | |
| equation | |
| locTim = cloTim + diff; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/Old/WeatherTRY/BaseClasses/Sun.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/Old/WeatherTRY/BaseClasses/Sun.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/Old/WeatherTRY/BaseClasses/Sun.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/Old/WeatherTRY/BaseClasses/Sun.mo" 2021-04-26 11:51:22.862641261 +0200 | |
| @@ -1,14 +1,14 @@ | |
| within AixLib.BoundaryConditions.WeatherData.Old.WeatherTRY.BaseClasses; | |
| model Sun "Computes the sun's altitude of the current site" | |
| -import Modelica.SIunits.Conversions.from_deg; | |
| -import Modelica.SIunits.Conversions.to_deg; | |
| +import Modelica.Units.Conversions.from_deg; | |
| +import Modelica.Units.Conversions.to_deg; | |
| parameter Real TimeCorrection = 0.5 "for TRY = 0.5, for TMY = 0"; | |
| - parameter Modelica.SIunits.Conversions.NonSIunits.Angle_deg Latitude | |
| + parameter Modelica.Units.NonSI.Angle_deg Latitude | |
| "latitude of location"; | |
| - parameter Modelica.SIunits.Conversions.NonSIunits.Angle_deg Longitude | |
| + parameter Modelica.Units.NonSI.Angle_deg Longitude | |
| "longitude of location in"; | |
| - parameter Modelica.SIunits.Conversions.NonSIunits.Time_hour | |
| + parameter Modelica.Units.NonSI.Time_hour | |
| DiffWeatherDataTime | |
| "difference between local time and UTC, e.g. +1 for MET"; | |
| parameter Real Diff_localStandardTime_WeatherDataTime = 0 | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/Old/WeatherTRY/RadiationOnTiltedSurface/BaseClasses/PartialRadOnTiltedSurf.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/Old/WeatherTRY/RadiationOnTiltedSurface/BaseClasses/PartialRadOnTiltedSurf.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/Old/WeatherTRY/RadiationOnTiltedSurface/BaseClasses/PartialRadOnTiltedSurf.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/Old/WeatherTRY/RadiationOnTiltedSurface/BaseClasses/PartialRadOnTiltedSurf.mo" 2021-04-26 11:51:22.818641200 +0200 | |
| @@ -2,15 +2,15 @@ | |
| partial model PartialRadOnTiltedSurf | |
| parameter Integer WeatherFormat = 1 "Format weather file" annotation (Dialog(group= | |
| "Properties of Weather Data", compact = true, descriptionLabel = true), choices(choice = 1 "TRY", choice= 2 "TMY", radioButtons = true)); | |
| - parameter Modelica.SIunits.Conversions.NonSIunits.Angle_deg Latitude= 49.5 | |
| + parameter Modelica.Units.NonSI.Angle_deg Latitude= 49.5 | |
| "latitude of location" | |
| annotation (Dialog(group="Location Properties")); | |
| parameter Real GroundReflection=0.2 "ground reflection coefficient" | |
| annotation (Dialog(group="Ground reflection")); | |
| - parameter Modelica.SIunits.Conversions.NonSIunits.Angle_deg Azimut = 13.400 | |
| + parameter Modelica.Units.NonSI.Angle_deg Azimut = 13.400 | |
| "azimut of tilted surface, e.g. 0=south, 90=west, 180=north, -90=east" annotation(Dialog(group="Surface Properties")); | |
| - parameter Modelica.SIunits.Conversions.NonSIunits.Angle_deg Tilt = 90 | |
| + parameter Modelica.Units.NonSI.Angle_deg Tilt = 90 | |
| "tilt of surface, e.g. 0=horizontal surface, 90=vertical surface" annotation (Dialog(group="Surface Properties")); | |
| Modelica.Blocks.Interfaces.RealInput InHourAngleSun | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/Old/WeatherTRY/RadiationOnTiltedSurface/RadOnTiltedSurf_Liu.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/Old/WeatherTRY/RadiationOnTiltedSurface/RadOnTiltedSurf_Liu.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/Old/WeatherTRY/RadiationOnTiltedSurface/RadOnTiltedSurf_Liu.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/Old/WeatherTRY/RadiationOnTiltedSurface/RadOnTiltedSurf_Liu.mo" 2021-04-26 11:51:22.806641183 +0200 | |
| @@ -3,7 +3,7 @@ | |
| "Calculates solar radiation on tilted surfaces according to Liu" | |
| extends BaseClasses.PartialRadOnTiltedSurf; | |
| -import Modelica.SIunits.Conversions.from_deg; | |
| +import Modelica.Units.Conversions.from_deg; | |
| Real InBeamRadHor "beam irradiance on the horizontal surface"; | |
| Real InDiffRadHor "diffuse irradiance on the horizontal surface"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/Old/WeatherTRY/RadiationOnTiltedSurface/RadOnTiltedSurf_Perez.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/Old/WeatherTRY/RadiationOnTiltedSurface/RadOnTiltedSurf_Perez.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/Old/WeatherTRY/RadiationOnTiltedSurface/RadOnTiltedSurf_Perez.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/Old/WeatherTRY/RadiationOnTiltedSurface/RadOnTiltedSurf_Perez.mo" 2021-04-26 11:51:22.778641145 +0200 | |
| @@ -3,8 +3,8 @@ | |
| "Calculates solar radiation on tilted surfaces according to Perez" | |
| extends RadiationOnTiltedSurface.BaseClasses.PartialRadOnTiltedSurf; | |
| - import Modelica.SIunits.Conversions.to_deg; | |
| - import Modelica.SIunits.Conversions.from_deg; | |
| + import Modelica.Units.Conversions.to_deg; | |
| + import Modelica.Units.Conversions.from_deg; | |
| import Modelica.Math.sin; | |
| import Modelica.Math.acos; | |
| import Modelica.Math.cos; | |
| @@ -14,7 +14,7 @@ | |
| parameter Boolean GroundReflexApprox = false | |
| "Shall the GroundReflection be approximated?" annotation (Dialog(group= | |
| "Ground reflection")); | |
| - parameter Modelica.SIunits.Height h=0 | |
| + parameter Modelica.Units.SI.Height h=0 | |
| "height of the tilted surfaces centre in metre. if unknown it is 0"; | |
| //constants | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/Old/WeatherTRY/Weather.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/Old/WeatherTRY/Weather.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/Old/WeatherTRY/Weather.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/Old/WeatherTRY/Weather.mo" 2021-04-26 11:51:22.722641068 +0200 | |
| @@ -1,10 +1,10 @@ | |
| within AixLib.BoundaryConditions.WeatherData.Old.WeatherTRY; | |
| model Weather "Complex weather model" | |
| - parameter Modelica.SIunits.Conversions.NonSIunits.Angle_deg Latitude = 49.5 | |
| + parameter Modelica.Units.NonSI.Angle_deg Latitude = 49.5 | |
| "latitude of location" annotation(Dialog(group = "Location Properties")); | |
| - parameter Modelica.SIunits.Conversions.NonSIunits.Angle_deg Longitude = 8.5 | |
| + parameter Modelica.Units.NonSI.Angle_deg Longitude = 8.5 | |
| "longitude of location" annotation(Dialog(group = "Location Properties")); | |
| - parameter Modelica.SIunits.Conversions.NonSIunits.Time_hour DiffWeatherDataTime = 1 | |
| + parameter Modelica.Units.NonSI.Time_hour DiffWeatherDataTime = 1 | |
| "difference between weather data time and UTC, e.g. +1 for CET" annotation(Dialog(group = "Properties of Weather Data")); | |
| parameter Real GroundReflection = 0.2 "ground reflection coefficient" annotation(Dialog(group = "Location Properties")); | |
| parameter String tableName = "wetter" | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/ReaderTMY3.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/ReaderTMY3.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/ReaderTMY3.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/ReaderTMY3.mo" 2021-04-26 11:51:22.642640958 +0200 | |
| @@ -9,7 +9,7 @@ | |
| parameter AixLib.BoundaryConditions.Types.DataSource pAtmSou=AixLib.BoundaryConditions.Types.DataSource.Parameter | |
| "Atmospheric pressure" | |
| annotation (Evaluate=true, Dialog(group="Data source")); | |
| - parameter Modelica.SIunits.Pressure pAtm=101325 | |
| + parameter Modelica.Units.SI.Pressure pAtm=101325 | |
| "Atmospheric pressure (used if pAtmSou=Parameter)" | |
| annotation (Dialog(group="Data source")); | |
| Modelica.Blocks.Interfaces.RealInput pAtm_in( | |
| @@ -73,7 +73,7 @@ | |
| parameter AixLib.BoundaryConditions.Types.DataSource TDryBulSou=AixLib.BoundaryConditions.Types.DataSource.File | |
| "Dry bulb temperature" | |
| annotation (Evaluate=true, Dialog(group="Data source")); | |
| - parameter Modelica.SIunits.Temperature TDryBul(displayUnit="degC") = 293.15 | |
| + parameter Modelica.Units.SI.Temperature TDryBul(displayUnit="degC") = 293.15 | |
| "Dry bulb temperature (used if TDryBul=Parameter)" | |
| annotation (Dialog(group="Data source")); | |
| Modelica.Blocks.Interfaces.RealInput TDryBul_in( | |
| @@ -88,7 +88,7 @@ | |
| parameter AixLib.BoundaryConditions.Types.DataSource TDewPoiSou=AixLib.BoundaryConditions.Types.DataSource.File | |
| "Dew point temperature" | |
| annotation (Evaluate=true, Dialog(group="Data source")); | |
| - parameter Modelica.SIunits.Temperature TDewPoi(displayUnit="degC") = 283.15 | |
| + parameter Modelica.Units.SI.Temperature TDewPoi(displayUnit="degC") = 283.15 | |
| "Dew point temperature (used if TDewPoi=Parameter)" | |
| annotation (Dialog(group="Data source")); | |
| Modelica.Blocks.Interfaces.RealInput TDewPoi_in( | |
| @@ -102,7 +102,7 @@ | |
| // Black body sky temperature | |
| parameter AixLib.BoundaryConditions.Types.DataSource TBlaSkySou=AixLib.BoundaryConditions.Types.DataSource.File | |
| "Black-body sky temperature" annotation (Evaluate=true, Dialog(group="Data source")); | |
| - parameter Modelica.SIunits.Temperature TBlaSky=273.15 | |
| + parameter Modelica.Units.SI.Temperature TBlaSky=273.15 | |
| "Black-body sky temperature (used if TBlaSkySou=Parameter)" | |
| annotation (Dialog(group="Data source")); | |
| Modelica.Blocks.Interfaces.RealInput TBlaSky_in( | |
| @@ -133,7 +133,7 @@ | |
| // Wind speed | |
| parameter AixLib.BoundaryConditions.Types.DataSource winSpeSou=AixLib.BoundaryConditions.Types.DataSource.File | |
| "Wind speed" annotation (Evaluate=true, Dialog(group="Data source")); | |
| - parameter Modelica.SIunits.Velocity winSpe(min=0) = 1 | |
| + parameter Modelica.Units.SI.Velocity winSpe(min=0) = 1 | |
| "Wind speed (used if winSpe=Parameter)" | |
| annotation (Dialog(group="Data source")); | |
| Modelica.Blocks.Interfaces.RealInput winSpe_in( | |
| @@ -147,7 +147,7 @@ | |
| // Wind direction | |
| parameter AixLib.BoundaryConditions.Types.DataSource winDirSou=AixLib.BoundaryConditions.Types.DataSource.File | |
| "Wind direction" annotation (Evaluate=true, Dialog(group="Data source")); | |
| - parameter Modelica.SIunits.Angle winDir=1.0 | |
| + parameter Modelica.Units.SI.Angle winDir=1.0 | |
| "Wind direction (used if winDir=Parameter)" | |
| annotation (Dialog(group="Data source")); | |
| Modelica.Blocks.Interfaces.RealInput winDir_in( | |
| @@ -161,7 +161,7 @@ | |
| // Infrared horizontal radiation | |
| parameter AixLib.BoundaryConditions.Types.DataSource HInfHorSou=AixLib.BoundaryConditions.Types.DataSource.File | |
| "Infrared horizontal radiation" annotation (Evaluate=true, Dialog(group="Data source")); | |
| - parameter Modelica.SIunits.HeatFlux HInfHor=0.0 | |
| + parameter Modelica.Units.SI.HeatFlux HInfHor=0.0 | |
| "Infrared horizontal radiation (used if HInfHorSou=Parameter)" | |
| annotation (Dialog(group="Data source")); | |
| Modelica.Blocks.Interfaces.RealInput HInfHor_in( | |
| @@ -203,13 +203,13 @@ | |
| parameter String filNam="" "Name of weather data file" annotation ( | |
| Dialog(loadSelector(filter="Weather files (*.mos)", | |
| caption="Select weather file"))); | |
| - final parameter Modelica.SIunits.Angle lon(displayUnit="deg")= | |
| + final parameter Modelica.Units.SI.Angle lon(displayUnit="deg")= | |
| AixLib.BoundaryConditions.WeatherData.BaseClasses.getLongitudeTMY3( | |
| filNam) "Longitude"; | |
| - final parameter Modelica.SIunits.Angle lat(displayUnit="deg")= | |
| + final parameter Modelica.Units.SI.Angle lat(displayUnit="deg")= | |
| AixLib.BoundaryConditions.WeatherData.BaseClasses.getLatitudeTMY3( | |
| filNam) "Latitude"; | |
| - final parameter Modelica.SIunits.Time timZon(displayUnit="h")= | |
| + final parameter Modelica.Units.SI.Time timZon(displayUnit="h")= | |
| AixLib.BoundaryConditions.WeatherData.BaseClasses.getTimeZoneTMY3(filNam) | |
| "Time zone"; | |
| @@ -224,10 +224,10 @@ | |
| Dialog(group="Sky temperature")); | |
| constant Real epsCos = 1e-6 "Small value to avoid division by 0"; | |
| - constant Modelica.SIunits.HeatFlux solCon = 1367.7 "Solar constant"; | |
| + constant Modelica.Units.SI.HeatFlux solCon = 1367.7 "Solar constant"; | |
| protected | |
| - final parameter Modelica.SIunits.Time[2] timeSpan= | |
| + final parameter Modelica.Units.SI.Time[2] timeSpan= | |
| AixLib.BoundaryConditions.WeatherData.BaseClasses.getTimeSpanTMY3(filNam, "tab1") | |
| "Start time, end time of weather data"; | |
| @@ -418,12 +418,13 @@ | |
| "Check black body sky temperature" | |
| annotation (Placement(transformation(extent={{240,-260},{260,-240}}))); | |
| + | |
| // Blocks that are added in order to set the name of the output signal, | |
| // which then is displayed in the GUI of the weather data connector. | |
| block Latitude "Generate constant signal of type Real" | |
| extends Modelica.Blocks.Icons.Block; | |
| - parameter Modelica.SIunits.Angle latitude "Latitude"; | |
| + parameter Modelica.Units.SI.Angle latitude "Latitude"; | |
| Modelica.Blocks.Interfaces.RealOutput y( | |
| unit="rad", | |
| @@ -467,7 +468,7 @@ | |
| block Longitude "Generate constant signal of type Real" | |
| extends Modelica.Blocks.Icons.Block; | |
| - parameter Modelica.SIunits.Angle longitude "Longitude"; | |
| + parameter Modelica.Units.SI.Angle longitude "Longitude"; | |
| Modelica.Blocks.Interfaces.RealOutput y( | |
| unit="rad", | |
| @@ -507,7 +508,6 @@ | |
| </ul> | |
| </html>")); | |
| end Longitude; | |
| - | |
| equation | |
| //--------------------------------------------------------------------------- | |
| // Select atmospheric pressure connector | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mo" "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mo" 2021-04-26 11:51:22.406640632 +0200 | |
| @@ -9,14 +9,14 @@ | |
| annotation (Placement(transformation(extent={{68,-10},{88,10}}))); | |
| protected | |
| Modelica.Blocks.Sources.Sine HGloHor1( | |
| - freqHz=1/86400, | |
| + f =1/86400, | |
| startTime=25200, | |
| offset=0, | |
| amplitude=100) "Horizontal global radiation" | |
| annotation (Placement(transformation(extent={{-88,-30},{-68,-10}}))); | |
| Modelica.Blocks.Sources.Sine HGloHor( | |
| - freqHz=1/86400, | |
| + f =1/86400, | |
| startTime=68428, | |
| offset=0, | |
| amplitude=100) "Horizontal global radiation" | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/AirHandling/FVUController.mo" "converted-libraries/AixLib 0.9.1-master/Controls/AirHandling/FVUController.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/AirHandling/FVUController.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/AirHandling/FVUController.mo" 2021-04-26 11:51:22.354640560 +0200 | |
| @@ -1,7 +1,7 @@ | |
| within AixLib.Controls.AirHandling; | |
| model FVUController "Rule-based controller of a facade ventilation unit" | |
| - parameter Modelica.SIunits.Temperature minimumSupTemp=273.15 + 17 | |
| + parameter Modelica.Units.SI.Temperature minimumSupTemp=273.15 + 17 | |
| "Minimum supply air temperature"; | |
| parameter Real co2SetConcentration(min=0) = 600 | |
| @@ -13,7 +13,7 @@ | |
| parameter Real maxExFanPower(min=0, max=0) = 1 | |
| "Maximum relative exhaust air fan power (0..1)"; | |
| - parameter Modelica.SIunits.TemperatureDifference deltaTemp = 1 | |
| + parameter Modelica.Units.SI.TemperatureDifference deltaTemp = 1 | |
| "Added to the set temperature in cooling mode"; | |
| Modelica.Blocks.Logical.OnOffController roomToBeCooled(bandwidth=2) | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Continuous/Examples/LimPID.mo" "converted-libraries/AixLib 0.9.1-master/Controls/Continuous/Examples/LimPID.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Continuous/Examples/LimPID.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/Continuous/Examples/LimPID.mo" 2021-04-26 11:51:22.242640407 +0200 | |
| @@ -10,7 +10,7 @@ | |
| Td=1, | |
| yMax=1, | |
| yMin=-1, | |
| - initType=Modelica.Blocks.Types.InitPID.InitialState) | |
| + initType=Modelica.Blocks.Types.Init.InitialState) | |
| annotation (Placement(transformation(extent={{-20,30},{0,50}}))); | |
| AixLib.Controls.Continuous.LimPID limPIDRev( | |
| controllerType=Modelica.Blocks.Types.SimpleController.PID, | |
| @@ -19,7 +19,7 @@ | |
| Td=1, | |
| yMax=1, | |
| yMin=-1, | |
| - initType=Modelica.Blocks.Types.InitPID.InitialState) | |
| + initType=Modelica.Blocks.Types.Init.InitialState) | |
| "Controller with reverse action" | |
| annotation (Placement(transformation(extent={{-20,-20},{0,0}}))); | |
| Modelica.Blocks.Sources.Constant const(k=0.5) | |
| @@ -35,7 +35,7 @@ | |
| Td=1, | |
| yMax=1, | |
| yMin=-1, | |
| - initType=Modelica.Blocks.Types.InitPID.InitialState) | |
| + initType=Modelica.Blocks.Types.Init.InitialState) | |
| annotation (Placement(transformation(extent={{-20,70},{0,90}}))); | |
| AixLib.Utilities.Diagnostics.AssertEquality assertEquality1( | |
| threShold=1e-3) | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Continuous/Examples/NumberOfRequests.mo" "converted-libraries/AixLib 0.9.1-master/Controls/Continuous/Examples/NumberOfRequests.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Continuous/Examples/NumberOfRequests.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/Continuous/Examples/NumberOfRequests.mo" 2021-04-26 11:51:22.198640346 +0200 | |
| @@ -6,7 +6,7 @@ | |
| nin=2, | |
| threShold=0, | |
| kind=0) annotation (Placement(transformation(extent={{0,20},{20,40}}))); | |
| - Modelica.Blocks.Sources.Sine sine(freqHz=2) | |
| + Modelica.Blocks.Sources.Sine sine(f =2) | |
| annotation (Placement(transformation(extent={{-60,-20},{-40,0}}))); | |
| Modelica.Blocks.Sources.Pulse pulse(period=0.35) | |
| annotation (Placement(transformation(extent={{-60,20},{-40,40}}))); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Continuous/Examples/PIDHysteresis.mo" "converted-libraries/AixLib 0.9.1-master/Controls/Continuous/Examples/PIDHysteresis.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Continuous/Examples/PIDHysteresis.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/Continuous/Examples/PIDHysteresis.mo" 2021-04-26 11:51:22.182640323 +0200 | |
| @@ -25,7 +25,7 @@ | |
| Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow Q_flow | |
| annotation (Placement(transformation(extent={{16,20},{36,40}}))); | |
| Modelica.Blocks.Sources.Sine sine( | |
| - freqHz=1/86400, | |
| + f =1/86400, | |
| offset=273.15, | |
| amplitude=20, | |
| phase=-1.5707963267949, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Continuous/Examples/PIDHysteresisTimer.mo" "converted-libraries/AixLib 0.9.1-master/Controls/Continuous/Examples/PIDHysteresisTimer.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Continuous/Examples/PIDHysteresisTimer.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/Continuous/Examples/PIDHysteresisTimer.mo" 2021-04-26 11:51:22.162640297 +0200 | |
| @@ -26,7 +26,7 @@ | |
| Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow Q_flow | |
| annotation (Placement(transformation(extent={{16,20},{36,40}}))); | |
| Modelica.Blocks.Sources.Sine sine( | |
| - freqHz=1/86400, | |
| + f =1/86400, | |
| offset=273.15, | |
| amplitude=20, | |
| phase=-1.5707963267949) | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Continuous/Examples/SignalRanker.mo" "converted-libraries/AixLib 0.9.1-master/Controls/Continuous/Examples/SignalRanker.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Continuous/Examples/SignalRanker.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/Continuous/Examples/SignalRanker.mo" 2021-04-26 11:51:22.142640269 +0200 | |
| @@ -1,14 +1,14 @@ | |
| within AixLib.Controls.Continuous.Examples; | |
| model SignalRanker "Example model for signal ranker" | |
| extends Modelica.Icons.Example; | |
| - Modelica.Blocks.Sources.Sine sine(freqHz=2) | |
| + Modelica.Blocks.Sources.Sine sine(f =2) | |
| annotation (Placement(transformation(extent={{-60,-20},{-40,0}}))); | |
| Modelica.Blocks.Sources.Pulse pulse(period=0.25) | |
| annotation (Placement(transformation(extent={{-60,20},{-40,40}}))); | |
| AixLib.Controls.Continuous.SignalRanker sigRan( | |
| nin=3) | |
| annotation (Placement(transformation(extent={{-20,20},{0,40}}))); | |
| - Modelica.Blocks.Sources.ExpSine expSine(freqHz=10, damping=1) | |
| + Modelica.Blocks.Sources.ExpSine expSine(f =10, damping=1) | |
| annotation (Placement(transformation(extent={{-60,60},{-40,80}}))); | |
| equation | |
| connect(sine.y, sigRan.u[1]) annotation (Line(points={{-39,-10},{-32, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Continuous/LimPID.mo" "converted-libraries/AixLib 0.9.1-master/Controls/Continuous/LimPID.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Continuous/LimPID.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/Continuous/LimPID.mo" 2021-04-26 11:51:22.130640252 +0200 | |
| @@ -9,11 +9,11 @@ | |
| parameter Modelica.Blocks.Types.SimpleController controllerType= | |
| Modelica.Blocks.Types.SimpleController.PID "Type of controller"; | |
| parameter Real k(min=0, unit="1") = 1 "Gain of controller"; | |
| - parameter Modelica.SIunits.Time Ti(min=Modelica.Constants.small)=0.5 | |
| + parameter Modelica.Units.SI.Time Ti(min=Modelica.Constants.small)=0.5 | |
| "Time constant of Integrator block" annotation (Dialog(enable= | |
| controllerType == Modelica.Blocks.Types.SimpleController.PI or | |
| controllerType == Modelica.Blocks.Types.SimpleController.PID)); | |
| - parameter Modelica.SIunits.Time Td(min=0)=0.1 | |
| + parameter Modelica.Units.SI.Time Td(min=0)=0.1 | |
| "Time constant of Derivative block" annotation (Dialog(enable= | |
| controllerType == Modelica.Blocks.Types.SimpleController.PD or | |
| controllerType == Modelica.Blocks.Types.SimpleController.PID)); | |
| @@ -31,7 +31,7 @@ | |
| "The higher Nd, the more ideal the derivative block" | |
| annotation(Dialog(enable=controllerType==.Modelica.Blocks.Types.SimpleController.PD or | |
| controllerType==.Modelica.Blocks.Types.SimpleController.PID)); | |
| - parameter Modelica.Blocks.Types.InitPID initType= Modelica.Blocks.Types.InitPID.DoNotUse_InitialIntegratorState | |
| + parameter Modelica.Blocks.Types.Init initType= Modelica.Blocks.Types.Init.InitialState | |
| "Type of initialization (1: no init, 2: steady state, 3: initial state, 4: initial output)" | |
| annotation(Evaluate=true, | |
| Dialog(group="Initialization")); | |
| @@ -93,12 +93,9 @@ | |
| final y_reset=y_reset, | |
| final k=unitTime/Ti, | |
| final y_start=xi_start, | |
| - final initType=if initType == Modelica.Blocks.Types.InitPID.SteadyState then | |
| + final initType=if initType == Modelica.Blocks.Types.Init.SteadyState then | |
| Modelica.Blocks.Types.Init.SteadyState | |
| - else if initType == Modelica.Blocks.Types.InitPID.InitialState | |
| - or initType == Modelica.Blocks.Types.InitPID.DoNotUse_InitialIntegratorState | |
| - then Modelica.Blocks.Types.Init.InitialState | |
| - else Modelica.Blocks.Types.Init.NoInit) if | |
| + else if initType == Modelica.Blocks.Types.Init.InitialState or initType == Modelica.Blocks.Types.Init.InitialState then Modelica.Blocks.Types.Init.InitialState else Modelica.Blocks.Types.Init.NoInit) if | |
| with_I "Integral term" | |
| annotation (Placement(transformation(extent={{-40,-60},{-20,-40}}))); | |
| @@ -106,15 +103,10 @@ | |
| final k=Td/unitTime, | |
| final T=max([Td/Nd,1.e-14]), | |
| final x_start=xd_start, | |
| - final initType=if initType == Modelica.Blocks.Types.InitPID.SteadyState or | |
| - initType == Modelica.Blocks.Types.InitPID.InitialOutput | |
| + final initType=if initType == Modelica.Blocks.Types.Init.SteadyState or initType == Modelica.Blocks.Types.Init.InitialOutput | |
| then | |
| Modelica.Blocks.Types.Init.SteadyState | |
| - else | |
| - if initType == Modelica.Blocks.Types.InitPID.InitialState then | |
| - Modelica.Blocks.Types.Init.InitialState | |
| - else | |
| - Modelica.Blocks.Types.Init.NoInit) if with_D "Derivative term" | |
| + else if initType == Modelica.Blocks.Types.Init.InitialState then Modelica.Blocks.Types.Init.InitialState else Modelica.Blocks.Types.Init.NoInit) if with_D "Derivative term" | |
| annotation (Placement( | |
| transformation(extent={{-40,-10},{-20,10}}))); | |
| @@ -125,7 +117,7 @@ | |
| annotation (Placement(transformation(extent={{0,-10},{20,10}}))); | |
| protected | |
| - constant Modelica.SIunits.Time unitTime=1 annotation (HideResult=true); | |
| + constant Modelica.Units.SI.Time unitTime=1 annotation (HideResult=true); | |
| final parameter Real revAct = if reverseAction then -1 else 1 | |
| "Switch for sign for reverse action"; | |
| @@ -278,14 +270,14 @@ | |
| initial equation | |
| - if initType==Modelica.Blocks.Types.InitPID.InitialOutput then | |
| + if initType== Modelica.Blocks.Types.Init.InitialOutput then | |
| gainPID.y = y_start; | |
| end if; | |
| equation | |
| assert(yMax >= yMin, "LimPID: Limits must be consistent. However, yMax (=" + String(yMax) + | |
| ") < yMin (=" + String(yMin) + ")"); | |
| - if initType == Modelica.Blocks.Types.InitPID.InitialOutput and (y_start < yMin or y_start > yMax) then | |
| + if initType == Modelica.Blocks.Types.Init.InitialOutput and (y_start < yMin or y_start > yMax) then | |
| Modelica.Utilities.Streams.error("LimPID: Start value y_start (=" + String(y_start) + | |
| ") is outside of the limits of yMin (=" + String(yMin) +") and yMax (=" + String(yMax) + ")"); | |
| end if; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Continuous/OffTimer.mo" "converted-libraries/AixLib 0.9.1-master/Controls/Continuous/OffTimer.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Continuous/OffTimer.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/Continuous/OffTimer.mo" 2021-04-26 11:51:22.026640109 +0200 | |
| @@ -9,7 +9,7 @@ | |
| annotation (Placement(transformation(extent={{100,-10},{120,10}}))); | |
| protected | |
| - discrete Modelica.SIunits.Time entryTime "Time instant when u became true"; | |
| + discrete Modelica.Units.SI.Time entryTime "Time instant when u became true"; | |
| initial equation | |
| pre(entryTime) = time; | |
| equation | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Continuous/PIDHysteresis.mo" "converted-libraries/AixLib 0.9.1-master/Controls/Continuous/PIDHysteresis.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Continuous/PIDHysteresis.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/Continuous/PIDHysteresis.mo" 2021-04-26 11:51:22.014640093 +0200 | |
| @@ -17,9 +17,9 @@ | |
| annotation (Dialog(group="Set point tracking")); | |
| parameter Real k=1 "Gain of controller" | |
| annotation (Dialog(group="Set point tracking")); | |
| - parameter Modelica.SIunits.Time Ti "Time constant of Integrator block" | |
| + parameter Modelica.Units.SI.Time Ti "Time constant of Integrator block" | |
| annotation (Dialog(group="Set point tracking")); | |
| - parameter Modelica.SIunits.Time Td "Time constant of Derivative block" | |
| + parameter Modelica.Units.SI.Time Td "Time constant of Derivative block" | |
| annotation (Dialog(group="Set point tracking")); | |
| parameter Real yMax=1 "Upper limit of output" | |
| annotation (Dialog(group="Set point tracking")); | |
| @@ -37,7 +37,7 @@ | |
| "Set to true to enable reverse action (such as for a cooling coil controller)" | |
| annotation (Dialog(group="Set point tracking")); | |
| - parameter Modelica.Blocks.Types.InitPID initType=Modelica.Blocks.Types.InitPID.DoNotUse_InitialIntegratorState | |
| + parameter Modelica.Blocks.Types.Init initType=Modelica.Blocks.Types.Init.InitialState | |
| "Type of initialization (1: no init, 2: steady state, 3: initial state, 4: initial output)" | |
| annotation (Dialog(group="Initialization")); | |
| parameter Real xi_start=0 | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Continuous/PIDHysteresisTimer.mo" "converted-libraries/AixLib 0.9.1-master/Controls/Continuous/PIDHysteresisTimer.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Continuous/PIDHysteresisTimer.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/Continuous/PIDHysteresisTimer.mo" 2021-04-26 11:51:21.974640037 +0200 | |
| @@ -20,9 +20,9 @@ | |
| annotation (Dialog(group="Set point tracking")); | |
| parameter Real k=1 "Gain of controller" | |
| annotation (Dialog(group="Set point tracking")); | |
| - parameter Modelica.SIunits.Time Ti "Time constant of Integrator block" | |
| + parameter Modelica.Units.SI.Time Ti "Time constant of Integrator block" | |
| annotation (Dialog(group="Set point tracking")); | |
| - parameter Modelica.SIunits.Time Td "Time constant of Derivative block" | |
| + parameter Modelica.Units.SI.Time Td "Time constant of Derivative block" | |
| annotation (Dialog(group="Set point tracking")); | |
| parameter Real yMax=1 "Upper limit of modulating output" | |
| annotation (Dialog(group="Set point tracking")); | |
| @@ -41,7 +41,7 @@ | |
| "Set to true to enable reverse action (such as for a cooling coil controller)" | |
| annotation (Dialog(group="Set point tracking")); | |
| - parameter Modelica.Blocks.Types.InitPID initType=Modelica.Blocks.Types.InitPID.DoNotUse_InitialIntegratorState | |
| + parameter Modelica.Blocks.Types.Init initType=Modelica.Blocks.Types.Init.InitialState | |
| "Type of initialization (1: no init, 2: steady state, 3: initial state, 4: initial output)" | |
| annotation (Dialog(group="Initialization")); | |
| parameter Real xi_start=0 | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Continuous/PITemp.mo" "converted-libraries/AixLib 0.9.1-master/Controls/Continuous/PITemp.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Continuous/PITemp.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/Continuous/PITemp.mo" 2021-04-26 11:51:21.930639976 +0200 | |
| @@ -12,7 +12,7 @@ | |
| parameter Real h = 1 "upper limit controller output" annotation(Dialog(group = "Control")); | |
| parameter Real l = 0 "lower limit of controller output" annotation(Dialog(group = "Control")); | |
| parameter Real KR = 1 "Gain" annotation(Dialog(group = "Control")); | |
| - parameter Modelica.SIunits.Time TN = 1 "Time Constant (T>0 required)" annotation(Dialog(group = "Control")); | |
| + parameter Modelica.Units.SI.Time TN = 1 "Time Constant (T>0 required)" annotation(Dialog(group = "Control")); | |
| Modelica.Blocks.Interfaces.RealOutput y annotation(Placement(transformation(extent = {{80, -10}, {100, 10}}), iconTransformation(extent = {{80, -10}, {100, 10}}))); | |
| parameter Boolean rangeSwitch = false "Switch controller output range"; | |
| Modelica.Blocks.Interfaces.BooleanInput onOff "Switches Controler on and off" annotation(Placement(transformation(extent = {{-120, -80}, {-80, -40}}), iconTransformation(extent = {{-100, -60}, {-80, -40}}))); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Continuous/Validation/LimPIDReset.mo" "converted-libraries/AixLib 0.9.1-master/Controls/Continuous/Validation/LimPIDReset.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Continuous/Validation/LimPIDReset.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/Continuous/Validation/LimPIDReset.mo" 2021-04-26 11:51:21.886639917 +0200 | |
| @@ -3,7 +3,7 @@ | |
| "Test model for PID controller with optional intgerator reset" | |
| extends Modelica.Icons.Example; | |
| - Modelica.Blocks.Sources.Sine setPoi(freqHz=1) "Set point signal" | |
| + Modelica.Blocks.Sources.Sine setPoi(f =1) "Set point signal" | |
| annotation (Placement(transformation(extent={{-40,-20},{-20,0}}))); | |
| AixLib.Controls.Continuous.LimPID limPIDPar( | |
| yMax=1, | |
| @@ -14,13 +14,13 @@ | |
| Td=10, | |
| k=0.2, | |
| controllerType=Modelica.Blocks.Types.SimpleController.PID, | |
| - initType=Modelica.Blocks.Types.InitPID.InitialOutput, | |
| + initType=Modelica.Blocks.Types.Init.InitialOutput, | |
| y_start=0.3) "PId controller with integrator reset to a parameter value" | |
| annotation (Placement(transformation(extent={{20,-20},{40,0}}))); | |
| Modelica.Blocks.Sources.Constant mea(k=0.5) "Measured signal" | |
| annotation (Placement(transformation(extent={{-40,-50},{-20,-30}}))); | |
| AixLib.Controls.Continuous.LimPID limPIDDef( | |
| - initType=Modelica.Blocks.Types.InitPID.InitialState, | |
| + initType=Modelica.Blocks.Types.Init.InitialState, | |
| Td=10, | |
| k=1, | |
| Ti=1, | |
| @@ -44,14 +44,14 @@ | |
| k=0.2, | |
| Ti=20, | |
| controllerType=Modelica.Blocks.Types.SimpleController.PID, | |
| - initType=Modelica.Blocks.Types.InitPID.InitialOutput, | |
| + initType=Modelica.Blocks.Types.Init.InitialOutput, | |
| y_start=0.3) "PId controller with integrator reset to an input value" | |
| annotation (Placement(transformation(extent={{20,-80},{40,-60}}))); | |
| Modelica.Blocks.Sources.Constant conRes(k=0.9) | |
| "Signal to which integrator will be reset to" | |
| annotation (Placement(transformation(extent={{-40,-90},{-20,-70}}))); | |
| Modelica.Blocks.Continuous.LimPID limPIDOri( | |
| - initType=Modelica.Blocks.Types.InitPID.InitialState, | |
| + initType=Modelica.Blocks.Types.Init.InitialState, | |
| Td=10, | |
| k=1, | |
| Ti=1, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/AntiLegionella.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/AntiLegionella.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/AntiLegionella.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/AntiLegionella.mo" 2021-04-26 11:51:19.974637282 +0200 | |
| @@ -1,10 +1,10 @@ | |
| -within AixLib.Controls.HeatPump; | |
| +within AixLib.Controls.HeatPump; | |
| model AntiLegionella "Control to avoid Legionella in the DHW" | |
| - parameter Modelica.SIunits.ThermodynamicTemperature TLegMin=333.15 | |
| + parameter Modelica.Units.SI.ThermodynamicTemperature TLegMin=333.15 | |
| "Temperature at which the legionella in DWH dies"; | |
| - parameter Modelica.SIunits.Time minTimeAntLeg | |
| + parameter Modelica.Units.SI.Time minTimeAntLeg | |
| "Minimal duration of antilegionella control"; | |
| parameter Boolean weekly=true | |
| "Switch between a daily or weekly trigger approach" annotation(Dialog(descriptionLabel=true), choices(choice=true "Weekly", | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/BaseClasses/InverterControlledHP.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/BaseClasses/InverterControlledHP.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/BaseClasses/InverterControlledHP.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/BaseClasses/InverterControlledHP.mo" 2021-04-26 11:51:19.934637226 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Controls.HeatPump.BaseClasses; | |
| +within AixLib.Controls.HeatPump.BaseClasses; | |
| model InverterControlledHP "Converter model for a inverter controlled HP" | |
| extends PartialTSetToNSet; | |
| parameter Real hys "Hysteresis of controller"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/BaseClasses/OnOffHP.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/BaseClasses/OnOffHP.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/BaseClasses/OnOffHP.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/BaseClasses/OnOffHP.mo" 2021-04-26 11:51:19.926637215 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Controls.HeatPump.BaseClasses; | |
| +within AixLib.Controls.HeatPump.BaseClasses; | |
| model OnOffHP "Converts a desired temperature to a certain compressor speed" | |
| extends AixLib.Controls.HeatPump.BaseClasses.PartialTSetToNSet; | |
| parameter Real hys "Hysteresis of controller"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/BaseClasses/package.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/BaseClasses/package.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/BaseClasses/package.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/BaseClasses/package.mo" 2021-04-26 11:51:19.938637231 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Controls.HeatPump; | |
| +within AixLib.Controls.HeatPump; | |
| package BaseClasses "Package with base classes for the HeatPump controller" | |
| annotation (Icon(graphics={ | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/BaseClasses/PartialTSetToNSet.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/BaseClasses/PartialTSetToNSet.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/BaseClasses/PartialTSetToNSet.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/BaseClasses/PartialTSetToNSet.mo" 2021-04-26 11:51:19.906637188 +0200 | |
| @@ -1,13 +1,13 @@ | |
| -within AixLib.Controls.HeatPump.BaseClasses; | |
| +within AixLib.Controls.HeatPump.BaseClasses; | |
| partial model PartialTSetToNSet | |
| "Partial model to convert set temperature to compressor speed of heat pump" | |
| parameter Boolean use_secHeaGen=false | |
| "True to choose a bivalent system" annotation(choices(checkBox=true)); | |
| // Heating limit temperature | |
| - parameter Modelica.SIunits.Temperature T_heaLim=293.15 | |
| + parameter Modelica.Units.SI.Temperature T_heaLim=293.15 | |
| "Heating limit temperature. If the filtered outdoor air temperature surpasses this threshold, the device will be shut down" annotation(Dialog(group="Heating limit temperature")); | |
| - parameter Modelica.SIunits.Time movAveTime=300 | |
| + parameter Modelica.Units.SI.Time movAveTime=300 | |
| "Time span for building the average of the outdoor air temperature. Used for heating limit temperature" annotation (Dialog(group="Heating limit temperature")); | |
| Utilities.Logical.SmoothSwitch swiNullHP "If HP is off, zero is passed" | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/Examples/HeatPumpController.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/Examples/HeatPumpController.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/Examples/HeatPumpController.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/Examples/HeatPumpController.mo" 2021-04-26 11:51:19.878637149 +0200 | |
| @@ -33,7 +33,7 @@ | |
| rotation=180, | |
| origin={69,-20}))); | |
| Modelica.Blocks.Sources.Sine T_meas( | |
| - freqHz=1/3600, | |
| + f =1/3600, | |
| amplitude=6, | |
| offset=310) "Generates the measured temperature" | |
| annotation (Placement(transformation(extent={{-100,20},{-80,40}}))); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/HPControl.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/HPControl.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/HPControl.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/HPControl.mo" 2021-04-26 11:51:19.846637104 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Controls.HeatPump; | |
| +within AixLib.Controls.HeatPump; | |
| model HPControl | |
| "Control block which makes sure the desired temperature is supplied by the HP" | |
| //General | |
| @@ -36,10 +36,10 @@ | |
| //Anti Legionella | |
| parameter Boolean use_antLeg "True if Legionella Control is of relevance" | |
| annotation (Dialog(tab="Anti Legionella"),choices(checkBox=true)); | |
| - parameter Modelica.SIunits.ThermodynamicTemperature TLegMin=333.15 | |
| + parameter Modelica.Units.SI.ThermodynamicTemperature TLegMin=333.15 | |
| "Temperature at which the legionella in DWH dies" | |
| annotation (Dialog(tab="Anti Legionella", enable=use_antLeg)); | |
| - parameter Modelica.SIunits.Time minTimeAntLeg | |
| + parameter Modelica.Units.SI.Time minTimeAntLeg | |
| "Minimal duration of antilegionella control" | |
| annotation (Dialog(tab="Anti Legionella", enable=use_antLeg)); | |
| parameter Boolean weekly=true | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/ModularHeatPumps/BaseClasses/PartialModularController.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/ModularHeatPumps/BaseClasses/PartialModularController.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/ModularHeatPumps/BaseClasses/PartialModularController.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/ModularHeatPumps/BaseClasses/PartialModularController.mo" 2021-04-26 11:51:19.778637011 +0200 | |
| @@ -35,7 +35,7 @@ | |
| annotation(Dialog(tab="Controller",group="Proportional term"), | |
| HideResult=true); | |
| - parameter Modelica.SIunits.Time Ti[nCom] = fill(0.5,nCom) | |
| + parameter Modelica.Units.SI.Time Ti[nCom] = fill(0.5,nCom) | |
| "Time constant of integrator block" | |
| annotation(Dialog(tab="Controller",group="Integral term"), | |
| HideResult=true); | |
| @@ -44,7 +44,7 @@ | |
| annotation(Dialog(tab="Controller",group="Integral term"), | |
| HideResult=true); | |
| - parameter Modelica.SIunits.Time Td[nCom] = fill(0.1,nCom) | |
| + parameter Modelica.Units.SI.Time Td[nCom] = fill(0.1,nCom) | |
| "Time constant of derivative block" | |
| annotation(Dialog(tab="Controller",group="Derivative term"), | |
| HideResult=true); | |
| @@ -71,8 +71,8 @@ | |
| annotation(Dialog(tab="Controller",group="Controller limits"), | |
| HideResult=true); | |
| - parameter Modelica.Blocks.Types.InitPID initType[nCom]= | |
| - fill(Modelica.Blocks.Types.InitPID.DoNotUse_InitialIntegratorState,nCom) | |
| + parameter Modelica.Blocks.Types.Init initType[nCom]= | |
| + fill(Modelica.Blocks.Types.Init.InitialState,nCom) | |
| "Init: (1: no init, 2: steady state, 3: initial state, 4: initial output)" | |
| annotation(Dialog(tab="Initialisation",group="General"), | |
| HideResult=true); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/AntiFreeze.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/AntiFreeze.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/AntiFreeze.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/AntiFreeze.mo" 2021-04-26 11:51:19.722636933 +0200 | |
| @@ -1,10 +1,10 @@ | |
| -within AixLib.Controls.HeatPump.SecurityControls; | |
| +within AixLib.Controls.HeatPump.SecurityControls; | |
| model AntiFreeze "Model to prevent source from freezing" | |
| extends BaseClasses.PartialSecurityControl; | |
| parameter Boolean use_antFre=true | |
| "True if anti freeze control is part of security control" annotation(choices(checkBox=true)); | |
| - parameter Modelica.SIunits.ThermodynamicTemperature TAntFre=276.15 | |
| + parameter Modelica.Units.SI.ThermodynamicTemperature TAntFre=276.15 | |
| "Limit temperature for anti freeze control" | |
| annotation (Dialog(enable=use_antFre)); | |
| parameter Real dTHys=2 | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/BaseClasses/BoundaryMapIcon.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/BaseClasses/BoundaryMapIcon.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/BaseClasses/BoundaryMapIcon.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/BaseClasses/BoundaryMapIcon.mo" 2021-04-26 11:51:19.654636840 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Controls.HeatPump.SecurityControls.BaseClasses; | |
| +within AixLib.Controls.HeatPump.SecurityControls.BaseClasses; | |
| partial block BoundaryMapIcon "PartialModel for the icon of a boundary map" | |
| parameter Boolean use_opeEnvFroRec=true | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/BaseClasses/BoundaryMap.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/BaseClasses/BoundaryMap.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/BaseClasses/BoundaryMap.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/BaseClasses/BoundaryMap.mo" 2021-04-26 11:51:19.670636861 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Controls.HeatPump.SecurityControls.BaseClasses; | |
| +within AixLib.Controls.HeatPump.SecurityControls.BaseClasses; | |
| block BoundaryMap | |
| "Block which returns false if the input parameters are out of the given charasteristic map. | |
| For the boundaries of the y-input value, a dynamic hysteresis is used to ensure a used device will stay off a certain time after shutdown." | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/BaseClasses/package.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/BaseClasses/package.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/BaseClasses/package.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/BaseClasses/package.mo" 2021-04-26 11:51:19.702636907 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Controls.HeatPump.SecurityControls; | |
| +within AixLib.Controls.HeatPump.SecurityControls; | |
| package BaseClasses "Package with base classes for AixLib.Controls.HeatPump.SecurityControls" | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/BaseClasses/PartialSecurityControl.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/BaseClasses/PartialSecurityControl.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/BaseClasses/PartialSecurityControl.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/BaseClasses/PartialSecurityControl.mo" 2021-04-26 11:51:19.646636828 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Controls.HeatPump.SecurityControls.BaseClasses; | |
| +within AixLib.Controls.HeatPump.SecurityControls.BaseClasses; | |
| partial block PartialSecurityControl "Base Block" | |
| Modelica.Blocks.Interfaces.RealInput nSet | |
| "Set value relative speed of compressor. Analog from 0 to 1" | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/BaseClasses/RunPerHouBoundary.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/BaseClasses/RunPerHouBoundary.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/BaseClasses/RunPerHouBoundary.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/BaseClasses/RunPerHouBoundary.mo" 2021-04-26 11:51:19.630636807 +0200 | |
| @@ -1,8 +1,8 @@ | |
| -within AixLib.Controls.HeatPump.SecurityControls.BaseClasses; | |
| +within AixLib.Controls.HeatPump.SecurityControls.BaseClasses; | |
| block RunPerHouBoundary "Checks if a maximal run per hour value is in boundary" | |
| extends Modelica.Blocks.Interfaces.BooleanSISO; | |
| parameter Integer maxRunPer_h "Number of maximal on/off cycles per hour"; | |
| - parameter Modelica.SIunits.Time delayTime(displayUnit="h") = 3600 | |
| + parameter Modelica.Units.SI.Time delayTime(displayUnit="h") = 3600 | |
| "Delay time of output with respect to input signal"; | |
| Modelica.Blocks.Logical.LessThreshold | |
| runCouLesMax(threshold=maxRunPer_h) | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/BaseClasses/TimeControl.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/BaseClasses/TimeControl.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/BaseClasses/TimeControl.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/BaseClasses/TimeControl.mo" 2021-04-26 11:51:19.610636779 +0200 | |
| @@ -1,9 +1,9 @@ | |
| -within AixLib.Controls.HeatPump.SecurityControls.BaseClasses; | |
| +within AixLib.Controls.HeatPump.SecurityControls.BaseClasses; | |
| block TimeControl | |
| "Counts seconds a device is turned on and returns true if the time is inside given boundaries" | |
| extends Modelica.Blocks.Interfaces.BooleanSISO; | |
| - parameter Modelica.SIunits.Time minRunTime | |
| + parameter Modelica.Units.SI.Time minRunTime | |
| "Minimal time the device is turned on or off"; | |
| Modelica.Blocks.Logical.Timer runTim | |
| "Counts the seconds the heat pump is locked still" | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/DefrostControl.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/DefrostControl.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/DefrostControl.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/DefrostControl.mo" 2021-04-26 11:51:19.590636752 +0200 | |
| @@ -1,10 +1,10 @@ | |
| -within AixLib.Controls.HeatPump.SecurityControls; | |
| +within AixLib.Controls.HeatPump.SecurityControls; | |
| block DefrostControl | |
| "Control block to ensure no frost limits heat flow at the evaporator" | |
| parameter Real minIceFac "Minimal value above which no defrost is necessary"; | |
| parameter Boolean use_chiller=true | |
| "True if defrost operates by changing mode to cooling. False to use an electrical heater" annotation(choices(checkBox=true)); | |
| - parameter Modelica.SIunits.Power calcPel_deFro | |
| + parameter Modelica.Units.SI.Power calcPel_deFro | |
| "Calculate how much eletrical energy is used to melt ice" | |
| annotation (Dialog(enable=not use_chiller)); | |
| parameter Real deltaIceFac = 0.1 "Bandwitdth for hystereses. If the icing factor is based on the duration of defrost, this value is necessary to avoid state-events."; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/OnOffControl.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/OnOffControl.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/OnOffControl.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/OnOffControl.mo" 2021-04-26 11:51:19.538636680 +0200 | |
| @@ -1,14 +1,14 @@ | |
| -within AixLib.Controls.HeatPump.SecurityControls; | |
| +within AixLib.Controls.HeatPump.SecurityControls; | |
| model OnOffControl | |
| "Controlls if the minimal runtime, stoptime and max. runs per hour are inside given boundaries" | |
| parameter Boolean use_minRunTime | |
| "False if minimal runtime of HP is not considered" annotation(choices(checkBox=true)); | |
| - parameter Modelica.SIunits.Time minRunTime(displayUnit="min") | |
| + parameter Modelica.Units.SI.Time minRunTime(displayUnit="min") | |
| "Mimimum runtime of heat pump" | |
| annotation (Dialog(enable=use_minRunTime)); | |
| parameter Boolean use_minLocTime | |
| "False if minimal locktime of HP is not considered" annotation(choices(checkBox=true)); | |
| - parameter Modelica.SIunits.Time minLocTime(displayUnit="min") | |
| + parameter Modelica.Units.SI.Time minLocTime(displayUnit="min") | |
| "Minimum lock time of heat pump" | |
| annotation (Dialog(enable=use_minLocTime)); | |
| parameter Boolean use_runPerHou | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/OperationalEnvelope.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/OperationalEnvelope.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/OperationalEnvelope.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/OperationalEnvelope.mo" 2021-04-26 11:51:19.486636609 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Controls.HeatPump.SecurityControls; | |
| +within AixLib.Controls.HeatPump.SecurityControls; | |
| block OperationalEnvelope | |
| "Block which computes an error if the current values are outside of the given operatinal envelope" | |
| extends BaseClasses.PartialSecurityControl; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/package.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/package.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/package.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/package.mo" 2021-04-26 11:51:19.726636940 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Controls.HeatPump; | |
| +within AixLib.Controls.HeatPump; | |
| package SecurityControls | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/SecurityControl.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/SecurityControl.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/SecurityControl.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HeatPump/SecurityControls/SecurityControl.mo" 2021-04-26 11:51:19.474636591 +0200 | |
| @@ -1,16 +1,16 @@ | |
| -within AixLib.Controls.HeatPump.SecurityControls; | |
| +within AixLib.Controls.HeatPump.SecurityControls; | |
| block SecurityControl "Block including all security levels" | |
| extends BaseClasses.PartialSecurityControl; | |
| parameter Boolean use_minRunTime=true | |
| "False if minimal runtime of HP is not considered" | |
| annotation (Dialog(group="OnOffControl"), choices(checkBox=true)); | |
| - parameter Modelica.SIunits.Time minRunTime "Mimimum runtime of heat pump" | |
| + parameter Modelica.Units.SI.Time minRunTime "Mimimum runtime of heat pump" | |
| annotation (Dialog(group="OnOffControl",enable=use_minRunTime)); | |
| parameter Boolean use_minLocTime=true | |
| "False if minimal locktime of HP is not considered" | |
| annotation (Dialog(group="OnOffControl"), choices(checkBox=true)); | |
| - parameter Modelica.SIunits.Time minLocTime "Minimum lock time of heat pump" | |
| + parameter Modelica.Units.SI.Time minLocTime "Minimum lock time of heat pump" | |
| annotation (Dialog(group="OnOffControl",enable=use_minLocTime)); | |
| parameter Boolean use_runPerHou=true | |
| "False if maximal runs per hour HP are not considered" | |
| @@ -41,13 +41,13 @@ | |
| "True if defrost operates by changing mode to cooling. False to use an electrical heater" | |
| annotation (Dialog(group="Defrost", enable=use_deFro), | |
| choices(checkBox=true)); | |
| - parameter Modelica.SIunits.Power calcPel_deFro | |
| + parameter Modelica.Units.SI.Power calcPel_deFro | |
| "Calculate how much eletrical energy is used to melt ice" | |
| annotation (Dialog(enable=not use_chiller and use_deFro, group="Defrost")); | |
| parameter Boolean use_antFre=true | |
| "True if anti freeze control is part of security control" | |
| annotation (Dialog(group="Anti Freeze Control"), choices(checkBox=true)); | |
| - parameter Modelica.SIunits.ThermodynamicTemperature TantFre=276.15 | |
| + parameter Modelica.Units.SI.ThermodynamicTemperature TantFre=276.15 | |
| "Limit temperature for anti freeze control" | |
| annotation (Dialog(group="Anti Freeze Control", enable=use_antFre)); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Agents/Broker.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Agents/Broker.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Agents/Broker.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Agents/Broker.mo" 2021-04-26 11:51:21.790639784 +0200 | |
| @@ -45,7 +45,7 @@ | |
| // This section contains the blocks for the state-machine logic of the agent | |
| public | |
| - Modelica.StateGraph.InitialStep waiting(nIn=7) | |
| + Modelica.StateGraph.InitialStep waiting(nOut = 1, nIn = 7) | |
| annotation (Placement(transformation( | |
| extent={{-10,-10},{10,10}}, | |
| rotation=0, | |
| @@ -55,7 +55,7 @@ | |
| extent={{-10,-10},{10,10}}, | |
| rotation=0, | |
| origin={-122,-444}))); | |
| - Modelica.StateGraph.Step message(nOut=2) | |
| + Modelica.StateGraph.Step message(nIn = 1, nOut = 2) | |
| annotation (Placement(transformation(extent={{-108,-454},{-88,-434}}))); | |
| Modelica.Blocks.Math.IntegerChange integerChange | |
| annotation (Placement(transformation(extent={{-184,-496},{-164,-476}}))); | |
| @@ -70,7 +70,7 @@ | |
| annotation (Placement(transformation(extent={{102,148},{122,168}}))); | |
| Modelica.StateGraph.TransitionWithSignal newRequests | |
| annotation (Placement(transformation(extent={{32,108},{12,128}}))); | |
| - Modelica.StateGraph.Step callForProposal(nIn=2) | |
| + Modelica.StateGraph.Step callForProposal(nOut = 1, nIn = 2) | |
| annotation (Placement(transformation(extent={{-142,38},{-122,58}}))); | |
| Modelica.StateGraph.TransitionWithSignal newProposal(waitTime=0.1, | |
| enableTimer=false) | |
| @@ -78,7 +78,7 @@ | |
| Modelica.Blocks.Sources.BooleanExpression booleanExpression1(y=noEvent(( | |
| getperformative.y[1] == 13) or (getperformative.y[1] == 17))) | |
| annotation (Placement(transformation(extent={{-32,4},{-6,22}}))); | |
| - Modelica.StateGraph.Step collectProposal(nOut=2) | |
| + Modelica.StateGraph.Step collectProposal(nIn = 1, nOut = 2) | |
| annotation (Placement(transformation(extent={{54,38},{74,58}}))); | |
| Modelica.StateGraph.TransitionWithSignal allProposalsCollected(enableTimer=true, waitTime= | |
| 0.1) | |
| @@ -94,7 +94,7 @@ | |
| annotation (Placement(transformation(extent={{126,38},{146,58}}))); | |
| Modelica.Blocks.Logical.Not not2 | |
| annotation (Placement(transformation(extent={{122,-10},{130,-2}}))); | |
| - Modelica.StateGraph.StepWithSignal sendCall(nOut=2) | |
| + Modelica.StateGraph.StepWithSignal sendCall(nIn = 1, nOut = 2) | |
| annotation (Placement(transformation(extent={{-78,38},{-58,58}}))); | |
| Modelica.StateGraph.Transition transition(enableTimer=true, waitTime=0.1) | |
| annotation (Placement(transformation(extent={{-110,38},{-90,58}}))); | |
| @@ -102,13 +102,13 @@ | |
| annotation (Placement(transformation(extent={{-22,-210},{-2,-190}}))); | |
| Modelica.StateGraph.Transition transition1(enableTimer=true, waitTime=0.1) | |
| annotation (Placement(transformation(extent={{-86,-210},{-66,-190}}))); | |
| - Modelica.StateGraph.Step check(nOut=2) | |
| + Modelica.StateGraph.Step check(nIn = 1, nOut = 2) | |
| annotation (Placement(transformation(extent={{-22,38},{-2,58}}))); | |
| Modelica.StateGraph.TransitionWithSignal correctPerformative(waitTime=0.5, | |
| enableTimer=false) | |
| annotation (Placement(transformation(extent={{10,38},{30,58}}))); | |
| Modelica.StateGraph.Step check1( | |
| - nOut=1) | |
| + nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{-26,108},{-46,128}}))); | |
| Modelica.StateGraph.TransitionWithSignal correctPerformative1( | |
| waitTime=0.5, | |
| @@ -116,7 +116,7 @@ | |
| annotation (Placement(transformation(extent={{-68,108},{-88,128}}))); | |
| Modelica.StateGraph.Transition requestNoted(enableTimer=true, waitTime=1) | |
| annotation (Placement(transformation(extent={{-2,148},{18,168}}))); | |
| - Modelica.StateGraph.StepWithSignal sendConfirmation(nOut=2) | |
| + Modelica.StateGraph.StepWithSignal sendConfirmation(nIn = 1, nOut = 2) | |
| annotation (Placement(transformation(extent={{40,148},{60,168}}))); | |
| Modelica.StateGraph.TransitionWithSignal actionConfirmed(waitTime=0.5, | |
| @@ -130,11 +130,11 @@ | |
| enableTimer= | |
| true, waitTime=0.5) | |
| annotation (Placement(transformation(extent={{-56,-428},{-36,-408}}))); | |
| - Modelica.StateGraph.Step composeNotUnderstood | |
| + Modelica.StateGraph.Step composeNotUnderstood(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{-14,-428},{6,-408}}))); | |
| Modelica.StateGraph.Transition transition2(enableTimer=true, waitTime=1) | |
| annotation (Placement(transformation(extent={{20,-428},{40,-408}}))); | |
| - Modelica.StateGraph.StepWithSignal sendNotUnderstood(nOut=1) | |
| + Modelica.StateGraph.StepWithSignal sendNotUnderstood(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{56,-428},{76,-408}}))); | |
| Modelica.StateGraph.Transition transition4(enableTimer=true, waitTime=1) | |
| annotation (Placement(transformation(extent={{88,-428},{108,-408}}))); | |
| @@ -150,15 +150,15 @@ | |
| Modelica.StateGraph.TransitionWithSignal newConfirm(waitTime=0.1, enableTimer= | |
| false) | |
| annotation (Placement(transformation(extent={{-136,-134},{-116,-114}}))); | |
| - Modelica.StateGraph.Step check2(nOut=2) | |
| + Modelica.StateGraph.Step check2(nIn = 1, nOut = 2) | |
| annotation (Placement(transformation(extent={{-104,-134},{-84,-114}}))); | |
| Modelica.StateGraph.TransitionWithSignal correctPerformative2( | |
| waitTime=0.5, | |
| enableTimer=false) | |
| annotation (Placement(transformation(extent={{-70,-134},{-50,-114}}))); | |
| - Modelica.StateGraph.Step collectConfirm(nOut=3) | |
| + Modelica.StateGraph.Step collectConfirm(nIn = 1, nOut = 3) | |
| annotation (Placement(transformation(extent={{-32,-134},{-12,-114}}))); | |
| - Modelica.StateGraph.Step computePrice(nOut=1) | |
| + Modelica.StateGraph.Step computePrice(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{-134,-64},{-114,-44}}))); | |
| Modelica.StateGraph.TransitionWithSignal | |
| transition5( | |
| @@ -167,17 +167,17 @@ | |
| Modelica.StateGraph.Transition transition6( | |
| enableTimer=true, waitTime=0.1) | |
| annotation (Placement(transformation(extent={{24,-64},{44,-44}}))); | |
| - Modelica.StateGraph.StepWithSignal sendInformation | |
| + Modelica.StateGraph.StepWithSignal sendInformation(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{74,-44},{94,-64}}))); | |
| Modelica.StateGraph.TransitionWithSignal confirmComplete(waitTime=0.5, | |
| enableTimer=false) | |
| annotation (Placement(transformation(extent={{10,-134},{30,-114}}))); | |
| - Modelica.StateGraph.Step computeFinalConstellation(nOut=1) | |
| + Modelica.StateGraph.Step computeFinalConstellation(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{52,-134},{72,-114}}))); | |
| Modelica.StateGraph.Transition transition7( | |
| enableTimer=true, waitTime=0.1) | |
| annotation (Placement(transformation(extent={{96,-134},{116,-114}}))); | |
| - Modelica.StateGraph.Step checkRequestComplete(nOut=2) | |
| + Modelica.StateGraph.Step checkRequestComplete(nIn = 1, nOut = 2) | |
| annotation (Placement(transformation(extent={{84,-210},{104,-190}}))); | |
| Modelica.StateGraph.TransitionWithSignal requestsComplete(waitTime=0.5, | |
| enableTimer=false) | |
| @@ -225,7 +225,7 @@ | |
| Modelica.Blocks.Sources.BooleanExpression booleanExpression11(y=noEvent( | |
| calculationDone)) | |
| annotation (Placement(transformation(extent={{-122,-106},{-96,-88}}))); | |
| - Modelica.StateGraph.Step prepareTableforRejections(nOut=1) | |
| + Modelica.StateGraph.Step prepareTableforRejections(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{118,-108},{138,-88}}))); | |
| Modelica.StateGraph.Transition transition3( | |
| enableTimer=true, waitTime=0.1) | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Agents/ColdProducerAgent.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Agents/ColdProducerAgent.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Agents/ColdProducerAgent.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Agents/ColdProducerAgent.mo" 2021-04-26 11:51:21.558639463 +0200 | |
| @@ -28,15 +28,15 @@ | |
| extent={{-10,10},{10,-10}}, | |
| rotation=0, | |
| origin={-92,-108}))); | |
| - Modelica.StateGraph.Step message(nOut=2) | |
| + Modelica.StateGraph.Step message(nIn = 1, nOut = 2) | |
| annotation (Placement(transformation(extent={{-72,-118},{-52,-98}}))); | |
| - Modelica.StateGraph.Step adjustHeat | |
| + Modelica.StateGraph.Step adjustHeat(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{-36,20},{-16,40}}))); | |
| Modelica.StateGraph.Transition transition2( | |
| enableTimer=true, waitTime=2) | |
| annotation (Placement(transformation(extent={{-8,20},{12,40}}))); | |
| - Modelica.StateGraph.Step computeProposal | |
| + Modelica.StateGraph.Step computeProposal(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{-26,86},{-6,106}}))); | |
| Modelica.Blocks.Sources.BooleanExpression booleanExpression(y=noEvent( | |
| getperformative.y[1] == 4)) | |
| @@ -54,7 +54,7 @@ | |
| enableTimer=true) | |
| annotation (Placement(transformation(extent={{44,86},{64,106}}))); | |
| - Modelica.StateGraph.StepWithSignal sendProposal(nOut=3) | |
| + Modelica.StateGraph.StepWithSignal sendProposal(nIn = 1, nOut = 3) | |
| annotation (Placement(transformation(extent={{76,86},{96,106}}))); | |
| Modelica.Blocks.Math.IntegerChange integerChange annotation (Placement( | |
| transformation(extent={{-170,-50},{-150,-30}}))); | |
| @@ -73,12 +73,12 @@ | |
| annotation (Placement(transformation(extent={{-124,-68},{-98,-50}}))); | |
| Modelica.Blocks.Logical.Not not1 | |
| annotation (Placement(transformation(extent={{-90,-62},{-84,-56}}))); | |
| - Modelica.StateGraph.Step composeNotUnderstood | |
| + Modelica.StateGraph.Step composeNotUnderstood(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{-36,-56},{-16,-36}}))); | |
| Modelica.StateGraph.Transition transition3(enableTimer=true, waitTime=1) | |
| annotation (Placement(transformation(extent={{2,-56},{22,-36}}))); | |
| - Modelica.StateGraph.StepWithSignal sendNotUnderstood(nOut=1) | |
| + Modelica.StateGraph.StepWithSignal sendNotUnderstood(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{42,-56},{62,-36}}))); | |
| Modelica.StateGraph.Transition transition4(enableTimer=true, waitTime=1) | |
| annotation (Placement(transformation(extent={{82,-56},{102,-36}}))); | |
| @@ -116,7 +116,7 @@ | |
| annotation (Placement(transformation(extent={{140,-204},{180,-164}}))); | |
| public | |
| - Modelica.StateGraph.Step confirm | |
| + Modelica.StateGraph.Step confirm(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{-38,-26},{-18,-6}}))); | |
| Modelica.StateGraph.Transition transition6( | |
| enableTimer=true, waitTime=2) | |
| @@ -146,7 +146,7 @@ | |
| rotation=0, | |
| origin={-82,-154}))); | |
| Modelica.StateGraph.Step shutDown( | |
| - nOut=2) | |
| + nIn = 1, nOut = 2) | |
| annotation (Placement(transformation(extent={{-56,-164},{-36,-144}}))); | |
| Modelica.StateGraph.Transition transition7( waitTime=0.1, | |
| enableTimer=true) | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Agents/ConsumerAgent.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Agents/ConsumerAgent.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Agents/ConsumerAgent.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Agents/ConsumerAgent.mo" 2021-04-26 11:51:21.414639266 +0200 | |
| @@ -30,7 +30,7 @@ | |
| Modelica.StateGraph.Transition requestNoted(enableTimer=true, waitTime= | |
| 0.1) | |
| annotation (Placement(transformation(extent={{-34,32},{-14,52}}))); | |
| - Modelica.StateGraph.StepWithSignal sendRequest(nOut=2) | |
| + Modelica.StateGraph.StepWithSignal sendRequest(nIn = 1, nOut = 2) | |
| annotation (Placement(transformation(extent={{2,32},{22,52}}))); | |
| Modelica.StateGraph.TransitionWithSignal newMessage1 "confirmation" | |
| annotation (Placement(transformation(extent={{38,52},{58,32}}))); | |
| @@ -45,11 +45,11 @@ | |
| annotation (Placement(transformation(extent={{106,52},{126,32}}))); | |
| Modelica.StateGraph.Transition repeat1(enableTimer=true, waitTime=10) | |
| annotation (Placement(transformation(extent={{-8,-38},{-28,-18}}))); | |
| - Modelica.StateGraph.Step composeNotUnderstood | |
| + Modelica.StateGraph.Step composeNotUnderstood(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{-56,-240},{-36,-220}}))); | |
| Modelica.StateGraph.Transition transition2(enableTimer=true, waitTime=0.1) | |
| annotation (Placement(transformation(extent={{-20,-240},{0,-220}}))); | |
| - Modelica.StateGraph.StepWithSignal sendNotUnderstood(nOut=1) | |
| + Modelica.StateGraph.StepWithSignal sendNotUnderstood(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{16,-240},{36,-220}}))); | |
| Modelica.StateGraph.Transition transition4(enableTimer=true, waitTime=0.1) | |
| annotation (Placement(transformation(extent={{54,-240},{74,-220}}))); | |
| @@ -58,7 +58,7 @@ | |
| Modelica.StateGraph.Step composeConfirm(nOut=1, nIn=1) | |
| annotation (Placement(transformation(extent={{-74,-118},{-54,-98}}))); | |
| - Modelica.StateGraph.StepWithSignal sendConfirm(nOut=1) | |
| + Modelica.StateGraph.StepWithSignal sendConfirm(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{14,-118},{34,-98}}))); | |
| Modelica.StateGraph.Transition confirmNoted(enableTimer=true, waitTime= | |
| 0.1) | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Agents/HeatProducerAgent.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Agents/HeatProducerAgent.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Agents/HeatProducerAgent.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Agents/HeatProducerAgent.mo" 2021-04-26 11:51:21.322639139 +0200 | |
| @@ -26,16 +26,16 @@ | |
| extent={{-10,10},{10,-10}}, | |
| rotation=0, | |
| origin={-92,-108}))); | |
| - Modelica.StateGraph.Step message(nOut=2) | |
| + Modelica.StateGraph.Step message(nIn = 1, nOut = 2) | |
| annotation (Placement(transformation(extent={{-72,-118},{-52,-98}}))); | |
| - Modelica.StateGraph.Step adjustHeat | |
| + Modelica.StateGraph.Step adjustHeat(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{-36,20},{-16,40}}))); | |
| Modelica.StateGraph.TransitionWithSignal | |
| transition2( | |
| enableTimer=true) | |
| annotation (Placement(transformation(extent={{-8,20},{12,40}}))); | |
| - Modelica.StateGraph.Step computeProposal | |
| + Modelica.StateGraph.Step computeProposal(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{-26,86},{-6,106}}))); | |
| Modelica.Blocks.Sources.BooleanExpression booleanExpression(y=noEvent( | |
| getperformative.y[1] == 4)) | |
| @@ -53,7 +53,7 @@ | |
| enableTimer=true) | |
| annotation (Placement(transformation(extent={{44,86},{64,106}}))); | |
| - Modelica.StateGraph.StepWithSignal sendProposal(nOut=3) | |
| + Modelica.StateGraph.StepWithSignal sendProposal(nIn = 1, nOut = 3) | |
| annotation (Placement(transformation(extent={{76,86},{96,106}}))); | |
| Modelica.Blocks.Math.IntegerChange integerChange annotation (Placement( | |
| transformation(extent={{-170,-50},{-150,-30}}))); | |
| @@ -72,12 +72,12 @@ | |
| annotation (Placement(transformation(extent={{-124,-68},{-98,-50}}))); | |
| Modelica.Blocks.Logical.Not not1 | |
| annotation (Placement(transformation(extent={{-90,-62},{-84,-56}}))); | |
| - Modelica.StateGraph.Step composeNotUnderstood | |
| + Modelica.StateGraph.Step composeNotUnderstood(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{-36,-56},{-16,-36}}))); | |
| Modelica.StateGraph.Transition transition3(enableTimer=true, waitTime=1) | |
| annotation (Placement(transformation(extent={{2,-56},{22,-36}}))); | |
| - Modelica.StateGraph.StepWithSignal sendNotUnderstood(nOut=1) | |
| + Modelica.StateGraph.StepWithSignal sendNotUnderstood(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{42,-56},{62,-36}}))); | |
| Modelica.StateGraph.Transition transition4(enableTimer=true, waitTime=1) | |
| annotation (Placement(transformation(extent={{82,-56},{102,-36}}))); | |
| @@ -111,7 +111,7 @@ | |
| annotation (Placement(transformation(extent={{134,-194},{154,-174}}))); | |
| public | |
| - Modelica.StateGraph.Step confirm | |
| + Modelica.StateGraph.Step confirm(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{-38,-26},{-18,-6}}))); | |
| Modelica.StateGraph.Transition transition6( | |
| enableTimer=true, waitTime=2) | |
| @@ -139,7 +139,7 @@ | |
| annotation (Placement(transformation(extent={{-100,-54},{-60,-14}}), | |
| iconTransformation(extent={{-100,-54},{-60,-14}}))); | |
| Modelica.StateGraph.Step shutDown( | |
| - nOut=2) | |
| + nIn = 1, nOut = 2) | |
| annotation (Placement(transformation(extent={{-42,-160},{-22,-140}}))); | |
| Modelica.StateGraph.TransitionWithSignal Off annotation (Placement( | |
| transformation( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Agents/IntermediateAgent.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Agents/IntermediateAgent.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Agents/IntermediateAgent.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Agents/IntermediateAgent.mo" 2021-04-26 11:51:21.210638984 +0200 | |
| @@ -22,10 +22,10 @@ | |
| extent={{10,10},{-10,-10}}, | |
| rotation=0, | |
| origin={-160,-136}))); | |
| - Modelica.StateGraph.Step message(nOut=2) | |
| + Modelica.StateGraph.Step message(nIn = 1, nOut = 2) | |
| annotation (Placement(transformation(extent={{-178,-98},{-158,-78}}))); | |
| - Modelica.StateGraph.Step passOnCall | |
| + Modelica.StateGraph.Step passOnCall(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{-36,86},{-16,106}}))); | |
| Modelica.Blocks.Sources.BooleanExpression booleanExpression(y=noEvent( | |
| getperformative.y[1] == 4)) | |
| @@ -37,7 +37,7 @@ | |
| enableTimer=true) | |
| annotation (Placement(transformation(extent={{14,86},{34,106}}))); | |
| - Modelica.StateGraph.StepWithSignal sendCall(nOut=2) | |
| + Modelica.StateGraph.StepWithSignal sendCall(nIn = 1, nOut = 2) | |
| annotation (Placement(transformation(extent={{74,86},{94,106}}))); | |
| Modelica.Blocks.Math.IntegerChange integerChange annotation (Placement( | |
| transformation(extent={{-176,-34},{-156,-14}}))); | |
| @@ -50,12 +50,12 @@ | |
| annotation (Placement(transformation(extent={{-120,-250},{-94,-232}}))); | |
| Modelica.Blocks.Logical.Not not1 | |
| annotation (Placement(transformation(extent={{-88,-244},{-82,-238}}))); | |
| - Modelica.StateGraph.Step composeNotUnderstood | |
| + Modelica.StateGraph.Step composeNotUnderstood(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{-34,-238},{-14,-218}}))); | |
| Modelica.StateGraph.Transition transition3(enableTimer=true, waitTime=1) | |
| annotation (Placement(transformation(extent={{4,-238},{24,-218}}))); | |
| - Modelica.StateGraph.StepWithSignal sendNotUnderstood(nOut=1) | |
| + Modelica.StateGraph.StepWithSignal sendNotUnderstood(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{44,-238},{64,-218}}))); | |
| Modelica.StateGraph.Transition transition4(enableTimer=true, waitTime=1) | |
| annotation (Placement(transformation(extent={{84,-238},{104,-218}}))); | |
| @@ -69,17 +69,17 @@ | |
| extent={{-10,-10},{10,10}}, | |
| rotation=0, | |
| origin={-108,40}))); | |
| - Modelica.StateGraph.Step check | |
| + Modelica.StateGraph.Step check(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{-82,30},{-62,50}}))); | |
| Modelica.Blocks.Sources.BooleanExpression booleanExpression4(y=noEvent(( | |
| getperformative.y[1] == 8) and (getsender.y[1] == broker))) | |
| annotation (Placement(transformation(extent={{-70,6},{-44,24}}))); | |
| - Modelica.StateGraph.Step passOnInformation | |
| + Modelica.StateGraph.Step passOnInformation(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{2,30},{22,50}}))); | |
| Modelica.StateGraph.Transition transition7( waitTime=0.1, | |
| enableTimer=true) | |
| annotation (Placement(transformation(extent={{44,30},{64,50}}))); | |
| - Modelica.StateGraph.StepWithSignal sendInformation(nOut=2) | |
| + Modelica.StateGraph.StepWithSignal sendInformation(nIn = 1, nOut = 2) | |
| annotation (Placement(transformation(extent={{84,30},{104,50}}))); | |
| Modelica.StateGraph.TransitionWithSignal newMessage2 | |
| annotation (Placement( | |
| @@ -87,18 +87,18 @@ | |
| extent={{-10,-10},{10,10}}, | |
| rotation=0, | |
| origin={-110,-40}))); | |
| - Modelica.StateGraph.Step check1 | |
| + Modelica.StateGraph.Step check1(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{-86,-50},{-66,-30}}))); | |
| Modelica.StateGraph.TransitionWithSignal fromBottomBroker(waitTime=0.5, | |
| enableTimer=false) | |
| annotation (Placement(transformation(extent={{-50,-50},{-30,-30}}))); | |
| - Modelica.StateGraph.Step passOnConfirmation | |
| + Modelica.StateGraph.Step passOnConfirmation(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{-2,-50},{18,-30}}))); | |
| Modelica.StateGraph.Transition transition8( waitTime=0.1, | |
| enableTimer=true) | |
| annotation (Placement(transformation(extent={{38,-50},{58,-30}}))); | |
| Modelica.StateGraph.StepWithSignal sendConfirmation( | |
| - nOut=1) | |
| + nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{82,-50},{102,-30}}))); | |
| Modelica.Blocks.Sources.BooleanExpression booleanExpression1(y=noEvent(( | |
| getsender.y[1] == currentClient))) | |
| @@ -106,13 +106,13 @@ | |
| Modelica.StateGraph.Transition transition2( waitTime=0.1, | |
| enableTimer=true) | |
| annotation (Placement(transformation(extent={{-112,-118},{-92,-98}}))); | |
| - Modelica.StateGraph.Step confirmToBottom | |
| + Modelica.StateGraph.Step confirmToBottom(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{-70,-118},{-50,-98}}))); | |
| Modelica.StateGraph.Transition transition5( waitTime=0.1, | |
| enableTimer=true) | |
| annotation (Placement(transformation(extent={{-22,-118},{-2,-98}}))); | |
| Modelica.StateGraph.StepWithSignal sendConfirmation1( | |
| - nOut=1) | |
| + nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{34,-118},{54,-98}}))); | |
| Modelica.StateGraph.Transition transition6( waitTime=0.1, | |
| enableTimer=true) | |
| @@ -176,7 +176,7 @@ | |
| Modelica.Blocks.Logical.And and1 | |
| annotation (Placement(transformation(extent={{-150,-300},{-130,-280}}))); | |
| Modelica.StateGraph.Step shutDown( | |
| - nOut=2) | |
| + nIn = 1, nOut = 2) | |
| annotation (Placement(transformation(extent={{-80,-274},{-60,-254}}))); | |
| Modelica.StateGraph.Transition transition9( waitTime=0.1, | |
| enableTimer=true) | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Agents/MessageNotification.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Agents/MessageNotification.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Agents/MessageNotification.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Agents/MessageNotification.mo" 2021-04-26 11:51:21.078638802 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Controls.HVACAgentBasedControl.Agents; | |
| +within AixLib.Controls.HVACAgentBasedControl.Agents; | |
| model MessageNotification | |
| parameter Integer n=1 | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Agents/RoomAgent.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Agents/RoomAgent.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Agents/RoomAgent.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Agents/RoomAgent.mo" 2021-04-26 11:51:21.070638792 +0200 | |
| @@ -54,7 +54,7 @@ | |
| annotation (Placement(transformation(extent={{-72,32},{-52,52}}))); | |
| Modelica.StateGraph.Transition requestNoted(enableTimer=true, waitTime=1) | |
| annotation (Placement(transformation(extent={{-34,32},{-14,52}}))); | |
| - Modelica.StateGraph.StepWithSignal sendRequest(nOut=2) | |
| + Modelica.StateGraph.StepWithSignal sendRequest(nIn = 1, nOut = 2) | |
| annotation (Placement(transformation(extent={{2,32},{22,52}}))); | |
| Modelica.StateGraph.TransitionWithSignal newMessage1 "confirmation" | |
| annotation (Placement(transformation(extent={{38,52},{58,32}}))); | |
| @@ -71,11 +71,11 @@ | |
| Modelica.StateGraph.Transition repeat1(enableTimer=true, waitTime= | |
| 100000000000.0) | |
| annotation (Placement(transformation(extent={{-8,-38},{-28,-18}}))); | |
| - Modelica.StateGraph.Step composeNotUnderstood | |
| + Modelica.StateGraph.Step composeNotUnderstood(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{-56,-240},{-36,-220}}))); | |
| Modelica.StateGraph.Transition transition2(enableTimer=true, waitTime=1) | |
| annotation (Placement(transformation(extent={{-20,-240},{0,-220}}))); | |
| - Modelica.StateGraph.StepWithSignal sendNotUnderstood(nOut=1) | |
| + Modelica.StateGraph.StepWithSignal sendNotUnderstood(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{16,-240},{36,-220}}))); | |
| Modelica.StateGraph.Transition transition4(enableTimer=true, waitTime=1) | |
| annotation (Placement(transformation(extent={{54,-240},{74,-220}}))); | |
| @@ -89,7 +89,7 @@ | |
| public | |
| Modelica.StateGraph.Step composeConfirm(nOut=1, nIn=1) | |
| annotation (Placement(transformation(extent={{-74,-122},{-54,-102}}))); | |
| - Modelica.StateGraph.StepWithSignal sendConfirm(nOut=1) | |
| + Modelica.StateGraph.StepWithSignal sendConfirm(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{16,-122},{36,-102}}))); | |
| Modelica.StateGraph.Transition confirmNoted(enableTimer=true, waitTime=1) | |
| annotation (Placement(transformation(extent={{-30,-122},{-10,-102}}))); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/Economic/PV_Variable_Economic_Cost.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/Economic/PV_Variable_Economic_Cost.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/Economic/PV_Variable_Economic_Cost.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/Economic/PV_Variable_Economic_Cost.mo" 2021-04-26 11:51:20.870638516 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Controls.HVACAgentBasedControl.CostFunctions.Economic; | |
| +within AixLib.Controls.HVACAgentBasedControl.CostFunctions.Economic; | |
| model PV_Variable_Economic_Cost | |
| extends HVACAgentBasedControl.BaseClasses.PartialCostFunction; | |
| parameter Real p = 0.30 "Price per kWh of fuel"; | |
| @@ -16,12 +16,12 @@ | |
| lessEqualThreshold(threshold= | |
| rad_treshold) | |
| annotation (Placement(transformation(extent={{6,-36},{26,-16}}))); | |
| - Modelica_Synchronous.RealSignals.Sampler.SampleClocked sample1 | |
| + Modelica.Clocked.RealSignals.Sampler.SampleClocked sample1 | |
| annotation (Placement(transformation(extent={{66,-16},{54,-4}}))); | |
| - Modelica_Synchronous.ClockSignals.Clocks.PeriodicRealClock periodicClock1(period= | |
| + Modelica.Clocked.ClockSignals.Clocks.PeriodicRealClock periodicClock1(period= | |
| 300) | |
| annotation (Placement(transformation(extent={{82,-56},{70,-44}}))); | |
| - Modelica_Synchronous.RealSignals.Sampler.Hold hold1(y_start=100) | |
| + Modelica.Clocked.RealSignals.Sampler.Hold hold1(y_start=100) | |
| annotation (Placement(transformation(extent={{50,-16},{38,-4}}))); | |
| Modelica.Blocks.Math.Product product | |
| annotation (Placement(transformation(extent={{-32,-62},{-12,-42}}))); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/Exergy/Boiler_ExergyDestruction.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/Exergy/Boiler_ExergyDestruction.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/Exergy/Boiler_ExergyDestruction.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/Exergy/Boiler_ExergyDestruction.mo" 2021-04-26 11:51:20.838638471 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Controls.HVACAgentBasedControl.CostFunctions.Exergy; | |
| +within AixLib.Controls.HVACAgentBasedControl.CostFunctions.Exergy; | |
| model Boiler_ExergyDestruction | |
| extends HVACAgentBasedControl.BaseClasses.PartialCostFunction; | |
| parameter Real T_0 = 298.15 "Exergy reference temperature"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/Exergy/HeatingRod_ExergyDestruction.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/Exergy/HeatingRod_ExergyDestruction.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/Exergy/HeatingRod_ExergyDestruction.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/Exergy/HeatingRod_ExergyDestruction.mo" 2021-04-26 11:51:20.718638307 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Controls.HVACAgentBasedControl.CostFunctions.Exergy; | |
| +within AixLib.Controls.HVACAgentBasedControl.CostFunctions.Exergy; | |
| model HeatingRod_ExergyDestruction | |
| extends HVACAgentBasedControl.BaseClasses.PartialCostFunction; | |
| parameter Real T_0 = 298.15 "Exergy reference temperature"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/Exergy/HeatPump_ExergyDestruction_Cooling.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/Exergy/HeatPump_ExergyDestruction_Cooling.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/Exergy/HeatPump_ExergyDestruction_Cooling.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/Exergy/HeatPump_ExergyDestruction_Cooling.mo" 2021-04-26 11:51:20.814638440 +0200 | |
| @@ -60,9 +60,9 @@ | |
| annotation (Placement(transformation(extent={{-28,60},{-8,80}}))); | |
| Modelica.Blocks.Math.Add add3(k2=-1) | |
| annotation (Placement(transformation(extent={{-68,22},{-48,42}}))); | |
| - Modelica.Blocks.Tables.CombiTable2D PowerTable(table = tablePower) annotation(Placement(transformation(extent={{54,-62}, | |
| + Modelica.Blocks.Tables.CombiTable2Ds PowerTable(table = tablePower) annotation(Placement(transformation(extent={{54,-62}, | |
| {74,-42}}))); | |
| - Modelica.Blocks.Tables.CombiTable2D HeatFlowCondenserTable(table = tableHeatFlowCondenser) annotation(Placement(transformation(extent={{54,-94}, | |
| + Modelica.Blocks.Tables.CombiTable2Ds HeatFlowCondenserTable(table = tableHeatFlowCondenser) annotation(Placement(transformation(extent={{54,-94}, | |
| {74,-74}}))); | |
| equation | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/Exergy/HeatPump_ExergyDestruction_Heating.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/Exergy/HeatPump_ExergyDestruction_Heating.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/Exergy/HeatPump_ExergyDestruction_Heating.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/Exergy/HeatPump_ExergyDestruction_Heating.mo" 2021-04-26 11:51:20.766638373 +0200 | |
| @@ -56,9 +56,9 @@ | |
| annotation (Placement(transformation(extent={{-20,-78},{0,-58}}))); | |
| Modelica.Blocks.Math.Product product1 | |
| annotation (Placement(transformation(extent={{0,-50},{20,-30}}))); | |
| - Modelica.Blocks.Tables.CombiTable2D HeatFlowCondenserTable(table = tableHeatFlowCondenser) annotation(Placement(transformation(extent={{54,-96}, | |
| + Modelica.Blocks.Tables.CombiTable2Ds HeatFlowCondenserTable(table = tableHeatFlowCondenser) annotation(Placement(transformation(extent={{54,-96}, | |
| {74,-76}}))); | |
| - Modelica.Blocks.Tables.CombiTable2D PowerTable(table = tablePower) annotation(Placement(transformation(extent={{54,-64}, | |
| + Modelica.Blocks.Tables.CombiTable2Ds PowerTable(table = tablePower) annotation(Placement(transformation(extent={{54,-64}, | |
| {74,-44}}))); | |
| equation | |
| COP = HeatFlowCondenserTable.y/PowerTable.y; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/Exergy/MixingValveAndHEX_ExergyDestruction.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/Exergy/MixingValveAndHEX_ExergyDestruction.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/Exergy/MixingValveAndHEX_ExergyDestruction.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/Exergy/MixingValveAndHEX_ExergyDestruction.mo" 2021-04-26 11:51:20.694638274 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Controls.HVACAgentBasedControl.CostFunctions.Exergy; | |
| +within AixLib.Controls.HVACAgentBasedControl.CostFunctions.Exergy; | |
| model MixingValveAndHEX_ExergyDestruction | |
| extends HVACAgentBasedControl.BaseClasses.PartialCostFunction; | |
| parameter Real T_0 = 298.15 "Exergy reference temperature"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/PrimaryExergy/HeatPump_PrimaryExergyDestruction_Cooling.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/PrimaryExergy/HeatPump_PrimaryExergyDestruction_Cooling.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/PrimaryExergy/HeatPump_PrimaryExergyDestruction_Cooling.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/PrimaryExergy/HeatPump_PrimaryExergyDestruction_Cooling.mo" 2021-04-26 11:51:20.642638203 +0200 | |
| @@ -61,9 +61,9 @@ | |
| annotation (Placement(transformation(extent={{-28,60},{-8,80}}))); | |
| Modelica.Blocks.Math.Add add3(k2=-1) | |
| annotation (Placement(transformation(extent={{-68,22},{-48,42}}))); | |
| - Modelica.Blocks.Tables.CombiTable2D PowerTable(table = tablePower) annotation(Placement(transformation(extent={{54,-62}, | |
| + Modelica.Blocks.Tables.CombiTable2Ds PowerTable(table = tablePower) annotation(Placement(transformation(extent={{54,-62}, | |
| {74,-42}}))); | |
| - Modelica.Blocks.Tables.CombiTable2D HeatFlowCondenserTable(table = tableHeatFlowCondenser) annotation(Placement(transformation(extent={{54,-94}, | |
| + Modelica.Blocks.Tables.CombiTable2Ds HeatFlowCondenserTable(table = tableHeatFlowCondenser) annotation(Placement(transformation(extent={{54,-94}, | |
| {74,-74}}))); | |
| Modelica.Blocks.Math.Gain gain(k=PEF) | |
| annotation (Placement(transformation(extent={{8,60},{28,80}}))); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/PrimaryExergy/HeatPump_PrimaryExergyDestruction_Heating.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/PrimaryExergy/HeatPump_PrimaryExergyDestruction_Heating.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/PrimaryExergy/HeatPump_PrimaryExergyDestruction_Heating.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/CostFunctions/PrimaryExergy/HeatPump_PrimaryExergyDestruction_Heating.mo" 2021-04-26 11:51:20.586638124 +0200 | |
| @@ -57,9 +57,9 @@ | |
| annotation (Placement(transformation(extent={{-20,-78},{0,-58}}))); | |
| Modelica.Blocks.Math.Product product1 | |
| annotation (Placement(transformation(extent={{0,-50},{20,-30}}))); | |
| - Modelica.Blocks.Tables.CombiTable2D HeatFlowCondenserTable(table = tableHeatFlowCondenser) annotation(Placement(transformation(extent={{54,-96}, | |
| + Modelica.Blocks.Tables.CombiTable2Ds HeatFlowCondenserTable(table = tableHeatFlowCondenser) annotation(Placement(transformation(extent={{54,-96}, | |
| {74,-76}}))); | |
| - Modelica.Blocks.Tables.CombiTable2D PowerTable(table = tablePower) annotation(Placement(transformation(extent={{54,-64}, | |
| + Modelica.Blocks.Tables.CombiTable2Ds PowerTable(table = tablePower) annotation(Placement(transformation(extent={{54,-64}, | |
| {74,-44}}))); | |
| Modelica.Blocks.Math.Gain gain(k=PEF) | |
| annotation (Placement(transformation(extent={{2,62},{22,82}}))); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Examples/BookTrading/BookBuyerAgent.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Examples/BookTrading/BookBuyerAgent.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Examples/BookTrading/BookBuyerAgent.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Examples/BookTrading/BookBuyerAgent.mo" 2021-04-26 11:51:20.474637971 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Controls.HVACAgentBasedControl.Examples.BookTrading; | |
| +within AixLib.Controls.HVACAgentBasedControl.Examples.BookTrading; | |
| model BookBuyerAgent | |
| extends BaseClasses.PartialAgent; | |
| parameter Real[:,1] knownSellers = [30001; 30002; 30003] | |
| @@ -14,13 +14,13 @@ | |
| parameter Integer sampleTime = 20 | |
| "Period of time between two tries of the agent to buy the book"; | |
| - Modelica.StateGraph.InitialStep waiting(nIn=4) | |
| + Modelica.StateGraph.InitialStep waiting(nOut = 1, nIn = 4) | |
| annotation (Placement(transformation(extent={{-166,-138},{-146,-118}}))); | |
| - Modelica.StateGraph.Step composeRequest(nIn=3) | |
| + Modelica.StateGraph.Step composeRequest(nOut = 1, nIn = 3) | |
| annotation (Placement(transformation(extent={{-84,116},{-64,136}}))); | |
| - Modelica.StateGraph.Step collectProposal(nOut=2) | |
| + Modelica.StateGraph.Step collectProposal(nIn = 1, nOut = 2) | |
| annotation (Placement(transformation(extent={{10,50},{30,70}}))); | |
| - Modelica.StateGraph.Step composeBuy | |
| + Modelica.StateGraph.Step composeBuy(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{-12,-66},{8,-46}}))); | |
| Modelica.Blocks.Math.IntegerChange integerChange annotation (Placement( | |
| transformation(extent={{-158,72},{-138,92}}))); | |
| @@ -31,7 +31,7 @@ | |
| annotation (Placement(transformation(extent={{-144,-18},{-124,2}}))); | |
| Modelica.StateGraph.Transition transition(enableTimer=true, waitTime=0.1) | |
| annotation (Placement(transformation(extent={{-44,116},{-24,136}}))); | |
| - Modelica.StateGraph.Step check(nOut=2) | |
| + Modelica.StateGraph.Step check(nIn = 1, nOut = 2) | |
| annotation (Placement(transformation(extent={{-80,50},{-60,70}}))); | |
| Modelica.StateGraph.TransitionWithSignal newMessage | |
| annotation (Placement(transformation(extent={{90,116},{110,136}}))); | |
| @@ -43,16 +43,16 @@ | |
| annotation (Placement(transformation(extent={{58,50},{78,70}}))); | |
| Modelica.StateGraph.TransitionWithSignal notDone(enableTimer=true, waitTime=0.1) | |
| annotation (Placement(transformation(extent={{58,6},{78,26}}))); | |
| - Modelica.StateGraph.StepWithSignal sendRequest(nOut=2) | |
| + Modelica.StateGraph.StepWithSignal sendRequest(nIn = 1, nOut = 2) | |
| annotation (Placement(transformation(extent={{-2,116},{18,136}}))); | |
| - Modelica.StateGraph.StepWithSignal sendBuy(nOut=2) | |
| + Modelica.StateGraph.StepWithSignal sendBuy(nIn = 1, nOut = 2) | |
| annotation (Placement(transformation(extent={{54,-66},{74,-46}}))); | |
| - Modelica.StateGraph.Step check1(nOut=2) | |
| + Modelica.StateGraph.Step check1(nIn = 1, nOut = 2) | |
| annotation (Placement(transformation(extent={{-72,-140},{-52,-120}}))); | |
| Modelica.StateGraph.TransitionWithSignal confirmation(enableTimer=true, | |
| waitTime=0.1) | |
| annotation (Placement(transformation(extent={{0,-140},{20,-120}}))); | |
| - Modelica.StateGraph.Step setDone(nOut=2) | |
| + Modelica.StateGraph.Step setDone(nIn = 1, nOut = 2) | |
| annotation (Placement(transformation(extent={{40,-140},{60,-120}}))); | |
| Modelica.StateGraph.Transition transition1(enableTimer=true, waitTime=0.1) | |
| annotation (Placement(transformation(extent={{22,-66},{42,-46}}))); | |
| @@ -90,7 +90,7 @@ | |
| inner Modelica.StateGraph.StateGraphRoot stateGraphRoot | |
| annotation (Placement(transformation(extent={{-140,180},{-120,200}}))); | |
| - Modelica.StateGraph.Step stateOfOffers(nOut=2) | |
| + Modelica.StateGraph.Step stateOfOffers(nIn = 1, nOut = 2) | |
| annotation (Placement(transformation(extent={{-68,-66},{-48,-46}}))); | |
| Modelica.StateGraph.TransitionWithSignal transitionWithSignal1 | |
| annotation (Placement(transformation(extent={{-40,-46},{-20,-66}}))); | |
| @@ -104,7 +104,7 @@ | |
| Modelica.StateGraph.Transition abortAction1( | |
| enableTimer=true, waitTime=15) | |
| annotation (Placement(transformation(extent={{90,-48},{110,-28}}))); | |
| - Modelica.StateGraph.Step notServed(nIn=2) annotation (Placement( | |
| + Modelica.StateGraph.Step notServed(nOut = 1, nIn = 2) annotation (Placement( | |
| transformation( | |
| extent={{-10,-10},{10,10}}, | |
| rotation=-90, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Examples/BookTrading/BookSellerAgent.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Examples/BookTrading/BookSellerAgent.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Examples/BookTrading/BookSellerAgent.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Examples/BookTrading/BookSellerAgent.mo" 2021-04-26 11:51:20.358637810 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Controls.HVACAgentBasedControl.Examples.BookTrading; | |
| +within AixLib.Controls.HVACAgentBasedControl.Examples.BookTrading; | |
| model BookSellerAgent | |
| extends BaseClasses.PartialAgent; | |
| Real[:,2] bookList( start= [3551551677.0,30; 3551551679.0,20; 3551551616.0, 20]); | |
| @@ -16,13 +16,13 @@ | |
| Modelica.Blocks.Math.IntegerChange integerChange annotation (Placement( | |
| transformation(extent={{-174,-50},{-154,-30}}))); | |
| - Modelica.StateGraph.InitialStep waiting(nIn=2) | |
| + Modelica.StateGraph.InitialStep waiting(nOut = 1, nIn = 2) | |
| annotation (Placement(transformation(extent={{-180,-120},{-160,-100}}))); | |
| inner Modelica.StateGraph.StateGraphRoot stateGraphRoot | |
| annotation (Placement(transformation(extent={{-120,160},{-100,180}}))); | |
| Modelica.StateGraph.TransitionWithSignal newMessage | |
| annotation (Placement(transformation(extent={{-144,-120},{-124,-100}}))); | |
| - Modelica.StateGraph.Step checkPurpose(nOut=2) | |
| + Modelica.StateGraph.Step checkPurpose(nIn = 1, nOut = 2) | |
| annotation (Placement(transformation(extent={{-108,-120},{-88,-100}}))); | |
| Modelica.StateGraph.TransitionWithSignal OfferRequestsServer(enableTimer=true, | |
| waitTime=0.1) | |
| @@ -30,17 +30,17 @@ | |
| Modelica.StateGraph.TransitionWithSignal PurchaseOrdersServer(enableTimer=true, | |
| waitTime=0.1) | |
| annotation (Placement(transformation(extent={{-120,0},{-100,20}}))); | |
| - Modelica.StateGraph.Step checkLibrary | |
| + Modelica.StateGraph.Step checkLibrary(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{-60,100},{-40,120}}))); | |
| - Modelica.StateGraph.Step composeResponse | |
| + Modelica.StateGraph.Step composeResponse(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{20,100},{40,120}}))); | |
| - Modelica.StateGraph.StepWithSignal sendResponse | |
| + Modelica.StateGraph.StepWithSignal sendResponse(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{100,100},{120,120}}))); | |
| - Modelica.StateGraph.Step checkLibrary1 | |
| + Modelica.StateGraph.Step checkLibrary1(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{-60,0},{-40,20}}))); | |
| - Modelica.StateGraph.Step composeResponse1 | |
| + Modelica.StateGraph.Step composeResponse1(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{20,0},{40,20}}))); | |
| - Modelica.StateGraph.StepWithSignal sendResponse1 | |
| + Modelica.StateGraph.StepWithSignal sendResponse1(nIn = 1, nOut = 1) | |
| annotation (Placement(transformation(extent={{100,0},{120,20}}))); | |
| Modelica.StateGraph.Transition transition(enableTimer=true, waitTime=0.1) | |
| annotation (Placement(transformation(extent={{-24,100},{-4,120}}))); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Examples/BookTrading/BookTrading.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Examples/BookTrading/BookTrading.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Examples/BookTrading/BookTrading.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Examples/BookTrading/BookTrading.mo" 2021-04-26 11:51:20.294637723 +0200 | |
| @@ -1,8 +1,8 @@ | |
| -within AixLib.Controls.HVACAgentBasedControl.Examples.BookTrading; | |
| +within AixLib.Controls.HVACAgentBasedControl.Examples.BookTrading; | |
| model BookTrading | |
| extends Modelica.Icons.Example; | |
| - BookBuyerAgent bookBuyerAgent(name=10001, ISBN=0618640150, | |
| + BookBuyerAgent bookBuyerAgent(name=10001, ISBN= 618640150, | |
| sampleRate=1) | |
| annotation (Placement(transformation(extent={{-60,-40},{-40,-20}}))); | |
| BookSellerAgent bookSellerAgent(name=30001, bookList(start=[3551555559.0,30; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Examples/BuildingHeatingSystems/BuildingHeating.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Examples/BuildingHeatingSystems/BuildingHeating.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Examples/BuildingHeatingSystems/BuildingHeating.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Examples/BuildingHeatingSystems/BuildingHeating.mo" 2021-04-26 11:51:20.262637678 +0200 | |
| @@ -105,7 +105,7 @@ | |
| annotation (Placement(transformation(extent={{80,-22},{60,-2}}))); | |
| Modelica.Blocks.Continuous.LimPID PID1( | |
| yMax=1, | |
| - initType=Modelica.Blocks.Types.InitPID.InitialOutput, | |
| + initType=Modelica.Blocks.Types.Init.InitialOutput, | |
| k=0.1, | |
| Ti=1, | |
| Td=0.01, | |
| @@ -119,7 +119,7 @@ | |
| annotation (Placement(transformation(extent={{-20,-20},{-40,0}}))); | |
| Modelica.Blocks.Continuous.LimPID PID2( | |
| yMax=1, | |
| - initType=Modelica.Blocks.Types.InitPID.InitialOutput, | |
| + initType=Modelica.Blocks.Types.Init.InitialOutput, | |
| k=0.1, | |
| Ti=1, | |
| Td=0.01, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Examples/BuildingHeatingSystems/BuildingWithPV.mo" "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Examples/BuildingHeatingSystems/BuildingWithPV.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Examples/BuildingHeatingSystems/BuildingWithPV.mo" 2021-03-15 12:05:56.595860817 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/HVACAgentBasedControl/Examples/BuildingHeatingSystems/BuildingWithPV.mo" 2021-04-26 11:51:20.134637501 +0200 | |
| @@ -89,7 +89,7 @@ | |
| G=2) annotation (Placement(transformation(extent={{100,14},{120,34}}))); | |
| Modelica.Blocks.Continuous.LimPID PID( | |
| yMax=1, | |
| - initType=Modelica.Blocks.Types.InitPID.InitialOutput, | |
| + initType=Modelica.Blocks.Types.Init.InitialOutput, | |
| k=0.1, | |
| Ti=1, | |
| Td=0.01, | |
| @@ -98,7 +98,7 @@ | |
| annotation (Placement(transformation(extent={{-66,28},{-46,48}}))); | |
| Modelica.Blocks.Continuous.LimPID PID1( | |
| yMax=1, | |
| - initType=Modelica.Blocks.Types.InitPID.InitialOutput, | |
| + initType=Modelica.Blocks.Types.Init.InitialOutput, | |
| k=0.1, | |
| Ti=1, | |
| Td=0.01, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Interfaces/BoilerControlBus.mo" "converted-libraries/AixLib 0.9.1-master/Controls/Interfaces/BoilerControlBus.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Interfaces/BoilerControlBus.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/Interfaces/BoilerControlBus.mo" 2021-04-26 11:51:19.422636520 +0200 | |
| @@ -4,11 +4,11 @@ | |
| extends Modelica.Icons.SignalBus; | |
| Boolean isOn "Switches Controller on and off"; | |
| -Modelica.SIunits.Temperature TAmbient "Ambient air temperature"; | |
| +Modelica.Units.SI.Temperature TAmbient "Ambient air temperature"; | |
| Boolean switchToNightMode "Switches the boiler to night mode"; | |
| -Modelica.SIunits.Power chemicalEnergyFlowRate | |
| - "Flow of primary (chemical) energy into boiler"; | |
| +Modelica.Units.SI.Power chemicalEnergyFlowRate | |
| + "Flow of primary (chemical) energy into boiler"; | |
| annotation ( | |
| Icon(coordinateSystem(preserveAspectRatio=false)), | |
| Diagram(coordinateSystem(preserveAspectRatio=false)), | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Interfaces/CHPControlBus.mo" "converted-libraries/AixLib 0.9.1-master/Controls/Interfaces/CHPControlBus.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Interfaces/CHPControlBus.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/Interfaces/CHPControlBus.mo" 2021-04-26 11:51:19.414636509 +0200 | |
| @@ -11,53 +11,53 @@ | |
| RotationSpeed meaRotEng "Measured engines' speed" | |
| annotation(Dialog(tab="Operation point", | |
| group="Combustion Engine")); | |
| - Modelica.SIunits.Power meaFuePowEng | |
| + Modelica.Units.SI.Power meaFuePowEng | |
| "Needed fuel power at combustion engines'" | |
| annotation(Dialog(tab="Operation point", | |
| group="Combustion Engine")); | |
| - Modelica.SIunits.Power meaThePowEng | |
| + Modelica.Units.SI.Power meaThePowEng | |
| "Thermal power output at combustion engines'" | |
| annotation(Dialog(tab="Operation point", | |
| group="Combustion Engine")); | |
| - Modelica.SIunits.Torque meaTorEng | |
| + Modelica.Units.SI.Torque meaTorEng | |
| "Engine torque at combustion engines'" | |
| annotation(Dialog(tab="Operation point", | |
| group="Combustion Engine")); | |
| - Modelica.SIunits.MassFlowRate meaMasFloFueEng | |
| + Modelica.Units.SI.MassFlowRate meaMasFloFueEng | |
| "Fuel consumption at engines' inlets" | |
| annotation(Dialog(tab="Operation point", | |
| group="Combustion Engine")); | |
| - Modelica.SIunits.MassFlowRate meaMasFloAirEng | |
| + Modelica.Units.SI.MassFlowRate meaMasFloAirEng | |
| "Air consumption at engines' inlets" | |
| annotation(Dialog(tab="Operation point", | |
| group="Combustion Engine")); | |
| - Modelica.SIunits.MassFlowRate meaMasFloCO2Eng | |
| + Modelica.Units.SI.MassFlowRate meaMasFloCO2Eng | |
| "CO2 mass flow rates at engines' exhaust outlets" | |
| annotation(Dialog(tab="Operation point", | |
| group="Combustion Engine")); | |
| - Modelica.SIunits.SpecificHeatCapacity calMeaCpExh | |
| + Modelica.Units.SI.SpecificHeatCapacity calMeaCpExh | |
| "Calculated mean specific heat capacity of the exhaust gas flow" | |
| annotation (Dialog(tab="Operation point", group="Combustion Engine")); | |
| - Modelica.SIunits.Temperature meaTemInEng | |
| + Modelica.Units.SI.Temperature meaTemInEng | |
| "Measured coolant temperature at engines' inlets" | |
| annotation(Dialog(tab="Operation point", | |
| group="Combustion Engine")); | |
| - Modelica.SIunits.Temperature meaTemOutEng | |
| + Modelica.Units.SI.Temperature meaTemOutEng | |
| "Measured coolant temperature at engines' outlets" | |
| annotation(Dialog(tab="Operation point", | |
| group="Combustion Engine")); | |
| // Definition of variables describing generators | |
| // | |
| - Modelica.SIunits.Power meaElPowGen | |
| + Modelica.Units.SI.Power meaElPowGen | |
| "Electric power at generators' clamps" | |
| annotation(Dialog(tab="Operation point", | |
| group="Generator")); | |
| - Modelica.SIunits.Current meaCurGen | |
| + Modelica.Units.SI.Current meaCurGen | |
| "Electric current at generators' clamps" | |
| annotation(Dialog(tab="Operation point", | |
| group="Generator")); | |
| - Modelica.SIunits.Torque meaTorGen | |
| + Modelica.Units.SI.Torque meaTorGen | |
| "Generators' torque" | |
| annotation(Dialog(tab="Operation point", | |
| group="Generator")); | |
| @@ -65,53 +65,53 @@ | |
| "Calculated generators' efficiency" | |
| annotation(Dialog(tab="Operation point", | |
| group="Generator")); | |
| - Modelica.SIunits.Power calThePowGen | |
| + Modelica.Units.SI.Power calThePowGen | |
| "Thermal loss power" | |
| annotation(Dialog(tab="Operation point", | |
| group="Generator")); | |
| // Definition of variables describing exhaust heat exchangers | |
| // | |
| - Modelica.SIunits.Temperature meaTemExhHexOut | |
| + Modelica.Units.SI.Temperature meaTemExhHexOut | |
| "Measured exhaust gas temperatures at exhaust heat exchangers' outlets" | |
| annotation (Dialog(tab="Operation point", | |
| group="Exhaust Heat Exchanger")); | |
| - Modelica.SIunits.Temperature meaTemExhHexIn | |
| + Modelica.Units.SI.Temperature meaTemExhHexIn | |
| "Measured exhaust gas temperatures at exhaust heat exchangers' inlets" | |
| annotation (Dialog(tab="Operation point", | |
| group="Exhaust Heat Exchanger")); | |
| - Modelica.SIunits.Power meaThePowOutHex | |
| + Modelica.Units.SI.Power meaThePowOutHex | |
| "Measured thermal power of exhaust heat exchangers'" | |
| annotation (Dialog(tab="Operation point", | |
| group="Exhaust Heat Exchanger")); | |
| - Modelica.SIunits.MassFlowRate meaMasFloConHex | |
| + Modelica.Units.SI.MassFlowRate meaMasFloConHex | |
| "Measured condensed water mass flow rates at exhaust heat exchangers' outlets" | |
| annotation (Dialog(tab="Operation point", | |
| group="Exhaust Heat Exchanger")); | |
| - Modelica.SIunits.Temperature meaTemInHex | |
| + Modelica.Units.SI.Temperature meaTemInHex | |
| "Measured coolant temperature at exhaust heat exchangers' inlets" | |
| annotation(Dialog(tab="Operation point", | |
| group="Exhaust Heat Exchanger")); | |
| - Modelica.SIunits.Temperature meaTemOutHex | |
| + Modelica.Units.SI.Temperature meaTemOutHex | |
| "Measured coolant temperature at exhaust heat exchangers' outlets" | |
| annotation(Dialog(tab="Operation point", | |
| group="Exhaust Heat Exchanger")); | |
| // Definition of variables describing CHP units in general | |
| // | |
| - Modelica.SIunits.Power meaThePowChp | |
| + Modelica.Units.SI.Power meaThePowChp | |
| "Measured thermal power at CHP units' outlets" | |
| annotation(Dialog(tab="Operation point", | |
| group="CHP Unit")); | |
| - Modelica.SIunits.Temperature meaTemRetCooChp | |
| + Modelica.Units.SI.Temperature meaTemRetCooChp | |
| "Measured temperatures at CHP units' coolant return flow" | |
| annotation(Dialog(tab="Operation point", | |
| group="CHP Unit")); | |
| - Modelica.SIunits.Temperature meaTemSupCooChp | |
| + Modelica.Units.SI.Temperature meaTemSupCooChp | |
| "Measured temperatures at CHP units' coolant supply flow" | |
| annotation(Dialog(tab="Operation point", | |
| group="CHP Unit")); | |
| - Modelica.SIunits.VolumeFlowRate preVolFloHea | |
| + Modelica.Units.SI.VolumeFlowRate preVolFloHea | |
| "Prescribed coolant volume flow rate inside primary cooling circuit" | |
| annotation (Dialog(tab="Operation point", | |
| group="CHP Unit")); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Interfaces/FVUControlBus.mo" "converted-libraries/AixLib 0.9.1-master/Controls/Interfaces/FVUControlBus.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Interfaces/FVUControlBus.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/Interfaces/FVUControlBus.mo" 2021-04-26 11:51:19.382636466 +0200 | |
| @@ -24,26 +24,26 @@ | |
| Real freshAirDamperOpening(min=0,max=1) | |
| "Relative opening of thefresh air damper (0..1)"; | |
| - Modelica.SIunits.ThermodynamicTemperature roomTemperature | |
| + Modelica.Units.SI.ThermodynamicTemperature roomTemperature | |
| "Room air temperature measurement"; | |
| - Modelica.SIunits.ThermodynamicTemperature outdoorTemperature | |
| + Modelica.Units.SI.ThermodynamicTemperature outdoorTemperature | |
| "Outdoor air temperature measurement"; | |
| - Modelica.SIunits.ThermodynamicTemperature roomSetTemperature | |
| + Modelica.Units.SI.ThermodynamicTemperature roomSetTemperature | |
| "Room air set temperature measurement"; | |
| Real co2Concentration(min=0) | |
| "CO2 concentration measurement in ppm"; | |
| - Modelica.SIunits.ThermodynamicTemperature mixTemperature | |
| - "Temperature measurement of the mixed circulation and fresh air streams"; | |
| - Modelica.SIunits.ThermodynamicTemperature supplyTemperature | |
| - "Temperature measurement of the supply air streams"; | |
| + Modelica.Units.SI.ThermodynamicTemperature mixTemperature | |
| + "Temperature measurement of the mixed circulation and fresh air streams"; | |
| + Modelica.Units.SI.ThermodynamicTemperature supplyTemperature | |
| + "Temperature measurement of the supply air streams"; | |
| annotation ( | |
| Icon(coordinateSystem(preserveAspectRatio=false)), | |
| Diagram(coordinateSystem(preserveAspectRatio=false)), | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Interfaces/ModularSensorControlBus.mo" "converted-libraries/AixLib 0.9.1-master/Controls/Interfaces/ModularSensorControlBus.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Interfaces/ModularSensorControlBus.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/Interfaces/ModularSensorControlBus.mo" 2021-04-26 11:51:19.350636420 +0200 | |
| @@ -24,13 +24,13 @@ | |
| // Definition of variables describing expansion valves | |
| // | |
| - Modelica.SIunits.AbsolutePressure meaPreVal[nValSen] | |
| + Modelica.Units.SI.AbsolutePressure meaPreVal[nValSen] | |
| "Array of measured pressures at expansion valves' outlets" | |
| annotation(Dialog(tab="Measurements",group="Expansion Valves")); | |
| - Modelica.SIunits.Temperature meaTemVal[nValSen] | |
| + Modelica.Units.SI.Temperature meaTemVal[nValSen] | |
| "Array of measured temperatures at expansion valves' outlets" | |
| annotation(Dialog(tab="Measurements",group="Expansion Valves")); | |
| - Modelica.SIunits.MassFlowRate meaMasFloVal[nValSen] | |
| + Modelica.Units.SI.MassFlowRate meaMasFloVal[nValSen] | |
| "Array of measured mass flow rates at expansion valves' outlets" | |
| annotation(Dialog(tab="Measurements",group="Expansion Valves")); | |
| Real meaPhaVal[nValSen](unit="1") | |
| @@ -39,13 +39,13 @@ | |
| // Definition of variables describing evaporators | |
| // | |
| - Modelica.SIunits.AbsolutePressure meaPreEva[nEvaSen] | |
| + Modelica.Units.SI.AbsolutePressure meaPreEva[nEvaSen] | |
| "Array of measured pressures at evaporators' outlets" | |
| annotation(Dialog(tab="Measurements",group="Evaporators")); | |
| - Modelica.SIunits.Temperature meaTemEva[nEvaSen] | |
| + Modelica.Units.SI.Temperature meaTemEva[nEvaSen] | |
| "Array of measured temperatures at evaporators' outlets" | |
| annotation(Dialog(tab="Measurements",group="Evaporators")); | |
| - Modelica.SIunits.MassFlowRate meaMasFloEva[nEvaSen] | |
| + Modelica.Units.SI.MassFlowRate meaMasFloEva[nEvaSen] | |
| "Array of measured mass flow rates at evaporators' outlets" | |
| annotation(Dialog(tab="Measurements",group="Evaporators")); | |
| Real meaPhaEva[nEvaSen](unit="1") | |
| @@ -54,13 +54,13 @@ | |
| // Definition of variables describing compressors | |
| // | |
| - Modelica.SIunits.AbsolutePressure meaPreCom[nComSen] | |
| + Modelica.Units.SI.AbsolutePressure meaPreCom[nComSen] | |
| "Array of measured pressures at compressors' outlets" | |
| annotation(Dialog(tab="Measurements",group="Compressors")); | |
| - Modelica.SIunits.Temperature meaTemCom[nComSen] | |
| + Modelica.Units.SI.Temperature meaTemCom[nComSen] | |
| "Array of measured temperatures at compressors' outlets" | |
| annotation(Dialog(tab="Measurements",group="Compressors")); | |
| - Modelica.SIunits.MassFlowRate meaMasFloCom[nComSen] | |
| + Modelica.Units.SI.MassFlowRate meaMasFloCom[nComSen] | |
| "Array of measured mass flow rates at compressors' outlets" | |
| annotation(Dialog(tab="Measurements",group="Compressors")); | |
| Real meaPhaCom[nComSen](unit="1") | |
| @@ -69,49 +69,49 @@ | |
| // Definition of variables describing condensers | |
| // | |
| - Modelica.SIunits.AbsolutePressure meaPreCon[nConSen] | |
| + Modelica.Units.SI.AbsolutePressure meaPreCon[nConSen] | |
| "Array of measured pressures at expansion valves' outlets" | |
| annotation(Dialog(tab="Measurements",group="Condensers")); | |
| - Modelica.SIunits.Temperature meaTemCon[nConSen] | |
| + Modelica.Units.SI.Temperature meaTemCon[nConSen] | |
| "Array of measured temperatures at expansion valves' outlets" | |
| annotation(Dialog(tab="Measurements",group="Condensers")); | |
| - Modelica.SIunits.MassFlowRate meaMasFloCon[nConSen] | |
| + Modelica.Units.SI.MassFlowRate meaMasFloCon[nConSen] | |
| "Array of measured mass flow rates at expansion valves' outlets" | |
| annotation(Dialog(tab="Measurements",group="Condensers")); | |
| Real meaPhaCon[nConSen](unit="1") | |
| "Array of measured phases at expansion valves' outlets" | |
| annotation(Dialog(tab="Measurements",group="Condensers")); | |
| + | |
| // Definition of variables describing heat pumps sources | |
| // | |
| - Modelica.SIunits.AbsolutePressure meaPreEvaSou[nEvaSen] | |
| + Modelica.Units.SI.AbsolutePressure meaPreEvaSou[nEvaSen] | |
| "Array of measured pressures at source-sided evaporators' outlets" | |
| annotation(Dialog(tab="Measurements",group="Sources")); | |
| - Modelica.SIunits.Temperature meaTemEvaSouInl[nEvaSen] | |
| + Modelica.Units.SI.Temperature meaTemEvaSouInl[nEvaSen] | |
| "Array of measured temperatures at source-sided evaporators' inlets" | |
| annotation(Dialog(tab="Measurements",group="Sources")); | |
| - Modelica.SIunits.Temperature meaTemEvaSouOut[nEvaSen] | |
| + Modelica.Units.SI.Temperature meaTemEvaSouOut[nEvaSen] | |
| "Array of measured temperatures at source-sided evaporators' outlet" | |
| annotation(Dialog(tab="Measurements",group="Sources")); | |
| - Modelica.SIunits.MassFlowRate meaMasFloEvaSou[nEvaSen] | |
| + Modelica.Units.SI.MassFlowRate meaMasFloEvaSou[nEvaSen] | |
| "Array of measured mass flow rates source-sided at evaporators' outlets" | |
| annotation(Dialog(tab="Measurements",group="Sources")); | |
| // Definition of variables describing heat pumps sinks | |
| // | |
| - Modelica.SIunits.AbsolutePressure meaPreConSin[nConSen] | |
| + Modelica.Units.SI.AbsolutePressure meaPreConSin[nConSen] | |
| "Array of measured pressures at sink-sided expansion valves' outlets" | |
| annotation(Dialog(tab="Measurements",group="Sinks")); | |
| - Modelica.SIunits.Temperature meaTemConSinInl[nConSen] | |
| + Modelica.Units.SI.Temperature meaTemConSinInl[nConSen] | |
| "Array of measured temperatures at sink-sided expansion valves' inlets" | |
| annotation(Dialog(tab="Measurements",group="Sinks")); | |
| - Modelica.SIunits.Temperature meaTemConSinOut[nConSen] | |
| + Modelica.Units.SI.Temperature meaTemConSinOut[nConSen] | |
| "Array of measured temperatures at sink-sided expansion valves' outlets" | |
| annotation(Dialog(tab="Measurements",group="Sinks")); | |
| - Modelica.SIunits.MassFlowRate meaMasFloConSin[nConSen] | |
| + Modelica.Units.SI.MassFlowRate meaMasFloConSin[nConSen] | |
| "Array of measured mass flow rates at sink-sided expansion valves' outlets" | |
| annotation(Dialog(tab="Measurements",group="Sinks")); | |
| - | |
| annotation (Documentation(revisions="<html> | |
| <ul> | |
| <li> | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Interfaces/ThermalMachineControlBus.mo" "converted-libraries/AixLib 0.9.1-master/Controls/Interfaces/ThermalMachineControlBus.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/Interfaces/ThermalMachineControlBus.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/Interfaces/ThermalMachineControlBus.mo" 2021-04-26 11:51:19.322636382 +0200 | |
| @@ -3,32 +3,32 @@ | |
| "Standard data bus with heat pump or chiller information" | |
| extends Modelica.Icons.SignalBus; | |
| -Modelica.SIunits.Conversions.NonSIunits.AngularVelocity_rpm N "rotational speed compressor" | |
| +Modelica.Units.NonSI.AngularVelocity_rpm N "rotational speed compressor" | |
| annotation (HideResult=false); | |
| Boolean onOff "true: on" annotation (HideResult=false); | |
| Boolean mode "true: main operation mode, false: reversible operation mode"; | |
| -Modelica.SIunits.ThermodynamicTemperature T_flow_ev "temperature of flow into evaporator"; | |
| +Modelica.Units.SI.ThermodynamicTemperature T_flow_ev "temperature of flow into evaporator"; | |
| -Modelica.SIunits.ThermodynamicTemperature T_flow_co "temperature of flow into condenser"; | |
| +Modelica.Units.SI.ThermodynamicTemperature T_flow_co "temperature of flow into condenser"; | |
| -Modelica.SIunits.ThermodynamicTemperature T_ret_ev "temperature of flow out of evaporator"; | |
| +Modelica.Units.SI.ThermodynamicTemperature T_ret_ev "temperature of flow out of evaporator"; | |
| -Modelica.SIunits.ThermodynamicTemperature T_ret_co "temperature of flow out of condenser"; | |
| +Modelica.Units.SI.ThermodynamicTemperature T_ret_co "temperature of flow out of condenser"; | |
| -Modelica.SIunits.Power Pel "Total electrical active power"; | |
| +Modelica.Units.SI.Power Pel "Total electrical active power"; | |
| -Modelica.SIunits.MassFlowRate m_flow_ev "Mass flow rate through evaporator"; | |
| +Modelica.Units.SI.MassFlowRate m_flow_ev "Mass flow rate through evaporator"; | |
| -Modelica.SIunits.MassFlowRate m_flow_co "Mass flow rate through condenser"; | |
| +Modelica.Units.SI.MassFlowRate m_flow_co "Mass flow rate through condenser"; | |
| Real CoP "Coefficient of performance"; | |
| -Modelica.SIunits.ThermodynamicTemperature T_oda "Outdoor air temperature"; | |
| -Modelica.SIunits.ThermodynamicTemperature T_amb_eva | |
| +Modelica.Units.SI.ThermodynamicTemperature T_oda "Outdoor air temperature"; | |
| +Modelica.Units.SI.ThermodynamicTemperature T_amb_eva | |
| "Ambient temperature on evaporator side"; | |
| -Modelica.SIunits.ThermodynamicTemperature T_amb_con | |
| +Modelica.Units.SI.ThermodynamicTemperature T_amb_con | |
| "Ambient temperature on condenser side"; | |
| Real iceFac | |
| "Factor(0..1) to estimate efficiency losses through icing of evaporator" | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/SetPoints/Functions/HeatingCurveFunction.mo" "converted-libraries/AixLib 0.9.1-master/Controls/SetPoints/Functions/HeatingCurveFunction.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/SetPoints/Functions/HeatingCurveFunction.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/SetPoints/Functions/HeatingCurveFunction.mo" 2021-04-26 11:51:19.258636295 +0200 | |
| @@ -1,10 +1,10 @@ | |
| -within AixLib.Controls.SetPoints.Functions; | |
| +within AixLib.Controls.SetPoints.Functions; | |
| function HeatingCurveFunction "Linear function with a set temperature of 55degC at -20 degC outdoor air temperature" | |
| extends PartialBaseFct; | |
| - parameter Modelica.SIunits.TemperatureDifference TOffNig=10 | |
| + parameter Modelica.Units.SI.TemperatureDifference TOffNig=10 | |
| "Delta K for night mode of heating system"; | |
| - parameter Modelica.SIunits.ThermodynamicTemperature TDesign=328.15 | |
| + parameter Modelica.Units.SI.ThermodynamicTemperature TDesign=328.15 | |
| "Design temperature of heating system at -20 °C outside air temperature"; | |
| algorithm | |
| if isDay then | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/SetPoints/Functions/package.mo" "converted-libraries/AixLib 0.9.1-master/Controls/SetPoints/Functions/package.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/SetPoints/Functions/package.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/SetPoints/Functions/package.mo" 2021-04-26 11:51:19.262636300 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Controls.SetPoints; | |
| +within AixLib.Controls.SetPoints; | |
| package Functions "Package with functions for pacakge AixLib.Controls.HeatPump" | |
| annotation (Documentation(revisions="<html> | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/SetPoints/Functions/PartialBaseFct.mo" "converted-libraries/AixLib 0.9.1-master/Controls/SetPoints/Functions/PartialBaseFct.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/SetPoints/Functions/PartialBaseFct.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/SetPoints/Functions/PartialBaseFct.mo" 2021-04-26 11:51:19.250636282 +0200 | |
| @@ -1,12 +1,12 @@ | |
| -within AixLib.Controls.SetPoints.Functions; | |
| +within AixLib.Controls.SetPoints.Functions; | |
| partial function PartialBaseFct "Base function of a heating curve" | |
| extends Modelica.Icons.Function; | |
| - input Modelica.SIunits.ThermodynamicTemperature T_oda "Outdoor air temperature"; | |
| - input Modelica.SIunits.ThermodynamicTemperature TRoom "Room temperature"; | |
| + input Modelica.Units.SI.ThermodynamicTemperature T_oda "Outdoor air temperature"; | |
| + input Modelica.Units.SI.ThermodynamicTemperature TRoom "Room temperature"; | |
| input Boolean isDay "Boolean to evaulate if it is day or night"; | |
| - output Modelica.SIunits.ThermodynamicTemperature TSet "Set temperature for the heat generator"; | |
| + output Modelica.Units.SI.ThermodynamicTemperature TSet "Set temperature for the heat generator"; | |
| annotation (Documentation(revisions="<html> | |
| <ul> | |
| <li> | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/SetPoints/HeatingCurve.mo" "converted-libraries/AixLib 0.9.1-master/Controls/SetPoints/HeatingCurve.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/SetPoints/HeatingCurve.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/SetPoints/HeatingCurve.mo" 2021-04-26 11:51:19.242636272 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Controls.SetPoints; | |
| +within AixLib.Controls.SetPoints; | |
| model HeatingCurve "Model of a heating curve" | |
| //General | |
| parameter Boolean use_tableData=true "Choose between tables or function to calculate TSet" annotation ( | |
| @@ -6,7 +6,7 @@ | |
| choice=true "Table Data", | |
| choice=false "Function", | |
| radioButtons=true)); | |
| - parameter Modelica.SIunits.ThermodynamicTemperature TOffset(displayUnit="K") = 0 | |
| + parameter Modelica.Units.SI.ThermodynamicTemperature TOffset(displayUnit="K") = 0 | |
| "Offset to heating curve temperature" annotation (Dialog(descriptionLabel = true)); | |
| //Function | |
| replaceable function HeatingCurveFunction = | |
| @@ -21,7 +21,7 @@ | |
| //Dynamic room temperature | |
| parameter Boolean use_dynTRoom=true "If different room temperatures are required, set to true" annotation(choices(checkBox=true), Dialog( | |
| group="Dynamic room Temperature")); | |
| - parameter Modelica.SIunits.ThermodynamicTemperature TRoom_nominal=293.15 "Constant desired room temperature " | |
| + parameter Modelica.Units.SI.ThermodynamicTemperature TRoom_nominal=293.15 "Constant desired room temperature " | |
| annotation (Dialog(group="Dynamic room Temperature",enable=not use_dynTRoom)); | |
| //Day-Night Mode: | |
| parameter AixLib.Utilities.Time.Types.ZeroTime zerTim=AixLib.Utilities.Time.Types.ZeroTime.Custom | |
| @@ -40,12 +40,12 @@ | |
| annotation (Placement(transformation(extent={{100,-10},{120,10}}))); | |
| protected | |
| - Modelica.Blocks.Tables.CombiTable2D tableDay( | |
| + Modelica.Blocks.Tables.CombiTable2Ds tableDay( | |
| final tableOnFile=false, | |
| final table=heatingCurveRecord.varFlowTempDay, | |
| final smoothness=Modelica.Blocks.Types.Smoothness.LinearSegments) if use_tableData "Combi Table for day data"; | |
| - Modelica.Blocks.Tables.CombiTable2D tableNight( | |
| + Modelica.Blocks.Tables.CombiTable2Ds tableNight( | |
| final tableOnFile=false, | |
| final table=heatingCurveRecord.varFlowTempNight, | |
| final smoothness=Modelica.Blocks.Types.Smoothness.LinearSegments) if use_tableData "Combi Table for night data"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/SetPoints/OccupancySchedule.mo" "converted-libraries/AixLib 0.9.1-master/Controls/SetPoints/OccupancySchedule.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/SetPoints/OccupancySchedule.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/SetPoints/OccupancySchedule.mo" 2021-04-26 11:51:19.210636228 +0200 | |
| @@ -6,7 +6,7 @@ | |
| "Occupancy table, each entry switching occupancy on or off"; | |
| parameter Boolean firstEntryOccupied = true | |
| "Set to true if first entry in occupancy denotes a changed from unoccupied to occupied"; | |
| - parameter Modelica.SIunits.Time period = 86400 "End time of periodicity"; | |
| + parameter Modelica.Units.SI.Time period = 86400 "End time of periodicity"; | |
| Modelica.Blocks.Interfaces.RealOutput tNexNonOcc | |
| "Time until next non-occupancy" | |
| @@ -21,7 +21,7 @@ | |
| final parameter Integer nRow = size(occupancy,1) | |
| "Number of rows in the schedule"; | |
| - output Modelica.SIunits.Time offSet=integer(time/period)*period | |
| + output Modelica.Units.SI.Time offSet=integer(time/period)*period | |
| "Time off-set, in multiples of period, that is used to switch the time when doing the table lookup"; | |
| output Integer nexStaInd "Next index when occupancy starts"; | |
| output Integer nexStoInd "Next index when occupancy stops"; | |
| @@ -31,8 +31,8 @@ | |
| output Integer iPerSto | |
| "Counter for the period in which the next occupancy stops"; | |
| - output Modelica.SIunits.Time tOcc "Time when next occupancy starts"; | |
| - output Modelica.SIunits.Time tNonOcc "Time when next non-occupancy starts"; | |
| + output Modelica.Units.SI.Time tOcc "Time when next occupancy starts"; | |
| + output Modelica.Units.SI.Time tNonOcc "Time when next non-occupancy starts"; | |
| encapsulated function switchInteger | |
| import Modelica; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/SetPoints/SupplyReturnTemperatureReset.mo" "converted-libraries/AixLib 0.9.1-master/Controls/SetPoints/SupplyReturnTemperatureReset.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/SetPoints/SupplyReturnTemperatureReset.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/SetPoints/SupplyReturnTemperatureReset.mo" 2021-04-26 11:51:19.182636188 +0200 | |
| @@ -4,23 +4,23 @@ | |
| extends Modelica.Blocks.Icons.Block; | |
| parameter Real m = 1.3 "Exponent for heat transfer"; | |
| - parameter Modelica.SIunits.Temperature TSup_nominal "Supply temperature" | |
| + parameter Modelica.Units.SI.Temperature TSup_nominal "Supply temperature" | |
| annotation (Dialog(group="Nominal conditions")); | |
| - parameter Modelica.SIunits.Temperature TRet_nominal "Return temperature" | |
| + parameter Modelica.Units.SI.Temperature TRet_nominal "Return temperature" | |
| annotation (Dialog(group="Nominal conditions")); | |
| - parameter Modelica.SIunits.Temperature TRoo_nominal = 293.15 | |
| + parameter Modelica.Units.SI.Temperature TRoo_nominal = 293.15 | |
| "Room temperature" | |
| annotation (Dialog(group="Nominal conditions")); | |
| - parameter Modelica.SIunits.Temperature TOut_nominal "Outside temperature" | |
| + parameter Modelica.Units.SI.Temperature TOut_nominal "Outside temperature" | |
| annotation (Dialog(group="Nominal conditions")); | |
| parameter Boolean use_TRoo_in = false | |
| "Get the room temperature set point from the input connector" | |
| annotation(Evaluate=true, HideResult=true); | |
| - parameter Modelica.SIunits.Temperature TRoo = 293.15 | |
| + parameter Modelica.Units.SI.Temperature TRoo = 293.15 | |
| "Fixed value of room temperature set point" | |
| annotation(Dialog(enable = not use_TRoo_in)); | |
| - parameter Modelica.SIunits.TemperatureDifference dTOutHeaBal(displayUnit="K") = 8 | |
| + parameter Modelica.Units.SI.TemperatureDifference dTOutHeaBal(displayUnit="K") = 8 | |
| "Offset for heating curve"; | |
| Modelica.Blocks.Interfaces.RealInput TRoo_in(final quantity="ThermodynamicTemperature", | |
| final unit = "K", displayUnit = "degC", min=0) if | |
| @@ -45,11 +45,11 @@ | |
| final unit = "K", displayUnit = "degC", min=0) | |
| "Needed to connect to conditional connector"; | |
| Real qRel "Relative heating load = Q_flow/Q_flow_nominal"; | |
| - Modelica.SIunits.Temperature TOutOffSet | |
| + | |
| + Modelica.Units.SI.Temperature TOutOffSet | |
| "Effective outside temperature for heat transfer (takes into account room heat gains)"; | |
| - parameter Modelica.SIunits.Temperature TOutOffSet_nominal = TOut_nominal + dTOutHeaBal | |
| + parameter Modelica.Units.SI.Temperature TOutOffSet_nominal = TOut_nominal + dTOutHeaBal | |
| "Effective outside temperature for heat transfer at nominal conditions (takes into account room heat gains)"; | |
| - | |
| equation | |
| connect(TRoo_in, TRoo_in_internal); | |
| if not use_TRoo_in then | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/SetPoints/Table.mo" "converted-libraries/AixLib 0.9.1-master/Controls/SetPoints/Table.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/SetPoints/Table.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/SetPoints/Table.mo" 2021-04-26 11:51:19.158636155 +0200 | |
| @@ -16,7 +16,7 @@ | |
| size(table,1) "Number of rows"; | |
| final parameter Real[nRow,2] offsetVector = [zeros(nRow), offset*ones(nRow)] | |
| "Vector to take offset of output signal into account"; | |
| - Modelica.Blocks.Tables.CombiTable1D tab( | |
| + Modelica.Blocks.Tables.CombiTable1Dv tab( | |
| tableOnFile=false, | |
| final table= (if constantExtrapolation then | |
| cat(1, [table[1,1]-1, table[1,2]], | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/VentilationController/BaseClasses/DEMA.mo" "converted-libraries/AixLib 0.9.1-master/Controls/VentilationController/BaseClasses/DEMA.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/VentilationController/BaseClasses/DEMA.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/VentilationController/BaseClasses/DEMA.mo" 2021-04-26 11:51:19.098636073 +0200 | |
| @@ -16,8 +16,8 @@ | |
| annotation (Placement(transformation(extent={{60,-10},{80,10}}, | |
| rotation=0))); | |
| public | |
| - parameter Modelica.SIunits.Time period=86400*4; | |
| - parameter Modelica.SIunits.Time sampleTime=86400; | |
| + parameter Modelica.Units.SI.Time period=86400*4; | |
| + parameter Modelica.Units.SI.Time sampleTime=86400; | |
| parameter Real ystart=279.15 "Start value of EMA"; | |
| protected | |
| Modelica.Blocks.Continuous.CriticalDamping ExpAVG1( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/VentilationController/BaseClasses/OptimalTempDeCarliHumidity.mo" "converted-libraries/AixLib 0.9.1-master/Controls/VentilationController/BaseClasses/OptimalTempDeCarliHumidity.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Controls/VentilationController/BaseClasses/OptimalTempDeCarliHumidity.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Controls/VentilationController/BaseClasses/OptimalTempDeCarliHumidity.mo" 2021-04-26 11:51:19.082636050 +0200 | |
| @@ -2,20 +2,20 @@ | |
| model OptimalTempDeCarliHumidity | |
| "optimal operative Temperature according to Fanger and deCarli model including humidity evaluation" | |
| - import Modelica.SIunits.Conversions.from_degC; | |
| - import Modelica.SIunits.Conversions.to_degC; | |
| + import Modelica.Units.Conversions.from_degC; | |
| + import Modelica.Units.Conversions.to_degC; | |
| extends Modelica.Blocks.Interfaces.MIMO(nin=2, nout=3); | |
| // u is 1. ambient temperature and 2. relative humidity; y is Min and max temperatures according to input temperature | |
| - parameter Modelica.SIunits.TemperatureDifference cat=2 | |
| + parameter Modelica.Units.SI.TemperatureDifference cat=2 | |
| "offset for quality category. cat I: 1 K, cat. II: 2 K, cat. III: 3 K."; | |
| - Modelica.SIunits.ThermodynamicTemperature Topt; | |
| + Modelica.Units.SI.ThermodynamicTemperature Topt; | |
| protected | |
| - parameter Modelica.SIunits.Temperature Tclomax=from_degC(0) | |
| + | |
| + parameter Modelica.Units.SI.Temperature Tclomax=from_degC(0) | |
| "mean outdoor air temperature when max clo value of 1.0 will be reached"; | |
| - parameter Modelica.SIunits.Temperature Tclomin=from_degC(27.778) | |
| + parameter Modelica.Units.SI.Temperature Tclomin=from_degC(27.778) | |
| "mean outdoor air temperature when min clo value of 0.5 will be reached"; | |
| - | |
| equation | |
| if u[1] <= Tclomax then | |
| Topt =from_degC(AixLib.Utilities.Math.Functions.polynomial(to_degC(Tclomax), | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/ActiveWalls/ActiveWallBaseDataDefinition.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/ActiveWalls/ActiveWallBaseDataDefinition.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/ActiveWalls/ActiveWallBaseDataDefinition.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/ActiveWalls/ActiveWallBaseDataDefinition.mo" 2021-04-26 11:51:19.030635979 +0200 | |
| @@ -1,14 +1,14 @@ | |
| within AixLib.DataBase.ActiveWalls; | |
| record ActiveWallBaseDataDefinition "Base data definition for active walls" | |
| extends Modelica.Icons.Record; | |
| -parameter Modelica.SIunits.Temperature Temp_nom[3] "Nominal Temperatures T_flow, T_return, T_room / air "; | |
| -parameter Modelica.SIunits.HeatFlux q_dot_nom "nominal Power per square meter"; | |
| -parameter Modelica.SIunits.CoefficientOfHeatTransfer k_isolation "k_isolation of whole FH Layer"; | |
| -parameter Modelica.SIunits.CoefficientOfHeatTransfer k_top "Heat transfer coefficient for layers above tubes"; | |
| -parameter Modelica.SIunits.CoefficientOfHeatTransfer k_down "Heat transfer coefficient for layers underneath tubes"; | |
| +parameter Modelica.Units.SI.Temperature Temp_nom[3] "Nominal Temperatures T_flow, T_return, T_room / air "; | |
| +parameter Modelica.Units.SI.HeatFlux q_dot_nom "nominal Power per square meter"; | |
| +parameter Modelica.Units.SI.CoefficientOfHeatTransfer k_isolation "k_isolation of whole FH Layer"; | |
| +parameter Modelica.Units.SI.CoefficientOfHeatTransfer k_top "Heat transfer coefficient for layers above tubes"; | |
| +parameter Modelica.Units.SI.CoefficientOfHeatTransfer k_down "Heat transfer coefficient for layers underneath tubes"; | |
| parameter Real VolumeWaterPerMeter(unit="l/m") "Water volume"; | |
| -parameter Modelica.SIunits.Length Spacing "Spacing of Pipe"; | |
| -parameter Modelica.SIunits.Emissivity eps "Emissivity of Floor"; | |
| +parameter Modelica.Units.SI.Length Spacing "Spacing of Pipe"; | |
| +parameter Modelica.Units.SI.Emissivity eps "Emissivity of Floor"; | |
| parameter AixLib.Fluid.HeatExchangers.ActiveWalls.BaseClasses.HeatCapacityPerArea C_ActivatedElement = 50000; | |
| parameter Real c_top_ratio; | |
| parameter Real PressureDropExponent; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/ActiveWalls/JocoKlimaBodenTOP2000_Parkett.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/ActiveWalls/JocoKlimaBodenTOP2000_Parkett.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/ActiveWalls/JocoKlimaBodenTOP2000_Parkett.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/ActiveWalls/JocoKlimaBodenTOP2000_Parkett.mo" 2021-04-26 11:51:19.022635968 +0200 | |
| @@ -3,7 +3,7 @@ | |
| "Floor Heating Klima Boden TOP 2000 by Joco with parquet" | |
| extends ActiveWallBaseDataDefinition( | |
| - Temp_nom=Modelica.SIunits.Conversions.from_degC({40,35,20}), | |
| + Temp_nom=Modelica.Units.Conversions.from_degC({40,35,20}), | |
| q_dot_nom=80, | |
| k_isolation=1.25, | |
| k_top=q_dot_nom/AixLib.Fluid.HeatExchangers.ActiveWalls.BaseClasses.logDT( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/ActiveWalls/UponorComfortPanelHL_Cooling.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/ActiveWalls/UponorComfortPanelHL_Cooling.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/ActiveWalls/UponorComfortPanelHL_Cooling.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/ActiveWalls/UponorComfortPanelHL_Cooling.mo" 2021-04-26 11:51:19.010635951 +0200 | |
| @@ -3,7 +3,7 @@ | |
| "Ceiling cooling from Uponor Comfort panel HL" | |
| extends ActiveWallBaseDataDefinition( | |
| - Temp_nom=Modelica.SIunits.Conversions.from_degC({16,20,26}), | |
| + Temp_nom=Modelica.Units.Conversions.from_degC({16,20,26}), | |
| q_dot_nom=74, | |
| k_isolation=0.38, | |
| k_top=q_dot_nom/AixLib.Fluid.HeatExchangers.ActiveWalls.BaseClasses.logDT( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/ActiveWalls/UponorComfortPanelHL_Heating.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/ActiveWalls/UponorComfortPanelHL_Heating.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/ActiveWalls/UponorComfortPanelHL_Heating.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/ActiveWalls/UponorComfortPanelHL_Heating.mo" 2021-04-26 11:51:19.002635941 +0200 | |
| @@ -3,7 +3,7 @@ | |
| "Ceiling heating from Uponor Comfort panel HL" | |
| extends ActiveWallBaseDataDefinition( | |
| - Temp_nom=Modelica.SIunits.Conversions.from_degC({40,30,20}), | |
| + Temp_nom=Modelica.Units.Conversions.from_degC({40,30,20}), | |
| q_dot_nom=100, | |
| k_isolation=0.38, | |
| k_top=q_dot_nom/AixLib.Fluid.HeatExchangers.ActiveWalls.BaseClasses.logDT( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/Boiler/DayNightMode/HeatingCurvesDayNightBaseDataDefinition.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/Boiler/DayNightMode/HeatingCurvesDayNightBaseDataDefinition.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/Boiler/DayNightMode/HeatingCurvesDayNightBaseDataDefinition.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/Boiler/DayNightMode/HeatingCurvesDayNightBaseDataDefinition.mo" 2021-04-26 11:51:18.946635864 +0200 | |
| @@ -2,8 +2,8 @@ | |
| record HeatingCurvesDayNightBaseDataDefinition | |
| "Base data definition for heating curves for Day and Night" | |
| extends Modelica.Icons.Record; | |
| -import SI = Modelica.SIunits; | |
| -import SIconv = Modelica.SIunits.Conversions.NonSIunits; | |
| +import SI = Modelica.Units.SI; | |
| +import SIconv = Modelica.Units.NonSI; | |
| parameter String name "Name of data set"; | |
| parameter Real varFlowTempDay[:,:] "Variable flow temperature during day time"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/Boiler/General/BoilerTwoPointBaseDataDefinition.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/Boiler/General/BoilerTwoPointBaseDataDefinition.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/Boiler/General/BoilerTwoPointBaseDataDefinition.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/Boiler/General/BoilerTwoPointBaseDataDefinition.mo" 2021-04-26 11:51:18.918635826 +0200 | |
| @@ -2,7 +2,7 @@ | |
| record BoilerTwoPointBaseDataDefinition | |
| "Basic data for boiler with two point characteristic" | |
| extends Modelica.Icons.Record; | |
| - import SI = Modelica.SIunits; | |
| + import SI = Modelica.Units.SI; | |
| parameter String name | |
| "Name of boiler"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/CHP/CHPDataSimple/CHPBaseDataDefinition.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/CHP/CHPDataSimple/CHPBaseDataDefinition.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/CHP/CHPDataSimple/CHPBaseDataDefinition.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/CHP/CHPDataSimple/CHPBaseDataDefinition.mo" 2021-04-26 11:51:18.782635637 +0200 | |
| @@ -2,7 +2,7 @@ | |
| record CHPBaseDataDefinition "Basic CHP data" | |
| extends Modelica.Icons.Record; | |
| - import SI = Modelica.SIunits; | |
| + import SI = Modelica.Units.SI; | |
| parameter SI.Volume vol[:] "Water volume of CHP"; | |
| parameter Real data_CHP[:,5]; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineData/CHPEngDataBaseRecord.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineData/CHPEngDataBaseRecord.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineData/CHPEngDataBaseRecord.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineData/CHPEngDataBaseRecord.mo" 2021-04-26 11:51:18.646635451 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.DataBase.CHP.ModularCHPEngineData; | |
| +within AixLib.DataBase.CHP.ModularCHPEngineData; | |
| record CHPEngDataBaseRecord "Base record for CHP engine data" | |
| extends Modelica.Icons.Record; | |
| @@ -16,27 +16,27 @@ | |
| constant Real z "Number of cylinders"; | |
| constant Real eps = if SIEngine then 12 else 21 "Compression ratio (default values are 12(SI) and 21(DI))"; | |
| constant Real i "Number of combustion for one operating cycle (1->two-stroke, 0.5->four-stroke)"; | |
| - constant Modelica.SIunits.Mass mEng = 70389*VEng+17.913 "Total dry weight of the engine block"; | |
| - constant Modelica.SIunits.Volume VEng = 0.25*hStr*Modelica.Constants.pi*dCyl^2*z "Engine displacement"; | |
| - constant Modelica.SIunits.Length hStr "Stroke"; | |
| - constant Modelica.SIunits.Length dCyl(min=0.01) "Cylinder diameter"; | |
| - constant Modelica.SIunits.Length ref_dCyl=0.091 "Reference cylinder diameter for friction calculation"; | |
| - constant Modelica.SIunits.Pressure ref_p_mfNominal = if SIEngine then 75000 else 110000 "Friction mean pressure of reference engine for calculation(dCyl=91mm & nEng=3000rpm & TEng=90°C)"; | |
| - constant Modelica.SIunits.Pressure p_meNominal = P_mecNominal/(i*nEngNominal*VEng) "Nominal mean effective cylinder pressure"; | |
| - constant Modelica.SIunits.Efficiency etaCHP "Nominal efficiency of the power unit referring to the fuel input"; | |
| - constant Modelica.SIunits.Efficiency etaGen = 0.92 "Generator efficiency"; | |
| - constant Modelica.SIunits.Power P_mecNominal = P_elNominal/etaGen "Mechanical power output of the engine at nominal operating point"; | |
| - constant Modelica.SIunits.Power P_FueNominal = (P_elNominal+Q_MaxHea)/etaCHP "Nominal fuel expenses"; | |
| - constant Modelica.SIunits.Power Q_MaxHea "Maximum of usable heat"; | |
| - constant Modelica.SIunits.Temperature T_ExhPowUniOut = 373.15 "Exhaust gas temperature after exhaust heat exchanger (default=100°C)"; | |
| + constant Modelica.Units.SI.Mass mEng = 70389*VEng+17.913 "Total dry weight of the engine block"; | |
| + constant Modelica.Units.SI.Volume VEng = 0.25*hStr*Modelica.Constants.pi*dCyl^2*z "Engine displacement"; | |
| + constant Modelica.Units.SI.Length hStr "Stroke"; | |
| + constant Modelica.Units.SI.Length dCyl(min=0.01) "Cylinder diameter"; | |
| + constant Modelica.Units.SI.Length ref_dCyl=0.091 "Reference cylinder diameter for friction calculation"; | |
| + constant Modelica.Units.SI.Pressure ref_p_mfNominal = if SIEngine then 75000 else 110000 "Friction mean pressure of reference engine for calculation(dCyl=91mm & nEng=3000rpm & TEng=90°C)"; | |
| + constant Modelica.Units.SI.Pressure p_meNominal = P_mecNominal/(i*nEngNominal*VEng) "Nominal mean effective cylinder pressure"; | |
| + constant Modelica.Units.SI.Efficiency etaCHP "Nominal efficiency of the power unit referring to the fuel input"; | |
| + constant Modelica.Units.SI.Efficiency etaGen = 0.92 "Generator efficiency"; | |
| + constant Modelica.Units.SI.Power P_mecNominal = P_elNominal/etaGen "Mechanical power output of the engine at nominal operating point"; | |
| + constant Modelica.Units.SI.Power P_FueNominal = (P_elNominal+Q_MaxHea)/etaCHP "Nominal fuel expenses"; | |
| + constant Modelica.Units.SI.Power Q_MaxHea "Maximum of usable heat"; | |
| + constant Modelica.Units.SI.Temperature T_ExhPowUniOut = 373.15 "Exhaust gas temperature after exhaust heat exchanger (default=100°C)"; | |
| //General CHP parameters | |
| - constant Modelica.SIunits.Diameter dExh = 0.0612+(Lambda*P_FueNominal)*10^(-7) "Exhaust pipe diameter for heat transfer calculation"; | |
| - constant Modelica.SIunits.Diameter dCoo = 0.0224+Q_MaxHea*2*10^(-7) "Coolant circle pipe diameter for heat transfer calculation"; | |
| - constant Modelica.SIunits.Thickness dInn "Thickness of the cylinder wall between combustion chamber and cooling circle (default value is 5mm)"; | |
| - constant Modelica.SIunits.MassFlowRate m_floCooNominal = 0.00003*Q_MaxHea-0.2043 "Nominal mass flow rate of coolant inside the engine cooling circle (default density of coolant is 1kg/l)"; | |
| - constant Modelica.SIunits.Pressure dp_Coo = 15000 "Pressure loss between coolant supply and return flow (default value is 0.15bar)"; | |
| + constant Modelica.Units.SI.Diameter dExh = 0.0612+(Lambda*P_FueNominal)*10^(-7) "Exhaust pipe diameter for heat transfer calculation"; | |
| + constant Modelica.Units.SI.Diameter dCoo = 0.0224+Q_MaxHea*2*10^(-7) "Coolant circle pipe diameter for heat transfer calculation"; | |
| + constant Modelica.Units.SI.Thickness dInn "Thickness of the cylinder wall between combustion chamber and cooling circle (default value is 5mm)"; | |
| + constant Modelica.Units.SI.MassFlowRate m_floCooNominal = 0.00003*Q_MaxHea-0.2043 "Nominal mass flow rate of coolant inside the engine cooling circle (default density of coolant is 1kg/l)"; | |
| + constant Modelica.Units.SI.Pressure dp_Coo = 15000 "Pressure loss between coolant supply and return flow (default value is 0.15bar)"; | |
| //Electric power converter (as an induction machine) | |
| @@ -44,13 +44,13 @@ | |
| constant Real p=f_1/n0 "Number of pole pairs"; | |
| constant Real gearRatio=1 "Gear ratio: engine speed to generator speed (default=1)"; | |
| constant Boolean useHeat=false "Is the thermal loss energy of the elctric machine used?"; | |
| - constant Modelica.SIunits.Frequency n0=f_1/p "Idling speed of the electric machine"; | |
| - constant Modelica.SIunits.Frequency n_nominal "Rated rotor speed [1/s]"; | |
| - constant Modelica.SIunits.Frequency f_1 "Source frequency"; | |
| - constant Modelica.SIunits.Voltage U_1 "Rated voltage"; | |
| - constant Modelica.SIunits.Current I_elNominal=P_elNominal/(sqrt(3)*U_1*cosPhi) "Rated current"; | |
| - constant Modelica.SIunits.Power P_elNominal "Nominal electrical power of electric machine"; | |
| + constant Modelica.Units.SI.Frequency n0=f_1/p "Idling speed of the electric machine"; | |
| + constant Modelica.Units.SI.Frequency n_nominal "Rated rotor speed [1/s]"; | |
| + constant Modelica.Units.SI.Frequency f_1 "Source frequency"; | |
| + constant Modelica.Units.SI.Voltage U_1 "Rated voltage"; | |
| + constant Modelica.Units.SI.Current I_elNominal=P_elNominal/(sqrt(3)*U_1*cosPhi) "Rated current"; | |
| + constant Modelica.Units.SI.Power P_elNominal "Nominal electrical power of electric machine"; | |
| annotation (Documentation(info="<html><h4> | |
| <span style=\"color: #008000\">Overview</span> | |
| </h4> | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineData/CHP_Vitoblock200_EM5_13.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineData/CHP_Vitoblock200_EM5_13.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineData/CHP_Vitoblock200_EM5_13.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineData/CHP_Vitoblock200_EM5_13.mo" 2021-04-26 11:51:18.590635372 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.DataBase.CHP.ModularCHPEngineData; | |
| +within AixLib.DataBase.CHP.ModularCHPEngineData; | |
| record CHP_Vitoblock200_EM5_13 "Noch nicht möglich, da Brennwert-Nutzung(T_ExhPowUniOut=?<90°C) Ansonsten aktuell" | |
| extends AixLib.DataBase.CHP.ModularCHPEngineData.CHPEngDataBaseRecord( | |
| SIEngine=true, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/CHPCombustionMixtureGasNasa.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/CHPCombustionMixtureGasNasa.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/CHPCombustionMixtureGasNasa.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/CHPCombustionMixtureGasNasa.mo" 2021-04-26 11:51:18.578635356 +0200 | |
| @@ -51,9 +51,9 @@ | |
| MM = molarMass(state); | |
| h = h_TX(T, X); | |
| - R = data.R*X; | |
| - u = h - R*T; | |
| - d = p/(R*T); | |
| + R_s = data.R * X; | |
| + u = h - R_s * T; | |
| + d = p / (R_s * T); | |
| // connect state with BaseProperties | |
| state.T = T; | |
| state.p = p; | |
| @@ -196,7 +196,7 @@ | |
| function h_TX "Return specific enthalpy" | |
| import Modelica.Media.Interfaces.Choices; | |
| extends Modelica.Icons.Function; | |
| - input Modelica.SIunits.Temperature T "Temperature"; | |
| + input Modelica.Units.SI.Temperature T "Temperature"; | |
| input MassFraction X[nX]=reference_X | |
| "Independent Mass fractions of gas mixture"; | |
| input Boolean exclEnthForm=excludeEnthalpyOfFormation | |
| @@ -204,9 +204,9 @@ | |
| input Modelica.Media.Interfaces.Choices.ReferenceEnthalpy | |
| refChoice=referenceChoice | |
| "Choice of reference enthalpy"; | |
| - input Modelica.SIunits.SpecificEnthalpy h_off=h_offset | |
| + input Modelica.Units.SI.SpecificEnthalpy h_off=h_offset | |
| "User defined offset for reference enthalpy, if referenceChoice = UserDefined"; | |
| - output Modelica.SIunits.SpecificEnthalpy h | |
| + output Modelica.Units.SI.SpecificEnthalpy h | |
| "Specific enthalpy at temperature T"; | |
| algorithm | |
| h :=(if fixedX then reference_X else X)* | |
| @@ -218,14 +218,14 @@ | |
| function h_TX_der "Return specific enthalpy derivative" | |
| import Modelica.Media.Interfaces.Choices; | |
| extends Modelica.Icons.Function; | |
| - input Modelica.SIunits.Temperature T "Temperature"; | |
| + input Modelica.Units.SI.Temperature T "Temperature"; | |
| input MassFraction X[nX] "Independent Mass fractions of gas mixture"; | |
| input Boolean exclEnthForm=excludeEnthalpyOfFormation | |
| "If true, enthalpy of formation Hf is not included in specific enthalpy h"; | |
| input Modelica.Media.Interfaces.Choices.ReferenceEnthalpy | |
| refChoice=referenceChoice | |
| "Choice of reference enthalpy"; | |
| - input Modelica.SIunits.SpecificEnthalpy h_off=h_offset | |
| + input Modelica.Units.SI.SpecificEnthalpy h_off=h_offset | |
| "User defined offset for reference enthalpy, if referenceChoice = UserDefined"; | |
| input Real dT "Temperature derivative"; | |
| input Real dX[nX] "Independent mass fraction derivative"; | |
| @@ -243,7 +243,7 @@ | |
| redeclare function extends gasConstant "Return gasConstant" | |
| algorithm | |
| - R := data.R*state.X; | |
| + R_s := data.R*state.X; | |
| annotation(Inline = true, smoothOrder = 3); | |
| end gasConstant; | |
| @@ -265,7 +265,7 @@ | |
| function MixEntropy "Return mixing entropy of ideal gases / R" | |
| extends Modelica.Icons.Function; | |
| - input Modelica.SIunits.MoleFraction x[:] "Mole fraction of mixture"; | |
| + input Modelica.Units.SI.MoleFraction x[:] "Mole fraction of mixture"; | |
| output Real smix "Mixing entropy contribution, divided by gas constant"; | |
| algorithm | |
| smix := sum(if x[i] > Modelica.Constants.eps then -x[i]*Modelica.Math.log(x[i]) else | |
| @@ -616,14 +616,15 @@ | |
| input Modelica.Media.Interfaces.Choices.ReferenceEnthalpy | |
| refChoice=referenceChoice | |
| "Choice of reference enthalpy"; | |
| - input Modelica.SIunits.SpecificEnthalpy h_off=h_offset | |
| + input Modelica.Units.SI.SpecificEnthalpy h_off=h_offset | |
| "User defined offset for reference enthalpy, if referenceChoice = UserDefined"; | |
| output Temperature T "Temperature"; | |
| protected | |
| MassFraction[nX] Xfull = if size(X,1) == nX then X else cat(1,X,{1-sum(X)}); | |
| + | |
| package Internal | |
| "Solve h(data,T) for T with given h (use only indirectly via temperature_phX)" | |
| - extends Modelica.Media.Common.OneNonLinearEquation; | |
| + extends ObsoleteModelica4.Media.Common.OneNonLinearEquation; | |
| redeclare record extends f_nonlinear_Data | |
| "Data to be passed to non-linear function" | |
| extends Modelica.Media.IdealGases.Common.DataRecord; | |
| @@ -638,7 +639,6 @@ | |
| redeclare function extends solve | |
| end solve; | |
| end Internal; | |
| - | |
| algorithm | |
| T := Internal.solve(h, 200, 6000, 1.0e5, Xfull, data[1]); | |
| annotation(inverse(h = h_TX(T,X,exclEnthForm,refChoice,h_off))); | |
| @@ -655,7 +655,7 @@ | |
| MassFraction[nX] Xfull = if size(X,1) == nX then X else cat(1,X,{1-sum(X)}); | |
| package Internal | |
| "Solve h(data,T) for T with given h (use only indirectly via temperature_phX)" | |
| - extends Modelica.Media.Common.OneNonLinearEquation; | |
| + extends ObsoleteModelica4.Media.Common.OneNonLinearEquation; | |
| redeclare record extends f_nonlinear_Data | |
| "Data to be passed to non-linear function" | |
| extends Modelica.Media.IdealGases.Common.DataRecord; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/CHPCoolantPropyleneGlycolWater.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/CHPCoolantPropyleneGlycolWater.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/CHPCoolantPropyleneGlycolWater.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/CHPCoolantPropyleneGlycolWater.mo" 2021-04-26 11:51:18.430635152 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.DataBase.CHP.ModularCHPEngineMedia; | |
| +within AixLib.DataBase.CHP.ModularCHPEngineMedia; | |
| package CHPCoolantPropyleneGlycolWater | |
| "Package with model for propylene glycol - water with constant properties" | |
| extends Modelica.Media.Interfaces.PartialSimpleMedium( | |
| @@ -12,7 +12,7 @@ | |
| final lambda_const=thermalConductivity_TX_a(T = property_T, X_a = X_a), | |
| a_const=1484, | |
| final T_min=fusionTemperature_TX_a(T = property_T, X_a = X_a), | |
| - T_max=Modelica.SIunits.Conversions.from_degC(100), | |
| + T_max=Modelica.Units.Conversions.from_degC(100), | |
| T0=273.15, | |
| MM_const=(X_a/simplePropyleneGlycolWaterConstants[1].molarMass + (1 | |
| - X_a)/0.018015268)^(-1), | |
| @@ -25,9 +25,9 @@ | |
| Temperature(start=T_default), | |
| Density(start=d_const)); | |
| - constant Modelica.SIunits.Temperature property_T | |
| + constant Modelica.Units.SI.Temperature property_T | |
| "Temperature for evaluation of constant fluid properties"; | |
| - constant Modelica.SIunits.MassFraction X_a | |
| + constant Modelica.Units.SI.MassFraction X_a | |
| "Mass fraction of propylene glycol in water"; | |
| redeclare model BaseProperties "Base properties" | |
| @@ -39,14 +39,14 @@ | |
| InputMassFraction[nXi] Xi=fill(0, 0) | |
| "Structurally independent mass fractions"; | |
| InputSpecificEnthalpy h "Specific enthalpy of medium"; | |
| - Modelica.SIunits.SpecificInternalEnergy u | |
| + Modelica.Units.SI.SpecificInternalEnergy u | |
| "Specific internal energy of medium"; | |
| - Modelica.SIunits.Density d=d_const "Density of medium"; | |
| - Modelica.SIunits.MassFraction[nX] X={1} | |
| + Modelica.Units.SI.Density d=d_const "Density of medium"; | |
| + Modelica.Units.SI.MassFraction[nX] X={1} | |
| "Mass fractions (= (component mass)/total mass m_i/m)"; | |
| - final Modelica.SIunits.SpecificHeatCapacity R=0 | |
| + final Modelica.Units.SI.SpecificHeatCapacity R=0 | |
| "Gas constant (of mixture if applicable)"; | |
| - final Modelica.SIunits.MolarMass MM=MM_const | |
| + final Modelica.Units.SI.MolarMass MM=MM_const | |
| "Molar mass (of mixture or single fluid)"; | |
| ThermodynamicState state | |
| "Thermodynamic state record for optional functions"; | |
| @@ -55,21 +55,21 @@ | |
| annotation(Evaluate=true, Dialog(tab="Advanced")); | |
| final parameter Boolean standardOrderComponents=true | |
| "If true, and reducedX = true, the last element of X will be computed from the other ones"; | |
| - Modelica.SIunits.Conversions.NonSIunits.Temperature_degC T_degC= | |
| - Modelica.SIunits.Conversions.to_degC(T) | |
| + | |
| + Modelica.Units.NonSI.Temperature_degC T_degC= | |
| + Modelica.Units.Conversions.to_degC(T) | |
| "Temperature of medium in [degC]"; | |
| - Modelica.SIunits.Conversions.NonSIunits.Pressure_bar p_bar= | |
| - Modelica.SIunits.Conversions.to_bar(p) | |
| + Modelica.Units.NonSI.Pressure_bar p_bar= | |
| + Modelica.Units.Conversions.to_bar(p) | |
| "Absolute pressure of medium in [bar]"; | |
| // Local connector definition, used for equation balancing check | |
| - connector InputAbsolutePressure = input Modelica.SIunits.AbsolutePressure | |
| + connector InputAbsolutePressure = input Modelica.Units.SI.AbsolutePressure | |
| "Pressure as input signal connector"; | |
| - connector InputSpecificEnthalpy = input Modelica.SIunits.SpecificEnthalpy | |
| + connector InputSpecificEnthalpy = input Modelica.Units.SI.SpecificEnthalpy | |
| "Specific enthalpy as input signal connector"; | |
| - connector InputMassFraction = input Modelica.SIunits.MassFraction | |
| + connector InputMassFraction = input Modelica.Units.SI.MassFraction | |
| "Mass fraction as input signal connector"; | |
| - | |
| equation | |
| assert(T >= T_min and T <= T_max, " | |
| Temperature T (= " + String(T) + " K) is not | |
| @@ -97,9 +97,9 @@ | |
| </html>")); | |
| end BaseProperties; | |
| protected | |
| - constant Modelica.SIunits.MassFraction X_a_min=0. | |
| + constant Modelica.Units.SI.MassFraction X_a_min=0. | |
| "Minimum allowed mass fraction of propylene glycol in water"; | |
| - constant Modelica.SIunits.MassFraction X_a_max=0.6 | |
| + constant Modelica.Units.SI.MassFraction X_a_max=0.6 | |
| "Maximum allowed mass fraction of propylene glycol in water"; | |
| // Fluid constants based on pure Propylene Glycol | |
| @@ -115,7 +115,7 @@ | |
| constant AixLib.Media.Antifreeze.BaseClasses.PropertyCoefficients | |
| proCoe( | |
| X_a_ref=0.307031, | |
| - T_ref=Modelica.SIunits.Conversions.from_degC(32.7083), | |
| + T_ref=Modelica.Units.Conversions.from_degC(32.7083), | |
| nX_a=6, | |
| nT={4,4,4,3,2,1}, | |
| nTot=18, | |
| @@ -139,9 +139,9 @@ | |
| replaceable function density_TX_a | |
| "Evaluate density of antifreeze-water mixture" | |
| extends Modelica.Icons.Function; | |
| - input Modelica.SIunits.Temperature T "Temperature of antifreeze-water mixture"; | |
| - input Modelica.SIunits.MassFraction X_a "Mass fraction of antifreeze"; | |
| - output Modelica.SIunits.Density d "Density of antifreeze-water mixture"; | |
| + input Modelica.Units.SI.Temperature T "Temperature of antifreeze-water mixture"; | |
| + input Modelica.Units.SI.MassFraction X_a "Mass fraction of antifreeze"; | |
| + output Modelica.Units.SI.Density d "Density of antifreeze-water mixture"; | |
| algorithm | |
| d :=polynomialProperty( | |
| X_a, | |
| @@ -174,9 +174,9 @@ | |
| replaceable function dynamicViscosity_TX_a | |
| "Evaluate dynamic viscosity of antifreeze-water mixture" | |
| extends Modelica.Icons.Function; | |
| - input Modelica.SIunits.Temperature T "Temperature of antifreeze-water mixture"; | |
| - input Modelica.SIunits.MassFraction X_a "Mass fraction of antifreeze"; | |
| - output Modelica.SIunits.DynamicViscosity eta "Dynamic Viscosity of antifreeze-water mixture"; | |
| + input Modelica.Units.SI.Temperature T "Temperature of antifreeze-water mixture"; | |
| + input Modelica.Units.SI.MassFraction X_a "Mass fraction of antifreeze"; | |
| + output Modelica.Units.SI.DynamicViscosity eta "Dynamic Viscosity of antifreeze-water mixture"; | |
| algorithm | |
| eta :=1e-3*exp(polynomialProperty( | |
| X_a, | |
| @@ -209,11 +209,11 @@ | |
| replaceable function fusionTemperature_TX_a | |
| "Evaluate temperature of fusion of antifreeze-water mixture" | |
| extends Modelica.Icons.Function; | |
| - input Modelica.SIunits.Temperature T "Temperature of antifreeze-water mixture"; | |
| - input Modelica.SIunits.MassFraction X_a "Mass fraction of antifreeze"; | |
| - output Modelica.SIunits.Temperature Tf "Temperature of fusion of antifreeze-water mixture"; | |
| + input Modelica.Units.SI.Temperature T "Temperature of antifreeze-water mixture"; | |
| + input Modelica.Units.SI.MassFraction X_a "Mass fraction of antifreeze"; | |
| + output Modelica.Units.SI.Temperature Tf "Temperature of fusion of antifreeze-water mixture"; | |
| algorithm | |
| - Tf :=Modelica.SIunits.Conversions.from_degC(polynomialProperty( | |
| + Tf :=Modelica.Units.Conversions.from_degC(polynomialProperty( | |
| X_a, | |
| T, | |
| proCoe.a_Tf)); | |
| @@ -304,9 +304,9 @@ | |
| replaceable function specificHeatCapacityCp_TX_a | |
| "Evaluate specific heat capacity of antifreeze-water mixture" | |
| extends Modelica.Icons.Function; | |
| - input Modelica.SIunits.Temperature T "Temperature of antifreeze-water mixture"; | |
| - input Modelica.SIunits.MassFraction X_a "Mass fraction of antifreeze"; | |
| - output Modelica.SIunits.SpecificHeatCapacity cp "Specific heat capacity of antifreeze-water mixture"; | |
| + input Modelica.Units.SI.Temperature T "Temperature of antifreeze-water mixture"; | |
| + input Modelica.Units.SI.MassFraction X_a "Mass fraction of antifreeze"; | |
| + output Modelica.Units.SI.SpecificHeatCapacity cp "Specific heat capacity of antifreeze-water mixture"; | |
| algorithm | |
| cp :=polynomialProperty( | |
| X_a, | |
| @@ -339,9 +339,9 @@ | |
| replaceable function thermalConductivity_TX_a | |
| "Evaluate thermal conductivity of antifreeze-water mixture" | |
| extends Modelica.Icons.Function; | |
| - input Modelica.SIunits.Temperature T "Temperature of antifreeze-water mixture"; | |
| - input Modelica.SIunits.MassFraction X_a "Mass fraction of antifreeze"; | |
| - output Modelica.SIunits.ThermalConductivity lambda "Thermal conductivity of antifreeze-water mixture"; | |
| + input Modelica.Units.SI.Temperature T "Temperature of antifreeze-water mixture"; | |
| + input Modelica.Units.SI.MassFraction X_a "Mass fraction of antifreeze"; | |
| + output Modelica.Units.SI.ThermalConductivity lambda "Thermal conductivity of antifreeze-water mixture"; | |
| algorithm | |
| lambda :=polynomialProperty( | |
| X_a, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/CombustionEngineFuelDataBaseRecord.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/CombustionEngineFuelDataBaseRecord.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/CombustionEngineFuelDataBaseRecord.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/CombustionEngineFuelDataBaseRecord.mo" 2021-04-26 11:51:18.318634997 +0200 | |
| @@ -9,22 +9,22 @@ | |
| //Base-Records for physical combustion calculations of natural gas out of (Nitrogen,Methane,Ethene,Ethane,Propane,n-Butane,n-Pentane,n-Hexane,Carbondioxide) | |
| parameter String substanceNames[:] = {"Nitrogen","Methane","Ethene","Ethane","Propane","n-Butane","n-Pentane","n-Hexane","Carbondioxide"}; | |
| - parameter Modelica.SIunits.MoleFraction Xi_mole[:] = {0, 0, 0, 0, 0, 0, 0, 0, 0} "Volumetric proportion of each fuel component"; | |
| - parameter Modelica.SIunits.MolarMass MMi[:] = {0.02802,0.01604,0.02805,0.03007,0.0441,0.05815,0.07215,0.08618,0.04401} "Molar mass of natural gas components"; | |
| - parameter Modelica.SIunits.SpecificEnergy H_Ui[:] = {0,50000000,50900000,47160000,46440000,45720000,45000000,44640000,0}; | |
| + parameter Modelica.Units.SI.MoleFraction Xi_mole[:] = {0, 0, 0, 0, 0, 0, 0, 0, 0} "Volumetric proportion of each fuel component"; | |
| + parameter Modelica.Units.SI.MolarMass MMi[:] = {0.02802,0.01604,0.02805,0.03007,0.0441,0.05815,0.07215,0.08618,0.04401} "Molar mass of natural gas components"; | |
| + parameter Modelica.Units.SI.SpecificEnergy H_Ui[:] = {0,50000000,50900000,47160000,46440000,45720000,45000000,44640000,0}; | |
| parameter Real nue_C[size(MMi, 1)] = {0, 1, 2, 2, 3, 4, 5, 6, 1} "Number of carbon atoms for each gas component (for composition calculation)"; | |
| parameter Real nue_H[size(MMi, 1)] = {0, 4, 4, 6, 8, 10, 12, 14, 0} "Number of hydrogen atoms for each gas component (for composition calculation)"; | |
| parameter Real nue_O[size(MMi, 1)] = {0, 0, 0, 0, 0, 0, 0, 0, 2} "Number of oxygen atoms for each gas component (for composition calculation)"; | |
| parameter Real nue_N[size(MMi, 1)] = {2, 0, 0, 0, 0, 0, 0, 0, 0} "Number of nitrogen atoms for each gas component (for composition calculation)"; | |
| parameter Real nue_min[:] = {0, 2, 3, 3.5, 5, 6.5, 8, 9.5, 0} "Number of O2 molecules needed for combustion"; | |
| - //Base-Data for combustion calculations with liquid fuels (sulfur is not considered) | |
| - parameter Modelica.SIunits.SpecificEnergy H_U = 0 "Calorific value of the liquid fuel based on VK1 by S.Pischinger"; | |
| - parameter Modelica.SIunits.MassFraction Xi_liq[:] = {0,0,0} "Elements mass fractions of carbon, hydrogen and oxygen"; | |
| - parameter Modelica.SIunits.MolarMass MMi_liq[:] = {0.012, 0.001, 0.016} "Molar mass of the main liquid fuel elements (C,H,O)"; | |
| - parameter Modelica.SIunits.MolarMass MM_liq = 0 "Total molar mass of the liquid fuel based on VK1 by S.Pischinger"; | |
| + //Base-Data for combustion calculations with liquid fuels (sulfur is not considered) | |
| + parameter Modelica.Units.SI.SpecificEnergy H_U = 0 "Calorific value of the liquid fuel based on VK1 by S.Pischinger"; | |
| + parameter Modelica.Units.SI.MassFraction Xi_liq[:] = {0,0,0} "Elements mass fractions of carbon, hydrogen and oxygen"; | |
| + parameter Modelica.Units.SI.MolarMass MMi_liq[:] = {0.012, 0.001, 0.016} "Molar mass of the main liquid fuel elements (C,H,O)"; | |
| + parameter Modelica.Units.SI.MolarMass MM_liq = 0 "Total molar mass of the liquid fuel based on VK1 by S.Pischinger"; | |
| annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( | |
| coordinateSystem(preserveAspectRatio=false))); | |
| end CombustionEngineFuelDataBaseRecord; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/LiquidFuel_Diesel.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/LiquidFuel_Diesel.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/LiquidFuel_Diesel.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/LiquidFuel_Diesel.mo" 2021-04-26 11:51:18.298634969 +0200 | |
| @@ -23,7 +23,7 @@ | |
| Fuel=DieselFuel() "Needed fuel data for combustion calculations" | |
| annotation (choicesAllMatching=true, Dialog(group="Natural gas type")); | |
| - import Modelica.SIunits.*; | |
| + import Modelica.Units.SI.*; | |
| constant Boolean isGas = Fuel.isGasoline "True = Gasoline fuel, False = Liquid fuel"; | |
| constant MolarMass MM = Fuel.MM_liq "Molar mass of the fuel"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/LiquidFuel_LPG.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/LiquidFuel_LPG.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/LiquidFuel_LPG.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/LiquidFuel_LPG.mo" 2021-04-26 11:51:18.286634954 +0200 | |
| @@ -22,7 +22,7 @@ | |
| Fuel=LPGFuel() "Needed fuel data for combustion calculations" | |
| annotation (choicesAllMatching=true, Dialog(group="Natural gas type")); | |
| - import Modelica.SIunits.*; | |
| + import Modelica.Units.SI.*; | |
| constant Boolean isGas = Fuel.isGasoline "True = Gasoline fuel, False = Liquid fuel"; | |
| constant MolarMass MM = Fuel.MM_liq "Molar mass of the fuel"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/LiquidFuel_Petrol.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/LiquidFuel_Petrol.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/LiquidFuel_Petrol.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/LiquidFuel_Petrol.mo" 2021-04-26 11:51:18.270634931 +0200 | |
| @@ -22,7 +22,7 @@ | |
| Fuel=PetrolFuel() "Needed fuel data for combustion calculations" | |
| annotation (choicesAllMatching=true, Dialog(group="Natural gas type")); | |
| - import Modelica.SIunits.*; | |
| + import Modelica.Units.SI.*; | |
| constant Boolean isGas = Fuel.isGasoline "True = Gasoline fuel, False = Liquid fuel"; | |
| constant MolarMass MM = Fuel.MM_liq "Molar mass of the fuel"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/NaturalGasMixture_GeneralType.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/NaturalGasMixture_GeneralType.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/NaturalGasMixture_GeneralType.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/NaturalGasMixture_GeneralType.mo" 2021-04-26 11:51:18.262634920 +0200 | |
| @@ -25,7 +25,7 @@ | |
| "Needed natural gas data for calculations, manual redefinition of volumetric proportions of the gas components (Xi_mole) required (default:{1/9,1/9,...})!" | |
| annotation (choicesAllMatching=true, Dialog(group="Natural gas type")); | |
| - import Modelica.SIunits.*; | |
| + import Modelica.Units.SI.*; | |
| constant Boolean isGas = Fuel.isGasoline "True = Gasoline fuel, False = Liquid fuel"; | |
| constant MoleFraction moleFractions_Gas[:] = Fuel.Xi_mole; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/NaturalGasMixture_TypeAachen.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/NaturalGasMixture_TypeAachen.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/NaturalGasMixture_TypeAachen.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/NaturalGasMixture_TypeAachen.mo" 2021-04-26 11:51:18.246634898 +0200 | |
| @@ -24,7 +24,7 @@ | |
| Fuel=NaturalGasTypeAachen() "Needed natural gas data for calculations" | |
| annotation (choicesAllMatching=true, Dialog(group="Natural gas type")); | |
| - import Modelica.SIunits.*; | |
| + import Modelica.Units.SI.*; | |
| constant Boolean isGas = Fuel.isGasoline "True = Gasoline fuel, False = Liquid fuel"; | |
| constant MoleFraction moleFractions_Gas[:] = Fuel.Xi_mole; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/NaturalGasMixture_TypeH.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/NaturalGasMixture_TypeH.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/NaturalGasMixture_TypeH.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/NaturalGasMixture_TypeH.mo" 2021-04-26 11:51:18.234634882 +0200 | |
| @@ -24,7 +24,7 @@ | |
| Fuel=NaturalGasTypeH() "Needed natural gas data for calculations" | |
| annotation (choicesAllMatching=true, Dialog(group="Natural gas type")); | |
| - import Modelica.SIunits.*; | |
| + import Modelica.Units.SI.*; | |
| constant Boolean isGas = Fuel.isGasoline "True = Gasoline fuel, False = Liquid fuel"; | |
| constant MoleFraction moleFractions_Gas[:] = Fuel.Xi_mole; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/NaturalGasMixture_TypeL.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/NaturalGasMixture_TypeL.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/NaturalGasMixture_TypeL.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/CHP/ModularCHPEngineMedia/NaturalGasMixture_TypeL.mo" 2021-04-26 11:51:18.222634865 +0200 | |
| @@ -24,7 +24,7 @@ | |
| Fuel=NaturalGasTypeL() "Needed natural gas data for calculations" | |
| annotation (choicesAllMatching=true, Dialog(group="Natural gas type")); | |
| - import Modelica.SIunits.*; | |
| + import Modelica.Units.SI.*; | |
| constant Boolean isGas = Fuel.isGasoline "True = Gasoline fuel, False = Liquid fuel"; | |
| constant MoleFraction moleFractions_Gas[:] = Fuel.Xi_mole; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/Media/Refrigerants/R134a/EoS_IIR_P1_395_T233_370.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/Media/Refrigerants/R134a/EoS_IIR_P1_395_T233_370.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/Media/Refrigerants/R134a/EoS_IIR_P1_395_T233_370.mo" 2021-03-15 12:05:56.599860821 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/Media/Refrigerants/R134a/EoS_IIR_P1_395_T233_370.mo" 2021-04-26 11:51:18.150634765 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.DataBase.Media.Refrigerants.R134a; | |
| +within AixLib.DataBase.Media.Refrigerants.R134a; | |
| record EoS_IIR_P1_395_T233_370 | |
| "Record with fitting coefficients calculated for first implementation" | |
| extends | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/Pipes/InsulationBaseDataDefinition.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/Pipes/InsulationBaseDataDefinition.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/Pipes/InsulationBaseDataDefinition.mo" 2021-03-15 12:05:56.603860824 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/Pipes/InsulationBaseDataDefinition.mo" 2021-04-26 11:51:17.582633982 +0200 | |
| @@ -2,7 +2,7 @@ | |
| record InsulationBaseDataDefinition | |
| "Definition of Parameter Values for insulation records" | |
| extends Modelica.Icons.Record; | |
| - import SI = Modelica.SIunits; | |
| + import SI = Modelica.Units.SI; | |
| // Constant chemical Values assumed | |
| parameter Real factor | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/Pipes/PipeBaseDataDefinition.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/Pipes/PipeBaseDataDefinition.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/Pipes/PipeBaseDataDefinition.mo" 2021-03-15 12:05:56.603860824 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/Pipes/PipeBaseDataDefinition.mo" 2021-04-26 11:51:17.542633926 +0200 | |
| @@ -2,7 +2,7 @@ | |
| record PipeBaseDataDefinition | |
| "Base data definition of parameter values for pipes" | |
| extends Modelica.Icons.Record; | |
| - import SI = Modelica.SIunits; | |
| + import SI = Modelica.Units.SI; | |
| // Constant chemical values assumed | |
| parameter SI.Diameter d_i "Inner pipe diameter"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/Pumps/PumpPolynomialBased/Examples/testMaxMinHeightTable.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/Pumps/PumpPolynomialBased/Examples/testMaxMinHeightTable.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/Pumps/PumpPolynomialBased/Examples/testMaxMinHeightTable.mo" 2021-03-15 12:05:56.603860824 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/Pumps/PumpPolynomialBased/Examples/testMaxMinHeightTable.mo" 2021-04-26 11:51:17.446633794 +0200 | |
| @@ -17,7 +17,7 @@ | |
| annotation (Placement(transformation(extent={{40,10},{80,50}}))); | |
| Modelica.Blocks.Interfaces.RealOutput HminCurve | |
| annotation (Placement(transformation(extent={{40,-50},{80,-10}}))); | |
| - Modelica.Blocks.Tables.CombiTable1D maxMinTable( | |
| + Modelica.Blocks.Tables.CombiTable1Dv maxMinTable( | |
| columns={2,3}, | |
| tableName="NoName", | |
| tableOnFile=false, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/Pumps/PumpPolynomialBased/Examples/testPumpSpeedCalculation.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/Pumps/PumpPolynomialBased/Examples/testPumpSpeedCalculation.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/Pumps/PumpPolynomialBased/Examples/testPumpSpeedCalculation.mo" 2021-03-15 12:05:56.603860824 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/Pumps/PumpPolynomialBased/Examples/testPumpSpeedCalculation.mo" 2021-04-26 11:51:17.414633750 +0200 | |
| @@ -21,9 +21,9 @@ | |
| parameter Real maxQ(unit="m3/h", displayUnit="m3/h") = param.maxMinHeight[ | |
| size(param.maxMinHeight, 1), 1]; | |
| - parameter Modelica.SIunits.Length maxHead = max(param.maxMinHeight[:, 2]) | |
| + parameter Modelica.Units.SI.Length maxHead = max(param.maxMinHeight[:, 2]) | |
| "maximum static head of the pump"; | |
| - parameter Modelica.SIunits.Length minHead = max(param.maxMinHeight[:, 3]) | |
| + parameter Modelica.Units.SI.Length minHead = max(param.maxMinHeight[:, 3]) | |
| "aprox. minimum static head of the pump"; | |
| Modelica.Blocks.Sources.TimeTable headTable(table=[ | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/Pumps/PumpPolynomialBased/PumpBaseRecord.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/Pumps/PumpPolynomialBased/PumpBaseRecord.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/Pumps/PumpPolynomialBased/PumpBaseRecord.mo" 2021-03-15 12:05:56.603860824 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/Pumps/PumpPolynomialBased/PumpBaseRecord.mo" 2021-04-26 11:51:17.390633717 +0200 | |
| @@ -10,7 +10,7 @@ | |
| 5, 12, 0.75; | |
| 10, 0.5, 0.5] | |
| "maximum and minimum boundaries of pump (Q [m3/h], Hmax [m], Hmin [m])"; | |
| - parameter Modelica.SIunits.Conversions.NonSIunits.AngularVelocity_rpm[:, :] | |
| + parameter Modelica.Units.NonSI.AngularVelocity_rpm[:, :] | |
| maxMinSpeedCurves=[ | |
| -1, nMax, nMin; | |
| 0, nMax, nMin; | |
| @@ -18,9 +18,9 @@ | |
| 10, nMin, nMin] | |
| "maximum and minimum boundaries of pump speed | |
| (Q [m3/h], nMax [rev/min], nMin [rev/min])"; | |
| - parameter Modelica.SIunits.Conversions.NonSIunits.AngularVelocity_rpm nMin=0 | |
| + parameter Modelica.Units.NonSI.AngularVelocity_rpm nMin=0 | |
| "minimum pump speed"; | |
| - parameter Modelica.SIunits.Conversions.NonSIunits.AngularVelocity_rpm nMax=0 | |
| + parameter Modelica.Units.NonSI.AngularVelocity_rpm nMax=0 | |
| "maximum pump speed"; | |
| // ***************************************************** | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/Radiators/RadiatorBaseDataDefinition.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/Radiators/RadiatorBaseDataDefinition.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/Radiators/RadiatorBaseDataDefinition.mo" 2021-03-15 12:05:56.603860824 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/Radiators/RadiatorBaseDataDefinition.mo" 2021-04-26 11:51:17.118633342 +0200 | |
| @@ -4,10 +4,10 @@ | |
| parameter Real NominalPower(unit="W/m") | |
| "Nominal power of radiator per m at nominal temperatures" | |
| annotation (Dialog(group="Geometry")); | |
| - parameter Modelica.SIunits.Temperature RT_nom[3] | |
| + parameter Modelica.Units.SI.Temperature RT_nom[3] | |
| "Nominal temperatures (Tin, Tout, Tair) according to DIN-EN 442." | |
| annotation (Dialog(group="Geometry")); | |
| - parameter Modelica.SIunits.Pressure PressureDrop | |
| + parameter Modelica.Units.SI.Pressure PressureDrop | |
| "Pressure drop coefficient, delta_p[Pa] = PD*m_flow[kg/s]^2"; | |
| parameter Real Exponent | |
| "Radiator exponent" | |
| @@ -18,13 +18,13 @@ | |
| parameter Real MassSteel(unit="kg/m") | |
| "Material mass of radiator per m" | |
| annotation (Dialog(group="Geometry")); | |
| -parameter Modelica.SIunits.Density DensitySteel=7900 | |
| +parameter Modelica.Units.SI.Density DensitySteel=7900 | |
| "Specific density of steel" | |
| annotation (Dialog(group="Material")); | |
| - parameter Modelica.SIunits.SpecificHeatCapacity CapacitySteel=551 | |
| + parameter Modelica.Units.SI.SpecificHeatCapacity CapacitySteel=551 | |
| "Specific heat capacity of steel" | |
| annotation (Dialog(group="Material")); | |
| - parameter Modelica.SIunits.ThermalConductivity LambdaSteel=60 | |
| + parameter Modelica.Units.SI.ThermalConductivity LambdaSteel=60 | |
| "Thermal conductivity of steel" | |
| annotation (Dialog(group="Material")); | |
| parameter | |
| @@ -32,9 +32,9 @@ | |
| Type | |
| "Type of radiator" | |
| annotation (Dialog(group="Geometry")); | |
| - parameter Modelica.SIunits.Length length | |
| + parameter Modelica.Units.SI.Length length | |
| "Length of radiator"; | |
| - parameter Modelica.SIunits.Height height | |
| + parameter Modelica.Units.SI.Height height | |
| "Height of radiator"; | |
| annotation (Documentation(info="<html> | |
| <h4><font color=\"#008000\">Overview</font></h4> | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/SolarElectric/PVBaseRecord.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/SolarElectric/PVBaseRecord.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/SolarElectric/PVBaseRecord.mo" 2021-03-15 12:05:56.603860824 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/SolarElectric/PVBaseRecord.mo" 2021-04-26 11:51:17.038633232 +0200 | |
| @@ -1,19 +1,19 @@ | |
| within AixLib.DataBase.SolarElectric; | |
| record PVBaseRecord | |
| extends Modelica.Icons.Record; | |
| - parameter Modelica.SIunits.Efficiency Eta0(min=0, max=1) | |
| + | |
| + parameter Modelica.Units.SI.Efficiency Eta0(min=0, max=1) | |
| "Maximum efficiency"; | |
| - parameter Modelica.SIunits.LinearTemperatureCoefficient TempCoeff(min=0, max=1) | |
| + parameter Modelica.Units.SI.LinearTemperatureCoefficient TempCoeff(min=0, max=1) | |
| "Temperature coeffient"; | |
| - parameter Modelica.SIunits.Temp_K NoctTempCell | |
| + parameter Modelica.Units.SI.Temperature NoctTempCell | |
| "Meassured cell temperature"; | |
| - parameter Modelica.SIunits.Temp_K NoctTemp | |
| + parameter Modelica.Units.SI.Temperature NoctTemp | |
| "Defined temperature"; | |
| - parameter Modelica.SIunits.RadiantEnergyFluenceRate NoctRadiation | |
| + parameter Modelica.Units.SI.RadiantEnergyFluenceRate NoctRadiation | |
| "Defined radiation"; | |
| - parameter Modelica.SIunits.Area Area | |
| + parameter Modelica.Units.SI.Area Area | |
| "Area of one Panel"; | |
| - | |
| annotation (Documentation(info="<html> | |
| <h4><span style=\"color: #008000\">Overview</span></h4> | |
| <p>Base data definition for photovoltaics </p> | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/SolarThermal/SolarThermalBaseDataDefinition.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/SolarThermal/SolarThermalBaseDataDefinition.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/SolarThermal/SolarThermalBaseDataDefinition.mo" 2021-03-15 12:05:56.603860824 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/SolarThermal/SolarThermalBaseDataDefinition.mo" 2021-04-26 11:51:16.982633154 +0200 | |
| @@ -2,7 +2,7 @@ | |
| record SolarThermalBaseDataDefinition | |
| "Base Data Definition for Solar thermal collectors" | |
| extends Modelica.Icons.Record; | |
| - parameter Modelica.SIunits.Efficiency eta_zero(max=1) "Conversion factor/Efficiency at Q = 0"; | |
| + parameter Modelica.Units.SI.Efficiency eta_zero(max=1) "Conversion factor/Efficiency at Q = 0"; | |
| parameter Real c1(unit = "W/(m.m.K)") "Loss coefficient c1"; | |
| parameter Real c2(unit = "W/(m.m.K.K)") "Loss coefficient c2"; | |
| annotation(Documentation(revisions="<html> | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/Storage/BufferStorageBaseDataDefinition.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/Storage/BufferStorageBaseDataDefinition.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/Storage/BufferStorageBaseDataDefinition.mo" 2021-03-15 12:05:56.603860824 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/Storage/BufferStorageBaseDataDefinition.mo" 2021-04-26 11:51:16.958633120 +0200 | |
| @@ -3,7 +3,7 @@ | |
| "Base data definition for Buffer storage records" | |
| extends Modelica.Icons.Record; | |
| ///////////input parameters//////////// | |
| - import SI = Modelica.SIunits; | |
| + import SI = Modelica.Units.SI; | |
| parameter SI.Height hTank "Height of storage"; | |
| parameter SI.Height hLowerPortDemand "Height of lower demand port"; | |
| parameter SI.Height hUpperPortDemand "Height of upper demand port"; | |
| @@ -17,9 +17,9 @@ | |
| parameter SI.Diameter dTank "Inner diameter of storage"; | |
| parameter SI.Length sWall "Thickness of storage Wall"; | |
| parameter SI.Length sIns "Thickness of storage insulation"; | |
| - parameter Modelica.SIunits.ThermalConductivity lambdaWall | |
| + parameter Modelica.Units.SI.ThermalConductivity lambdaWall | |
| "thermal conductivity of storage wall"; | |
| - parameter Modelica.SIunits.ThermalConductivity lambdaIns | |
| + parameter Modelica.Units.SI.ThermalConductivity lambdaIns | |
| "thermal conductivity of storage insulation"; | |
| //parameter SI.CoefficientOfHeatTransfer alpha | |
| //"Coefficient of heat transfer air <-> insulation of tank"; | |
| @@ -38,9 +38,9 @@ | |
| parameter DataBase.Pipes.PipeBaseDataDefinition pipeHC2 | |
| "Type of Pipe for HR2"; | |
| - parameter Modelica.SIunits.Length lengthHC1 "Length of Pipe for HR1"; | |
| - parameter Modelica.SIunits.Length lengthHC2 "Length of Pipe for HR2"; | |
| + parameter Modelica.Units.SI.Length lengthHC1 "Length of Pipe for HR1"; | |
| + parameter Modelica.Units.SI.Length lengthHC2 "Length of Pipe for HR2"; | |
| annotation (Icon(graphics), Documentation(info="<html> | |
| <h4><font color=\"#008000\">Overview</font></h4> | |
| <p> Base data definition for buffer storage records </p> | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/Chiller/ChillerBaseDataDefinition.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/Chiller/ChillerBaseDataDefinition.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/Chiller/ChillerBaseDataDefinition.mo" 2021-03-15 12:05:56.603860824 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/Chiller/ChillerBaseDataDefinition.mo" 2021-04-26 11:51:16.850632972 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.DataBase.ThermalMachines.Chiller; | |
| +within AixLib.DataBase.ThermalMachines.Chiller; | |
| record ChillerBaseDataDefinition "Basic chiller data" | |
| extends | |
| AixLib.DataBase.ThermalMachines.HeatPump.HeatPumpBaseDataDefinition( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/Chiller/EN14511/package.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/Chiller/EN14511/package.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/Chiller/EN14511/package.mo" 2021-03-15 12:05:56.603860824 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/Chiller/EN14511/package.mo" 2021-04-26 11:51:16.842632962 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.DataBase.ThermalMachines.Chiller; | |
| +within AixLib.DataBase.ThermalMachines.Chiller; | |
| package EN14511 | |
| annotation (Documentation(revisions="<html> | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/Chiller/EN14511/Vitocal200AWO201.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/Chiller/EN14511/Vitocal200AWO201.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/Chiller/EN14511/Vitocal200AWO201.mo" 2021-03-15 12:05:56.603860824 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/Chiller/EN14511/Vitocal200AWO201.mo" 2021-04-26 11:51:16.838632955 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.DataBase.ThermalMachines.Chiller.EN14511; | |
| +within AixLib.DataBase.ThermalMachines.Chiller.EN14511; | |
| record Vitocal200AWO201 "Vitocal200AWO201Chilling" | |
| extends | |
| AixLib.DataBase.ThermalMachines.Chiller.ChillerBaseDataDefinition( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/Chiller/package.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/Chiller/package.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/Chiller/package.mo" 2021-03-15 12:05:56.603860824 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/Chiller/package.mo" 2021-04-26 11:51:16.854632978 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.DataBase.ThermalMachines; | |
| +within AixLib.DataBase.ThermalMachines; | |
| package Chiller "Collection of Chiller Database Records" | |
| extends Modelica.Icons.Package; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/Chiller/PerformanceData/LookUpTable2D.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/Chiller/PerformanceData/LookUpTable2D.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/Chiller/PerformanceData/LookUpTable2D.mo" 2021-03-15 12:05:56.603860824 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/Chiller/PerformanceData/LookUpTable2D.mo" 2021-04-26 11:51:16.814632922 +0200 | |
| @@ -105,7 +105,6 @@ | |
| maxSup + 273.15 > sigBus.T_ret_ev, | |
| "Current T_ret_ev is too high. Extrapolation of data will result in unrealistic results", | |
| level=AssertionLevel.warning); | |
| - else | |
| end if; | |
| connect(t_Co_in.y,Qdot_EvaTable. u2) annotation (Line(points={{52,65.4},{52, | |
| 60},{37.6,60},{37.6,50.8}}, color={0,0,127})); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/HeatPump/EN14511.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/HeatPump/EN14511.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/HeatPump/EN14511.mo" 2021-03-15 12:05:56.603860824 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/HeatPump/EN14511.mo" 2021-04-26 11:51:16.738632817 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.DataBase.ThermalMachines.HeatPump; | |
| +within AixLib.DataBase.ThermalMachines.HeatPump; | |
| package EN14511 | |
| record AlphaInnotec_LW80MA "Alpha Innotec LW 80 M-A" | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/HeatPump/Functions.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/HeatPump/Functions.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/HeatPump/Functions.mo" 2021-03-15 12:05:56.603860824 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/HeatPump/Functions.mo" 2021-04-26 11:51:16.714632784 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.DataBase.ThermalMachines.HeatPump; | |
| +within AixLib.DataBase.ThermalMachines.HeatPump; | |
| package Functions "Functions for AixLib.Fluid.HeatPumps" | |
| extends Modelica.Icons.Package; | |
| package Characteristics | |
| @@ -12,7 +12,7 @@ | |
| T_eva, | |
| mFlow_eva, | |
| mFlow_con); | |
| - parameter Modelica.SIunits.Power powerCompressor=2000 | |
| + parameter Modelica.Units.SI.Power powerCompressor=2000 | |
| "Constant electric power input for compressor"; | |
| parameter Real CoP "Constant CoP"; | |
| algorithm | |
| @@ -39,7 +39,7 @@ | |
| mFlow_eva, | |
| mFlow_con); | |
| parameter Real qualityGrade=0.3 "Constant quality grade"; | |
| - parameter Modelica.SIunits.Power P_com=2000 | |
| + parameter Modelica.Units.SI.Power P_com=2000 | |
| "Constant electric power input for compressor"; | |
| protected | |
| Real CoP_C "Carnot CoP"; | |
| @@ -81,7 +81,7 @@ | |
| function CarnotFunction | |
| "Function to emulate the polynomal approach of the Carnot_y heat pump model" | |
| extends PartialBaseFct; | |
| - parameter Modelica.SIunits.Power Pel_nominal=2000 | |
| + parameter Modelica.Units.SI.Power Pel_nominal=2000 | |
| "Constant nominal electric power"; | |
| parameter Real etaCarnot_nominal(unit="1") = 0.5 | |
| "Carnot effectiveness (=COP/COP_Carnot) used if use_eta_Carnot_nominal = true" | |
| @@ -91,7 +91,7 @@ | |
| "Coefficients for efficiency curve (need p(a=a, yPL=1)=1)" | |
| annotation (Dialog(group="Efficiency")); | |
| protected | |
| - Modelica.SIunits.Power Pel; | |
| + Modelica.Units.SI.Power Pel; | |
| Real COP; | |
| Real COP_carnot; | |
| Real etaPartLoad = AixLib.Utilities.Math.Functions.polynomial(a=a, x=N); | |
| @@ -117,11 +117,11 @@ | |
| function PolynomalApproach | |
| "Function to emulate the polynomal approach of the TRNSYS Type 401 heat pump model" | |
| extends PartialBaseFct; | |
| - parameter Modelica.SIunits.Power p[6] = {0,0,0,0,0,0} | |
| + | |
| + parameter Modelica.Units.SI.Power p[6] = {0,0,0,0,0,0} | |
| "Polynomal coefficient for the electrical power"; | |
| - parameter Modelica.SIunits.HeatFlowRate q[6] = {0,0,0,0,0,0} | |
| + parameter Modelica.Units.SI.HeatFlowRate q[6] = {0,0,0,0,0,0} | |
| "Polynomal coefficient for the condenser heat flow"; | |
| - | |
| protected | |
| Real TEva_n = T_eva/273.15 + 1 "Normalized evaporator temperature"; | |
| Real TCon_n = T_con/273.15 + 1 "Normalized condenser temperature"; | |
| @@ -243,10 +243,10 @@ | |
| partial function PartialBaseFct "Base function for all icing factor functions" | |
| extends Modelica.Icons.Function; | |
| - input Modelica.SIunits.ThermodynamicTemperature T_flow_ev "Evaporator supply temperature"; | |
| - input Modelica.SIunits.ThermodynamicTemperature T_ret_ev "Evaporator return temperature"; | |
| - input Modelica.SIunits.ThermodynamicTemperature T_oda "Outdoor air temperature"; | |
| - input Modelica.SIunits.MassFlowRate m_flow_ev "Mass flow rate at the evaporator"; | |
| + input Modelica.Units.SI.ThermodynamicTemperature T_flow_ev "Evaporator supply temperature"; | |
| + input Modelica.Units.SI.ThermodynamicTemperature T_ret_ev "Evaporator return temperature"; | |
| + input Modelica.Units.SI.ThermodynamicTemperature T_oda "Outdoor air temperature"; | |
| + input Modelica.Units.SI.MassFlowRate m_flow_ev "Mass flow rate at the evaporator"; | |
| output Real iceFac(min=0, max=1) "Icing factor, normalized value between 0 and 1"; | |
| annotation (Documentation(revisions="<html> | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/HeatPump/HeatPumpBaseDataDefinition.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/HeatPump/HeatPumpBaseDataDefinition.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/HeatPump/HeatPumpBaseDataDefinition.mo" 2021-03-15 12:05:56.603860824 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/HeatPump/HeatPumpBaseDataDefinition.mo" 2021-04-26 11:51:16.666632718 +0200 | |
| @@ -3,9 +3,9 @@ | |
| extends Modelica.Icons.Record; | |
| parameter Real tableQdot_con[:,:] "Heating power table; T in degC; Q_flow in W"; | |
| parameter Real tableP_ele[:,:] "Electrical power table; T in degC; Q_flow in W"; | |
| - parameter Modelica.SIunits.MassFlowRate mFlow_conNom | |
| + parameter Modelica.Units.SI.MassFlowRate mFlow_conNom | |
| "Nominal mass flow rate in condenser"; | |
| - parameter Modelica.SIunits.MassFlowRate mFlow_evaNom | |
| + parameter Modelica.Units.SI.MassFlowRate mFlow_evaNom | |
| "Nominal mass flow rate in evaporator"; | |
| parameter Real tableUppBou[:,2] "Points to define upper boundary for sink temperature"; | |
| parameter Real tableLowBou[:,2] "Points to define lower boundary for sink temperature"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/HeatPump/PerformanceData.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/HeatPump/PerformanceData.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/HeatPump/PerformanceData.mo" 2021-03-15 12:05:56.603860824 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/ThermalMachines/HeatPump/PerformanceData.mo" 2021-04-26 11:51:16.654632702 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.DataBase.ThermalMachines.HeatPump; | |
| +within AixLib.DataBase.ThermalMachines.HeatPump; | |
| package PerformanceData "Different models used for a black box heat pump model" | |
| model IcingBlock | |
| "Block which decreases evaporator power by an icing factor" | |
| @@ -177,7 +177,6 @@ | |
| maxSup + 273.15 > sigBus.T_ret_co, | |
| "Current T_ret_co is too high. Extrapolation of data will result in unrealistic results", | |
| level=AssertionLevel.warning); | |
| - else | |
| end if; | |
| connect(t_Ev_in.y, Qdot_ConTable.u2) annotation (Line(points={{52,65.4},{52, | |
| 60},{37.6,60},{37.6,50.8}}, color={0,0,127})); | |
| @@ -660,8 +659,8 @@ | |
| model calcCOP | |
| "To calculate the COP or EER of a device, this model ensures no integration failure will happen" | |
| - parameter Modelica.SIunits.Power lowBouPel "If P_el falls below this value, COP will not be calculated"; | |
| - parameter Modelica.SIunits.Time aveTime=60 "Time span for average"; | |
| + parameter Modelica.Units.SI.Power lowBouPel "If P_el falls below this value, COP will not be calculated"; | |
| + parameter Modelica.Units.SI.Time aveTime=60 "Time span for average"; | |
| Modelica.Blocks.Interfaces.RealInput Pel(final unit="W", final displayUnit= | |
| "kW") | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/ThermalZones/ZoneBaseRecord.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/ThermalZones/ZoneBaseRecord.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/ThermalZones/ZoneBaseRecord.mo" 2021-03-15 12:05:56.603860824 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/ThermalZones/ZoneBaseRecord.mo" 2021-04-26 11:51:16.454632426 +0200 | |
| @@ -1,66 +1,66 @@ | |
| -within AixLib.DataBase.ThermalZones; | |
| +within AixLib.DataBase.ThermalZones; | |
| record ZoneBaseRecord "Base record definition for zone records" | |
| extends Modelica.Icons.Record; | |
| - parameter Modelica.SIunits.Temperature T_start "Initial temperature"; | |
| + parameter Modelica.Units.SI.Temperature T_start "Initial temperature"; | |
| parameter Boolean withAirCap = true "Consider capacity of indoor air"; | |
| - parameter Modelica.SIunits.Volume VAir "Air volume of the zone"; | |
| - parameter Modelica.SIunits.Area AZone "Net floor area of zone"; | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hRad "Coefficient of heat transfer for linearized radiation exchange between walls"; | |
| - parameter Modelica.SIunits.Angle lat "Latitude of zone location"; | |
| + parameter Modelica.Units.SI.Volume VAir "Air volume of the zone"; | |
| + parameter Modelica.Units.SI.Area AZone "Net floor area of zone"; | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hRad "Coefficient of heat transfer for linearized radiation exchange between walls"; | |
| + parameter Modelica.Units.SI.Angle lat "Latitude of zone location"; | |
| parameter Integer nOrientations(min=1) "Number of orientations"; | |
| - parameter Modelica.SIunits.Area AWin[nOrientations] | |
| + parameter Modelica.Units.SI.Area AWin[nOrientations] | |
| "Areas of windows by orientations"; | |
| - parameter Modelica.SIunits.Area ATransparent[nOrientations] | |
| + parameter Modelica.Units.SI.Area ATransparent[nOrientations] | |
| "Areas of transparent (solar radiation transmittend) elements by orientations"; | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConWin "Convective coefficient of heat transfer of windows (indoor)"; | |
| - parameter Modelica.SIunits.ThermalResistance RWin "Resistor for windows"; | |
| - parameter Modelica.SIunits.TransmissionCoefficient gWin | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConWin "Convective coefficient of heat transfer of windows (indoor)"; | |
| + parameter Modelica.Units.SI.ThermalResistance RWin "Resistor for windows"; | |
| + parameter Modelica.Units.SI.TransmissionCoefficient gWin | |
| "Total energy transmittance of windows"; | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer UWin | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer UWin | |
| "Thermal transmission coefficient of windows"; | |
| parameter Real ratioWinConRad | |
| "Ratio for windows between convective and radiative heat emission"; | |
| - parameter Modelica.SIunits.Area AExt[nOrientations] "Areas of exterior walls by orientations"; | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConExt "Convective coefficient of heat transfer for exterior walls (indoor)"; | |
| + parameter Modelica.Units.SI.Area AExt[nOrientations] "Areas of exterior walls by orientations"; | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConExt "Convective coefficient of heat transfer for exterior walls (indoor)"; | |
| parameter Integer nExt(min=1) "Number of RC-elements of exterior walls"; | |
| - parameter Modelica.SIunits.ThermalResistance RExt[nExt] "Resistances of exterior walls, from inside to outside"; | |
| - parameter Modelica.SIunits.ThermalResistance RExtRem "Resistance of remaining resistor RExtRem between capacity n and outside"; | |
| - parameter Modelica.SIunits.HeatCapacity CExt[nExt] "Heat capacities of exterior walls, from inside to outside"; | |
| - parameter Modelica.SIunits.Area AInt "Area of interior walls"; | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConInt "Convective coefficient of heat transfer of interior walls (indoor)"; | |
| + parameter Modelica.Units.SI.ThermalResistance RExt[nExt] "Resistances of exterior walls, from inside to outside"; | |
| + parameter Modelica.Units.SI.ThermalResistance RExtRem "Resistance of remaining resistor RExtRem between capacity n and outside"; | |
| + parameter Modelica.Units.SI.HeatCapacity CExt[nExt] "Heat capacities of exterior walls, from inside to outside"; | |
| + parameter Modelica.Units.SI.Area AInt "Area of interior walls"; | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConInt "Convective coefficient of heat transfer of interior walls (indoor)"; | |
| parameter Integer nInt(min=1) "Number of RC-elements of interior walls"; | |
| - parameter Modelica.SIunits.ThermalResistance RInt[nInt] "Resistances of interior wall, from port to center"; | |
| - parameter Modelica.SIunits.HeatCapacity CInt[nInt] "Heat capacities of interior walls, from port to center"; | |
| - parameter Modelica.SIunits.Area AFloor "Area of floor plate"; | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConFloor "Convective coefficient of heat transfer of floor plate (indoor)"; | |
| + parameter Modelica.Units.SI.ThermalResistance RInt[nInt] "Resistances of interior wall, from port to center"; | |
| + parameter Modelica.Units.SI.HeatCapacity CInt[nInt] "Heat capacities of interior walls, from port to center"; | |
| + parameter Modelica.Units.SI.Area AFloor "Area of floor plate"; | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConFloor "Convective coefficient of heat transfer of floor plate (indoor)"; | |
| parameter Integer nFloor(min=1) "Number of RC-elements of floor plate"; | |
| - parameter Modelica.SIunits.ThermalResistance RFloor[nFloor] "Resistances of floor plate, from inside to outside"; | |
| - parameter Modelica.SIunits.ThermalResistance RFloorRem "Resistance of remaining resistor RFloorRem between capacity n and outside"; | |
| - parameter Modelica.SIunits.HeatCapacity CFloor[nFloor] "Heat capacities of floor plate, from inside to outside"; | |
| - parameter Modelica.SIunits.Area ARoof "Area of roof"; | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConRoof "Convective coefficient of heat transfer of roof (indoor)"; | |
| + parameter Modelica.Units.SI.ThermalResistance RFloor[nFloor] "Resistances of floor plate, from inside to outside"; | |
| + parameter Modelica.Units.SI.ThermalResistance RFloorRem "Resistance of remaining resistor RFloorRem between capacity n and outside"; | |
| + parameter Modelica.Units.SI.HeatCapacity CFloor[nFloor] "Heat capacities of floor plate, from inside to outside"; | |
| + parameter Modelica.Units.SI.Area ARoof "Area of roof"; | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConRoof "Convective coefficient of heat transfer of roof (indoor)"; | |
| parameter Integer nRoof(min=1) "Number of RC-elements of roof"; | |
| - parameter Modelica.SIunits.ThermalResistance RRoof[nRoof] "Resistances of roof, from inside to outside"; | |
| - parameter Modelica.SIunits.ThermalResistance RRoofRem "Resistance of remaining resistor RRoofRem between capacity n and outside"; | |
| - parameter Modelica.SIunits.HeatCapacity CRoof[nRoof] "Heat capacities of roof, from inside to outside"; | |
| + parameter Modelica.Units.SI.ThermalResistance RRoof[nRoof] "Resistances of roof, from inside to outside"; | |
| + parameter Modelica.Units.SI.ThermalResistance RRoofRem "Resistance of remaining resistor RRoofRem between capacity n and outside"; | |
| + parameter Modelica.Units.SI.HeatCapacity CRoof[nRoof] "Heat capacities of roof, from inside to outside"; | |
| parameter Integer nOrientationsRoof(min=1) "Number of orientations for roof"; | |
| - parameter Modelica.SIunits.Angle tiltRoof[nOrientationsRoof] "Tilts of roof"; | |
| - parameter Modelica.SIunits.Angle aziRoof[nOrientationsRoof] "Azimuths of roof"; | |
| + parameter Modelica.Units.SI.Angle tiltRoof[nOrientationsRoof] "Tilts of roof"; | |
| + parameter Modelica.Units.SI.Angle aziRoof[nOrientationsRoof] "Azimuths of roof"; | |
| parameter Real wfRoof[nOrientationsRoof] | |
| "Weight factors of the roof"; | |
| - parameter Modelica.SIunits.Emissivity aRoof "Coefficient of absorption of roof (outdoor)"; | |
| + parameter Modelica.Units.SI.Emissivity aRoof "Coefficient of absorption of roof (outdoor)"; | |
| - parameter Modelica.SIunits.Emissivity aExt "Coefficient of absorption of exterior walls (outdoor)"; | |
| - parameter Modelica.SIunits.Temperature TSoil "Temperature of soil"; | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConWallOut "Exterior walls convective coefficient of heat transfer (outdoor)"; | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hRadWall "Coefficient of heat transfer for linearized radiation for exterior walls"; | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConWinOut "Windows' convective coefficient of heat transfer (outdoor)"; | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConRoofOut "Roof's convective coefficient of heat transfer (outdoor)"; | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hRadRoof "Coefficient of heat transfer for linearized radiation for roof"; | |
| - parameter Modelica.SIunits.Angle tiltExtWalls[nOrientations] "Tilts of exterior walls"; | |
| - parameter Modelica.SIunits.Angle aziExtWalls[nOrientations] "Azimuths of exterior walls"; | |
| + parameter Modelica.Units.SI.Emissivity aExt "Coefficient of absorption of exterior walls (outdoor)"; | |
| + parameter Modelica.Units.SI.Temperature TSoil "Temperature of soil"; | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConWallOut "Exterior walls convective coefficient of heat transfer (outdoor)"; | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hRadWall "Coefficient of heat transfer for linearized radiation for exterior walls"; | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConWinOut "Windows' convective coefficient of heat transfer (outdoor)"; | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConRoofOut "Roof's convective coefficient of heat transfer (outdoor)"; | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hRadRoof "Coefficient of heat transfer for linearized radiation for roof"; | |
| + parameter Modelica.Units.SI.Angle tiltExtWalls[nOrientations] "Tilts of exterior walls"; | |
| + parameter Modelica.Units.SI.Angle aziExtWalls[nOrientations] "Azimuths of exterior walls"; | |
| parameter Real wfWall[nOrientations] | |
| "Weight factors of the walls"; | |
| parameter Real wfWin[nOrientations] | |
| @@ -69,7 +69,7 @@ | |
| "Weight factor of the ground"; | |
| parameter Real specificPeople "people per squaremeter"; | |
| parameter Real activityDegree "acitivity degree of people in met"; | |
| - parameter Modelica.SIunits.HeatFlowRate fixedHeatFlowRatePersons | |
| + parameter Modelica.Units.SI.HeatFlowRate fixedHeatFlowRatePersons | |
| "Area specific heatflowrate by persons in case of temperature independent | |
| calculation"; | |
| parameter Real ratioConvectiveHeatPeople | |
| @@ -79,7 +79,7 @@ | |
| parameter Real internalGainsMachinesSpecific "Heat Flux of machines"; | |
| parameter Real ratioConvectiveHeatMachines | |
| "Ratio of convective heat from overall heat output for machines"; | |
| - parameter Modelica.SIunits.HeatFlux lightingPowerSpecific "Heat flux of lighting"; | |
| + parameter Modelica.Units.SI.HeatFlux lightingPowerSpecific "Heat flux of lighting"; | |
| parameter Real ratioConvectiveHeatLighting | |
| "Ratio of convective heat from overall heat output for lights"; | |
| parameter Boolean useConstantACHrate | |
| @@ -101,17 +101,17 @@ | |
| parameter Real hHeat "Upper limit controller output"; | |
| parameter Real lHeat "Lower limit controller output"; | |
| parameter Real KRHeat "Gain of the controller"; | |
| - parameter Modelica.SIunits.Time TNHeat "Time constant of the controller"; | |
| + parameter Modelica.Units.SI.Time TNHeat "Time constant of the controller"; | |
| parameter Boolean HeaterOn "Use heater component"; | |
| parameter Real hCool "Upper limit controller output"; | |
| parameter Real lCool "Lower limit controller output"; | |
| parameter Real KRCool "Gain of the controller"; | |
| - parameter Modelica.SIunits.Time TNCool | |
| + parameter Modelica.Units.SI.Time TNCool | |
| "Time constant of the controller"; | |
| parameter Boolean CoolerOn "Use chiller component"; | |
| - parameter Modelica.SIunits.Temperature TThresholdHeater | |
| + parameter Modelica.Units.SI.Temperature TThresholdHeater | |
| "Threshold temperature below ideal heater is used"; | |
| - parameter Modelica.SIunits.Temperature TThresholdCooler | |
| + parameter Modelica.Units.SI.Temperature TThresholdCooler | |
| "Threshold temperature above ideal cooler is used"; | |
| parameter Boolean withIdealThresholds | |
| "Sets if the threshold temperatures for ideal heater and cooler should | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/Walls/WallBaseDataDefinition.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/Walls/WallBaseDataDefinition.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/Walls/WallBaseDataDefinition.mo" 2021-03-15 12:05:56.607860830 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/Walls/WallBaseDataDefinition.mo" 2021-04-26 11:51:15.442631030 +0200 | |
| @@ -3,13 +3,13 @@ | |
| extends Modelica.Icons.Record; | |
| // pma 2010-04-28: REMOVED THE BASE DEFINITIONS to get errors thrown when using unparameterised wall models | |
| parameter Integer n(min = 1) = 3 "Number of wall layers" annotation(Dialog(tab = "Wall 1", group = "Wall 1 parameters")); | |
| - parameter Modelica.SIunits.Length d[n] "Thickness of wall layers" annotation(Dialog(tab = "Wall 1", group = "Layer 1 parameters")); | |
| - parameter Modelica.SIunits.Density rho[n] "Density of wall layers" annotation(Dialog(tab = "Wall 1", group = "Layer 1 parameters")); | |
| - parameter Modelica.SIunits.ThermalConductivity lambda[n] | |
| + parameter Modelica.Units.SI.Length d[n] "Thickness of wall layers" annotation(Dialog(tab = "Wall 1", group = "Layer 1 parameters")); | |
| + parameter Modelica.Units.SI.Density rho[n] "Density of wall layers" annotation(Dialog(tab = "Wall 1", group = "Layer 1 parameters")); | |
| + parameter Modelica.Units.SI.ThermalConductivity lambda[n] | |
| "Thermal conductivity of wall layers" annotation(Dialog(tab = "Wall 1", group = "Wall 1 parameters")); | |
| - parameter Modelica.SIunits.SpecificHeatCapacity c[n] | |
| + parameter Modelica.Units.SI.SpecificHeatCapacity c[n] | |
| "Specific heat capacity of wall layers" annotation(Dialog(tab = "Wall 1", group = "Wall 1 parameters")); | |
| - parameter Modelica.SIunits.Emissivity eps = 0.95 | |
| + parameter Modelica.Units.SI.Emissivity eps = 0.95 | |
| "Emissivity of inner wall surface" annotation(Dialog(tab = "Wall 1", group = "Wall 1 parameters")); | |
| annotation(Documentation(info = "<html> | |
| <h4><font color=\"#008000\">Overview</font></h4> | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/Weather/SurfaceOrientation/SurfaceOrientationBaseDataDefinition.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/Weather/SurfaceOrientation/SurfaceOrientationBaseDataDefinition.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/Weather/SurfaceOrientation/SurfaceOrientationBaseDataDefinition.mo" 2021-03-15 12:05:56.607860830 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/Weather/SurfaceOrientation/SurfaceOrientationBaseDataDefinition.mo" 2021-04-26 11:51:15.406630979 +0200 | |
| @@ -3,8 +3,8 @@ | |
| extends Modelica.Icons.Record; | |
| parameter Integer nSurfaces; | |
| parameter String[nSurfaces] name; | |
| - parameter Modelica.SIunits.Conversions.NonSIunits.Angle_deg[nSurfaces] Azimut; | |
| - parameter Modelica.SIunits.Conversions.NonSIunits.Angle_deg[nSurfaces] Tilt; | |
| + parameter Modelica.Units.NonSI.Angle_deg[nSurfaces] Azimut; | |
| + parameter Modelica.Units.NonSI.Angle_deg[nSurfaces] Tilt; | |
| annotation(Documentation(info = "<html> | |
| <h4><span style=\"color:#008000\">Overview</span></h4> | |
| <p>Base data definition for the surface orientation</p> | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/WindowsDoors/Simple/OWBaseDataDefinition_Simple.mo" "converted-libraries/AixLib 0.9.1-master/DataBase/WindowsDoors/Simple/OWBaseDataDefinition_Simple.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/DataBase/WindowsDoors/Simple/OWBaseDataDefinition_Simple.mo" 2021-03-15 12:05:56.607860830 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/DataBase/WindowsDoors/Simple/OWBaseDataDefinition_Simple.mo" 2021-04-26 11:51:15.334630880 +0200 | |
| @@ -2,10 +2,10 @@ | |
| record OWBaseDataDefinition_Simple | |
| "Outer window base definition for simple model" | |
| extends Modelica.Icons.Record; | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer Uw = 2.875 | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer Uw = 2.875 | |
| "Thermal transmission coefficient of whole window: glass + frame"; | |
| parameter Real g = 0.8 "coefficient of solar energy transmission"; | |
| - parameter Modelica.SIunits.Emissivity Emissivity = 0.84 "Material emissivity"; | |
| + parameter Modelica.Units.SI.Emissivity Emissivity = 0.84 "Material emissivity"; | |
| parameter Real frameFraction = 0.2 | |
| "frame fraction from total fenestration area"; | |
| annotation(Documentation(info = "<html> | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Electrical/Machines/InductionMachine.mo" "converted-libraries/AixLib 0.9.1-master/Electrical/Machines/InductionMachine.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Electrical/Machines/InductionMachine.mo" 2021-03-15 12:05:56.607860830 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Electrical/Machines/InductionMachine.mo" 2021-04-26 11:51:15.242630752 +0200 | |
| @@ -4,35 +4,35 @@ | |
| import AixLib; | |
| extends Modelica.Electrical.Machines.Icons.TransientMachine; | |
| - parameter Modelica.SIunits.Frequency n0=f_1/p | |
| + parameter Modelica.Units.SI.Frequency n0=f_1/p | |
| "Idling speed of the electric machine" | |
| annotation (Dialog(group="Machine specifications")); | |
| - parameter Modelica.SIunits.Frequency n_nominal=1530/60 "Rated rotor speed" | |
| + parameter Modelica.Units.SI.Frequency n_nominal=1530/60 "Rated rotor speed" | |
| annotation (Dialog(group="Machine specifications")); | |
| - parameter Modelica.SIunits.Frequency f_1=50 "Frequency" | |
| + parameter Modelica.Units.SI.Frequency f_1=50 "Frequency" | |
| annotation (Dialog(group="Machine specifications")); | |
| - parameter Modelica.SIunits.Voltage U_1=400 "Rated voltage" | |
| + parameter Modelica.Units.SI.Voltage U_1=400 "Rated voltage" | |
| annotation (Dialog(group="Machine specifications")); | |
| - parameter Modelica.SIunits.Current I_elNominal=P_elNominal/(sqrt(3)*U_1* | |
| + parameter Modelica.Units.SI.Current I_elNominal=P_elNominal/(sqrt(3)*U_1* | |
| cosPhi) "Rated current" | |
| annotation (Dialog(group="Machine specifications")); | |
| - parameter Modelica.SIunits.Current I_1_start=if P_Mec_nominal<=15000 then 7.2*I_elNominal else 8*I_elNominal | |
| + parameter Modelica.Units.SI.Current I_1_start=if P_Mec_nominal<=15000 then 7.2*I_elNominal else 8*I_elNominal | |
| "Motor start current (realistic factors used from DIN VDE 2650/2651)" | |
| annotation (Dialog( tab="Calculations")); | |
| - parameter Modelica.SIunits.Power P_elNominal=15000 | |
| + parameter Modelica.Units.SI.Power P_elNominal=15000 | |
| "Nominal electrical power of electric machine" | |
| annotation (Dialog(group="Machine specifications")); | |
| - parameter Modelica.SIunits.Power P_Mec_nominal=P_elNominal*(1+s_nominal/0.22) "Nominal mechanical power of electric machine" | |
| + parameter Modelica.Units.SI.Power P_Mec_nominal=P_elNominal*(1+s_nominal/0.22) "Nominal mechanical power of electric machine" | |
| annotation (Dialog(tab="Calculations")); | |
| - parameter Modelica.SIunits.Torque M_nominal=P_Mec_nominal/(2*Modelica.Constants.pi*n_nominal) "Nominal torque of electric machine" | |
| + parameter Modelica.Units.SI.Torque M_nominal=P_Mec_nominal/(2*Modelica.Constants.pi*n_nominal) "Nominal torque of electric machine" | |
| annotation (Dialog(tab="Calculations")); | |
| - parameter Modelica.SIunits.Torque M_til=2*M_nominal "Tilting torque of electric machine (realistic factor used from DIN VDE 2650/2651)" | |
| + parameter Modelica.Units.SI.Torque M_til=2*M_nominal "Tilting torque of electric machine (realistic factor used from DIN VDE 2650/2651)" | |
| annotation (Dialog(tab="Calculations")); | |
| - parameter Modelica.SIunits.Torque M_start=if P_Mec_nominal<=4000 then 1.6*M_nominal | |
| + parameter Modelica.Units.SI.Torque M_start=if P_Mec_nominal<=4000 then 1.6*M_nominal | |
| elseif P_Mec_nominal>=22000 then 1*M_nominal else 1.25*M_nominal | |
| "Starting torque of electric machine (realistic factor used from DIN VDE 2650/2651)" | |
| annotation (Dialog(tab="Calculations")); | |
| - parameter Modelica.SIunits.Inertia J_Gen=1 | |
| + parameter Modelica.Units.SI.Inertia J_Gen=1 | |
| "Moment of inertia of the electric machine (default=0.5kg.m2)" | |
| annotation (Dialog(group="Calibration")); | |
| parameter Real s_nominal=abs(1-n_nominal*p/f_1) "Nominal slip of electric machine" | |
| @@ -50,13 +50,13 @@ | |
| parameter Real gearRatio=1 "Transmission ratio (engine speed / generator speed)" | |
| annotation (Dialog(group="Machine specifications")); | |
| - Modelica.SIunits.Frequency n=inertia.w/(2*Modelica.Constants.pi) "Speed of machine rotor [1/s]"; | |
| - Modelica.SIunits.Current I_1 "Electric current of machine stator"; | |
| - Modelica.SIunits.Power P_E "Electrical power at the electric machine"; | |
| - Modelica.SIunits.Power P_Mec "Mechanical power at the electric machine"; | |
| - Modelica.SIunits.Power CalQ_Loss | |
| + Modelica.Units.SI.Frequency n=inertia.w/(2*Modelica.Constants.pi) "Speed of machine rotor [1/s]"; | |
| + Modelica.Units.SI.Current I_1 "Electric current of machine stator"; | |
| + Modelica.Units.SI.Power P_E "Electrical power at the electric machine"; | |
| + Modelica.Units.SI.Power P_Mec "Mechanical power at the electric machine"; | |
| + Modelica.Units.SI.Power CalQ_Loss | |
| "Calculated heat flow from electric machine"; | |
| - Modelica.SIunits.Torque M "Torque at electric machine"; | |
| + Modelica.Units.SI.Torque M "Torque at electric machine"; | |
| Real s=1-n*p/f_1 "Current slip of electric machine"; | |
| Real eta "Total efficiency of the electric machine (as motor)"; | |
| Real calI_1 = 1/(1+((k-1)/((s_nominal^2)-k))*((s^2)+rho1*abs(s)+rho0)); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Electrical/PVSystem/BaseClasses/PartialPVSystem.mo" "converted-libraries/AixLib 0.9.1-master/Electrical/PVSystem/BaseClasses/PartialPVSystem.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Electrical/PVSystem/BaseClasses/PartialPVSystem.mo" 2021-03-15 12:05:56.607860830 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Electrical/PVSystem/BaseClasses/PartialPVSystem.mo" 2021-04-26 11:51:15.150630627 +0200 | |
| @@ -6,7 +6,7 @@ | |
| parameter AixLib.DataBase.SolarElectric.PVBaseRecord data | |
| "PV data set" | |
| annotation (choicesAllMatching=true); | |
| - parameter Modelica.SIunits.Power MaxOutputPower | |
| + parameter Modelica.Units.SI.Power MaxOutputPower | |
| "Maximum output power for inverter"; | |
| Modelica.Blocks.Interfaces.RealOutput PVPowerW( | |
| final quantity="Power", | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Electrical/PVSystem/BaseClasses/PVInverterRMS.mo" "converted-libraries/AixLib 0.9.1-master/Electrical/PVSystem/BaseClasses/PVInverterRMS.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Electrical/PVSystem/BaseClasses/PVInverterRMS.mo" 2021-03-15 12:05:56.607860830 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Electrical/PVSystem/BaseClasses/PVInverterRMS.mo" 2021-04-26 11:51:15.182630670 +0200 | |
| @@ -2,7 +2,7 @@ | |
| model PVInverterRMS | |
| "Inverter model including system management" | |
| - parameter Modelica.SIunits.Power uMax2 | |
| + parameter Modelica.Units.SI.Power uMax2 | |
| "Upper limits of input signals (MaxOutputPower)"; | |
| Modelica.Blocks.Interfaces.RealOutput PVPowerRmsW( | |
| final quantity="Power", | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Electrical/PVSystem/BaseClasses/PVModuleDC.mo" "converted-libraries/AixLib 0.9.1-master/Electrical/PVSystem/BaseClasses/PVModuleDC.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Electrical/PVSystem/BaseClasses/PVModuleDC.mo" 2021-03-15 12:05:56.607860830 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Electrical/PVSystem/BaseClasses/PVModuleDC.mo" 2021-04-26 11:51:15.166630648 +0200 | |
| @@ -1,23 +1,23 @@ | |
| within AixLib.Electrical.PVSystem.BaseClasses; | |
| model PVModuleDC "partial model for PV module" | |
| - parameter Modelica.SIunits.Area Area | |
| + parameter Modelica.Units.SI.Area Area | |
| "Area of one Panel"; | |
| - parameter Modelica.SIunits.Efficiency Eta0 | |
| + parameter Modelica.Units.SI.Efficiency Eta0 | |
| "Maximum efficiency"; | |
| - parameter Modelica.SIunits.Temp_K NoctTemp | |
| + parameter Modelica.Units.SI.Temperature NoctTemp | |
| "Defined temperature"; | |
| - parameter Modelica.SIunits.Temp_K NoctTempCell | |
| + parameter Modelica.Units.SI.Temperature NoctTempCell | |
| "Meassured cell temperature"; | |
| - parameter Modelica.SIunits.RadiantEnergyFluenceRate NoctRadiation | |
| + parameter Modelica.Units.SI.RadiantEnergyFluenceRate NoctRadiation | |
| "Defined radiation"; | |
| - parameter Modelica.SIunits.LinearTemperatureCoefficient TempCoeff | |
| + parameter Modelica.Units.SI.LinearTemperatureCoefficient TempCoeff | |
| "Temperature coeffient"; | |
| - Modelica.SIunits.Power PowerPV | |
| + Modelica.Units.SI.Power PowerPV | |
| "Power of PV panels"; | |
| - Modelica.SIunits.Efficiency EtaVar | |
| + Modelica.Units.SI.Efficiency EtaVar | |
| "Efficiency of PV cell"; | |
| - Modelica.SIunits.Temp_K TCell | |
| + Modelica.Units.SI.Temperature TCell | |
| "Cell temperature"; | |
| Modelica.Blocks.Interfaces.RealOutput DCOutputPower( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Electrical/PVSystem/PVSystemTMY3.mo" "converted-libraries/AixLib 0.9.1-master/Electrical/PVSystem/PVSystemTMY3.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Electrical/PVSystem/PVSystemTMY3.mo" 2021-03-15 12:05:56.607860830 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Electrical/PVSystem/PVSystemTMY3.mo" 2021-04-26 11:51:15.102630560 +0200 | |
| @@ -2,15 +2,15 @@ | |
| model PVSystemTMY3 | |
| extends BaseClasses.PartialPVSystem; | |
| - parameter Modelica.SIunits.Angle Latitude = 0.65798912800186 | |
| + parameter Modelica.Units.SI.Angle Latitude = 0.65798912800186 | |
| "Location's Latitude" | |
| annotation (Dialog(group="Location")); | |
| - parameter Modelica.SIunits.Angle til = 0.34906585039887 | |
| + parameter Modelica.Units.SI.Angle til = 0.34906585039887 | |
| "Surface's tilt angle (0:flat)" | |
| annotation (Dialog(group="Geometry")); | |
| - parameter Modelica.SIunits.Angle azi = -0.78539816339745 | |
| + parameter Modelica.Units.SI.Angle azi = -0.78539816339745 | |
| "Surface's azimut angle (0:South)" | |
| annotation (Dialog(group="Geometry")); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/BaseClasses/EvaporatorCondenserWithCapacity.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/BaseClasses/EvaporatorCondenserWithCapacity.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/BaseClasses/EvaporatorCondenserWithCapacity.mo" 2021-03-15 12:05:56.607860830 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/BaseClasses/EvaporatorCondenserWithCapacity.mo" 2021-04-26 11:51:15.058630499 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.FastHVAC.BaseClasses; | |
| +within AixLib.FastHVAC.BaseClasses; | |
| model EvaporatorCondenserWithCapacity | |
| extends AixLib.FastHVAC.Interfaces.TwoPortHeatMassExchanger( workingFluid(m_fluid=m_fluid, | |
| medium=medium)); | |
| @@ -6,13 +6,13 @@ | |
| annotation (Dialog( descriptionLabel = true),choices(choice=true "Condenser", | |
| choice=false "Evaporator", | |
| radioButtons=true)); | |
| - parameter Modelica.SIunits.Volume V "Volume in condenser"; | |
| + parameter Modelica.Units.SI.Volume V "Volume in condenser"; | |
| parameter Boolean use_cap=true "False if capacity and heat losses are neglected" | |
| annotation (Dialog(group="Heat losses"),choices(checkBox=true)); | |
| - parameter Modelica.SIunits.HeatCapacity C "Capacity of heat exchanger" | |
| + parameter Modelica.Units.SI.HeatCapacity C "Capacity of heat exchanger" | |
| annotation (Dialog(group="Heat losses", enable=use_cap)); | |
| - parameter Modelica.SIunits.Mass m_fluid "Mass of working fluid"; | |
| - parameter Modelica.SIunits.ThermalConductance kAOut_nominal | |
| + parameter Modelica.Units.SI.Mass m_fluid "Mass of working fluid"; | |
| + parameter Modelica.Units.SI.ThermalConductance kAOut_nominal | |
| "Nominal value for thermal conductance to the ambient" | |
| annotation (Dialog(group="Heat losses", enable= | |
| use_cap)); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/BaseClasses/WorkingFluid.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/BaseClasses/WorkingFluid.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/BaseClasses/WorkingFluid.mo" 2021-03-15 12:05:56.607860830 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/BaseClasses/WorkingFluid.mo" 2021-04-26 11:51:15.014630438 +0200 | |
| @@ -3,8 +3,8 @@ | |
| parameter AixLib.FastHVAC.Media.BaseClasses.MediumSimple medium=AixLib.FastHVAC.Media.WaterSimple() | |
| "Mediums charastics (heat capacity, density, thermal conductivity)"; | |
| - parameter Modelica.SIunits.Temperature T0 " Initial temperature"; | |
| - parameter Modelica.SIunits.Mass m_fluid "Mass of working fluid"; | |
| + parameter Modelica.Units.SI.Temperature T0 " Initial temperature"; | |
| + parameter Modelica.Units.SI.Mass m_fluid "Mass of working fluid"; | |
| AixLib.FastHVAC.BaseClasses.EnergyBalance energyBalance | |
| annotation (Placement(transformation(extent={{-34,-30},{26,30}}))); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Chiller/Chiller.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Chiller/Chiller.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Chiller/Chiller.mo" 2021-03-15 12:05:56.607860830 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Chiller/Chiller.mo" 2021-04-26 11:51:14.986630400 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.FastHVAC.Components.Chiller; | |
| +within AixLib.FastHVAC.Components.Chiller; | |
| model Chiller "Base model of FastHVAC Chiller" | |
| import AixLib; | |
| @@ -16,7 +16,7 @@ | |
| parameter Boolean use_autoCalc=false | |
| "Enable automatic estimation of volumes and mass flows?" | |
| annotation(choices(checkBox=true), Dialog(descriptionLabel=true)); | |
| - parameter Modelica.SIunits.Power Q_useNominal(start=0) | |
| + parameter Modelica.Units.SI.Power Q_useNominal(start=0) | |
| "Nominal usable heat flow of the thermal machine (HP: Heating; Chiller: Cooling)" | |
| annotation (Dialog(enable=use_autoCalc)); | |
| replaceable model PerDataMainChi = | |
| @@ -31,7 +31,7 @@ | |
| parameter Boolean use_refIne=true "Consider the inertia of the refrigerant cycle" | |
| annotation(choices(checkBox=true), Dialog( | |
| group="Refrigerant inertia")); | |
| - parameter Modelica.SIunits.Frequency refIneFre_constant | |
| + parameter Modelica.Units.SI.Frequency refIneFre_constant | |
| "Cut off frequency for inertia of refrigerant cycle" | |
| annotation (Dialog(enable=use_refIne, group="Refrigerant inertia"),Evaluate=true); | |
| parameter Integer nthOrder=3 "Order of refrigerant cycle interia" annotation (Dialog(enable= | |
| @@ -40,12 +40,12 @@ | |
| annotation(choices(checkBox=true), Dialog(group="Input Connectors")); | |
| //Condenser | |
| - parameter Modelica.SIunits.MassFlowRate mFlow_conNominal | |
| + parameter Modelica.Units.SI.MassFlowRate mFlow_conNominal | |
| "Nominal mass flow rate" | |
| annotation (Dialog(group="Parameters", tab="Condenser"),Evaluate=true); | |
| - parameter Modelica.SIunits.Volume VCon "Volume in condenser" | |
| + parameter Modelica.Units.SI.Volume VCon "Volume in condenser" | |
| annotation (Evaluate=true,Dialog(group="Parameters", tab="Condenser")); | |
| - parameter Modelica.SIunits.Mass m_fluidCon = VCon_final * con.medium.rho "Mass of working fluid"; | |
| + parameter Modelica.Units.SI.Mass m_fluidCon = VCon_final * con.medium.rho "Mass of working fluid"; | |
| parameter Real deltaM_con=0.1 | |
| "Fraction of nominal mass flow rate where transition to turbulent occurs" | |
| annotation (Dialog(tab="Condenser", group="Flow resistance")); | |
| @@ -53,25 +53,25 @@ | |
| "If heat losses at capacitor side are considered or not" | |
| annotation (Dialog(group="Heat Losses", tab="Condenser"), | |
| choices(checkBox=true)); | |
| - parameter Modelica.SIunits.HeatCapacity CCon | |
| + parameter Modelica.Units.SI.HeatCapacity CCon | |
| "Heat capacity of Condenser (= cp*m)" annotation (Evaluate=true,Dialog(group="Heat Losses", | |
| tab="Condenser", | |
| enable=use_ConCap)); | |
| - parameter Modelica.SIunits.ThermalConductance GCon | |
| + parameter Modelica.Units.SI.ThermalConductance GCon | |
| "Constant thermal conductance of condenser material" | |
| annotation (Evaluate=true,Dialog(group="Heat Losses", tab="Condenser", | |
| enable=use_ConCap)); | |
| - parameter Modelica.SIunits.ThermalConductance GConIns | |
| + parameter Modelica.Units.SI.ThermalConductance GConIns | |
| "Constant thermal conductance of condenser material" | |
| annotation (Evaluate=true,Dialog(group="Heat Losses", tab="Condenser", | |
| enable=use_ConCap)); | |
| //Evaporator | |
| - parameter Modelica.SIunits.MassFlowRate mFlow_evaNominal | |
| + parameter Modelica.Units.SI.MassFlowRate mFlow_evaNominal | |
| "Nominal mass flow rate" annotation (Dialog(group="Parameters", tab="Evaporator"),Evaluate=true); | |
| - parameter Modelica.SIunits.Volume VEva "Volume in evaporator" | |
| + parameter Modelica.Units.SI.Volume VEva "Volume in evaporator" | |
| annotation (Evaluate=true,Dialog(group="Parameters", tab="Evaporator")); | |
| - parameter Modelica.SIunits.Mass m_fluidEva = VEva_final * eva.medium.rho "Mass of working fluid"; | |
| + parameter Modelica.Units.SI.Mass m_fluidEva = VEva_final * eva.medium.rho "Mass of working fluid"; | |
| parameter Real deltaM_eva=0.1 | |
| "Fraction of nominal mass flow rate where transition to turbulent occurs" | |
| annotation (Dialog(tab="Evaporator", group="Flow resistance")); | |
| @@ -79,15 +79,15 @@ | |
| "If heat losses at capacitor side are considered or not" | |
| annotation (Dialog(group="Heat Losses", tab="Evaporator"), | |
| choices(checkBox=true)); | |
| - parameter Modelica.SIunits.HeatCapacity CEva | |
| + parameter Modelica.Units.SI.HeatCapacity CEva | |
| "Heat capacity of Evaporator (= cp*m)" | |
| annotation (Evaluate=true,Dialog(group="Heat Losses", tab="Evaporator", | |
| enable=use_EvaCap)); | |
| - parameter Modelica.SIunits.ThermalConductance GEva | |
| + parameter Modelica.Units.SI.ThermalConductance GEva | |
| "Constant thermal conductance of Evaporator material" | |
| annotation (Evaluate=true,Dialog(group="Heat Losses", tab="Evaporator", | |
| enable=use_EvaCap)); | |
| - parameter Modelica.SIunits.ThermalConductance GEvaIns | |
| + parameter Modelica.Units.SI.ThermalConductance GEvaIns | |
| "Constant thermal conductance of Evaporator material" | |
| annotation (Evaluate=true,Dialog(group="Heat Losses", tab="Evaporator", | |
| enable=use_EvaCap)); | |
| @@ -102,15 +102,15 @@ | |
| parameter Boolean transferHeat=true | |
| "If true, temperature T converges towards TAmb when no flow" | |
| annotation (Dialog(tab="Assumptions", group="Temperature sensors"),choices(checkBox=true)); | |
| - parameter Modelica.SIunits.Time tauHeaTra=1200 | |
| + parameter Modelica.Units.SI.Time tauHeaTra=1200 | |
| "Time constant for heat transfer in temperature sensors, default 20 minutes" | |
| annotation (Dialog(tab="Assumptions", group="Temperature sensors"),Evaluate=true); | |
| - parameter Modelica.SIunits.Temperature TAmbCon_nominal=291.15 | |
| + parameter Modelica.Units.SI.Temperature TAmbCon_nominal=291.15 | |
| "Fixed ambient temperature for heat transfer of sensors at the condenser side" annotation ( Dialog(tab= | |
| "Assumptions", group= | |
| "Condenser")); | |
| - parameter Modelica.SIunits.Temperature TAmbEva_nominal=273.15 | |
| + parameter Modelica.Units.SI.Temperature TAmbEva_nominal=273.15 | |
| "Fixed ambient temperature for heat transfer of sensors at the evaporator side" | |
| annotation ( Dialog(tab="Assumptions",group="Evaporator")); | |
| //Initialization | |
| @@ -297,19 +297,19 @@ | |
| //Automatic calculation of mass flow rates and volumes of the evaporator and condenser using linear regressions from data sheets of heat pumps and chillers (water to water) | |
| protected | |
| parameter Boolean machineType=false "=true if heat pump; =false if chiller"; | |
| - parameter Modelica.SIunits.MassFlowRate autoCalc_mFlow_min = 0.3 "Realistic mass flow minimum for simulation plausibility"; | |
| - parameter Modelica.SIunits.Volume autoCalc_Vmin = 0.003 "Realistic volume minimum for simulation plausibility"; | |
| - parameter Modelica.SIunits.MassFlowRate autoCalc_mFlow_eva = if machineType then max(0.00004*Q_useNominal - 0.3177, autoCalc_mFlow_min) else max(0.00005*Q_useNominal - 0.5662, autoCalc_mFlow_min); | |
| - parameter Modelica.SIunits.MassFlowRate autoCalc_mFlow_con = if machineType then max(0.00004*Q_useNominal - 0.6162, autoCalc_mFlow_min) else max(0.00005*Q_useNominal + 0.3161, autoCalc_mFlow_min); | |
| - parameter Modelica.SIunits.MassFlowRate mFlow_evaNominal_final=if use_autoCalc then autoCalc_mFlow_eva else mFlow_evaNominal; | |
| - parameter Modelica.SIunits.MassFlowRate mFlow_conNominal_final=if use_autoCalc then autoCalc_mFlow_con else mFlow_conNominal; | |
| - parameter Modelica.SIunits.Volume autoCalc_VEva = if machineType then max(0.0000001*Q_useNominal - 0.0075, autoCalc_Vmin) else max(0.0000001*Q_useNominal - 0.0066, autoCalc_Vmin); | |
| - parameter Modelica.SIunits.Volume autoCalc_VCon = if machineType then max(0.0000001*Q_useNominal - 0.0094, autoCalc_Vmin) else max(0.0000002*Q_useNominal - 0.0084, autoCalc_Vmin); | |
| - parameter Modelica.SIunits.Volume VEva_final=if use_autoCalc then autoCalc_VEva else VEva; | |
| - parameter Modelica.SIunits.Volume VCon_final=if use_autoCalc then autoCalc_VCon else VCon; | |
| + parameter Modelica.Units.SI.MassFlowRate autoCalc_mFlow_min = 0.3 "Realistic mass flow minimum for simulation plausibility"; | |
| + parameter Modelica.Units.SI.Volume autoCalc_Vmin = 0.003 "Realistic volume minimum for simulation plausibility"; | |
| + parameter Modelica.Units.SI.MassFlowRate autoCalc_mFlow_eva = if machineType then max(0.00004*Q_useNominal - 0.3177, autoCalc_mFlow_min) else max(0.00005*Q_useNominal - 0.5662, autoCalc_mFlow_min); | |
| + parameter Modelica.Units.SI.MassFlowRate autoCalc_mFlow_con = if machineType then max(0.00004*Q_useNominal - 0.6162, autoCalc_mFlow_min) else max(0.00005*Q_useNominal + 0.3161, autoCalc_mFlow_min); | |
| + parameter Modelica.Units.SI.MassFlowRate mFlow_evaNominal_final=if use_autoCalc then autoCalc_mFlow_eva else mFlow_evaNominal; | |
| + parameter Modelica.Units.SI.MassFlowRate mFlow_conNominal_final=if use_autoCalc then autoCalc_mFlow_con else mFlow_conNominal; | |
| + parameter Modelica.Units.SI.Volume autoCalc_VEva = if machineType then max(0.0000001*Q_useNominal - 0.0075, autoCalc_Vmin) else max(0.0000001*Q_useNominal - 0.0066, autoCalc_Vmin); | |
| + parameter Modelica.Units.SI.Volume autoCalc_VCon = if machineType then max(0.0000001*Q_useNominal - 0.0094, autoCalc_Vmin) else max(0.0000002*Q_useNominal - 0.0084, autoCalc_Vmin); | |
| + parameter Modelica.Units.SI.Volume VEva_final=if use_autoCalc then autoCalc_VEva else VEva; | |
| + parameter Modelica.Units.SI.Volume VCon_final=if use_autoCalc then autoCalc_VCon else VCon; | |
| equation | |
| //Control and feedback for the auto-calculation of condenser and evaporator data | |
| assert(not use_autoCalc or (use_autoCalc and Q_useNominal>0), "Can't auto-calculate evaporator and condenser data without a given nominal power flow (Q_useNominal)!", | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatExchangers/BaseClasses/ML_thermal_delta.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatExchangers/BaseClasses/ML_thermal_delta.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatExchangers/BaseClasses/ML_thermal_delta.mo" 2021-03-15 12:05:56.607860830 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatExchangers/BaseClasses/ML_thermal_delta.mo" 2021-04-26 11:51:14.834630189 +0200 | |
| @@ -12,48 +12,48 @@ | |
| FastHVAC.Media.WaterSimple() | |
| "Standard charastics for fluid (heat capacity, density, thermal conductivity)"; | |
| - parameter Modelica.SIunits.Mass m_radiator=20; | |
| + parameter Modelica.Units.SI.Mass m_radiator=20; | |
| parameter calcT.Temp calc_dT | |
| "Select calculation method of excess temperature"; | |
| parameter AixLib.Fluid.HeatExchangers.Radiators.BaseClasses.RadiatorTypes.RadiatorType | |
| Type | |
| "Type of radiator" annotation (choicesAllMatching=true, Dialog(tab="Geometry and Material", group="Geometry")); | |
| parameter Real n=1.3 annotation (Dialog(tab="Geometry and Material", group="Geometry")); | |
| - parameter Modelica.SIunits.Density densitySteel=densitySteel | |
| + parameter Modelica.Units.SI.Density densitySteel=densitySteel | |
| "Specific density of steel, in kg/m3" | |
| annotation (Dialog(tab="Geometry and Material", group="Material")); | |
| // parameter Modelica.SIunits.Density densityWater=densityWater | |
| // "Specific density of Water, in kg/m3"; | |
| - parameter Modelica.SIunits.SpecificHeatCapacity capacitySteel=capacitySteel | |
| + parameter Modelica.Units.SI.SpecificHeatCapacity capacitySteel=capacitySteel | |
| "Specific heat capacity of steel, in J/kgK" | |
| annotation (Dialog(tab="Geometry and Material", group="Material")); | |
| // parameter Modelica.SIunits.SpecificHeatCapacity capacityWater=capacityWater | |
| // "Specific heat capacity of Water, in J/kgK"; | |
| - parameter Modelica.SIunits.ThermalConductivity lambdaSteel=lambdaSteel | |
| + parameter Modelica.Units.SI.ThermalConductivity lambdaSteel=lambdaSteel | |
| "Thermal conductivity of steel, in W/mK" | |
| annotation (Dialog(tab="Geometry and Material", group="Material")); | |
| - parameter Modelica.SIunits.Length length=1.05 "Length of radiator, in m" | |
| + parameter Modelica.Units.SI.Length length=1.05 "Length of radiator, in m" | |
| annotation (Dialog(tab="Geometry and Material", group="Geometry")); | |
| - parameter Modelica.SIunits.Temperature T0=Modelica.SIunits.Conversions.from_degC(55) | |
| + parameter Modelica.Units.SI.Temperature T0=Modelica.Units.Conversions.from_degC(55) | |
| "Initial temperature, in Kelvin" | |
| annotation (Dialog(group="Miscellaneous")); | |
| - parameter Modelica.SIunits.Volume vol_water=0.0001; | |
| + parameter Modelica.Units.SI.Volume vol_water=0.0001; | |
| parameter Real s_eff=Type[1]; | |
| parameter Real dotQ_nomLayer=100 "Nominal power of single layer"; | |
| - parameter Modelica.SIunits.Temperature dT_nom=50 "Nominal access temperature"; | |
| - parameter Modelica.SIunits.Temperature delta_nom=50 | |
| + parameter Modelica.Units.SI.Temperature dT_nom=50 "Nominal access temperature"; | |
| + parameter Modelica.Units.SI.Temperature delta_nom=50 | |
| "Nominal Radiation temperature"; | |
| - parameter Modelica.SIunits.Emissivity eps=0.95 "Emissivity"; | |
| - parameter Modelica.SIunits.Area A=1 "Area of radiator layer"; | |
| - parameter Modelica.SIunits.Length d=0.025 "Thickness of radiator wall"; | |
| - | |
| - Modelica.SIunits.Temperature Tin; | |
| - Modelica.SIunits.Temperature Tout; | |
| - Modelica.SIunits.Temperature Trad; | |
| - Modelica.SIunits.Temperature Tair; | |
| + parameter Modelica.Units.SI.Emissivity eps=0.95 "Emissivity"; | |
| + parameter Modelica.Units.SI.Area A=1 "Area of radiator layer"; | |
| + parameter Modelica.Units.SI.Length d=0.025 "Thickness of radiator wall"; | |
| + | |
| + Modelica.Units.SI.Temperature Tin; | |
| + Modelica.Units.SI.Temperature Tout; | |
| + Modelica.Units.SI.Temperature Trad; | |
| + Modelica.Units.SI.Temperature Tair; | |
| Real dT_V; | |
| Real dT_R; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatExchangers/BaseClasses/PseudoRadiator.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatExchangers/BaseClasses/PseudoRadiator.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatExchangers/BaseClasses/PseudoRadiator.mo" 2021-03-15 12:05:56.607860830 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatExchangers/BaseClasses/PseudoRadiator.mo" 2021-04-26 11:51:14.786630123 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.FastHVAC.Components.HeatExchangers.BaseClasses; | |
| +within AixLib.FastHVAC.Components.HeatExchangers.BaseClasses; | |
| model PseudoRadiator | |
| /* ******************************************************************* | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatExchangers/DHWHeatExchanger.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatExchangers/DHWHeatExchanger.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatExchangers/DHWHeatExchanger.mo" 2021-03-15 12:05:56.607860830 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatExchangers/DHWHeatExchanger.mo" 2021-04-26 11:51:14.770630102 +0200 | |
| @@ -16,21 +16,21 @@ | |
| ******************************************************************* */ | |
| public | |
| - parameter Modelica.SIunits.Area A_HE=2 "Area of the heat exchanger "; | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer k_HE=1500 | |
| + parameter Modelica.Units.SI.Area A_HE=2 "Area of the heat exchanger "; | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer k_HE=1500 | |
| "Thermal transmission coefficient"; | |
| - parameter Modelica.SIunits.Temperature T_inlet_DHW=283.15 | |
| + parameter Modelica.Units.SI.Temperature T_inlet_DHW=283.15 | |
| "DHW Temperature at inlet"; | |
| - parameter Modelica.SIunits.Temperature T_set_DHW_ideal=333.15 | |
| + parameter Modelica.Units.SI.Temperature T_set_DHW_ideal=333.15 | |
| "DHW set temperature"; | |
| parameter Integer n(min=3) = 5 | |
| "Number of segments the heat exchanger is separated to"; | |
| - parameter Modelica.SIunits.Mass m_heater=10 | |
| + parameter Modelica.Units.SI.Mass m_heater=10 | |
| "How much fluid is inside the heat exchanger at the side of the heater"; | |
| - parameter Modelica.SIunits.Mass m_DHW=10 | |
| + parameter Modelica.Units.SI.Mass m_DHW=10 | |
| "How much fluid is inside the heat exchanger at the side of the DHW"; | |
| - Modelica.SIunits.HeatFlowRate dotQ; | |
| - parameter Modelica.SIunits.Temperature T0=Modelica.SIunits.Conversions.from_degC(20) | |
| + Modelica.Units.SI.HeatFlowRate dotQ; | |
| + parameter Modelica.Units.SI.Temperature T0=Modelica.Units.Conversions.from_degC(20) | |
| "Initial temperature, in degrees Celsius"; | |
| /* ******************************************************************* | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatExchangers/MultiRadiator.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatExchangers/MultiRadiator.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatExchangers/MultiRadiator.mo" 2021-03-15 12:05:56.607860830 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatExchangers/MultiRadiator.mo" 2021-04-26 11:51:14.742630063 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.FastHVAC.Components.HeatExchangers; | |
| +within AixLib.FastHVAC.Components.HeatExchangers; | |
| model MultiRadiator "Simple multi radiator model" | |
| /* ******************************************************************* | |
| @@ -15,9 +15,9 @@ | |
| annotation (choicesAllMatching); | |
| protected | |
| - parameter Modelica.SIunits.SpecificHeatCapacityAtConstantPressure capacityWater=medium.c | |
| + parameter Modelica.Units.SI.SpecificHeatCapacityAtConstantPressure capacityWater=medium.c | |
| "Heat capacity of medium"; | |
| - parameter Modelica.SIunits.Density densityWater=medium.rho | |
| + parameter Modelica.Units.SI.Density densityWater=medium.rho | |
| "density of medium"; | |
| /* ******************************************************************* | |
| Components | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatExchangers/RadiatorMultiLayer.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatExchangers/RadiatorMultiLayer.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatExchangers/RadiatorMultiLayer.mo" 2021-03-15 12:05:56.607860830 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatExchangers/RadiatorMultiLayer.mo" 2021-04-26 11:51:14.710630018 +0200 | |
| @@ -1,259 +1,117 @@ | |
| -within AixLib.FastHVAC.Components.HeatExchangers; | |
| -model RadiatorMultiLayer "Simple radiator multilayer model" | |
| - import Modelica.SIunits; | |
| - import calcT = | |
| - AixLib.Fluid.HeatExchangers.Radiators.BaseClasses.CalcExcessTemp; | |
| - | |
| - parameter AixLib.FastHVAC.Media.BaseClasses.MediumSimple medium= AixLib.FastHVAC.Media.WaterSimple() | |
| - "Standard charastics for water (heat capacity, density, thermal conductivity)" | |
| - annotation (choicesAllMatching); | |
| +within AixLib.FastHVAC.Components.HeatExchangers; | |
| +model RadiatorMultiLayer "Simple radiator multilayer model" | |
| + import Modelica.Units.SI; | |
| + import calcT = AixLib.Fluid.HeatExchangers.Radiators.BaseClasses.CalcExcessTemp; | |
| + parameter AixLib.FastHVAC.Media.BaseClasses.MediumSimple medium = AixLib.FastHVAC.Media.WaterSimple() "Standard charastics for water (heat capacity, density, thermal conductivity)" annotation( | |
| + choicesAllMatching); | |
| /* ******************************************************************* | |
| - Radiator Multilayer Parameters | |
| - ******************************************************************* */ | |
| - | |
| - parameter Boolean selectable=false "Radiator record" annotation(Dialog(group="Radiator Data")); | |
| - parameter AixLib.DataBase.Radiators.RadiatorBaseDataDefinition radiatorType | |
| - "Choose a radiator" annotation (Dialog(group="Radiator Data", enable= | |
| - selectable), choicesAllMatching=true); | |
| - parameter | |
| - AixLib.Fluid.HeatExchangers.Radiators.BaseClasses.RadiatorTypes.RadiatorType | |
| - Type=(if selectable then | |
| - radiatorType.Type else AixLib.Fluid.HeatExchangers.Radiators.BaseClasses.RadiatorTypes.PanelRadiator10) | |
| - "Type of radiator" annotation (choicesAllMatching=true, Dialog( | |
| - tab="Geometry and Material", | |
| - group="Geometry", | |
| - enable=not selectable)); | |
| - parameter Real nominalPower=(if selectable then radiatorType.NominalPower else 1000) | |
| - "Nominal power of radiator per meter at nominal temperatures in W/m" | |
| - annotation (Dialog(tab="Geometry and Material", group="Geometry", enable=not selectable)); | |
| - parameter Real exponent=(if selectable then radiatorType.Exponent else 1.29) | |
| - annotation (Dialog(tab="Geometry and Material", group="Geometry", enable=not selectable)); | |
| - parameter SIunits.Length length=(if selectable then radiatorType.length else 1) | |
| - "Length of radiator, in m" | |
| - annotation (Dialog(tab="Geometry and Material", group="Geometry", enable=not selectable)); | |
| - parameter SIunits.Length height=(if selectable then radiatorType.height else 0.6) | |
| - "Height of raditor, in m" | |
| - annotation (Dialog(tab="Geometry and Material", group="Geometry", enable=not selectable)); | |
| - parameter Modelica.SIunits.Area A=2*length*height | |
| - annotation (Dialog(tab="Geometry and Material", group="Material")); | |
| - parameter Modelica.SIunits.Length d=0.025 "Thickness of radiator wall" | |
| - annotation (Dialog(tab="Geometry and Material", group="Material")); | |
| - parameter Modelica.SIunits.Emissivity eps=0.95 "Emissivity" | |
| - annotation (Dialog(tab="Geometry and Material", group="Material")); | |
| - | |
| + Radiator Multilayer Parameters | |
| + ******************************************************************* */ | |
| + parameter Boolean selectable = false "Radiator record" annotation( | |
| + Dialog(group = "Radiator Data")); | |
| + parameter AixLib.DataBase.Radiators.RadiatorBaseDataDefinition radiatorType "Choose a radiator" annotation( | |
| + Dialog(group = "Radiator Data", enable = selectable), | |
| + choicesAllMatching = true); | |
| + parameter AixLib.Fluid.HeatExchangers.Radiators.BaseClasses.RadiatorTypes.RadiatorType Type = if selectable then radiatorType.Type else AixLib.Fluid.HeatExchangers.Radiators.BaseClasses.RadiatorTypes.PanelRadiator10 "Type of radiator" annotation( | |
| + choicesAllMatching = true, | |
| + Dialog(tab = "Geometry and Material", group = "Geometry", enable = not selectable)); | |
| + parameter Real nominalPower = if selectable then radiatorType.NominalPower else 1000 "Nominal power of radiator per meter at nominal temperatures in W/m" annotation( | |
| + Dialog(tab = "Geometry and Material", group = "Geometry", enable = not selectable)); | |
| + parameter Real exponent = if selectable then radiatorType.Exponent else 1.29 annotation( | |
| + Dialog(tab = "Geometry and Material", group = "Geometry", enable = not selectable)); | |
| + parameter SIunits.Length length = if selectable then radiatorType.length else 1 "Length of radiator, in m" annotation( | |
| + Dialog(tab = "Geometry and Material", group = "Geometry", enable = not selectable)); | |
| + parameter SIunits.Length height = if selectable then radiatorType.height else 0.6 "Height of raditor, in m" annotation( | |
| + Dialog(tab = "Geometry and Material", group = "Geometry", enable = not selectable)); | |
| + parameter Modelica.Units.SI.Area A = 2 * length * height annotation( | |
| + Dialog(tab = "Geometry and Material", group = "Material")); | |
| + parameter Modelica.Units.SI.Length d = 0.025 "Thickness of radiator wall" annotation( | |
| + Dialog(tab = "Geometry and Material", group = "Material")); | |
| + parameter Modelica.Units.SI.Emissivity eps = 0.95 "Emissivity" annotation( | |
| + Dialog(tab = "Geometry and Material", group = "Material")); | |
| /* *********Water And Steel Parameters**********************************/ | |
| - parameter Real volumeWater( unit="l/m")=(if selectable then radiatorType.VolumeWater else 20) | |
| - "Water volume inside radiator per m, in l/m" | |
| - annotation (Dialog(tab="Geometry and Material", group="Geometry", enable=not selectable)); | |
| - parameter Modelica.SIunits.LinearDensity massSteel=(if selectable then radiatorType.MassSteel else 30) | |
| - "Material mass of radiator per m, in kg/m" | |
| - annotation (Dialog(tab="Geometry and Material", group="Geometry", enable=not selectable)); | |
| - parameter SIunits.Density densitySteel=(if selectable then radiatorType.DensitySteel else 7900) | |
| - "Specific density of steel, in kg/m3" | |
| - annotation (Dialog(tab="Geometry and Material", group="Material", enable=not selectable)); | |
| - | |
| - parameter SIunits.SpecificHeatCapacity capacitySteel=(if selectable then radiatorType.CapacitySteel else 551) | |
| - "Specific heat capacity of steel, in J/kgK" | |
| - annotation (Dialog(tab="Geometry and Material", group="Material", enable=not selectable)); | |
| - | |
| - parameter SIunits.ThermalConductivity lambdaSteel=(if selectable then radiatorType.LambdaSteel else 60) | |
| - "Thermal conductivity of steel, in W/mK" | |
| - annotation (Dialog(tab="Geometry and Material", group="Material", enable=not selectable)); | |
| - parameter SIunits.Temperature T0=Modelica.SIunits.Conversions.from_degC(20) | |
| - "Initial temperature, in degrees Celsius" | |
| - annotation (Dialog(group="Miscellaneous")); | |
| - parameter SIunits.Temperature RT_nom[3]= | |
| - (if selectable then Modelica.SIunits.Conversions.from_degC(radiatorType.RT_nom) | |
| - else Modelica.SIunits.Conversions.from_degC({75,65,20})) | |
| - "Nominal temperatures (TIn, TOut, TAir) according to DIN-EN 442." | |
| - annotation (Dialog(group="Miscellaneous",enable=not selectable)); | |
| - parameter Integer N=16 "Number of discretisation layers"; | |
| - parameter AixLib.Fluid.HeatExchangers.Radiators.BaseClasses.CalcExcessTemp.Temp | |
| - calc_dT=calcT.exp | |
| - "Select calculation method"; | |
| + parameter Real volumeWater(unit = "l/m") = if selectable then radiatorType.VolumeWater else 20 "Water volume inside radiator per m, in l/m" annotation( | |
| + Dialog(tab = "Geometry and Material", group = "Geometry", enable = not selectable)); | |
| + parameter Modelica.Units.SI.LinearDensity massSteel = if selectable then radiatorType.MassSteel else 30 "Material mass of radiator per m, in kg/m" annotation( | |
| + Dialog(tab = "Geometry and Material", group = "Geometry", enable = not selectable)); | |
| + parameter SIunits.Density densitySteel = if selectable then radiatorType.DensitySteel else 7900 "Specific density of steel, in kg/m3" annotation( | |
| + Dialog(tab = "Geometry and Material", group = "Material", enable = not selectable)); | |
| + parameter SIunits.SpecificHeatCapacity capacitySteel = if selectable then radiatorType.CapacitySteel else 551 "Specific heat capacity of steel, in J/kgK" annotation( | |
| + Dialog(tab = "Geometry and Material", group = "Material", enable = not selectable)); | |
| + parameter SIunits.ThermalConductivity lambdaSteel = if selectable then radiatorType.LambdaSteel else 60 "Thermal conductivity of steel, in W/mK" annotation( | |
| + Dialog(tab = "Geometry and Material", group = "Material", enable = not selectable)); | |
| + parameter SIunits.Temperature T0 = Modelica.Units.Conversions.from_degC(20) "Initial temperature, in degrees Celsius" annotation( | |
| + Dialog(group = "Miscellaneous")); | |
| + parameter SIunits.Temperature RT_nom[3] = if selectable then Modelica.Units.Conversions.from_degC(radiatorType.RT_nom) else Modelica.Units.Conversions.from_degC({75, 65, 20}) "Nominal temperatures (TIn, TOut, TAir) according to DIN-EN 442." annotation( | |
| + Dialog(group = "Miscellaneous", enable = not selectable)); | |
| + parameter Integer N = 16 "Number of discretisation layers"; | |
| + parameter AixLib.Fluid.HeatExchangers.Radiators.BaseClasses.CalcExcessTemp.Temp calc_dT = calcT.exp "Select calculation method"; | |
| /* *********Select calculation method**********************************/ | |
| -// | |
| -// protected | |
| -// parameter SIunits.SpecificHeatCapacity capacityWater = medium.c | |
| -// "Specific heat capacity of Water, in J/kgK"; | |
| -// parameter SIunits.Density densityWater=medium.rho | |
| -// "Specific density of water, in kg/m3"; | |
| - | |
| + // | |
| + // protected | |
| + // parameter SIunits.SpecificHeatCapacity capacityWater = medium.c | |
| + // "Specific heat capacity of Water, in J/kgK"; | |
| + // parameter SIunits.Density densityWater=medium.rho | |
| + // "Specific density of water, in kg/m3"; | |
| SIunits.Temperature TV_1; | |
| SIunits.Temperature TR_N; | |
| protected | |
| - parameter Modelica.SIunits.Temperature T0_N[N]= {(T0-ki*0.2) for ki in 1:N}; | |
| - parameter SIunits.Volume vol_water=(length*volumeWater/1000)/N; | |
| - parameter SIunits.Volume vol_steel=(length*massSteel) / densitySteel /N | |
| - annotation (Dialog(tab="Geometry and Material", group="Geometry")); | |
| - | |
| - parameter SIunits.Length d1=2*(vol_water/Modelica.Constants.pi/length)^0.5 | |
| - "inner diameter of single layer"; | |
| - parameter SIunits.Length d2=2*((vol_water+vol_steel)/Modelica.Constants.pi/length)^0.5 | |
| - "outer diameter of single layer"; | |
| - | |
| - parameter Modelica.SIunits.TemperatureDifference dT_V_nom=RT_nom[1]-RT_nom[3] | |
| - "Temperature difference between the nominal temperatures Tin and Tair"; | |
| - parameter Modelica.SIunits.TemperatureDifference dT_R_nom=RT_nom[2]-RT_nom[3] | |
| - "Temperature difference between the nominal temperatures Tout and Tair"; | |
| - | |
| + parameter Modelica.Units.SI.Temperature T0_N[N] = {T0 - ki * 0.2 for ki in 1:N}; | |
| + parameter SIunits.Volume vol_water = length * volumeWater / 1000 / N; | |
| + parameter SIunits.Volume vol_steel = length * massSteel / densitySteel / N annotation( | |
| + Dialog(tab = "Geometry and Material", group = "Geometry")); | |
| + parameter SIunits.Length d1 = 2 * (vol_water / Modelica.Constants.pi / length) ^ 0.5 "inner diameter of single layer"; | |
| + parameter SIunits.Length d2 = 2 * ((vol_water + vol_steel) / Modelica.Constants.pi / length) ^ 0.5 "outer diameter of single layer"; | |
| + parameter Modelica.Units.SI.TemperatureDifference dT_V_nom = RT_nom[1] - RT_nom[3] "Temperature difference between the nominal temperatures Tin and Tair"; | |
| + parameter Modelica.Units.SI.TemperatureDifference dT_R_nom = RT_nom[2] - RT_nom[3] "Temperature difference between the nominal temperatures Tout and Tair"; | |
| /* *********Calculation of convective excess temperature, according to the chosen calculation method**********************************/ | |
| - parameter Real dT_nom=if calc_dT==calcT.ari then (dT_V_nom+dT_R_nom)/2 else | |
| - if calc_dT==calcT.log then (dT_V_nom-dT_R_nom)/log(dT_V_nom/dT_R_nom) else | |
| - ((exponent-1)*(dT_V_nom-dT_R_nom)/(dT_R_nom^(1-exponent)-dT_V_nom^(1-exponent)))^(1/exponent) | |
| - "Convective excess temperature"; | |
| - | |
| + parameter Real dT_nom = if calc_dT == calcT.ari then (dT_V_nom + dT_R_nom) / 2 else if calc_dT == calcT.log then (dT_V_nom - dT_R_nom) / log(dT_V_nom / dT_R_nom) else ((exponent - 1) * (dT_V_nom - dT_R_nom) / (dT_R_nom ^ (1 - exponent) - dT_V_nom ^ (1 - exponent))) ^ (1 / exponent) "Convective excess temperature"; | |
| /* *********Calculation of nominal radiation excess temperature**********************************/ | |
| - parameter SIunits.Temperature delta_nom=(dT_nom+RT_nom[3])*(dT_nom+RT_nom[3])*(dT_nom+RT_nom[3])*(dT_nom+RT_nom[3])-RT_nom[3]*RT_nom[3]*RT_nom[3]*RT_nom[3] | |
| - "Nominal radiation excess temperature"; | |
| - parameter SIunits.Power dotQ_nomLayer= length * nominalPower/N | |
| - "Nominal heat flow"; | |
| + parameter SIunits.Temperature delta_nom = (dT_nom + RT_nom[3]) * (dT_nom + RT_nom[3]) * (dT_nom + RT_nom[3]) * (dT_nom + RT_nom[3]) - RT_nom[3] * RT_nom[3] * RT_nom[3] * RT_nom[3] "Nominal radiation excess temperature"; | |
| + parameter SIunits.Power dotQ_nomLayer = length * nominalPower / N "Nominal heat flow"; | |
| /* ******************************************************************* | |
| - Components | |
| - ******************************************************************* */ | |
| - | |
| + Components | |
| + ******************************************************************* */ | |
| public | |
| - BaseClasses.ML_thermal_delta hexRadiator[ | |
| - N]( | |
| - medium=fill(medium, N), | |
| - m_radiator=fill((length*massSteel)/N, N), | |
| - Type=fill(Type, N), | |
| - n=fill(exponent, N), | |
| - densitySteel=fill(densitySteel, N), | |
| - capacitySteel=fill(capacitySteel, N), | |
| - length=fill(length, N), | |
| - T0=T0_N, | |
| - s_eff=fill(Type[1], N), | |
| - dotQ_nomLayer=fill(dotQ_nomLayer, N), | |
| - dT_nom=fill(dT_nom, N), | |
| - delta_nom=fill(delta_nom, N), | |
| - lambdaSteel=fill(lambdaSteel, N), | |
| - eps=fill(eps, N), | |
| - A=fill(A/N, N), | |
| - d=fill(d, N), | |
| - vol_water=fill(vol_water, N), | |
| - calc_dT=fill(calc_dT, N)) | |
| - annotation (Placement(transformation(extent={{-28,-64},{30,12}}))); | |
| -// densityWater=fill(densityWater, N), | |
| -// capacityWater=fill(capacityWater, N), | |
| - Sensors.TemperatureSensor flowTemperature | |
| - annotation (Placement(transformation(extent={{-80,-60},{-60,-40}}))); | |
| - Sensors.TemperatureSensor returnTemperature | |
| - annotation (Placement(transformation(extent={{60,-60},{80,-40}}))); | |
| - Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a | |
| - ConvectiveHeat | |
| - annotation (Placement(transformation(extent={{-64,48},{-44,68}}), | |
| - iconTransformation(extent={{-64,48},{-44,68}}))); | |
| - AixLib.Utilities.Interfaces.RadPort RadiativeHeat annotation (Placement(transformation(extent={{46,50},{66,70}}), iconTransformation(extent={{46,50},{66,70}}))); | |
| - Interfaces.EnthalpyPort_b enthalpyPort_b1 "radiator_Out" annotation ( | |
| - Placement(transformation(extent={{70,-12},{90,8}}), iconTransformation( | |
| - extent={{70,-12},{90,8}}))); | |
| - Interfaces.EnthalpyPort_a enthalpyPort_a1 "radiator_In" annotation (Placement( | |
| - transformation(extent={{-90,-12},{-70,8}}), iconTransformation(extent={{ | |
| - -90,-12},{-70,8}}))); | |
| + BaseClasses.ML_thermal_delta hexRadiator[N](medium = fill(medium, N), m_radiator = fill(length * massSteel / N, N), Type = fill(Type, N), n = fill(exponent, N), densitySteel = fill(densitySteel, N), capacitySteel = fill(capacitySteel, N), length = fill(length, N), T0 = T0_N, s_eff = fill(Type[1], N), dotQ_nomLayer = fill(dotQ_nomLayer, N), dT_nom = fill(dT_nom, N), delta_nom = fill(delta_nom, N), lambdaSteel = fill(lambdaSteel, N), eps = fill(eps, N), A = fill(A / N, N), d = fill(d, N), vol_water = fill(vol_water, N), calc_dT = fill(calc_dT, N)) annotation( | |
| + Placement(transformation(extent = {{-28, -64}, {30, 12}}))); | |
| + // densityWater=fill(densityWater, N), | |
| + // capacityWater=fill(capacityWater, N), | |
| + Sensors.TemperatureSensor flowTemperature annotation( | |
| + Placement(transformation(extent = {{-80, -60}, {-60, -40}}))); | |
| + Sensors.TemperatureSensor returnTemperature annotation( | |
| + Placement(transformation(extent = {{60, -60}, {80, -40}}))); | |
| + Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a ConvectiveHeat annotation( | |
| + Placement(transformation(extent = {{-64, 48}, {-44, 68}}), iconTransformation(extent = {{-64, 48}, {-44, 68}}))); | |
| + AixLib.Utilities.Interfaces.RadPort RadiativeHeat annotation( | |
| + Placement(transformation(extent = {{46, 50}, {66, 70}}), iconTransformation(extent = {{46, 50}, {66, 70}}))); | |
| + Interfaces.EnthalpyPort_b enthalpyPort_b1 "radiator_Out" annotation( | |
| + Placement(transformation(extent = {{70, -12}, {90, 8}}), iconTransformation(extent = {{70, -12}, {90, 8}}))); | |
| + Interfaces.EnthalpyPort_a enthalpyPort_a1 "radiator_In" annotation( | |
| + Placement(transformation(extent = {{-90, -12}, {-70, 8}}), iconTransformation(extent = {{-90, -12}, {-70, 8}}))); | |
| equation | |
| - | |
| - TV_1=hexRadiator[1].Tin; | |
| - TR_N=hexRadiator[N].Tout; | |
| - | |
| + TV_1 = hexRadiator[1].Tin; | |
| + TR_N = hexRadiator[N].Tout; | |
| for i in 1:N loop | |
| connect(hexRadiator[i].Convective, ConvectiveHeat); | |
| connect(hexRadiator[i].Radiative, RadiativeHeat); | |
| end for; | |
| - | |
| - for j in 1:(N-1) loop | |
| - connect(hexRadiator[j].enthalpyPort_b1, hexRadiator[j+1].enthalpyPort_a1); | |
| + for j in 1:N - 1 loop | |
| + connect(hexRadiator[j].enthalpyPort_b1, hexRadiator[j + 1].enthalpyPort_a1); | |
| end for; | |
| - connect(flowTemperature. enthalpyPort_b, hexRadiator[1].enthalpyPort_a1); | |
| - connect(returnTemperature. enthalpyPort_a, hexRadiator[N].enthalpyPort_b1); | |
| - | |
| - connect(flowTemperature.enthalpyPort_a, enthalpyPort_a1) annotation (Line( | |
| - points={{-78.8,-50.1},{-80,-50.1},{-80,-2}}, | |
| - color={176,0,0}, | |
| - smooth=Smooth.None)); | |
| - connect(returnTemperature.enthalpyPort_b, enthalpyPort_b1) annotation (Line( | |
| - points={{79,-50.1},{79,-2},{80,-2}}, | |
| - color={176,0,0}, | |
| - smooth=Smooth.None)); | |
| - annotation (Line( | |
| - points={{-55,-36.1},{-41.5,-36.1},{-41.5,-22.2},{-28,-22.2}}, | |
| - color={176,0,0}, | |
| - smooth=Smooth.None), | |
| - Line( | |
| - points={{30,-22.2},{44,-22.2},{44,-40.12},{57.44,-40.12}}, | |
| - color={176,0,0}, | |
| - smooth=Smooth.None), | |
| - Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100, | |
| - -100},{100,100}})), Icon(coordinateSystem(preserveAspectRatio=false, | |
| - extent={{-100,-100},{100,100}}), graphics={ | |
| - Polygon( | |
| - points={{14,-60},{54,-75},{14,-90},{14,-60}}, | |
| - lineColor={176,0,0}, | |
| - smooth=Smooth.None, | |
| - fillColor={176,0,0}, | |
| - fillPattern=FillPattern.Solid), | |
| - Polygon( | |
| - points={{14,-65},{44,-75},{14,-85},{14,-65}}, | |
| - lineColor={255,255,255}, | |
| - smooth=Smooth.None, | |
| - fillColor={255,255,255}, | |
| - fillPattern=FillPattern.Solid, | |
| - visible=allowFlowReversal), | |
| - Line( | |
| - points={{49,-75},{-66,-75}}, | |
| - color={176,0,0}, | |
| - smooth=Smooth.None), | |
| - Text( | |
| - extent={{-139,-104},{161,-144}}, | |
| - lineColor={0,0,255}, | |
| - textString="%name"), | |
| - Rectangle( | |
| - extent={{-64,72},{-56,-58}}, | |
| - lineColor={95,95,95}, | |
| - fillColor={215,215,215}, | |
| - fillPattern=FillPattern.Solid), | |
| - Rectangle( | |
| - extent={{-44,72},{-36,-58}}, | |
| - lineColor={95,95,95}, | |
| - fillColor={215,215,215}, | |
| - fillPattern=FillPattern.Solid), | |
| - Rectangle( | |
| - extent={{-24,72},{-16,-58}}, | |
| - lineColor={95,95,95}, | |
| - fillColor={215,215,215}, | |
| - fillPattern=FillPattern.Solid), | |
| - Rectangle( | |
| - extent={{-4,72},{4,-58}}, | |
| - lineColor={95,95,95}, | |
| - fillColor={215,215,215}, | |
| - fillPattern=FillPattern.Solid), | |
| - Rectangle( | |
| - extent={{16,72},{24,-58}}, | |
| - lineColor={95,95,95}, | |
| - fillColor={215,215,215}, | |
| - fillPattern=FillPattern.Solid), | |
| - Rectangle( | |
| - extent={{36,72},{44,-58}}, | |
| - lineColor={95,95,95}, | |
| - fillColor={215,215,215}, | |
| - fillPattern=FillPattern.Solid), | |
| - Rectangle( | |
| - extent={{56,72},{64,-58}}, | |
| - lineColor={95,95,95}, | |
| - fillColor={215,215,215}, | |
| - fillPattern=FillPattern.Solid), | |
| - Rectangle( | |
| - extent={{-70,-44},{66,-54}}, | |
| - lineColor={95,95,95}, | |
| - fillColor={230,230,230}, | |
| - fillPattern=FillPattern.Solid), | |
| - Rectangle( | |
| - extent={{-68,66},{68,56}}, | |
| - lineColor={95,95,95}, | |
| - fillColor={230,230,230}, | |
| - fillPattern=FillPattern.Solid)}), | |
| - Documentation(info="<html><h4> | |
| + connect(flowTemperature.enthalpyPort_b, hexRadiator[1].enthalpyPort_a1); | |
| + connect(returnTemperature.enthalpyPort_a, hexRadiator[N].enthalpyPort_b1); | |
| + connect(flowTemperature.enthalpyPort_a, enthalpyPort_a1) annotation( | |
| + Line(points = {{-78.8, -50.1}, {-80, -50.1}, {-80, -2}}, color = {176, 0, 0}, smooth = Smooth.None)); | |
| + connect(returnTemperature.enthalpyPort_b, enthalpyPort_b1) annotation( | |
| + Line(points = {{79, -50.1}, {79, -2}, {80, -2}}, color = {176, 0, 0}, smooth = Smooth.None)); | |
| + annotation( | |
| + Line(points = {{-55, -36.1}, {-41.5, -36.1}, {-41.5, -22.2}, {-28, -22.2}}, color = {176, 0, 0}, smooth = Smooth.None), | |
| + Line(points = {{30, -22.2}, {44, -22.2}, {44, -40.12}, {57.44, -40.12}}, color = {176, 0, 0}, smooth = Smooth.None), | |
| + Diagram(coordinateSystem(preserveAspectRatio = false, extent = {{-100, -100}, {100, 100}})), | |
| + Icon(coordinateSystem(preserveAspectRatio = false, extent = {{-100, -100}, {100, 100}}), graphics = {Polygon(points = {{14, -60}, {54, -75}, {14, -90}, {14, -60}}, lineColor = {176, 0, 0}, smooth = Smooth.None, fillColor = {176, 0, 0}, fillPattern = FillPattern.Solid), Polygon(points = {{14, -65}, {44, -75}, {14, -85}, {14, -65}}, lineColor = {255, 255, 255}, smooth = Smooth.None, fillColor = {255, 255, 255}, fillPattern = FillPattern.Solid, visible = allowFlowReversal), Line(points = {{49, -75}, {-66, -75}}, color = {176, 0, 0}, smooth = Smooth.None), Text(extent = {{-139, -104}, {161, -144}}, lineColor = {0, 0, 255}, textString = "%name"), Rectangle(extent = {{-64, 72}, {-56, -58}}, lineColor = {95, 95, 95}, fillColor = {215, 215, 215}, fillPattern = FillPattern.Solid), Rectangle(extent = {{-44, 72}, {-36, -58}}, lineColor = {95, 95, 95}, fillColor = {215, 215, 215}, fillPattern = FillPattern.Solid), Rectangle(extent = {{-24, 72}, {-16, -58}}, lineColor = {95, 95, 95}, fillColor = {215, 215, 215}, fillPattern = FillPattern.Solid), Rectangle(extent = {{-4, 72}, {4, -58}}, lineColor = {95, 95, 95}, fillColor = {215, 215, 215}, fillPattern = FillPattern.Solid), Rectangle(extent = {{16, 72}, {24, -58}}, lineColor = {95, 95, 95}, fillColor = {215, 215, 215}, fillPattern = FillPattern.Solid), Rectangle(extent = {{36, 72}, {44, -58}}, lineColor = {95, 95, 95}, fillColor = {215, 215, 215}, fillPattern = FillPattern.Solid), Rectangle(extent = {{56, 72}, {64, -58}}, lineColor = {95, 95, 95}, fillColor = {215, 215, 215}, fillPattern = FillPattern.Solid), Rectangle(extent = {{-70, -44}, {66, -54}}, lineColor = {95, 95, 95}, fillColor = {230, 230, 230}, fillPattern = FillPattern.Solid), Rectangle(extent = {{-68, 66}, {68, 56}}, lineColor = {95, 95, 95}, fillColor = {230, 230, 230}, fillPattern = FillPattern.Solid)}), | |
| + Documentation(info = "<html><h4> | |
| <span style=\"color:#008000\">Overview</span> | |
| </h4> | |
| <p> | |
| @@ -855,8 +713,7 @@ | |
| \"AixLib.FastHVAC.Examples.HeatExchangers.RadiatorMultiLayer.ValidationRadiator\"> | |
| ValidationRadiator</a> | |
| </p> | |
| -</html>", | |
| -revisions="<html><ul> | |
| +</html>", revisions = "<html><ul> | |
| <li> | |
| <i>February, 2 2018 </i> David Jansen:<br/> | |
| Formatted documentation | |
| @@ -883,9 +740,6 @@ | |
| </li> | |
| </ul> | |
| </html>"), | |
| - experiment( | |
| - StopTime=864000, | |
| - Interval=30, | |
| - Algorithm="Lsodar"), | |
| + experiment(StopTime = 864000, Interval = 30, Algorithm = "Lsodar"), | |
| experimentSetupOutput); | |
| -end RadiatorMultiLayer; | |
| +end RadiatorMultiLayer; | |
| \ No newline at end of file | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatGenerators/Boiler/Boiler.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatGenerators/Boiler/Boiler.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatGenerators/Boiler/Boiler.mo" 2021-03-15 12:05:56.607860830 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatGenerators/Boiler/Boiler.mo" 2021-04-26 11:51:14.642629924 +0200 | |
| @@ -13,8 +13,8 @@ | |
| "Parameters for Boiler" annotation (Dialog(tab="General", group= | |
| "Boiler type"), choicesAllMatching=true); | |
| - parameter Modelica.SIunits.Temperature T_start= | |
| - Modelica.SIunits.Conversions.from_degC(50) | |
| + parameter Modelica.Units.SI.Temperature T_start= | |
| + Modelica.Units.Conversions.from_degC(50) | |
| "Initial temperature of heat source" annotation (Evaluate=true, | |
| Dialog(tab="General", group="Simulation")); | |
| @@ -28,7 +28,7 @@ | |
| rotation=180, | |
| origin={-3.25,-30}))); | |
| - Modelica.Blocks.Tables.CombiTable1D tableEfficiency( | |
| + Modelica.Blocks.Tables.CombiTable1Dv tableEfficiency( | |
| tableOnFile=false, | |
| table=paramBoiler.eta, | |
| columns={2}, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatGenerators/CHP/CHP_PT1.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatGenerators/CHP/CHP_PT1.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatGenerators/CHP/CHP_PT1.mo" 2021-03-15 12:05:56.607860830 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatGenerators/CHP/CHP_PT1.mo" 2021-04-26 11:51:14.594629858 +0200 | |
| @@ -11,10 +11,10 @@ | |
| FastHVAC.Data.CHP.Ecopower() "Paramter contains data from CHP records" | |
| annotation (Dialog(enable=selectable), choicesAllMatching=true, group="Unit properties"); | |
| - parameter Modelica.SIunits.Efficiency eta_el= 0.25 | |
| + parameter Modelica.Units.SI.Efficiency eta_el= 0.25 | |
| "CHP's electrical efficiency " | |
| annotation (Dialog(group = "Unit properties",enable=not selectable)); | |
| - parameter Modelica.SIunits.Efficiency eta_th = 0.65 | |
| + parameter Modelica.Units.SI.Efficiency eta_th = 0.65 | |
| "CHP's thermal efficiency " | |
| annotation (Dialog(group = "Unit properties",enable=not selectable)); | |
| @@ -23,23 +23,23 @@ | |
| "Standard flow charastics for water (heat capacity, density, thermal conductivity)" annotation (choicesAllMatching); | |
| constant Real LHV(unit="J/kg")=47300000 "Lower heating value [J/kg]"; | |
| protected | |
| - parameter Modelica.SIunits.Volume V_water = 3e-3 | |
| + parameter Modelica.Units.SI.Volume V_water = 3e-3 | |
| "Water volume inside the CHP"; | |
| public | |
| - parameter Modelica.SIunits.Temperature T0=Modelica.SIunits.Conversions.from_degC(20) | |
| + parameter Modelica.Units.SI.Temperature T0=Modelica.Units.Conversions.from_degC(20) | |
| "Initial temperature "; | |
| - parameter Modelica.SIunits.Power capP_el=1000 "CHPs electrical capacity" annotation (Dialog(group = "Unit properties",enable=not selectable)); | |
| + parameter Modelica.Units.SI.Power capP_el=1000 "CHPs electrical capacity" annotation (Dialog(group = "Unit properties",enable=not selectable)); | |
| /* ******************************************************************* | |
| Variables | |
| ******************************************************************* */ | |
| - Modelica.SIunits.Efficiency eff_tot "Total efficiency "; | |
| - Modelica.SIunits.HeatFlowRate Q_th "Thermal power"; | |
| - Modelica.SIunits.MassFlowRate dotm_fuel "Fuel mass flow rate "; | |
| - Modelica.SIunits.HeatFlowRate dotE_fuel "Fuel energy consumption "; | |
| - Modelica.SIunits.Efficiency eff_el "CHP's electrical efficiency "; | |
| - Modelica.SIunits.Efficiency eff_th "CHP's thermal efficiency "; | |
| - Modelica.SIunits.Power P_el "Capacity "; | |
| + Modelica.Units.SI.Efficiency eff_tot "Total efficiency "; | |
| + Modelica.Units.SI.HeatFlowRate Q_th "Thermal power"; | |
| + Modelica.Units.SI.MassFlowRate dotm_fuel "Fuel mass flow rate "; | |
| + Modelica.Units.SI.HeatFlowRate dotE_fuel "Fuel energy consumption "; | |
| + Modelica.Units.SI.Efficiency eff_el "CHP's electrical efficiency "; | |
| + Modelica.Units.SI.Efficiency eff_th "CHP's thermal efficiency "; | |
| + Modelica.Units.SI.Power P_el "Capacity "; | |
| Real sigma( start=0.4) "Nominal power to heat ratio"; | |
| /* ******************************************************************* | |
| @@ -129,8 +129,8 @@ | |
| Q_th = firstOrderQ_th.y; | |
| if onOff and selectable then | |
| - eff_el = param.a_0 + param.a_1*(P_el/1000)^2 + param.a_2*(P_el/1000) + param.a_3*massFlowRate.dotm^2 + param.a_4*massFlowRate.dotm + param.a_5* Modelica.SIunits.Conversions.to_degC(T_return.T)^2 + param.a_6*Modelica.SIunits.Conversions.to_degC(T_return.T); | |
| - eff_th = param.b_0 + param.b_1*(P_el/1000)^2 + param.b_2*(P_el/1000) + param.b_3*massFlowRate.dotm^2 + param.b_4*massFlowRate.dotm + param.b_5* Modelica.SIunits.Conversions.to_degC(T_return.T)^2 + param.b_6*Modelica.SIunits.Conversions.to_degC(T_return.T); | |
| + eff_el = param.a_0 + param.a_1 * (P_el / 1000) ^ 2 + param.a_2 * (P_el / 1000) + param.a_3 * massFlowRate.dotm ^ 2 + param.a_4 * massFlowRate.dotm + param.a_5 * Modelica.Units.Conversions.to_degC(T_return.T) ^ 2 + param.a_6 * Modelica.Units.Conversions.to_degC(T_return.T); | |
| + eff_th = param.b_0 + param.b_1 * (P_el / 1000) ^ 2 + param.b_2 * (P_el / 1000) + param.b_3 * massFlowRate.dotm ^ 2 + param.b_4 * massFlowRate.dotm + param.b_5 * Modelica.Units.Conversions.to_degC(T_return.T) ^ 2 + param.b_6 * Modelica.Units.Conversions.to_degC(T_return.T); | |
| firstOrderQ_th.u = param.P_elRated*P_elRel / sigma; | |
| firstOrderP_el.u=param.P_elRated*P_elRel; | |
| sigma=eff_el/eff_th; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatGenerators/HeatPump/HeatPump.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatGenerators/HeatPump/HeatPump.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatGenerators/HeatPump/HeatPump.mo" 2021-03-15 12:05:56.607860830 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/HeatGenerators/HeatPump/HeatPump.mo" 2021-04-26 11:51:14.482629704 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.FastHVAC.Components.HeatGenerators.HeatPump; | |
| +within AixLib.FastHVAC.Components.HeatGenerators.HeatPump; | |
| model HeatPump "Base model of FastHVAC Heat Pump" | |
| //General | |
| @@ -16,7 +16,7 @@ | |
| parameter Boolean use_autoCalc=false | |
| "Enable automatic estimation of volumes and mass flows?" | |
| annotation(choices(checkBox=true), Dialog(descriptionLabel=true)); | |
| - parameter Modelica.SIunits.Power Q_useNominal(start=0) | |
| + parameter Modelica.Units.SI.Power Q_useNominal(start=0) | |
| "Nominal usable heat flow of the thermal machine (HP: Heating; Chiller: Cooling)" | |
| annotation (Dialog(enable=use_autoCalc)); | |
| replaceable model PerDataHea = | |
| @@ -31,7 +31,7 @@ | |
| parameter Boolean use_refIne=true "Consider the inertia of the refrigerant cycle" | |
| annotation(choices(checkBox=true), Dialog( | |
| group="Refrigerant inertia")); | |
| - parameter Modelica.SIunits.Frequency refIneFre_constant | |
| + parameter Modelica.Units.SI.Frequency refIneFre_constant | |
| "Cut off frequency for inertia of refrigerant cycle" | |
| annotation (Dialog(enable=use_refIne, group="Refrigerant inertia"),Evaluate=true); | |
| parameter Integer nthOrder=3 "Order of refrigerant cycle interia" annotation (Dialog(enable= | |
| @@ -40,12 +40,12 @@ | |
| annotation(choices(checkBox=true), Dialog(group="Input Connectors")); | |
| //Condenser | |
| - parameter Modelica.SIunits.MassFlowRate mFlow_conNominal | |
| + parameter Modelica.Units.SI.MassFlowRate mFlow_conNominal | |
| "Nominal mass flow rate" | |
| annotation (Dialog(group="Parameters", tab="Condenser"),Evaluate=true); | |
| - parameter Modelica.SIunits.Volume VCon "Volume in condenser" | |
| + parameter Modelica.Units.SI.Volume VCon "Volume in condenser" | |
| annotation (Evaluate=true,Dialog(group="Parameters", tab="Condenser")); | |
| - parameter Modelica.SIunits.Mass m_fluidCon = VCon_final * con.medium.rho "Mass of working fluid"; | |
| + parameter Modelica.Units.SI.Mass m_fluidCon = VCon_final * con.medium.rho "Mass of working fluid"; | |
| parameter Real deltaM_con=0.1 | |
| "Fraction of nominal mass flow rate where transition to turbulent occurs" | |
| annotation (Dialog(tab="Condenser", group="Flow resistance")); | |
| @@ -53,25 +53,25 @@ | |
| "If heat losses at capacitor side are considered or not" | |
| annotation (Dialog(group="Heat Losses", tab="Condenser"), | |
| choices(checkBox=true)); | |
| - parameter Modelica.SIunits.HeatCapacity CCon | |
| + parameter Modelica.Units.SI.HeatCapacity CCon | |
| "Heat capacity of Condenser (= cp*m)" annotation (Evaluate=true,Dialog(group="Heat Losses", | |
| tab="Condenser", | |
| enable=use_ConCap)); | |
| - parameter Modelica.SIunits.ThermalConductance GCon | |
| + parameter Modelica.Units.SI.ThermalConductance GCon | |
| "Constant thermal conductance of condenser material" | |
| annotation (Evaluate=true,Dialog(group="Heat Losses", tab="Condenser", | |
| enable=use_ConCap)); | |
| - parameter Modelica.SIunits.ThermalConductance GConIns | |
| + parameter Modelica.Units.SI.ThermalConductance GConIns | |
| "Constant thermal conductance of condenser material" | |
| annotation (Evaluate=true,Dialog(group="Heat Losses", tab="Condenser", | |
| enable=use_ConCap)); | |
| //Evaporator | |
| - parameter Modelica.SIunits.MassFlowRate mFlow_evaNominal | |
| + parameter Modelica.Units.SI.MassFlowRate mFlow_evaNominal | |
| "Nominal mass flow rate" annotation (Dialog(group="Parameters", tab="Evaporator"),Evaluate=true); | |
| - parameter Modelica.SIunits.Volume VEva "Volume in evaporator" | |
| + parameter Modelica.Units.SI.Volume VEva "Volume in evaporator" | |
| annotation (Evaluate=true,Dialog(group="Parameters", tab="Evaporator")); | |
| - parameter Modelica.SIunits.Mass m_fluidEva = VEva_final * eva.medium.rho "Mass of working fluid"; | |
| + parameter Modelica.Units.SI.Mass m_fluidEva = VEva_final * eva.medium.rho "Mass of working fluid"; | |
| parameter Real deltaM_eva=0.1 | |
| "Fraction of nominal mass flow rate where transition to turbulent occurs" | |
| annotation (Dialog(tab="Evaporator", group="Flow resistance")); | |
| @@ -79,15 +79,15 @@ | |
| "If heat losses at capacitor side are considered or not" | |
| annotation (Dialog(group="Heat Losses", tab="Evaporator"), | |
| choices(checkBox=true)); | |
| - parameter Modelica.SIunits.HeatCapacity CEva | |
| + parameter Modelica.Units.SI.HeatCapacity CEva | |
| "Heat capacity of Evaporator (= cp*m)" | |
| annotation (Evaluate=true,Dialog(group="Heat Losses", tab="Evaporator", | |
| enable=use_EvaCap)); | |
| - parameter Modelica.SIunits.ThermalConductance GEva | |
| + parameter Modelica.Units.SI.ThermalConductance GEva | |
| "Constant thermal conductance of Evaporator material" | |
| annotation (Evaluate=true,Dialog(group="Heat Losses", tab="Evaporator", | |
| enable=use_EvaCap)); | |
| - parameter Modelica.SIunits.ThermalConductance GEvaIns | |
| + parameter Modelica.Units.SI.ThermalConductance GEvaIns | |
| "Constant thermal conductance of Evaporator material" | |
| annotation (Evaluate=true,Dialog(group="Heat Losses", tab="Evaporator", | |
| enable=use_EvaCap)); | |
| @@ -102,15 +102,15 @@ | |
| parameter Boolean transferHeat=true | |
| "If true, temperature T converges towards TAmb when no flow" | |
| annotation (Dialog(tab="Assumptions", group="Temperature sensors"),choices(checkBox=true)); | |
| - parameter Modelica.SIunits.Time tauHeaTra=1200 | |
| + parameter Modelica.Units.SI.Time tauHeaTra=1200 | |
| "Time constant for heat transfer in temperature sensors, default 20 minutes" | |
| annotation (Dialog(tab="Assumptions", group="Temperature sensors"),Evaluate=true); | |
| - parameter Modelica.SIunits.Temperature TAmbCon_nominal=291.15 | |
| + parameter Modelica.Units.SI.Temperature TAmbCon_nominal=291.15 | |
| "Fixed ambient temperature for heat transfer of sensors at the condenser side" annotation ( Dialog(tab= | |
| "Assumptions", group= | |
| "Condenser")); | |
| - parameter Modelica.SIunits.Temperature TAmbEva_nominal=273.15 | |
| + parameter Modelica.Units.SI.Temperature TAmbEva_nominal=273.15 | |
| "Fixed ambient temperature for heat transfer of sensors at the evaporator side" | |
| annotation ( Dialog(tab="Assumptions",group="Evaporator")); | |
| //Initialization | |
| @@ -299,18 +299,18 @@ | |
| //Automatic calculation of mass flow rates and volumes of the evaporator and condenser using linear regressions from data sheets of heat pumps and chillers (water to water) | |
| protected | |
| parameter Boolean machineType=true "=true if heat pump; =false if chiller"; | |
| - parameter Modelica.SIunits.MassFlowRate autoCalc_mFlow_min = 0.3 "Realistic mass flow minimum for simulation plausibility"; | |
| - parameter Modelica.SIunits.Volume autoCalc_Vmin = 0.003 "Realistic volume minimum for simulation plausibility"; | |
| - parameter Modelica.SIunits.MassFlowRate autoCalc_mFlow_eva = if machineType then max(0.00004*Q_useNominal - 0.3177, autoCalc_mFlow_min) else max(0.00005*Q_useNominal - 0.5662, autoCalc_mFlow_min); | |
| - parameter Modelica.SIunits.MassFlowRate autoCalc_mFlow_con = if machineType then max(0.00004*Q_useNominal - 0.6162, autoCalc_mFlow_min) else max(0.00005*Q_useNominal + 0.3161, autoCalc_mFlow_min); | |
| - parameter Modelica.SIunits.MassFlowRate mFlow_evaNominal_final=if use_autoCalc then autoCalc_mFlow_eva else mFlow_evaNominal; | |
| - parameter Modelica.SIunits.MassFlowRate mFlow_conNominal_final=if use_autoCalc then autoCalc_mFlow_con else mFlow_conNominal; | |
| - parameter Modelica.SIunits.Volume autoCalc_VEva = if machineType then max(0.0000001*Q_useNominal - 0.0075, autoCalc_Vmin) else max(0.0000001*Q_useNominal - 0.0066, autoCalc_Vmin); | |
| - parameter Modelica.SIunits.Volume autoCalc_VCon = if machineType then max(0.0000001*Q_useNominal - 0.0094, autoCalc_Vmin) else max(0.0000002*Q_useNominal - 0.0084, autoCalc_Vmin); | |
| - parameter Modelica.SIunits.Volume VEva_final=if use_autoCalc then autoCalc_VEva else VEva; | |
| - parameter Modelica.SIunits.Volume VCon_final=if use_autoCalc then autoCalc_VCon else VCon; | |
| + parameter Modelica.Units.SI.MassFlowRate autoCalc_mFlow_min = 0.3 "Realistic mass flow minimum for simulation plausibility"; | |
| + parameter Modelica.Units.SI.Volume autoCalc_Vmin = 0.003 "Realistic volume minimum for simulation plausibility"; | |
| + parameter Modelica.Units.SI.MassFlowRate autoCalc_mFlow_eva = if machineType then max(0.00004*Q_useNominal - 0.3177, autoCalc_mFlow_min) else max(0.00005*Q_useNominal - 0.5662, autoCalc_mFlow_min); | |
| + parameter Modelica.Units.SI.MassFlowRate autoCalc_mFlow_con = if machineType then max(0.00004*Q_useNominal - 0.6162, autoCalc_mFlow_min) else max(0.00005*Q_useNominal + 0.3161, autoCalc_mFlow_min); | |
| + parameter Modelica.Units.SI.MassFlowRate mFlow_evaNominal_final=if use_autoCalc then autoCalc_mFlow_eva else mFlow_evaNominal; | |
| + parameter Modelica.Units.SI.MassFlowRate mFlow_conNominal_final=if use_autoCalc then autoCalc_mFlow_con else mFlow_conNominal; | |
| + parameter Modelica.Units.SI.Volume autoCalc_VEva = if machineType then max(0.0000001*Q_useNominal - 0.0075, autoCalc_Vmin) else max(0.0000001*Q_useNominal - 0.0066, autoCalc_Vmin); | |
| + parameter Modelica.Units.SI.Volume autoCalc_VCon = if machineType then max(0.0000001*Q_useNominal - 0.0094, autoCalc_Vmin) else max(0.0000002*Q_useNominal - 0.0084, autoCalc_Vmin); | |
| + parameter Modelica.Units.SI.Volume VEva_final=if use_autoCalc then autoCalc_VEva else VEva; | |
| + parameter Modelica.Units.SI.Volume VCon_final=if use_autoCalc then autoCalc_VCon else VCon; | |
| equation | |
| //Control and feedback for the auto-calculation of condenser and evaporator data | |
| assert(not use_autoCalc or (use_autoCalc and Q_useNominal>0), "Can't auto-calculate evaporator and condenser data without a given nominal power flow (Q_useNominal)!", | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Pipes/BaseClasses/PipeBase.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Pipes/BaseClasses/PipeBase.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Pipes/BaseClasses/PipeBase.mo" 2021-03-15 12:05:56.607860830 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Pipes/BaseClasses/PipeBase.mo" 2021-04-26 11:51:14.350629521 +0200 | |
| @@ -10,12 +10,12 @@ | |
| FastHVAC.Media.WaterSimple() | |
| "Mediums charastics (heat capacity, density, thermal conductivity)" | |
| annotation(choicesAllMatching); | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConIn_const=30 "Fix value for heat transfer coeffiecient inside pipe" annotation(Dialog(enable=not | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConIn_const=30 "Fix value for heat transfer coeffiecient inside pipe" annotation(Dialog(enable=not | |
| calcHCon)); | |
| parameter Boolean calcHCon=true "Use calculated value for inside heat coefficient"; | |
| - final parameter Modelica.SIunits.Volume V_fluid=nParallel*Modelica.Constants.pi* length*parameterPipe.d_i*parameterPipe.d_i/4; | |
| + final parameter Modelica.Units.SI.Volume V_fluid=nParallel*Modelica.Constants.pi* length*parameterPipe.d_i*parameterPipe.d_i/4; | |
| - parameter Modelica.SIunits.Temperature T_0=Modelica.SIunits.Conversions.from_degC(20) | |
| + parameter Modelica.Units.SI.Temperature T_0=Modelica.Units.Conversions.from_degC(20) | |
| "Initial temperature of fluid"; | |
| /* ******************************************************************* | |
| @@ -24,7 +24,7 @@ | |
| parameter Integer nParallel(min=1)=1 "Number of identical parallel pipes" | |
| annotation(Dialog(group="Geometry")); | |
| - parameter Modelica.SIunits.Length length "Length of pipe" | |
| + parameter Modelica.Units.SI.Length length "Length of pipe" | |
| annotation(Dialog(group = "Geometry")); | |
| parameter AixLib.DataBase.Pipes.PipeBaseDataDefinition parameterPipe= | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Pipes/DynamicPipeAggregated.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Pipes/DynamicPipeAggregated.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Pipes/DynamicPipeAggregated.mo" 2021-03-15 12:05:56.607860830 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Pipes/DynamicPipeAggregated.mo" 2021-04-26 11:51:14.274629416 +0200 | |
| @@ -11,20 +11,20 @@ | |
| annotation(choicesAllMatching); | |
| protected | |
| - parameter Modelica.SIunits.Volume V_fluid= Modelica.Constants.pi*length*nParallel*innerDiameter*innerDiameter/4; | |
| - parameter Modelica.SIunits.Diameter innerDiameter=(if selectable then parameterPipe.d_i else diameter) | |
| + parameter Modelica.Units.SI.Volume V_fluid= Modelica.Constants.pi*length*nParallel*innerDiameter*innerDiameter/4; | |
| + parameter Modelica.Units.SI.Diameter innerDiameter=(if selectable then parameterPipe.d_i else diameter) | |
| "Inner diameter of pipe"; | |
| - parameter Modelica.SIunits.Diameter outerDiameter=(if selectable then parameterPipe.d_o else innerDiameter+2*s_pipeWall) | |
| + parameter Modelica.Units.SI.Diameter outerDiameter=(if selectable then parameterPipe.d_o else innerDiameter+2*s_pipeWall) | |
| "Outer diameter of pipe"; | |
| - parameter Modelica.SIunits.Density d=(if selectable then parameterPipe.d else rho_pipeWall) | |
| + parameter Modelica.Units.SI.Density d=(if selectable then parameterPipe.d else rho_pipeWall) | |
| "Density of pipe material"; | |
| - parameter Modelica.SIunits.SpecificHeatCapacity c=(if selectable then parameterPipe.c else c_pipeWall) | |
| + parameter Modelica.Units.SI.SpecificHeatCapacity c=(if selectable then parameterPipe.c else c_pipeWall) | |
| "Heat capacity of pipe material"; | |
| - parameter Modelica.SIunits.ThermalConductivity lambda= (if selectable then parameterPipe.lambda else lambda_pipeWall) | |
| + parameter Modelica.Units.SI.ThermalConductivity lambda= (if selectable then parameterPipe.lambda else lambda_pipeWall) | |
| "Thermal Conductivity of pipe material"; | |
| public | |
| - parameter Modelica.SIunits.Temperature T_0=Modelica.SIunits.Conversions.from_degC(20) | |
| + parameter Modelica.Units.SI.Temperature T_0=Modelica.Units.Conversions.from_degC(20) | |
| "Initial temperature of fluid"; | |
| /* ******************************************************************* | |
| @@ -35,21 +35,21 @@ | |
| parameter Integer nParallel(min=1)=1 "Number of identical parallel pipes" | |
| annotation(Dialog(group = "Geometry")); | |
| - parameter Modelica.SIunits.Length length=1 "Length of pipe" | |
| + parameter Modelica.Units.SI.Length length=1 "Length of pipe" | |
| annotation(Dialog(group = "Geometry")); | |
| - parameter Modelica.SIunits.Diameter diameter= 0.01 | |
| + parameter Modelica.Units.SI.Diameter diameter= 0.01 | |
| "Inner diameter of pipe (if selectable=false)" | |
| annotation (Dialog(group = "Geometry",enable=not selectable)); | |
| - parameter Modelica.SIunits.Density rho_pipeWall= 8900 | |
| + parameter Modelica.Units.SI.Density rho_pipeWall= 8900 | |
| "Density of pipe material (if selectable=false)" | |
| annotation (Dialog(group = "Pipe material",enable=not selectable)); | |
| - parameter Modelica.SIunits.Thickness s_pipeWall = 0.001 | |
| + parameter Modelica.Units.SI.Thickness s_pipeWall = 0.001 | |
| "Thickness of pipe wall (if selectable=false)" | |
| annotation (Dialog(group = "Geometry", enable=not selectable)); | |
| - parameter Modelica.SIunits.SpecificHeatCapacity c_pipeWall= 390 | |
| + parameter Modelica.Units.SI.SpecificHeatCapacity c_pipeWall= 390 | |
| "Heat capacity of pipe material (if selectable=false)" | |
| annotation (Dialog(group = "Pipe material",enable=not selectable)); | |
| - parameter Modelica.SIunits.ThermalConductivity lambda_pipeWall= 393 | |
| + parameter Modelica.Units.SI.ThermalConductivity lambda_pipeWall= 393 | |
| "Thermal Conductivity of pipe material (if selectable=false)" | |
| annotation (Dialog(group = "Pipe material",enable=not selectable)); | |
| parameter AixLib.DataBase.Pipes.PipeBaseDataDefinition parameterPipe= | |
| @@ -70,15 +70,15 @@ | |
| final parameter Boolean withRadiationParam=if not withConvection then false else withRadiation | |
| "= true to internally simulate heat loss to ambient by radiation (only works with convection = true)" | |
| annotation (Dialog( enable = false)); | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConOut=8 "Heat transfer coefficient to ambient" | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConOut=8 "Heat transfer coefficient to ambient" | |
| annotation (Dialog( enable=withConvection)); | |
| - parameter Modelica.SIunits.Emissivity eps = 0.8 "Emissivity" | |
| + parameter Modelica.Units.SI.Emissivity eps = 0.8 "Emissivity" | |
| annotation (Dialog( enable = withRadiation)); | |
| parameter Boolean calcHCon=true "Use calculated value for inside heat coefficient"; | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConIn_const=30 "Fix value for heat transfer coeffiecient inside pipe" | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConIn_const=30 "Fix value for heat transfer coeffiecient inside pipe" | |
| annotation(Dialog(enable=not | |
| calcHCon)); | |
| - final parameter Modelica.SIunits.Area AOutside = if not withInsulation then Modelica.Constants.pi*outerDiameter*length | |
| + final parameter Modelica.Units.SI.Area AOutside = if not withInsulation then Modelica.Constants.pi*outerDiameter*length | |
| else Modelica.Constants.pi*(outerDiameter*parameterIso.factor*2 + outerDiameter)*length; | |
| /* ******************************************************************* | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Pipes/DynamicPipe.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Pipes/DynamicPipe.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Pipes/DynamicPipe.mo" 2021-03-15 12:05:56.607860830 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Pipes/DynamicPipe.mo" 2021-04-26 11:51:14.322629483 +0200 | |
| @@ -11,20 +11,20 @@ | |
| annotation(choicesAllMatching); | |
| protected | |
| - parameter Modelica.SIunits.Volume V_fluid = Modelica.Constants.pi*length*nParallel*innerDiameter*innerDiameter/4; | |
| - parameter Modelica.SIunits.Diameter innerDiameter = (if selectable then parameterPipe.d_i else diameter) | |
| + parameter Modelica.Units.SI.Volume V_fluid = Modelica.Constants.pi*length*nParallel*innerDiameter*innerDiameter/4; | |
| + parameter Modelica.Units.SI.Diameter innerDiameter = (if selectable then parameterPipe.d_i else diameter) | |
| "Inner diameter of pipe"; | |
| - parameter Modelica.SIunits.Diameter outerDiameter = (if selectable then parameterPipe.d_o else innerDiameter+2*s_pipeWall) | |
| + parameter Modelica.Units.SI.Diameter outerDiameter = (if selectable then parameterPipe.d_o else innerDiameter+2*s_pipeWall) | |
| "Outer diameter of pipe"; | |
| - parameter Modelica.SIunits.Density d = (if selectable then parameterPipe.d else rho_pipeWall) | |
| + parameter Modelica.Units.SI.Density d = (if selectable then parameterPipe.d else rho_pipeWall) | |
| "Density of pipe material"; | |
| - parameter Modelica.SIunits.SpecificHeatCapacity c = (if selectable then parameterPipe.c else c_pipeWall) | |
| + parameter Modelica.Units.SI.SpecificHeatCapacity c = (if selectable then parameterPipe.c else c_pipeWall) | |
| "Heat capacity of pipe material"; | |
| - parameter Modelica.SIunits.ThermalConductivity lambda = (if selectable then parameterPipe.lambda else lambda_pipeWall) | |
| + parameter Modelica.Units.SI.ThermalConductivity lambda = (if selectable then parameterPipe.lambda else lambda_pipeWall) | |
| "Thermal Conductivity of pipe material"; | |
| public | |
| - parameter Modelica.SIunits.Temperature T_0=Modelica.SIunits.Conversions.from_degC(20) | |
| + parameter Modelica.Units.SI.Temperature T_0=Modelica.Units.Conversions.from_degC(20) | |
| "Initial temperature of fluid"; | |
| /* ******************************************************************* | |
| @@ -35,21 +35,21 @@ | |
| parameter Integer nParallel(min=1)=1 "Number of identical parallel pipes" | |
| annotation(Dialog(group = "Geometry")); | |
| - parameter Modelica.SIunits.Length length=1 "Length of pipe" | |
| + parameter Modelica.Units.SI.Length length=1 "Length of pipe" | |
| annotation(Dialog(group = "Geometry")); | |
| - parameter Modelica.SIunits.Diameter diameter= 0.01 | |
| + parameter Modelica.Units.SI.Diameter diameter= 0.01 | |
| "Inner diameter of pipe (if selectable=false)" | |
| annotation (Dialog(group = "Geometry",enable=not selectable)); | |
| - parameter Modelica.SIunits.Density rho_pipeWall= 8900 | |
| + parameter Modelica.Units.SI.Density rho_pipeWall= 8900 | |
| "Density of pipe material (if selectable=false)" | |
| annotation (Dialog(group = "Pipe material",enable=not selectable)); | |
| - parameter Modelica.SIunits.Thickness s_pipeWall = 0.001 | |
| + parameter Modelica.Units.SI.Thickness s_pipeWall = 0.001 | |
| "Thickness of pipe wall (if selectable=false)" | |
| annotation (Dialog(group = "Geometry", enable=not selectable)); | |
| - parameter Modelica.SIunits.SpecificHeatCapacity c_pipeWall= 390 | |
| + parameter Modelica.Units.SI.SpecificHeatCapacity c_pipeWall= 390 | |
| "Heat capacity of pipe material (if selectable=false)" | |
| annotation (Dialog(group = "Pipe material",enable=not selectable)); | |
| - parameter Modelica.SIunits.ThermalConductivity lambda_pipeWall= 393 | |
| + parameter Modelica.Units.SI.ThermalConductivity lambda_pipeWall= 393 | |
| "Thermal Conductivity of pipe material (if selectable=false)" | |
| annotation (Dialog(group = "Pipe material",enable=not selectable)); | |
| parameter AixLib.DataBase.Pipes.PipeBaseDataDefinition parameterPipe= | |
| @@ -69,12 +69,12 @@ | |
| final parameter Boolean withRadiationParam=if not withConvection then false else withRadiation | |
| "= true to internally simulate heat loss to ambient by radiation (only works with convection = true)" | |
| annotation (Dialog( enable = false)); | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConOut=8 "Heat transfer coefficient to ambient" | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConOut=8 "Heat transfer coefficient to ambient" | |
| annotation (Dialog( enable=withConvection)); | |
| - parameter Modelica.SIunits.Emissivity eps = 0.8 "Emissivity" | |
| + parameter Modelica.Units.SI.Emissivity eps = 0.8 "Emissivity" | |
| annotation (Dialog( enable = withRadiation)); | |
| parameter Boolean calcHCon=true "Use calculated value for inside heat transfer coefficient"; | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConIn_const=30 "Fix value for heat transfer coeffiecient inside pipe" annotation(Dialog(enable=not | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConIn_const=30 "Fix value for heat transfer coeffiecient inside pipe" annotation(Dialog(enable=not | |
| calcHCon)); | |
| /* ******************************************************************* | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Pumps/FluidSource.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Pumps/FluidSource.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Pumps/FluidSource.mo" 2021-03-15 12:05:56.607860830 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Pumps/FluidSource.mo" 2021-04-26 11:51:14.218629340 +0200 | |
| @@ -10,7 +10,7 @@ | |
| "Standard charastics for water (heat capacity, density, thermal conductivity)" | |
| annotation (choicesAllMatching); | |
| protected | |
| - parameter Modelica.SIunits.SpecificHeatCapacity cp=medium.c | |
| + parameter Modelica.Units.SI.SpecificHeatCapacity cp=medium.c | |
| "medium's specific heat capacity"; | |
| /* ******************************************************************* | |
| Components | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Pumps/Pump.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Pumps/Pump.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Pumps/Pump.mo" 2021-03-15 12:05:56.607860830 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Pumps/Pump.mo" 2021-04-26 11:51:14.202629317 +0200 | |
| @@ -10,7 +10,7 @@ | |
| "Standard charastics for water (heat capacity, density, thermal conductivity)" | |
| annotation (choicesAllMatching); | |
| protected | |
| - parameter Modelica.SIunits.SpecificHeatCapacity cp=medium.c | |
| + parameter Modelica.Units.SI.SpecificHeatCapacity cp=medium.c | |
| "Medium's specific heat capacity"; | |
| /* ******************************************************************* | |
| Components | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/buoyancyDitribution.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/buoyancyDitribution.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/buoyancyDitribution.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/buoyancyDitribution.mo" 2021-04-26 11:51:13.866628853 +0200 | |
| @@ -9,7 +9,7 @@ | |
| "position of the highest layer receiving buoyant mass flow"; | |
| input Integer n | |
| "total number of layers"; | |
| - input Modelica.SIunits.Temperature T[n] | |
| + input Modelica.Units.SI.Temperature T[n] | |
| "Temperature of layers"; | |
| output Real[n] y "mass fraction of buoyant current received (-1 for emitting layer)"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatingCoil.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatingCoil.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatingCoil.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatingCoil.mo" 2021-04-26 11:51:14.014629057 +0200 | |
| @@ -6,11 +6,11 @@ | |
| parameter Media.BaseClasses.MediumSimple medium_HC=Media.WaterSimple() | |
| "Mediums charastics (heat capacity, density, thermal conductivity)"; | |
| - parameter Modelica.SIunits.Length lengthHC = 3 "Length of Pipe for HC"; | |
| + parameter Modelica.Units.SI.Length lengthHC = 3 "Length of Pipe for HC"; | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConHC=20 "Model assumptions heat transfer coefficient HC <-> Heating Water"; | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConHC=20 "Model assumptions heat transfer coefficient HC <-> Heating Water"; | |
| - parameter Modelica.SIunits.Temperature T_start "Start Temperature of fluid"; | |
| + parameter Modelica.Units.SI.Temperature T_start "Start Temperature of fluid"; | |
| parameter AixLib.DataBase.Pipes.PipeBaseDataDefinition pipeRecordHC= | |
| AixLib.DataBase.Pipes.Copper.Copper_28x1() "Type of Pipe for HR1"; | |
| @@ -51,7 +51,7 @@ | |
| AixLib.FastHVAC.Interfaces.EnthalpyPort_a enthalpyPort_a1 | |
| annotation (Placement(transformation(extent={{-106,-10},{-86,10}}))); | |
| parameter Boolean calcHCon=true "Use calculated value for inside heat transfer coefficient"; | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConIn_const=30 "Fix value for heat transfer coefficient inside pipe" | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConIn_const=30 "Fix value for heat transfer coefficient inside pipe" | |
| annotation(Dialog(enable=not calcHCon)); | |
| equation | |
| connect(conv_HC1_Outside.port_a, Therm1) annotation (Line( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatTransferBuoyancyWetter.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatTransferBuoyancyWetter.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatTransferBuoyancyWetter.mo" 2021-03-15 12:05:56.607860830 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatTransferBuoyancyWetter.mo" 2021-04-26 11:51:14.106629184 +0200 | |
| @@ -2,8 +2,8 @@ | |
| model HeatTransferBuoyancyWetter | |
| extends PartialHeatTransferLayers; | |
| - parameter Modelica.SIunits.Time tau(min=0)=100 "Time constant for mixing"; | |
| - Modelica.SIunits.HeatFlowRate[n-1] Q_flow | |
| + parameter Modelica.Units.SI.Time tau(min=0)=100 "Time constant for mixing"; | |
| + Modelica.Units.SI.HeatFlowRate[n-1] Q_flow | |
| "Heat flow rate from segment i+1 to i"; | |
| //parameter Medium.ThermodynamicState sta0 = Medium.setState_pTX(T=Medium.T_default, | |
| // p=Medium.p_default, X=Medium.X_default[1:Medium.nXi]); | |
| @@ -11,11 +11,11 @@ | |
| each A=Modelica.Constants.pi/4*data.d_Tank^2, | |
| each d=data.h_Tank/n) annotation 0;*/ | |
| protected | |
| - parameter Modelica.SIunits.Density rho0=1000 | |
| + parameter Modelica.Units.SI.Density rho0=1000 | |
| "Density, used to compute fluid mass"; | |
| - parameter Modelica.SIunits.SpecificHeatCapacity cp0=4180 | |
| + parameter Modelica.Units.SI.SpecificHeatCapacity cp0=4180 | |
| "Specific heat capacity"; | |
| - Modelica.SIunits.TemperatureDifference dT[n-1] | |
| + Modelica.Units.SI.TemperatureDifference dT[n-1] | |
| "Temperature difference between adjoining volumes"; | |
| parameter Real k(unit="W/K") = data.hTank*Modelica.Constants.pi/4*data.dTank^2*rho0*cp0/tau/n | |
| "Proportionality constant, since we use dT instead of dH"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatTransferDirectedHeatTransfer.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatTransferDirectedHeatTransfer.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatTransferDirectedHeatTransfer.mo" 2021-03-15 12:05:56.607860830 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatTransferDirectedHeatTransfer.mo" 2021-04-26 11:51:14.094629167 +0200 | |
| @@ -4,28 +4,28 @@ | |
| // import BufferStorage = BufferStorage2; | |
| extends | |
| AixLib.FastHVAC.Components.Storage.BaseClasses.PartialHeatTransferLayers; | |
| - Modelica.SIunits.HeatFlowRate[n-1] Q_flow | |
| + Modelica.Units.SI.HeatFlowRate[n-1] Q_flow | |
| "Heat flow rate from layer i+1 to i due to heat conduction"; | |
| //Modelica.Thermal.HeatTransfer.TemperatureSensor[n] temperatureSensor | |
| // annotation 2; | |
| - Modelica.SIunits.HeatFlowRate[ n] Q_buoy_abs | |
| + Modelica.Units.SI.HeatFlowRate[ n] Q_buoy_abs | |
| "Cumulative heat flow rate into the layer due to buoyancy"; | |
| - parameter Modelica.SIunits.Time tau=100; | |
| - parameter Modelica.SIunits.TemperatureDifference dTref=1; | |
| + parameter Modelica.Units.SI.Time tau=100; | |
| + parameter Modelica.Units.SI.TemperatureDifference dTref=1; | |
| function fQbuoy = | |
| AixLib.FastHVAC.Components.Storage.BaseClasses.QBuoyFunction; | |
| protected | |
| - parameter Modelica.SIunits.Length height=data.hTank/n | |
| + parameter Modelica.Units.SI.Length height=data.hTank/n | |
| "height of fluid layers"; | |
| - parameter Modelica.SIunits.Area A=Modelica.Constants.pi/4*data.dTank^2 | |
| + parameter Modelica.Units.SI.Area A=Modelica.Constants.pi/4*data.dTank^2 | |
| "Area of heat transfer between layers"; | |
| - Modelica.SIunits.TemperatureDifference dT[n-1] | |
| + Modelica.Units.SI.TemperatureDifference dT[n-1] | |
| "Temperature difference between adjoining volumes"; | |
| - parameter Modelica.SIunits.ThermalConductivity lambda_water=0.64; | |
| + parameter Modelica.Units.SI.ThermalConductivity lambda_water=0.64; | |
| parameter AixLib.FastHVAC.Media.BaseClasses.MediumSimple medium= | |
| AixLib.FastHVAC.Media.WaterSimple(); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatTransferLambdaEff.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatTransferLambdaEff.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatTransferLambdaEff.mo" 2021-03-15 12:05:56.607860830 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatTransferLambdaEff.mo" 2021-04-26 11:51:14.082629151 +0200 | |
| @@ -3,28 +3,28 @@ | |
| // import BufferStorage = BufferStorage2; | |
| extends PartialHeatTransferLayers; | |
| - Modelica.SIunits.HeatFlowRate[n-1] Q_flow | |
| + Modelica.Units.SI.HeatFlowRate[n-1] Q_flow | |
| "Heat flow rate from segment i+1 to i"; | |
| //Modelica.Thermal.HeatTransfer.TemperatureSensor[n] temperatureSensor | |
| // annotation 2; | |
| protected | |
| parameter Real kappa=0.41 "Karman constant"; | |
| - parameter Modelica.SIunits.Length height=data.hTank/n | |
| + parameter Modelica.Units.SI.Length height=data.hTank/n | |
| "height of fluid layers"; | |
| Real beta=350e-6 "thermal expansion coefficient in 1/K"; | |
| - parameter Modelica.SIunits.Area A=Modelica.Constants.pi/4*data.dTank^2 | |
| + parameter Modelica.Units.SI.Area A=Modelica.Constants.pi/4*data.dTank^2 | |
| "Area of heat transfer between layers"; | |
| - parameter Modelica.SIunits.Density rho=1000 | |
| + parameter Modelica.Units.SI.Density rho=1000 | |
| "Density, used to compute fluid mass"; | |
| - parameter Modelica.SIunits.SpecificHeatCapacity c_p=4180 | |
| + parameter Modelica.Units.SI.SpecificHeatCapacity c_p=4180 | |
| "Specific heat capacity"; | |
| // | |
| - Modelica.SIunits.TemperatureDifference dT[n-1] | |
| + Modelica.Units.SI.TemperatureDifference dT[n-1] | |
| "Temperature difference between adjoining volumes"; | |
| Real[n-1] k(unit="W/K") "effective heat transfer coefficient"; | |
| Real[n-1] lambda(unit="W/mK") "effective heat conductivity"; | |
| - parameter Modelica.SIunits.ThermalConductivity lambda_water=0.64; | |
| + parameter Modelica.Units.SI.ThermalConductivity lambda_water=0.64; | |
| equation | |
| for i in 1:n-1 loop | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatTransferLambdaEffSmooth.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatTransferLambdaEffSmooth.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatTransferLambdaEffSmooth.mo" 2021-03-15 12:05:56.607860830 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatTransferLambdaEffSmooth.mo" 2021-04-26 11:51:14.070629134 +0200 | |
| @@ -3,28 +3,28 @@ | |
| // import BufferStorage = BufferStorage2; | |
| extends PartialHeatTransferLayers; | |
| - Modelica.SIunits.HeatFlowRate[n-1] Q_flow | |
| + Modelica.Units.SI.HeatFlowRate[n-1] Q_flow | |
| "Heat flow rate from segment i+1 to i"; | |
| //Modelica.Thermal.HeatTransfer.TemperatureSensor[n] temperatureSensor | |
| // annotation 2; | |
| protected | |
| parameter Real kappa=0.41 "Karman constant"; | |
| - parameter Modelica.SIunits.Length height=data.hTank/n | |
| + parameter Modelica.Units.SI.Length height=data.hTank/n | |
| "height of fluid layers"; | |
| Real beta=350e-6 "thermal expansion coefficient in 1/K"; | |
| - parameter Modelica.SIunits.Area A=Modelica.Constants.pi/4*data.dTank^2 | |
| + parameter Modelica.Units.SI.Area A=Modelica.Constants.pi/4*data.dTank^2 | |
| "Area of heat transfer between layers"; | |
| - parameter Modelica.SIunits.Density rho=1000 | |
| + parameter Modelica.Units.SI.Density rho=1000 | |
| "Density, used to compute fluid mass"; | |
| - parameter Modelica.SIunits.SpecificHeatCapacity c_p=4180 | |
| + parameter Modelica.Units.SI.SpecificHeatCapacity c_p=4180 | |
| "Specific heat capacity"; | |
| // | |
| - Modelica.SIunits.TemperatureDifference dT[n-1] | |
| + Modelica.Units.SI.TemperatureDifference dT[n-1] | |
| "Temperature difference between adjoining volumes"; | |
| Real[n-1] k(unit="W/K") "effective heat transfer coefficient"; | |
| Real[n-1] lambda(unit="W/mK") "effective heat conductivity"; | |
| - parameter Modelica.SIunits.ThermalConductivity lambda_water=0.64; | |
| + parameter Modelica.Units.SI.ThermalConductivity lambda_water=0.64; | |
| equation | |
| for i in 1:n-1 loop | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatTransferOnlyConduction.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatTransferOnlyConduction.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatTransferOnlyConduction.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatTransferOnlyConduction.mo" 2021-04-26 11:51:14.054629113 +0200 | |
| @@ -4,19 +4,19 @@ | |
| // import BufferStorage = BufferStorage2; | |
| extends | |
| AixLib.FastHVAC.Components.Storage.BaseClasses.PartialHeatTransferLayers; | |
| - Modelica.SIunits.HeatFlowRate[n-1] Q_flow | |
| + Modelica.Units.SI.HeatFlowRate[n-1] Q_flow | |
| "Heat flow rate from segment i+1 to i"; | |
| //Modelica.Thermal.HeatTransfer.TemperatureSensor[n] temperatureSensor | |
| // annotation 2; | |
| protected | |
| - parameter Modelica.SIunits.Length height=data.hTank/n | |
| + parameter Modelica.Units.SI.Length height=data.hTank/n | |
| "height of fluid layers"; | |
| - parameter Modelica.SIunits.Area A=Modelica.Constants.pi/4*data.dTank^2 | |
| + parameter Modelica.Units.SI.Area A=Modelica.Constants.pi/4*data.dTank^2 | |
| "Area of heat transfer between layers"; | |
| - Modelica.SIunits.TemperatureDifference dT[n-1] | |
| + Modelica.Units.SI.TemperatureDifference dT[n-1] | |
| "Temperature difference between adjoining volumes"; | |
| - parameter Modelica.SIunits.ThermalConductivity lambda_water=0.64; | |
| + parameter Modelica.Units.SI.ThermalConductivity lambda_water=0.64; | |
| equation | |
| for i in 1:n-1 loop | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatTransferQbuoy.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatTransferQbuoy.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatTransferQbuoy.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatTransferQbuoy.mo" 2021-04-26 11:51:14.042629095 +0200 | |
| @@ -4,25 +4,25 @@ | |
| // import BufferStorage = BufferStorage2; | |
| extends | |
| AixLib.FastHVAC.Components.Storage.BaseClasses.PartialHeatTransferLayers; | |
| - Modelica.SIunits.HeatFlowRate[n-1] Q_flow | |
| + Modelica.Units.SI.HeatFlowRate[n-1] Q_flow | |
| "Heat flow rate from segment i+1 to i"; | |
| //Modelica.Thermal.HeatTransfer.TemperatureSensor[n] temperatureSensor | |
| // annotation 2; | |
| protected | |
| - parameter Modelica.SIunits.Length height=data.hTank/n | |
| + | |
| + parameter Modelica.Units.SI.Length height=data.hTank/n | |
| "height of fluid layers"; | |
| - parameter Modelica.SIunits.Area A=Modelica.Constants.pi/4*data.dTank^2 | |
| + parameter Modelica.Units.SI.Area A=Modelica.Constants.pi/4*data.dTank^2 | |
| "Area of heat transfer between layers"; | |
| - Modelica.SIunits.TemperatureDifference dT[n-1] | |
| + Modelica.Units.SI.TemperatureDifference dT[n-1] | |
| "Temperature difference between adjoining volumes"; | |
| - parameter Modelica.SIunits.ThermalConductivity lambda_water=0.64; | |
| - parameter Modelica.SIunits.Density rho=1000 | |
| + parameter Modelica.Units.SI.ThermalConductivity lambda_water=0.64; | |
| + parameter Modelica.Units.SI.Density rho=1000 | |
| "Density, used to compute fluid mass"; | |
| - parameter Modelica.SIunits.Time tau=90; | |
| - Modelica.SIunits.HeatFlowRate Q_buoy[n]; | |
| - | |
| + parameter Modelica.Units.SI.Time tau=90; | |
| + Modelica.Units.SI.HeatFlowRate Q_buoy[n]; | |
| equation | |
| Q_buoy= | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatTransferQbuoyTimer.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatTransferQbuoyTimer.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatTransferQbuoyTimer.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/HeatTransferQbuoyTimer.mo" 2021-04-26 11:51:14.030629080 +0200 | |
| @@ -4,26 +4,26 @@ | |
| // import BufferStorage = BufferStorage2; | |
| extends | |
| AixLib.FastHVAC.Components.Storage.BaseClasses.PartialHeatTransferLayers; | |
| - Modelica.SIunits.HeatFlowRate[n-1] Q_flow | |
| + Modelica.Units.SI.HeatFlowRate[n-1] Q_flow | |
| "Heat flow rate from segment i+1 to i"; | |
| //Modelica.Thermal.HeatTransfer.TemperatureSensor[n] temperatureSensor | |
| // annotation 2; | |
| Real timer(start=tau); | |
| protected | |
| - parameter Modelica.SIunits.Length height=data.hTank/n | |
| + parameter Modelica.Units.SI.Length height=data.hTank/n | |
| "height of fluid layers"; | |
| - parameter Modelica.SIunits.Area A=Modelica.Constants.pi/4*data.dTank^2 | |
| + parameter Modelica.Units.SI.Area A=Modelica.Constants.pi/4*data.dTank^2 | |
| "Area of heat transfer between layers"; | |
| - Modelica.SIunits.TemperatureDifference dT[n-1] | |
| + Modelica.Units.SI.TemperatureDifference dT[n-1] | |
| "Temperature difference between adjoining volumes"; | |
| - parameter Modelica.SIunits.ThermalConductivity lambda_water=0.64; | |
| - parameter Modelica.SIunits.Density rho=1000 | |
| + parameter Modelica.Units.SI.ThermalConductivity lambda_water=0.64; | |
| + parameter Modelica.Units.SI.Density rho=1000 | |
| "Density, used to compute fluid mass"; | |
| - parameter Modelica.SIunits.Time tau=60; | |
| - parameter Modelica.SIunits.Time tau_refresh=900; | |
| - Modelica.SIunits.HeatFlowRate Q_buoy[n](start=zeros(n)); | |
| - Modelica.SIunits.SpecificEnergy q_buoy[n]; | |
| + parameter Modelica.Units.SI.Time tau=60; | |
| + parameter Modelica.Units.SI.Time tau_refresh=900; | |
| + Modelica.Units.SI.HeatFlowRate Q_buoy[n](start=zeros(n)); | |
| + Modelica.Units.SI.SpecificEnergy q_buoy[n]; | |
| function isBuoy = | |
| AixLib.FastHVAC.Components.Storage.BaseClasses.QBuoyFunctions.isBuoy; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/QBuoyFunction.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/QBuoyFunction.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/QBuoyFunction.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/QBuoyFunction.mo" 2021-04-26 11:51:13.970628996 +0200 | |
| @@ -2,14 +2,14 @@ | |
| function QBuoyFunction | |
| input Integer n; | |
| - input Modelica.SIunits.Length height; | |
| - input Modelica.SIunits.Area A; | |
| - input Modelica.SIunits.Temperature[n] T; | |
| + input Modelica.Units.SI.Length height; | |
| + input Modelica.Units.SI.Area A; | |
| + input Modelica.Units.SI.Temperature[n] T; | |
| input AixLib.FastHVAC.Media.BaseClasses.MediumSimple medium= | |
| AixLib.FastHVAC.Media.WaterSimple(); | |
| - input Modelica.SIunits.Time tau; | |
| - input Modelica.SIunits.TemperatureDifference dTref; | |
| - output Modelica.SIunits.HeatFlowRate[n] Q_buoy_abs | |
| + input Modelica.Units.SI.Time tau; | |
| + input Modelica.Units.SI.TemperatureDifference dTref; | |
| + output Modelica.Units.SI.HeatFlowRate[n] Q_buoy_abs | |
| "Cumulative heat flow rate into the layer due to buoyancy"; | |
| replaceable function fDist = | |
| AixLib.FastHVAC.Components.Storage.BaseClasses.buoyancyDitribution.buoyancyDistInv2 | |
| @@ -17,19 +17,19 @@ | |
| AixLib.FastHVAC.Components.Storage.BaseClasses.buoyancyDitribution.buoyancyDist; | |
| protected | |
| - Modelica.SIunits.HeatFlowRate Q_buoy "Heat flow rate from layer i to all above layers with lower temperature"; | |
| - Modelica.SIunits.HeatFlowRate[ n] Q_buoy_step | |
| + Modelica.Units.SI.HeatFlowRate Q_buoy "Heat flow rate from layer i to all above layers with lower temperature"; | |
| + Modelica.Units.SI.HeatFlowRate[ n] Q_buoy_step | |
| "Heat flow rate into each layer resulting from the buoyant mass flow in a particular iteration step"; | |
| - Modelica.SIunits.TemperatureDifference dT[n-1] | |
| + Modelica.Units.SI.TemperatureDifference dT[n-1] | |
| "Temperature difference between adjoining volumes"; | |
| - Modelica.SIunits.MassFlowRate m_buoy "Total buoyant mass flow (in a particular iteration step)"; | |
| - Modelica.SIunits.MassFlowRate[n] m_buoy_in "Buoyant mass flow going into each layer (in a particular iteration step)"; | |
| + Modelica.Units.SI.MassFlowRate m_buoy "Total buoyant mass flow (in a particular iteration step)"; | |
| + Modelica.Units.SI.MassFlowRate[n] m_buoy_in "Buoyant mass flow going into each layer (in a particular iteration step)"; | |
| Integer k; | |
| Integer j; | |
| - Modelica.SIunits.MassFlowRate s1 "temporary variable for calculations"; | |
| - Modelica.SIunits.MassFlowRate s2 "temporary variable for calculations"; | |
| + Modelica.Units.SI.MassFlowRate s1 "temporary variable for calculations"; | |
| + Modelica.Units.SI.MassFlowRate s2 "temporary variable for calculations"; | |
| algorithm | |
| for i in 1:n-1 loop | |
| dT[i] :=T[i] - T[i + 1]; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/QBuoyFunctions.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/QBuoyFunctions.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/QBuoyFunctions.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/BaseClasses/QBuoyFunctions.mo" 2021-04-26 11:51:13.950628968 +0200 | |
| @@ -2,9 +2,9 @@ | |
| package QBuoyFunctions | |
| function dToverEff | |
| - input Modelica.SIunits.TemperatureDifference dTover; | |
| + input Modelica.Units.SI.TemperatureDifference dTover; | |
| input Real h_rel; | |
| - output Modelica.SIunits.TemperatureDifference dTover_eff; | |
| + output Modelica.Units.SI.TemperatureDifference dTover_eff; | |
| protected | |
| parameter Real a=0.5023; | |
| @@ -16,9 +16,9 @@ | |
| end dToverEff; | |
| function qbuoy0 | |
| - input Modelica.SIunits.TemperatureDifference dTover; | |
| + input Modelica.Units.SI.TemperatureDifference dTover; | |
| input Real dh_gap; | |
| - output Modelica.SIunits.SpecificEnergy qbuoy0; | |
| + output Modelica.Units.SI.SpecificEnergy qbuoy0; | |
| protected | |
| parameter Real a(unit="J/(kg.K)")=3844; | |
| @@ -30,7 +30,7 @@ | |
| end qbuoy0; | |
| function xDown | |
| - input Modelica.SIunits.TemperatureDifference dTover; | |
| + input Modelica.Units.SI.TemperatureDifference dTover; | |
| input Real dh_gap; | |
| output Real xdown; | |
| @@ -46,7 +46,7 @@ | |
| end xDown; | |
| function dhDown | |
| - input Modelica.SIunits.TemperatureDifference dTover; | |
| + input Modelica.Units.SI.TemperatureDifference dTover; | |
| input Real dh_gap; | |
| output Real dhdown; | |
| @@ -78,12 +78,12 @@ | |
| input Integer n; | |
| input Integer nbuoy; | |
| input Integer nstop; | |
| - input Modelica.SIunits.TemperatureDifference dTover; | |
| + input Modelica.Units.SI.TemperatureDifference dTover; | |
| - output Modelica.SIunits.SpecificEnergy q_freebuoy[n]; | |
| + output Modelica.Units.SI.SpecificEnergy q_freebuoy[n]; | |
| protected | |
| - Modelica.SIunits.SpecificEnergy qb0; | |
| + Modelica.Units.SI.SpecificEnergy qb0; | |
| Real dh_gap; | |
| Real dhdwn; | |
| Real c_qu; | |
| @@ -118,11 +118,11 @@ | |
| function qtop | |
| - input Modelica.SIunits.TemperatureDifference dTover; | |
| - input Modelica.SIunits.TemperatureDifference dTborder; | |
| + input Modelica.Units.SI.TemperatureDifference dTover; | |
| + input Modelica.Units.SI.TemperatureDifference dTborder; | |
| input Integer dn_gap; | |
| - output Modelica.SIunits.SpecificEnergy qtop; | |
| + output Modelica.Units.SI.SpecificEnergy qtop; | |
| protected | |
| parameter Real a(unit="J/(kg.K)")=3896; | |
| @@ -136,8 +136,8 @@ | |
| end qtop; | |
| function cTopDown | |
| - input Modelica.SIunits.TemperatureDifference dTover; | |
| - input Modelica.SIunits.TemperatureDifference dTborder; | |
| + input Modelica.Units.SI.TemperatureDifference dTover; | |
| + input Modelica.Units.SI.TemperatureDifference dTborder; | |
| input Integer dn_gap; | |
| output Real c_top_down; | |
| @@ -155,8 +155,8 @@ | |
| end cTopDown; | |
| function cTopUp | |
| - input Modelica.SIunits.TemperatureDifference dTover; | |
| - input Modelica.SIunits.TemperatureDifference dTborder; | |
| + input Modelica.Units.SI.TemperatureDifference dTover; | |
| + input Modelica.Units.SI.TemperatureDifference dTborder; | |
| input Integer dn_gap; | |
| output Real c_top_up; | |
| @@ -177,10 +177,10 @@ | |
| input Integer n; | |
| input Integer nbuoy; | |
| input Integer nstop; | |
| - input Modelica.SIunits.TemperatureDifference dTover; | |
| - input Modelica.SIunits.TemperatureDifference dTborder; | |
| + input Modelica.Units.SI.TemperatureDifference dTover; | |
| + input Modelica.Units.SI.TemperatureDifference dTborder; | |
| - output Modelica.SIunits.SpecificEnergy q_topmix[n]; | |
| + output Modelica.Units.SI.SpecificEnergy q_topmix[n]; | |
| protected | |
| Integer dn_gap; | |
| @@ -189,8 +189,8 @@ | |
| Real c_td; | |
| Real c_tu; | |
| - Modelica.SIunits.SpecificEnergy qt0; | |
| + Modelica.Units.SI.SpecificEnergy qt0; | |
| algorithm | |
| q_topmix:=zeros(n); | |
| @@ -238,11 +238,11 @@ | |
| end qTopmix; | |
| function qbot | |
| - input Modelica.SIunits.TemperatureDifference dTover; | |
| - input Modelica.SIunits.TemperatureDifference dT13; | |
| - output Modelica.SIunits.SpecificEnergy qbot; | |
| + input Modelica.Units.SI.TemperatureDifference dTover; | |
| + input Modelica.Units.SI.TemperatureDifference dT13; | |
| + output Modelica.Units.SI.SpecificEnergy qbot; | |
| protected | |
| parameter Real a=594.1; | |
| algorithm | |
| @@ -251,8 +251,8 @@ | |
| end qbot; | |
| function cBotDown | |
| - input Modelica.SIunits.TemperatureDifference dTover; | |
| - input Modelica.SIunits.TemperatureDifference dT13; | |
| + input Modelica.Units.SI.TemperatureDifference dTover; | |
| + input Modelica.Units.SI.TemperatureDifference dT13; | |
| output Real c_bot_down; | |
| @@ -266,8 +266,8 @@ | |
| end cBotDown; | |
| function cBotUp | |
| - input Modelica.SIunits.TemperatureDifference dTover; | |
| - input Modelica.SIunits.TemperatureDifference dT13; | |
| + input Modelica.Units.SI.TemperatureDifference dTover; | |
| + input Modelica.Units.SI.TemperatureDifference dT13; | |
| output Real c_bot_up; | |
| protected | |
| @@ -283,10 +283,10 @@ | |
| function qBotmix | |
| input Integer n; | |
| input Integer nbuoy; | |
| - input Modelica.SIunits.TemperatureDifference dTover; | |
| - input Modelica.SIunits.TemperatureDifference dT13; | |
| + input Modelica.Units.SI.TemperatureDifference dTover; | |
| + input Modelica.Units.SI.TemperatureDifference dT13; | |
| - output Modelica.SIunits.SpecificEnergy q_botmix[n]; | |
| + output Modelica.Units.SI.SpecificEnergy q_botmix[n]; | |
| protected | |
| Real fbotdown_sum; | |
| @@ -294,8 +294,8 @@ | |
| Real c_bd; | |
| Real c_bu; | |
| - Modelica.SIunits.SpecificEnergy qb0; | |
| + Modelica.Units.SI.SpecificEnergy qb0; | |
| algorithm | |
| q_botmix:=zeros(n); | |
| @@ -336,12 +336,12 @@ | |
| input Integer n; | |
| input Integer nbuoy; | |
| input Integer nstop; | |
| - input Modelica.SIunits.TemperatureDifference dTover; | |
| - input Modelica.SIunits.TemperatureDifference dT13; | |
| - input Modelica.SIunits.TemperatureDifference dTborder; | |
| - output Modelica.SIunits.SpecificEnergy q_buoy_single[n]; | |
| + input Modelica.Units.SI.TemperatureDifference dTover; | |
| + input Modelica.Units.SI.TemperatureDifference dT13; | |
| + input Modelica.Units.SI.TemperatureDifference dTborder; | |
| + output Modelica.Units.SI.SpecificEnergy q_buoy_single[n]; | |
| algorithm | |
| q_buoy_single:=qFreebuoy( | |
| n, | |
| @@ -362,13 +362,13 @@ | |
| function qbuoyTotal | |
| input Integer n; | |
| - input Modelica.SIunits.Temperature T[n]; | |
| - output Modelica.SIunits.SpecificEnergy q_total[n]; | |
| + input Modelica.Units.SI.Temperature T[n]; | |
| + output Modelica.Units.SI.SpecificEnergy q_total[n]; | |
| protected | |
| - Modelica.SIunits.TemperatureDifference dTover; | |
| - Modelica.SIunits.TemperatureDifference dT13; | |
| - Modelica.SIunits.TemperatureDifference dTborder; | |
| + Modelica.Units.SI.TemperatureDifference dTover; | |
| + Modelica.Units.SI.TemperatureDifference dT13; | |
| + Modelica.Units.SI.TemperatureDifference dTborder; | |
| Integer nbuoy; | |
| Integer dngap; | |
| Integer nstop; | |
| @@ -421,7 +421,7 @@ | |
| function isBuoy | |
| input Integer n; | |
| - input Modelica.SIunits.Temperature T[n]; | |
| + input Modelica.Units.SI.Temperature T[n]; | |
| output Boolean isBuoy; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/HeatStorage.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/HeatStorage.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/HeatStorage.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/HeatStorage.mo" 2021-04-26 11:51:13.850628830 +0200 | |
| @@ -16,11 +16,11 @@ | |
| AixLib.FastHVAC.Media.WaterSimple() | |
| "Mediums charastics for HC2 (heat capacity, density, thermal conductivity)" | |
| annotation(Dialog(group="Medium"),choicesAllMatching); | |
| - parameter Modelica.SIunits.Temperature T_start=323.15 | |
| + parameter Modelica.Units.SI.Temperature T_start=323.15 | |
| "Start temperature of medium" annotation(Dialog(tab="Initialisation")); | |
| - parameter Modelica.SIunits.Temperature T_start_wall=293.15 | |
| + parameter Modelica.Units.SI.Temperature T_start_wall=293.15 | |
| "Starting Temperature of wall in K" annotation(Dialog(tab="Initialisation")); | |
| - parameter Modelica.SIunits.Temperature T_start_ins=293.15 | |
| + parameter Modelica.Units.SI.Temperature T_start_ins=293.15 | |
| "Starting Temperature of insulation in K" annotation(Dialog(tab="Initialisation")); | |
| /* ******************************************************************* | |
| @@ -30,21 +30,21 @@ | |
| inner parameter Real tau(min=0) = 1000 "Time constant for mixing"; | |
| inner parameter Integer n(min=3) = 3 "Model assumptions Number of Layers"; | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConIn=1500 "Heat transfer coefficient at the inner wall"; | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConOut=15 "Heat transfer coefficient at the outer wall"; | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConIn=1500 "Heat transfer coefficient at the inner wall"; | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConOut=15 "Heat transfer coefficient at the outer wall"; | |
| inner parameter AixLib.DataBase.Storage.BufferStorageBaseDataDefinition data= | |
| AixLib.DataBase.Storage.Generic_New_2000l() "Storage data" | |
| annotation (choicesAllMatching); | |
| - Modelica.SIunits.Energy Heat_loss; | |
| + Modelica.Units.SI.Energy Heat_loss; | |
| /* ***************Heating Coil Section********************************/ | |
| parameter Boolean use_heatingCoil1=true "Use Heating Coil1?" annotation(Dialog(tab="Heating Coils and Rod")); | |
| parameter Boolean use_heatingCoil2=true "Use Heating Coil2?" annotation(Dialog(tab="Heating Coils and Rod")); | |
| parameter Boolean use_heatingRod=true "Use Heating Rod?" annotation(Dialog(tab="Heating Coils and Rod")); | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConHC1=20 "Model assumptions heat transfer coefficient HC1 <-> Heating Water" | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConHC1=20 "Model assumptions heat transfer coefficient HC1 <-> Heating Water" | |
| annotation(Dialog(enable=use_heatingCoil1, tab="Heating Coils and Rod")); | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConHC2=400 "Model assumptions heat transfer coefficient HC2 <-> Heating Water" | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConHC2=400 "Model assumptions heat transfer coefficient HC2 <-> Heating Water" | |
| annotation(Dialog(enable=use_heatingCoil2, tab="Heating Coils and Rod")); | |
| parameter Boolean Up_to_down_HC1 = true | |
| "Heating Coil 1 orientation from up to down?" | |
| @@ -54,7 +54,7 @@ | |
| annotation(Dialog(enable = use_heatingCoil2,tab="Heating Coils and Rod")); | |
| parameter Boolean calcHCon=true "Use calculated value for inside heat transfer coefficient" | |
| annotation(Dialog(tab="Heating Coils and Rod")); | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConIn_const=30 "Fix value for heat transfer coefficient inside pipe" | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConIn_const=30 "Fix value for heat transfer coefficient inside pipe" | |
| annotation(Dialog(enable=not calcHCon, tab="Heating Coils and Rod")); | |
| // parameter Modelica.SIunits.Length d_HC1=0.02 "Inner diameter of HC1" | |
| // annotation(Dialog(enable = use_heatingCoil1,tab="Heating Coils and Rod")); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/HeatStorageVariablePorts.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/HeatStorageVariablePorts.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/HeatStorageVariablePorts.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/HeatStorageVariablePorts.mo" 2021-04-26 11:51:13.758628703 +0200 | |
| @@ -21,11 +21,11 @@ | |
| "Mediums charastics HC2 (heat capacity, density, thermal conductivity)" | |
| annotation(Dialog(group="Medium"),choicesAllMatching); | |
| - parameter Modelica.SIunits.Temperature[n] T_start=fill(293.15, n) | |
| + parameter Modelica.Units.SI.Temperature[n] T_start=fill(293.15, n) | |
| "Start temperature of medium" annotation(Dialog(tab="Initialisation")); | |
| - parameter Modelica.SIunits.Temperature T_start_wall=293.15 | |
| + parameter Modelica.Units.SI.Temperature T_start_wall=293.15 | |
| "Starting Temperature of wall in K" annotation(Dialog(tab="Initialisation")); | |
| - parameter Modelica.SIunits.Temperature T_start_ins=293.15 | |
| + parameter Modelica.Units.SI.Temperature T_start_ins=293.15 | |
| "Starting Temperature of insulation in K" annotation(Dialog(tab="Initialisation")); | |
| /* ******************************************************************* | |
| HeatStorage Parameters | |
| @@ -34,8 +34,8 @@ | |
| parameter Real tau(min=0) = 1000 "Time constant for mixing"; | |
| parameter Integer n(min=3) = 5 "Model assumptions Number of Layers"; | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConIn=1500 "Heat transfer coefficient at the inner wall"; | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConOut=15 "Heat transder coefficient at the outer wall"; | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConIn=1500 "Heat transfer coefficient at the inner wall"; | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConOut=15 "Heat transder coefficient at the outer wall"; | |
| parameter AixLib.DataBase.Storage.BufferStorageBaseDataDefinition data= | |
| AixLib.DataBase.Storage.Generic_New_2000l() "Storage data" | |
| annotation (choicesAllMatching); | |
| @@ -46,7 +46,7 @@ | |
| "Unloading cycle connection pairs (lower position first)" | |
| annotation (Dialog(tab="Connections")); | |
| - Modelica.SIunits.Energy Heat_loss; | |
| + Modelica.Units.SI.Energy Heat_loss; | |
| parameter Integer n_load_cycles=2 "Number of loading cycle connection pairs" | |
| annotation (Dialog(tab="Connections")); | |
| parameter Integer n_unload_cycles=2 | |
| @@ -58,10 +58,10 @@ | |
| parameter Boolean use_heatingCoil1=true "Use Heating Coil1?" annotation(Dialog(tab="Heating Coils and Rod")); | |
| parameter Boolean use_heatingCoil2=true "Use Heating Coil2?" annotation(Dialog(tab="Heating Coils and Rod")); | |
| parameter Boolean use_heatingRod=true "Use Heating Rod?" annotation(Dialog(tab="Heating Coils and Rod")); | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConHC1=20 "Model assumptions heat transfer coefficient HC1 <-> Heating Water" | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConHC1=20 "Model assumptions heat transfer coefficient HC1 <-> Heating Water" | |
| annotation(Dialog(enable=use_heatingCoil1, tab= | |
| "Heating Coils and Rod")); | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConHC2=400 "Model assumptions heat transfer coefficient HC2 <-> Heating Water" | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConHC2=400 "Model assumptions heat transfer coefficient HC2 <-> Heating Water" | |
| annotation(Dialog(enable=use_heatingCoil2, tab= | |
| "Heating Coils and Rod")); | |
| parameter Boolean Up_to_down_HC1 = true | |
| @@ -72,7 +72,7 @@ | |
| annotation(Dialog(enable = use_heatingCoil2,tab="Heating Coils and Rod")); | |
| parameter Boolean calcHCon=true "Use calculated value for inside heat transfer coefficient" | |
| annotation(Dialog(tab="Heating Coils and Rod")); | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConIn_const=30 "Fix value for heat transfer coefficient inside pipe" | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConIn_const=30 "Fix value for heat transfer coefficient inside pipe" | |
| annotation(Dialog(enable=not calcHCon, tab="Heating Coils and Rod")); | |
| // parameter Modelica.SIunits.Length d_HC1=0.02 "Inner diameter of HC1" | |
| // annotation(Dialog(enable = use_heatingCoil1,tab="Heating Coils and Rod")); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/StorageSimpleWall.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/StorageSimpleWall.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/StorageSimpleWall.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Storage/StorageSimpleWall.mo" 2021-04-26 11:51:13.670628583 +0200 | |
| @@ -20,7 +20,7 @@ | |
| "Mediums charastics HC2 (heat capacity, density, thermal conductivity)" | |
| annotation(Dialog(group="Medium"),choicesAllMatching); | |
| - parameter Modelica.SIunits.Temperature T_start=323.15 | |
| + parameter Modelica.Units.SI.Temperature T_start=323.15 | |
| "Start temperature of medium"; | |
| /* ******************************************************************* | |
| @@ -30,8 +30,8 @@ | |
| parameter Real tau(min=0) = 1000 "Time constant for mixing"; | |
| parameter Integer n(min=3) = 5 "Model assumptions Number of Layers"; | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConIn=1500 "Heat transfer coefficient at the inner wall"; | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConOut=15 "Heat transfer coefficient at the outer wall"; | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConIn=1500 "Heat transfer coefficient at the inner wall"; | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConOut=15 "Heat transfer coefficient at the outer wall"; | |
| inner parameter AixLib.DataBase.Storage.BufferStorageBaseDataDefinition data= | |
| AixLib.DataBase.Storage.Generic_New_2000l() "Storage data" | |
| annotation (choicesAllMatching); | |
| @@ -42,7 +42,7 @@ | |
| "Unloading cycle connection pairs (lower position first)" | |
| annotation (Dialog(tab="Connections")); | |
| - Modelica.SIunits.Energy Heat_loss; | |
| + Modelica.Units.SI.Energy Heat_loss; | |
| parameter Integer n_load_cycles=2 "Number of loading cycle connection pairs" | |
| annotation (Dialog(tab="Connections")); | |
| parameter Integer n_unload_cycles=2 | |
| @@ -54,10 +54,10 @@ | |
| parameter Boolean use_heatingCoil1=true "Use Heating Coil1?" annotation(Dialog(tab="Heating Coils and Rod")); | |
| parameter Boolean use_heatingCoil2=true "Use Heating Coil2?" annotation(Dialog(tab="Heating Coils and Rod")); | |
| parameter Boolean use_heatingRod=true "Use Heating Rod?" annotation(Dialog(tab="Heating Coils and Rod")); | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConHC1=20 "Model assumptions heat transfer coefficient HC1 <-> Heating Water" | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConHC1=20 "Model assumptions heat transfer coefficient HC1 <-> Heating Water" | |
| annotation(Dialog(enable=use_heatingCoil1, tab= | |
| "Heating Coils and Rod")); | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConHC2=400 "Model assumptions heat transfer coefficient HC2 <-> Heating Water" | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConHC2=400 "Model assumptions heat transfer coefficient HC2 <-> Heating Water" | |
| annotation(Dialog(enable=use_heatingCoil2, tab= | |
| "Heating Coils and Rod")); | |
| parameter Boolean Up_to_down_HC1 = true | |
| @@ -68,7 +68,7 @@ | |
| annotation(Dialog(enable = use_heatingCoil2,tab="Heating Coils and Rod")); | |
| parameter Boolean calcHCon=true "Use calculated value for inside heat transfer coefficient" | |
| annotation(Dialog(tab="Heating Coils and Rod")); | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hConIn_const=30 "Fix value for heat transfer coefficient inside pipe" | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConIn_const=30 "Fix value for heat transfer coefficient inside pipe" | |
| annotation(Dialog(enable=not calcHCon, tab="Heating Coils and Rod")); | |
| // parameter Modelica.SIunits.Length d_HC1=0.02 "Inner diameter of HC1" | |
| // annotation(Dialog(enable = use_heatingCoil1,tab="Heating Coils and Rod")); | |
| @@ -193,9 +193,9 @@ | |
| protected | |
| parameter Real k_zyl(final unit="W/K") = 2*Modelica.Constants.pi*data.hTank/n/(1/(hConIn*data.dTank/2) + 1/data.lambdaIns*log((data.dTank | |
| /2 + data.sIns)/(data.dTank/2)) + 1/(hConOut*(data.dTank/2 + data.sIns))); | |
| - parameter Modelica.SIunits.Area A_cov = data.dTank^2/4*Modelica.Constants.pi | |
| + parameter Modelica.Units.SI.Area A_cov = data.dTank^2/4*Modelica.Constants.pi | |
| "Area cop/bottom cover"; | |
| - parameter Modelica.SIunits.Area A_wall = (data.dTank+data.sIns+data.sWall)*Modelica.Constants.pi * data.hTank | |
| + parameter Modelica.Units.SI.Area A_wall = (data.dTank+data.sIns+data.sWall)*Modelica.Constants.pi * data.hTank | |
| "Area mantle"; | |
| //parameter Real k_cov(final unit="W/(m2.K)") = {data.lambdaIns/data.sIns*Modelica.Constants.pi*(data.dTank /2)^2 ; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Valves/BaseClases/HysteresisValve.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Valves/BaseClases/HysteresisValve.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Valves/BaseClases/HysteresisValve.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Valves/BaseClases/HysteresisValve.mo" 2021-04-26 11:51:13.558628427 +0200 | |
| @@ -6,7 +6,7 @@ | |
| parameter Real leakageOpening | |
| "The opening signal is limited by leakageOpening (to improve the numerics)"; | |
| - parameter Modelica.SIunits.Time riseTime; | |
| + parameter Modelica.Units.SI.Time riseTime; | |
| Modelica.Blocks.Continuous.Filter filter(order=2, f_cut=5/(2*Modelica.Constants.pi | |
| *riseTime)) if filteredOpening | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Valves/Manifold.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Valves/Manifold.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Valves/Manifold.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Valves/Manifold.mo" 2021-04-26 11:51:13.542628405 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.FastHVAC.Components.Valves; | |
| +within AixLib.FastHVAC.Components.Valves; | |
| model Manifold | |
| /* ******************************************************************* | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Valves/Splitter.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Valves/Splitter.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Valves/Splitter.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Valves/Splitter.mo" 2021-04-26 11:51:13.526628384 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.FastHVAC.Components.Valves; | |
| +within AixLib.FastHVAC.Components.Valves; | |
| model Splitter | |
| /* ******************************************************************* | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Valves/ThermostaticValve.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Valves/ThermostaticValve.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Components/Valves/ThermostaticValve.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Components/Valves/ThermostaticValve.mo" 2021-04-26 11:51:13.486628328 +0200 | |
| @@ -15,7 +15,7 @@ | |
| parameter Boolean filteredOpening=false | |
| "= true, if opening is filtered with a 2nd order CriticalDamping filter" | |
| annotation(Dialog(group="Filtered opening"),choices(__Dymola_checkBox=true)); | |
| - parameter Modelica.SIunits.Time riseTime=1 | |
| + parameter Modelica.Units.SI.Time riseTime=1 | |
| "Rise time of the filter (time to reach 99.6 % of an opening step)" | |
| annotation(Dialog(group="Filtered opening",enable=filteredOpening)); | |
| parameter Real leakageOpening(min=0,max=1)=0.001 | |
| @@ -23,10 +23,10 @@ | |
| annotation(Dialog(group="Filtered opening",enable=filteredOpening)); | |
| parameter Real k(min=0, unit="1") = 0.1 "Gain of controller"; | |
| - parameter Modelica.SIunits.Time Ti(min=Modelica.Constants.small, start=0.5) = 1000 | |
| + parameter Modelica.Units.SI.Time Ti(min=Modelica.Constants.small, start=0.5) = 1000 | |
| "Time constant of Integrator block"; | |
| -parameter Modelica.SIunits.MassFlowRate dotm_nominal = 0.5; | |
| +parameter Modelica.Units.SI.MassFlowRate dotm_nominal = 0.5; | |
| //Modelica.SIunits.MassFlowRate dotm; | |
| //Real relativeFlowCoefficient; | |
| @@ -135,13 +135,11 @@ | |
| controllerType=Modelica.Blocks.Types.SimpleController.PI, | |
| k=k, | |
| Ti=Ti, | |
| - limitsAtInit=true, | |
| yMax=1, | |
| yMin=0, | |
| xi_start=0, | |
| xd_start=0, | |
| - y_start=0.5, | |
| - initType=Modelica.Blocks.Types.InitPID.InitialOutput) | |
| + y_start=0.5, initType = Modelica.Blocks.Types.Init.InitialOutput) | |
| annotation (Placement(transformation(extent={{11,-11},{-11,11}}, | |
| rotation=180, | |
| origin={-25,-1}))); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/DayNightMode/HeatingCurvesDayNightBaseDataDefinition.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/DayNightMode/HeatingCurvesDayNightBaseDataDefinition.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/DayNightMode/HeatingCurvesDayNightBaseDataDefinition.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/DayNightMode/HeatingCurvesDayNightBaseDataDefinition.mo" 2021-04-26 11:51:13.426628244 +0200 | |
| @@ -2,8 +2,8 @@ | |
| record HeatingCurvesDayNightBaseDataDefinition | |
| "Base data definition for heating curves for Day and Night" | |
| extends Modelica.Icons.Record; | |
| -import SI = Modelica.SIunits; | |
| -import SIconv = Modelica.SIunits.Conversions.NonSIunits; | |
| +import SI = Modelica.Units.SI; | |
| +import SIconv = Modelica.Units.NonSI; | |
| parameter String name "Name of data set"; | |
| parameter Real varFlowTempDay[:, :] "Variable flow temperature during day time"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/DayNightMode/HeatingCurvesVitotronicDay23Night10.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/DayNightMode/HeatingCurvesVitotronicDay23Night10.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/DayNightMode/HeatingCurvesVitotronicDay23Night10.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/DayNightMode/HeatingCurvesVitotronicDay23Night10.mo" 2021-04-26 11:51:13.414628229 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.FastHVAC.Data.Boiler.DayNightMode; | |
| +within AixLib.FastHVAC.Data.Boiler.DayNightMode; | |
| record HeatingCurvesVitotronicDay23Night10 | |
| "Heating Curves for Vitotronic Controller, TsetDay = 23°C, TsetNight = 10°C " | |
| extends HeatingCurvesDayNightBaseDataDefinition( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/DayNightMode/HeatingCurvesVitotronicDay25Night10.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/DayNightMode/HeatingCurvesVitotronicDay25Night10.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/DayNightMode/HeatingCurvesVitotronicDay25Night10.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/DayNightMode/HeatingCurvesVitotronicDay25Night10.mo" 2021-04-26 11:51:13.406628218 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.FastHVAC.Data.Boiler.DayNightMode; | |
| +within AixLib.FastHVAC.Data.Boiler.DayNightMode; | |
| record HeatingCurvesVitotronicDay25Night10 | |
| "Heating Curves for Vitotronic Controller, TsetDay = 25°C, TsetNight = 10°C " | |
| extends HeatingCurvesDayNightBaseDataDefinition( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/General/BoilerTwoPointBaseDataDefinition.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/General/BoilerTwoPointBaseDataDefinition.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/General/BoilerTwoPointBaseDataDefinition.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/General/BoilerTwoPointBaseDataDefinition.mo" 2021-04-26 11:51:13.394628201 +0200 | |
| @@ -2,8 +2,8 @@ | |
| record BoilerTwoPointBaseDataDefinition | |
| "Basic data for boiler with two point characteristic" | |
| extends Modelica.Icons.Record; | |
| - import SI = Modelica.SIunits; | |
| - import SIconv = Modelica.SIunits.Conversions.NonSIunits; | |
| + import SI = Modelica.Units.SI; | |
| + import SIconv = Modelica.Units.NonSI; | |
| parameter String name "Name of Boiler"; | |
| parameter SI.Volume volume "Water volume of Boiler"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/General/Boiler_Vitocrossal200_311kW.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/General/Boiler_Vitocrossal200_311kW.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/General/Boiler_Vitocrossal200_311kW.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/General/Boiler_Vitocrossal200_311kW.mo" 2021-04-26 11:51:13.378628178 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.FastHVAC.Data.Boiler.General; | |
| +within AixLib.FastHVAC.Data.Boiler.General; | |
| record Boiler_Vitocrossal200_311kW | |
| "Gas-fired condensing boiler Viessmann Vitocrossal200 311kW" | |
| extends BoilerTwoPointBaseDataDefinition( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/General/Boiler_Vitodens300W_13kW.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/General/Boiler_Vitodens300W_13kW.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/General/Boiler_Vitodens300W_13kW.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/General/Boiler_Vitodens300W_13kW.mo" 2021-04-26 11:51:13.374628173 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.FastHVAC.Data.Boiler.General; | |
| +within AixLib.FastHVAC.Data.Boiler.General; | |
| record Boiler_Vitodens300W_13kW | |
| "Condesing boiler Viessmann Vitodens 300W 13kW, for Tv/Tr = 50/30 °C" | |
| extends BoilerTwoPointBaseDataDefinition( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/WorkLoad/BuderusGB202_40_30.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/WorkLoad/BuderusGB202_40_30.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/WorkLoad/BuderusGB202_40_30.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/WorkLoad/BuderusGB202_40_30.mo" 2021-04-26 11:51:13.290628058 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.FastHVAC.Data.Boiler.WorkLoad; | |
| +within AixLib.FastHVAC.Data.Boiler.WorkLoad; | |
| record BuderusGB202_40_30 | |
| "Buderus Logano Plus GB202 - Condensing Boiler - 40/30°C" | |
| extends WorkLoadBaseDataDefinition( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/WorkLoad/BuderusGB202_75_60.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/WorkLoad/BuderusGB202_75_60.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/WorkLoad/BuderusGB202_75_60.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Data/Boiler/WorkLoad/BuderusGB202_75_60.mo" 2021-04-26 11:51:13.286628051 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.FastHVAC.Data.Boiler.WorkLoad; | |
| +within AixLib.FastHVAC.Data.Boiler.WorkLoad; | |
| record BuderusGB202_75_60 | |
| "Buderus Logano Plus GB202 - Condensing Boiler - 75/60°C" | |
| extends WorkLoadBaseDataDefinition( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Data/CHP/BaseDataDefinition.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Data/CHP/BaseDataDefinition.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Data/CHP/BaseDataDefinition.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Data/CHP/BaseDataDefinition.mo" 2021-04-26 11:51:13.258628012 +0200 | |
| @@ -2,14 +2,14 @@ | |
| record BaseDataDefinition "Basic Mikro_KWK Data" | |
| extends Modelica.Icons.Record; | |
| - import SI = Modelica.SIunits; | |
| - import SIconv = Modelica.SIunits.Conversions.NonSIunits; | |
| -Modelica.SIunits.MassFlowRate dotm_max "maximum mass flow rate"; | |
| -Modelica.SIunits.MassFlowRate dotm_min "minimum mass flow rate"; | |
| + import SI = Modelica.Units.SI; | |
| + import SIconv = Modelica.Units.NonSI; | |
| +Modelica.Units.SI.MassFlowRate dotm_max "maximum mass flow rate"; | |
| +Modelica.Units.SI.MassFlowRate dotm_min "minimum mass flow rate"; | |
| parameter SI.Power P_elRated "rated electrical power (unit=W)"; | |
| - parameter Modelica.SIunits.Time tauQ_th | |
| + parameter Modelica.Units.SI.Time tauQ_th | |
| "time constant thermal power start behavior (unit=sec) "; | |
| - parameter Modelica.SIunits.Time tauP_el | |
| + parameter Modelica.Units.SI.Time tauP_el | |
| "time constant electrical power start behavior (unit=sec)"; | |
| parameter Real a_0; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Examples/Chiller/Chiller.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Examples/Chiller/Chiller.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Examples/Chiller/Chiller.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Examples/Chiller/Chiller.mo" 2021-04-26 11:51:13.206627941 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.FastHVAC.Examples.Chiller; | |
| +within AixLib.FastHVAC.Examples.Chiller; | |
| model Chiller | |
| extends Modelica.Icons.Example; | |
| FastHVAC.Components.Sensors.TemperatureSensor temperatureSensor | |
| @@ -88,7 +88,7 @@ | |
| rotation=270, | |
| origin={54,-2}))); | |
| Modelica.Blocks.Sources.Sine sine( | |
| - freqHz=1/3600, | |
| + f =1/3600, | |
| amplitude=500, | |
| phase=3.1415926535898, | |
| offset=500) "hourly sine " | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Examples/HeatGenerators/HeatPump/HeatPump.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Examples/HeatGenerators/HeatPump/HeatPump.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Examples/HeatGenerators/HeatPump/HeatPump.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Examples/HeatGenerators/HeatPump/HeatPump.mo" 2021-04-26 11:51:13.046627719 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.FastHVAC.Examples.HeatGenerators.HeatPump; | |
| +within AixLib.FastHVAC.Examples.HeatGenerators.HeatPump; | |
| model HeatPump | |
| extends Modelica.Icons.Example; | |
| FastHVAC.Components.Sensors.TemperatureSensor temperatureSensor | |
| @@ -91,7 +91,7 @@ | |
| rotation=270, | |
| origin={54,-2}))); | |
| Modelica.Blocks.Sources.Sine sine( | |
| - freqHz=1/3600, | |
| + f =1/3600, | |
| amplitude=3000, | |
| offset=3000) "hourly sine " | |
| annotation (Placement(transformation(extent={{66,8},{58,16}}))); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Examples/Valves/ThermostaticValveRadiator.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Examples/Valves/ThermostaticValveRadiator.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Examples/Valves/ThermostaticValveRadiator.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Examples/Valves/ThermostaticValveRadiator.mo" 2021-04-26 11:51:12.846627444 +0200 | |
| @@ -4,7 +4,7 @@ | |
| Modelica.Blocks.Sources.Constant T_setRoom(k=273.15 + 20) | |
| annotation (Placement(transformation(extent={{-96,-42},{-78,-24}}))); | |
| Modelica.Blocks.Sources.Sine sine1( | |
| - freqHz=1/86400, | |
| + f =1/86400, | |
| offset=-2000, | |
| amplitude=1214) | |
| annotation (Placement(transformation( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Examples/Valves/ThreeWayValve.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Examples/Valves/ThreeWayValve.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Examples/Valves/ThreeWayValve.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Examples/Valves/ThreeWayValve.mo" 2021-04-26 11:51:12.818627406 +0200 | |
| @@ -17,7 +17,7 @@ | |
| annotation (Placement(transformation(extent={{-94,2},{-74,22}}))); | |
| Modelica.Blocks.Sources.Sine sine( | |
| amplitude=0.5, | |
| - freqHz=1/3600, | |
| +f =1/3600, | |
| offset=0.5) | |
| annotation (Placement(transformation(extent={{-36,44},{-16,64}}))); | |
| equation | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Interfaces/EnthalpyPort.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Interfaces/EnthalpyPort.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Interfaces/EnthalpyPort.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Interfaces/EnthalpyPort.mo" 2021-04-26 11:51:12.798627378 +0200 | |
| @@ -1,12 +1,12 @@ | |
| within AixLib.FastHVAC.Interfaces; | |
| partial connector EnthalpyPort "Enthalpy port for 1-dim. enthalpy transfer" | |
| - Modelica.SIunits.Temperature T "Port temperature"; | |
| - Modelica.SIunits.MassFlowRate m_flow | |
| - "Mass flow rate(positive if flowing from outside into the component)"; | |
| - Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy of fluid"; | |
| - Modelica.SIunits.SpecificHeatCapacity c "Constant specific heat capacity"; | |
| + Modelica.Units.SI.Temperature T "Port temperature"; | |
| + Modelica.Units.SI.MassFlowRate m_flow | |
| + "Mass flow rate(positive if flowing from outside into the component)"; | |
| + Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy of fluid"; | |
| + Modelica.Units.SI.SpecificHeatCapacity c "Constant specific heat capacity"; | |
| annotation (Documentation(info="<html>This is an interface model for a 1-dimensional enthalpy port to | |
| consider enthalpy transfer | |
| </html>", revisions="<html> | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Interfaces/TwoPortHeatMassExchanger.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Interfaces/TwoPortHeatMassExchanger.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Interfaces/TwoPortHeatMassExchanger.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Interfaces/TwoPortHeatMassExchanger.mo" 2021-04-26 11:51:12.782627355 +0200 | |
| @@ -1,20 +1,20 @@ | |
| -within AixLib.FastHVAC.Interfaces; | |
| +within AixLib.FastHVAC.Interfaces; | |
| model TwoPortHeatMassExchanger | |
| "Model transporting one enthalpy stream with storing mass or energy" | |
| parameter Modelica.Media.Interfaces.Types.Temperature T_start = workingFluid.T0; | |
| - parameter Modelica.SIunits.Mass m_fluid "Mass of working fluid"; | |
| + parameter Modelica.Units.SI.Mass m_fluid "Mass of working fluid"; | |
| parameter Media.BaseClasses.MediumSimple medium= | |
| AixLib.FastHVAC.Media.WaterSimple() | |
| "Mediums charastics (heat capacity, density, thermal conductivity)"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal | |
| "Nominal mass flow rate" | |
| annotation(Dialog(group = "Nominal condition")); | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_small(min=0) = 1E-4*abs(m_flow_nominal) | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_small(min=0) = 1E-4*abs(m_flow_nominal) | |
| "Small mass flow rate for regularization of zero flow" | |
| annotation(Dialog(tab = "Advanced")); | |
| - final parameter Modelica.SIunits.MassFlowRate m_flow_start = 0 | |
| + final parameter Modelica.Units.SI.MassFlowRate m_flow_start = 0 | |
| "Start value for m_flow, used to avoid a warning if not set in m_flow, and to avoid m_flow.start in parameter window"; | |
| - Modelica.SIunits.MassFlowRate m_flow(start=m_flow_start) = enthalpyPort_a.m_flow | |
| + Modelica.Units.SI.MassFlowRate m_flow(start=m_flow_start) = enthalpyPort_a.m_flow | |
| "Mass flow rate from port_a to port_b (m_flow > 0 is design flow direction)"; | |
| Interfaces.EnthalpyPort_a enthalpyPort_a | |
| "FastHVAC connector a (positive design flow direction is from port_a to port_b)" | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Media/BaseClasses/MediumSimple.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Media/BaseClasses/MediumSimple.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Media/BaseClasses/MediumSimple.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Media/BaseClasses/MediumSimple.mo" 2021-04-26 11:51:12.754627317 +0200 | |
| @@ -1,11 +1,11 @@ | |
| within AixLib.FastHVAC.Media.BaseClasses; | |
| record MediumSimple | |
| -parameter Modelica.SIunits.SpecificHeatCapacity c | |
| +parameter Modelica.Units.SI.SpecificHeatCapacity c | |
| "Heat capacity of considered medium"; | |
| -parameter Modelica.SIunits.Density rho "Density of considered medium"; | |
| -parameter Modelica.SIunits.ThermalConductivity lambda | |
| +parameter Modelica.Units.SI.Density rho "Density of considered medium"; | |
| +parameter Modelica.Units.SI.ThermalConductivity lambda | |
| "Thermal conductivity of considered medium"; | |
| -parameter Modelica.SIunits.DynamicViscosity eta | |
| +parameter Modelica.Units.SI.DynamicViscosity eta | |
| "Dynamic viscosity of considered medium"; | |
| annotation (Documentation(info="<html><p> | |
| This record declares parameters that are used by models within the | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Media/WaterSimple.mo" "converted-libraries/AixLib 0.9.1-master/FastHVAC/Media/WaterSimple.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/FastHVAC/Media/WaterSimple.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/FastHVAC/Media/WaterSimple.mo" 2021-04-26 11:51:12.738627294 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.FastHVAC.Media; | |
| +within AixLib.FastHVAC.Media; | |
| record WaterSimple | |
| extends AixLib.FastHVAC.Media.BaseClasses.MediumSimple( | |
| rho=999.7, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/BaseClasses/ActuatorSignal.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/BaseClasses/ActuatorSignal.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/BaseClasses/ActuatorSignal.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/BaseClasses/ActuatorSignal.mo" 2021-04-26 11:51:12.726627278 +0200 | |
| @@ -5,7 +5,7 @@ | |
| parameter Boolean use_inputFilter=true | |
| "= true, if opening is filtered with a 2nd order CriticalDamping filter" | |
| annotation(Dialog(tab="Dynamics", group="Filtered opening")); | |
| - parameter Modelica.SIunits.Time riseTime=120 | |
| + parameter Modelica.Units.SI.Time riseTime=120 | |
| "Rise time of the filter (time to reach 99.6 % of an opening step)" | |
| annotation(Dialog(tab="Dynamics", group="Filtered opening",enable=use_inputFilter)); | |
| parameter Integer order(min=1) = 2 "Order of filter" | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo" 2021-04-26 11:51:12.686627222 +0200 | |
| @@ -11,8 +11,8 @@ | |
| parameter Real deltaM = 0.3 | |
| "Fraction of nominal mass flow rate where transition to turbulent occurs" | |
| annotation(Dialog(enable=use_deltaM)); | |
| - parameter Modelica.SIunits.Velocity v_nominal = 1 "Nominal face velocity"; | |
| - final parameter Modelica.SIunits.Area A=m_flow_nominal/rho_default/v_nominal | |
| + parameter Modelica.Units.SI.Velocity v_nominal = 1 "Nominal face velocity"; | |
| + final parameter Modelica.Units.SI.Area A=m_flow_nominal/rho_default/v_nominal | |
| "Face area"; | |
| parameter Boolean roundDuct = false | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo" 2021-04-26 11:51:12.662627189 +0200 | |
| @@ -35,7 +35,7 @@ | |
| extends AixLib.Fluid.Actuators.BaseClasses.ValveParameters( | |
| rhoStd=Medium.density_pTX(101325, 273.15+4, Medium.X_default)); | |
| - parameter Modelica.SIunits.PressureDifference dpFixed_nominal[2](each displayUnit="Pa", | |
| + parameter Modelica.Units.SI.PressureDifference dpFixed_nominal[2](each displayUnit="Pa", | |
| each min=0) = {0, 0} | |
| "Nominal pressure drop of pipes and other equipment in flow legs at port_1 and port_3" | |
| annotation(Dialog(group="Nominal condition")); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo" 2021-04-26 11:51:12.642627161 +0200 | |
| @@ -10,7 +10,7 @@ | |
| rhoStd=Medium.density_pTX(101325, 273.15+4, Medium.X_default)); | |
| extends AixLib.Fluid.Actuators.BaseClasses.ActuatorSignal; | |
| - parameter Modelica.SIunits.PressureDifference dpFixed_nominal(displayUnit="Pa", min=0) = 0 | |
| + parameter Modelica.Units.SI.PressureDifference dpFixed_nominal(displayUnit="Pa", min=0) = 0 | |
| "Pressure drop of pipe and other resistances that are in series" | |
| annotation(Dialog(group = "Nominal condition")); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/BaseClasses/ValveParameters.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/BaseClasses/ValveParameters.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/BaseClasses/ValveParameters.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/BaseClasses/ValveParameters.mo" 2021-04-26 11:51:12.614627123 +0200 | |
| @@ -14,7 +14,7 @@ | |
| "Cv (US) flow coefficient [USG/min/(psi)^(1/2)]" | |
| annotation(Dialog(group = "Flow Coefficient", | |
| enable = (CvData==AixLib.Fluid.Types.CvTypes.Cv))); | |
| - parameter Modelica.SIunits.Area Av( | |
| + parameter Modelica.Units.SI.Area Av( | |
| fixed= if CvData==AixLib.Fluid.Types.CvTypes.Av then true else false) | |
| "Av (metric) flow coefficient" | |
| annotation(Dialog(group = "Flow Coefficient", | |
| @@ -23,10 +23,11 @@ | |
| parameter Real deltaM = 0.02 | |
| "Fraction of nominal flow rate where linearization starts, if y=1" | |
| annotation(Dialog(group="Pressure-flow linearization")); | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal | |
| + | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal | |
| "Nominal mass flow rate" | |
| annotation(Dialog(group = "Nominal condition")); | |
| - parameter Modelica.SIunits.PressureDifference dpValve_nominal( | |
| + parameter Modelica.Units.SI.PressureDifference dpValve_nominal( | |
| displayUnit="Pa", | |
| min=0, | |
| fixed= if CvData==AixLib.Fluid.Types.CvTypes.OpPoint then true else false) | |
| @@ -34,10 +35,9 @@ | |
| annotation(Dialog(group="Nominal condition", | |
| enable = (CvData==AixLib.Fluid.Types.CvTypes.OpPoint))); | |
| - parameter Modelica.SIunits.Density rhoStd | |
| + parameter Modelica.Units.SI.Density rhoStd | |
| "Inlet density for which valve coefficients are defined" | |
| annotation(Dialog(group="Nominal condition", tab="Advanced")); | |
| - | |
| protected | |
| parameter Real Kv_SI( | |
| min=0, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Dampers/MixingBox.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Dampers/MixingBox.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Dampers/MixingBox.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Dampers/MixingBox.mo" 2021-04-26 11:51:12.510626980 +0200 | |
| @@ -38,7 +38,7 @@ | |
| parameter Real deltaM = 0.3 | |
| "Fraction of nominal mass flow rate where transition to turbulent occurs" | |
| annotation(Dialog(enable=use_deltaM)); | |
| - parameter Modelica.SIunits.Velocity v_nominal=1 "Nominal face velocity"; | |
| + parameter Modelica.Units.SI.Velocity v_nominal=1 "Nominal face velocity"; | |
| parameter Boolean roundDuct = false | |
| "Set to true for round duct, false for square cross section" | |
| @@ -98,24 +98,24 @@ | |
| "set to true if dp_nominal includes the pressure loss of the open damper" | |
| annotation (Dialog(group="Nominal condition")); | |
| - parameter Modelica.SIunits.MassFlowRate mOut_flow_nominal | |
| + parameter Modelica.Units.SI.MassFlowRate mOut_flow_nominal | |
| "Mass flow rate outside air damper" | |
| annotation (Dialog(group="Nominal condition")); | |
| - parameter Modelica.SIunits.PressureDifference dpOut_nominal(min=0, displayUnit="Pa") | |
| + parameter Modelica.Units.SI.PressureDifference dpOut_nominal(min=0, displayUnit="Pa") | |
| "Pressure drop outside air leg" | |
| annotation (Dialog(group="Nominal condition")); | |
| - parameter Modelica.SIunits.MassFlowRate mRec_flow_nominal | |
| + parameter Modelica.Units.SI.MassFlowRate mRec_flow_nominal | |
| "Mass flow rate recirculation air damper" | |
| annotation (Dialog(group="Nominal condition")); | |
| - parameter Modelica.SIunits.PressureDifference dpRec_nominal(min=0, displayUnit="Pa") | |
| + parameter Modelica.Units.SI.PressureDifference dpRec_nominal(min=0, displayUnit="Pa") | |
| "Pressure drop recirculation air leg" | |
| annotation (Dialog(group="Nominal condition")); | |
| - parameter Modelica.SIunits.MassFlowRate mExh_flow_nominal | |
| + parameter Modelica.Units.SI.MassFlowRate mExh_flow_nominal | |
| "Mass flow rate exhaust air damper" | |
| annotation (Dialog(group="Nominal condition")); | |
| - parameter Modelica.SIunits.PressureDifference dpExh_nominal(min=0, displayUnit="Pa") | |
| + parameter Modelica.Units.SI.PressureDifference dpExh_nominal(min=0, displayUnit="Pa") | |
| "Pressure drop exhaust air leg" | |
| annotation (Dialog(group="Nominal condition")); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Dampers/PressureIndependent.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Dampers/PressureIndependent.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Dampers/PressureIndependent.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Dampers/PressureIndependent.mo" 2021-04-26 11:51:12.458626908 +0200 | |
| @@ -12,8 +12,8 @@ | |
| parameter Real deltaM = 0.3 | |
| "Fraction of nominal mass flow rate where transition to turbulent occurs" | |
| annotation(Dialog(enable=use_deltaM)); | |
| - parameter Modelica.SIunits.Velocity v_nominal = 1 "Nominal face velocity"; | |
| - final parameter Modelica.SIunits.Area A=m_flow_nominal/rho_default/v_nominal | |
| + parameter Modelica.Units.SI.Velocity v_nominal = 1 "Nominal face velocity"; | |
| + final parameter Modelica.Units.SI.Area A=m_flow_nominal/rho_default/v_nominal | |
| "Face area"; | |
| parameter Boolean roundDuct = false | |
| @@ -24,7 +24,7 @@ | |
| parameter Boolean use_constant_density=true | |
| "Set to true to use constant density for flow friction" | |
| annotation (Evaluate=true, Dialog(tab="Advanced")); | |
| - parameter Modelica.SIunits.PressureDifference dpFixed_nominal(displayUnit="Pa", min=0) = 0 | |
| + parameter Modelica.Units.SI.PressureDifference dpFixed_nominal(displayUnit="Pa", min=0) = 0 | |
| "Pressure drop of duct and other resistances that are in series" | |
| annotation(Dialog(group = "Nominal condition")); | |
| parameter Real l(min=1e-10, max=1) = 0.0001 | |
| @@ -55,17 +55,17 @@ | |
| "Parameter for avoiding unnecessary computations"; | |
| constant Real y2dd = 0 | |
| "Second derivative at second support point"; | |
| - Modelica.SIunits.MassFlowRate m_flow_set | |
| + Modelica.Units.SI.MassFlowRate m_flow_set | |
| "Requested mass flow rate"; | |
| - Modelica.SIunits.PressureDifference dp_min(displayUnit="Pa") | |
| + Modelica.Units.SI.PressureDifference dp_min(displayUnit="Pa") | |
| "Minimum pressure difference required for delivering requested mass flow rate"; | |
| - Modelica.SIunits.PressureDifference dp_x, dp_x1, dp_x2, dp_y2, dp_y1 | |
| + Modelica.Units.SI.PressureDifference dp_x, dp_x1, dp_x2, dp_y2, dp_y1 | |
| "Support points for interpolation flow functions"; | |
| - Modelica.SIunits.MassFlowRate m_flow_x, m_flow_x1, m_flow_x2, m_flow_y2, m_flow_y1 | |
| + Modelica.Units.SI.MassFlowRate m_flow_x, m_flow_x1, m_flow_x2, m_flow_y2, m_flow_y1 | |
| "Support points for interpolation flow functions"; | |
| - Modelica.SIunits.MassFlowRate m_flow_smooth | |
| + Modelica.Units.SI.MassFlowRate m_flow_smooth | |
| "Smooth interpolation result between two flow regimes"; | |
| - Modelica.SIunits.PressureDifference dp_smooth | |
| + Modelica.Units.SI.PressureDifference dp_smooth | |
| "Smooth interpolation result between two flow regimes"; | |
| initial equation | |
| assert(m_flow_turbulent > 0, "m_flow_turbulent must be bigger than zero."); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Dampers/VAVBoxExponential.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Dampers/VAVBoxExponential.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Dampers/VAVBoxExponential.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Dampers/VAVBoxExponential.mo" 2021-04-26 11:51:12.426626863 +0200 | |
| @@ -8,7 +8,7 @@ | |
| "set to true if dp_nominal includes the pressure loss of the open damper" | |
| annotation(Dialog(group = "Nominal condition")); | |
| protected | |
| - parameter Modelica.SIunits.PressureDifference dpDamOpe_nominal(displayUnit="Pa")= | |
| + parameter Modelica.Units.SI.PressureDifference dpDamOpe_nominal(displayUnit="Pa")= | |
| k1*m_flow_nominal^2/2/Medium.density(sta_default)/A^2 | |
| "Pressure drop of fully open damper at nominal flow rate"; | |
| parameter Real kResSqu(unit="kg.m", fixed=false) | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Motors/IdealMotor.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Motors/IdealMotor.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Motors/IdealMotor.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Motors/IdealMotor.mo" 2021-04-26 11:51:12.362626776 +0200 | |
| @@ -3,8 +3,8 @@ | |
| extends Modelica.Blocks.Interfaces.SISO; | |
| parameter Real delta(min=0, max=0.5) = 0.05 "Hysteresis"; | |
| - parameter Modelica.SIunits.Time tOpe(min=0) = 120 "Opening time"; | |
| - parameter Modelica.SIunits.Time tClo(min=0) = tOpe "Closing time"; | |
| + parameter Modelica.Units.SI.Time tOpe(min=0) = 120 "Opening time"; | |
| + parameter Modelica.Units.SI.Time tClo(min=0) = tOpe "Closing time"; | |
| parameter Real y_start(min=0, max=1) = 0.5 "Start position"; | |
| Modelica.Blocks.Logical.Hysteresis uppHys(final uLow=0, uHigh=delta, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/BaseClasses/PartialExpansionValve.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/BaseClasses/PartialExpansionValve.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/BaseClasses/PartialExpansionValve.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/BaseClasses/PartialExpansionValve.mo" 2021-04-26 11:51:12.162626499 +0200 | |
| @@ -4,17 +4,17 @@ | |
| // Definition of parameters | |
| // | |
| - parameter Modelica.SIunits.Area AVal = 2.5e-6 | |
| + parameter Modelica.Units.SI.Area AVal = 2.5e-6 | |
| "Cross-sectional area of the valve when it is fully opened" | |
| annotation(Dialog(group="Geometry")); | |
| - parameter Modelica.SIunits.Diameter dInlPip = 7.5e-3 | |
| + parameter Modelica.Units.SI.Diameter dInlPip = 7.5e-3 | |
| "Diameter of the pipe at valve's inlet" | |
| annotation(Dialog(group="Geometry")); | |
| parameter Boolean useInpFil = true | |
| "= true, if transient behaviour of valve opening or closing is computed" | |
| annotation(Dialog(group="Transient behaviour")); | |
| - parameter Modelica.SIunits.Time risTim = 0.5 | |
| + parameter Modelica.Units.SI.Time risTim = 0.5 | |
| "Time until valve opening reaches 99.6 % of its set value" | |
| annotation(Dialog( | |
| enable = useInpFil, | |
| @@ -23,7 +23,7 @@ | |
| parameter Utilities.Types.CalcProc calcProc=Utilities.Types.CalcProc.nominal | |
| "Chose predefined calculation method for flow coefficient" | |
| annotation (Dialog(tab="Flow Coefficient")); | |
| - parameter Modelica.SIunits.MassFlowRate mFlowNom = m_flow_nominal | |
| + parameter Modelica.Units.SI.MassFlowRate mFlowNom = m_flow_nominal | |
| "Mass flow at nominal conditions" | |
| annotation(Dialog( | |
| tab="Flow Coefficient", | |
| @@ -31,7 +31,7 @@ | |
| enable=if ((calcProc == Utilities.Types.CalcProc.nominal) or ( | |
| calcProc == Utilities.Types.CalcProc.flowCoefficient)) then true | |
| else false)); | |
| - parameter Modelica.SIunits.PressureDifference dpNom = 15e5 | |
| + parameter Modelica.Units.SI.PressureDifference dpNom = 15e5 | |
| "Pressure drop at nominal conditions" | |
| annotation(Dialog( | |
| tab="Flow Coefficient", | |
| @@ -137,19 +137,19 @@ | |
| protected | |
| - Modelica.SIunits.Area AThr | |
| + Modelica.Units.SI.Area AThr | |
| "Current cross-sectional area of the valve"; | |
| Real opening(unit="1") | |
| "Current valve's opening"; | |
| - Modelica.SIunits.Density dInl = Medium.density(staInl) | |
| + | |
| + | |
| + Modelica.Units.SI.Density dInl = Medium.density(staInl) | |
| "Density at valves's inlet conditions"; | |
| - Modelica.SIunits.AbsolutePressure pInl = port_a.p | |
| + Modelica.Units.SI.AbsolutePressure pInl = port_a.p | |
| "Pressure of the fluid at inlet conditions"; | |
| - Modelica.SIunits.AbsolutePressure pOut = port_b.p | |
| + Modelica.Units.SI.AbsolutePressure pOut = port_b.p | |
| "Pressure of the fluid at outlet conditions"; | |
| - | |
| - | |
| equation | |
| // Calculation of thermodynamic states | |
| // | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/BaseClasses/PartialFlowCoefficient.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/BaseClasses/PartialFlowCoefficient.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/BaseClasses/PartialFlowCoefficient.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/BaseClasses/PartialFlowCoefficient.mo" 2021-04-26 11:51:12.130626455 +0200 | |
| @@ -11,18 +11,18 @@ | |
| input Real opening(unit="1") | |
| "Current valve's opening"; | |
| - input Modelica.SIunits.Area AVal | |
| + input Modelica.Units.SI.Area AVal | |
| "Cross-sectional area of the expansion valve"; | |
| - input Modelica.SIunits.Diameter dInlPip | |
| + input Modelica.Units.SI.Diameter dInlPip | |
| "Diameter of the pipe at valve's inlet"; | |
| input Medium.ThermodynamicState staInl | |
| "Thermodynamic state at valve's inlet conditions"; | |
| input Medium.ThermodynamicState staOut | |
| "Thermodynamic state at valve's outlet conditions"; | |
| - input Modelica.SIunits.AbsolutePressure pInl | |
| + input Modelica.Units.SI.AbsolutePressure pInl | |
| "Pressure at valves's inlet conditions"; | |
| - input Modelica.SIunits.AbsolutePressure pOut | |
| + input Modelica.Units.SI.AbsolutePressure pOut | |
| "Pressure at valves's outlet conditions"; | |
| // Definition of base variables | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/BaseClasses/PartialModularExpansionVavles.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/BaseClasses/PartialModularExpansionVavles.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/BaseClasses/PartialModularExpansionVavles.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/BaseClasses/PartialModularExpansionVavles.mo" 2021-04-26 11:51:12.110626427 +0200 | |
| @@ -35,11 +35,11 @@ | |
| // Definition of parameters describing the expansion valves | |
| // | |
| - parameter Modelica.SIunits.Area AVal[nVal] = fill(2e-6, nVal) | |
| + parameter Modelica.Units.SI.Area AVal[nVal] = fill(2e-6, nVal) | |
| "Cross-sectional areas of the valves when they are fully opened" | |
| annotation(Dialog(tab="Expansion valves",group="Geometry"), | |
| HideResult=not show_parVal); | |
| - parameter Modelica.SIunits.Diameter dInlPip[nVal] = fill(7.5e-3, nVal) | |
| + parameter Modelica.Units.SI.Diameter dInlPip[nVal] = fill(7.5e-3, nVal) | |
| "Diameters of the pipes at valves' inlets" | |
| annotation(Dialog(tab="Expansion valves",group="Geometry"), | |
| HideResult=not show_parVal); | |
| @@ -48,7 +48,7 @@ | |
| "= true, if transient behaviours of valves opening or closing are computed" | |
| annotation(Dialog(tab="Expansion valves",group="Transient behaviour"), | |
| HideResult=not show_parVal); | |
| - parameter Modelica.SIunits.Time risTim[nVal] = fill(0.5, nVal) | |
| + parameter Modelica.Units.SI.Time risTim[nVal] = fill(0.5, nVal) | |
| "Time until valves opening reach 99.6 % of the set values" | |
| annotation(Dialog(tab="Expansion valves",group="Transient behaviour"), | |
| HideResult=not show_parVal); | |
| @@ -57,12 +57,12 @@ | |
| nVal) "Chose predefined calculation method for flow coefficients" | |
| annotation (Dialog(tab="Expansion valves", group="Flow Coefficient"), | |
| HideResult=not show_parVal); | |
| - parameter Modelica.SIunits.MassFlowRate mFlowNom[nVal]= | |
| + parameter Modelica.Units.SI.MassFlowRate mFlowNom[nVal]= | |
| {m_flow_nominal/sum(AVal)*AVal[i] for i in 1:nVal} | |
| "Mass flow at nominal conditions" | |
| annotation(Dialog(tab="Expansion valves",group="Flow Coefficient"), | |
| HideResult=not show_parVal); | |
| - parameter Modelica.SIunits.PressureDifference dpNom[nVal]= | |
| + parameter Modelica.Units.SI.PressureDifference dpNom[nVal]= | |
| fill(dp_nominal, nVal) | |
| "Pressure drop at nominal conditions" | |
| annotation(Dialog(tab="Expansion valves",group="Flow Coefficient"), | |
| @@ -140,7 +140,7 @@ | |
| "Gain of controller" | |
| annotation(Dialog(tab="Controller", group="PID setup"), | |
| HideResult=not show_parCon); | |
| - parameter Modelica.SIunits.Time Ti[nVal] = fill(0.5,nVal) | |
| + parameter Modelica.Units.SI.Time Ti[nVal] = fill(0.5,nVal) | |
| "Time constant of integrator block" | |
| annotation(Dialog(tab="Controller", group="PID setup"), | |
| HideResult=not show_parCon); | |
| @@ -148,7 +148,7 @@ | |
| "Ni*Ti is time constant of anti-windup compensation" | |
| annotation(Dialog(tab="Controller", group="PID setup"), | |
| HideResult=not show_parCon); | |
| - parameter Modelica.SIunits.Time Td[nVal] = fill(0.1,nVal) | |
| + parameter Modelica.Units.SI.Time Td[nVal] = fill(0.1,nVal) | |
| "Time constant of derivative block" | |
| annotation(Dialog(tab="Controller", group="PID setup"), | |
| HideResult=not show_parCon); | |
| @@ -174,8 +174,8 @@ | |
| annotation(Dialog(tab="Controller", group="Weighting and limits"), | |
| HideResult=not show_parCon); | |
| - parameter Modelica.Blocks.Types.InitPID initType[nVal]= | |
| - fill(Modelica.Blocks.Types.InitPID.DoNotUse_InitialIntegratorState,nVal) | |
| + parameter Modelica.Blocks.Types.Init initType[nVal]= | |
| + fill(Modelica.Blocks.Types.Init.InitialState,nVal) | |
| "Init: (1: no init, 2: steady state, 3: initial state, 4: initial output)" | |
| annotation(Dialog(tab="Advanced", group="Initialisation Controller"), | |
| HideResult=not show_parCon); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Examples/ExpansionValveMassFlowRate.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Examples/ExpansionValveMassFlowRate.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Examples/ExpansionValveMassFlowRate.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Examples/ExpansionValveMassFlowRate.mo" 2021-04-26 11:51:12.034626322 +0200 | |
| @@ -10,15 +10,15 @@ | |
| Modelica.Media.R134a.R134a_ph | |
| "Actual medium of the compressor"; | |
| - parameter Modelica.SIunits.Temperature TInl = 343.15 | |
| + parameter Modelica.Units.SI.Temperature TInl = 343.15 | |
| "Actual temperature at inlet conditions"; | |
| - parameter Modelica.SIunits.AbsolutePressure pOut= | |
| + parameter Modelica.Units.SI.AbsolutePressure pOut= | |
| Medium.pressure(Medium.setDewState(Medium.setSat_T(TOut))) | |
| "Actual set point of the compressor's outlet pressure"; | |
| - parameter Modelica.SIunits.Temperature TOut = 278.15 | |
| + parameter Modelica.Units.SI.Temperature TOut = 278.15 | |
| "Actual temperature at outlet conditions"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.1 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.1 | |
| "Nominal mass flow rate"; | |
| // Define components | |
| @@ -31,7 +31,7 @@ | |
| "Source of constant mass flow and temperature" | |
| annotation (Placement(transformation(extent={{-80,-10},{-60,10}}))); | |
| Modelica.Blocks.Sources.Sine valOpe( | |
| - freqHz=1, | |
| + f =1, | |
| amplitude=0.3, | |
| offset=0.7) | |
| "Input signal to prediscribe expansion valve's opening" | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Examples/ExpansionValvePressureDifference.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Examples/ExpansionValvePressureDifference.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Examples/ExpansionValvePressureDifference.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Examples/ExpansionValvePressureDifference.mo" 2021-04-26 11:51:12.018626300 +0200 | |
| @@ -10,18 +10,18 @@ | |
| Modelica.Media.R134a.R134a_ph | |
| "Actual medium of the compressor"; | |
| - parameter Modelica.SIunits.AbsolutePressure pInl= | |
| + parameter Modelica.Units.SI.AbsolutePressure pInl= | |
| Medium.pressure(Medium.setBubbleState(Medium.setSat_T(TInl+5))) | |
| "Actual pressure at inlet conditions"; | |
| - parameter Modelica.SIunits.Temperature TInl = 348.15 | |
| + parameter Modelica.Units.SI.Temperature TInl = 348.15 | |
| "Actual temperature at inlet conditions"; | |
| - parameter Modelica.SIunits.AbsolutePressure pOut= | |
| + parameter Modelica.Units.SI.AbsolutePressure pOut= | |
| Medium.pressure(Medium.setDewState(Medium.setSat_T(TOut))) | |
| "Actual set point of the compressor's outlet pressure"; | |
| - parameter Modelica.SIunits.Temperature TOut = 278.15 | |
| + parameter Modelica.Units.SI.Temperature TOut = 278.15 | |
| "Actual temperature at outlet conditions"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.1 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.1 | |
| "Nominal mass flow rate"; | |
| // Define components | |
| @@ -35,7 +35,7 @@ | |
| annotation (Placement(transformation(extent={{-80,-10},{-60,10}}))); | |
| Modelica.Blocks.Sources.Sine valOpe( | |
| amplitude=0.45, | |
| - freqHz=1, | |
| +f =1, | |
| offset=0.5) | |
| "Input signal to prediscribe expansion valve's opening" | |
| annotation (Placement(transformation(extent={{-80,40},{-60,60}}))); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Examples/ModularExpansionValvesMassFlowRate.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Examples/ModularExpansionValvesMassFlowRate.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Examples/ModularExpansionValvesMassFlowRate.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Examples/ModularExpansionValvesMassFlowRate.mo" 2021-04-26 11:51:11.994626267 +0200 | |
| @@ -12,15 +12,15 @@ | |
| parameter Integer nVal = 3 | |
| "Number of valves - each valve will be connected to an individual port_b"; | |
| - parameter Modelica.SIunits.AbsolutePressure pInl= | |
| + parameter Modelica.Units.SI.AbsolutePressure pInl= | |
| Medium.pressure(Medium.setBubbleState(Medium.setSat_T(TInl+5))) | |
| "Current pressure at inlet conditions"; | |
| - parameter Modelica.SIunits.Temperature TInl = 348.15 | |
| + parameter Modelica.Units.SI.Temperature TInl = 348.15 | |
| "Current temperature at inlet conditions"; | |
| - parameter Modelica.SIunits.AbsolutePressure pOut= | |
| + parameter Modelica.Units.SI.AbsolutePressure pOut= | |
| Medium.pressure(Medium.setDewState(Medium.setSat_T(TOut))) | |
| "Current set point of the compressor's outlet pressure"; | |
| - parameter Modelica.SIunits.Temperature TOut = 278.15 | |
| + parameter Modelica.Units.SI.Temperature TOut = 278.15 | |
| "Current temperature at outlet conditions"; | |
| // Definition of models | |
| @@ -82,7 +82,7 @@ | |
| "Replicating the valves' opening signal" | |
| annotation (Placement(transformation(extent={{40,40},{20,60}}))); | |
| Modelica.Blocks.Sources.Sine valOpe( | |
| - freqHz=1, | |
| + f =1, | |
| amplitude=0.45, | |
| offset=0.5) | |
| "Input signal to prediscribe expansion valve's opening" | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Examples/ModularExpansionValvesPressureDifference.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Examples/ModularExpansionValvesPressureDifference.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Examples/ModularExpansionValvesPressureDifference.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Examples/ModularExpansionValvesPressureDifference.mo" 2021-04-26 11:51:11.966626228 +0200 | |
| @@ -12,15 +12,15 @@ | |
| parameter Integer nVal = 3 | |
| "Number of valves - each valve will be connected to an individual port_b"; | |
| - parameter Modelica.SIunits.AbsolutePressure pInl= | |
| + parameter Modelica.Units.SI.AbsolutePressure pInl= | |
| Medium.pressure(Medium.setBubbleState(Medium.setSat_T(TInl+5))) | |
| "Current pressure at inlet conditions"; | |
| - parameter Modelica.SIunits.Temperature TInl = 348.15 | |
| + parameter Modelica.Units.SI.Temperature TInl = 348.15 | |
| "Current temperature at inlet conditions"; | |
| - parameter Modelica.SIunits.AbsolutePressure pOut= | |
| + parameter Modelica.Units.SI.AbsolutePressure pOut= | |
| Medium.pressure(Medium.setDewState(Medium.setSat_T(TOut))) | |
| "Current set point of the compressor's outlet pressure"; | |
| - parameter Modelica.SIunits.Temperature TOut = 278.15 | |
| + parameter Modelica.Units.SI.Temperature TOut = 278.15 | |
| "Current temperature at outlet conditions"; | |
| // Definition of models | |
| @@ -79,7 +79,7 @@ | |
| "Replicating the valves' opening signal" | |
| annotation (Placement(transformation(extent={{40,40},{20,60}}))); | |
| Modelica.Blocks.Sources.Sine valOpe( | |
| - freqHz=1, | |
| + f =1, | |
| amplitude=0.45, | |
| offset=0.5) | |
| "Input signal to prediscribe expansion valve's opening" | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Examples/StaticHeatPumpBoundaries.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Examples/StaticHeatPumpBoundaries.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Examples/StaticHeatPumpBoundaries.mo" 2021-03-15 12:05:56.611860833 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Examples/StaticHeatPumpBoundaries.mo" 2021-04-26 11:51:11.942626195 +0200 | |
| @@ -22,27 +22,27 @@ | |
| // Definition of parameters describing boundary conditions | |
| // | |
| - parameter Modelica.SIunits.TemperatureDifference dTPinEva=2 | |
| + parameter Modelica.Units.SI.TemperatureDifference dTPinEva=2 | |
| "Pinch temperature at evaporator's outlet" | |
| annotation (Dialog(tab="General", group="Evaporator")); | |
| - parameter Modelica.SIunits.TemperatureDifference dTSupHea=1 | |
| + parameter Modelica.Units.SI.TemperatureDifference dTSupHea=1 | |
| "Superheating of working fluid" | |
| annotation (Dialog(tab="General", group="Evaporator")); | |
| - parameter Modelica.SIunits.TemperatureDifference dTPinCond=2 | |
| + parameter Modelica.Units.SI.TemperatureDifference dTPinCond=2 | |
| "Pinch temperature at condenser's outlet" | |
| annotation (Dialog(tab="General", group="Condenser")); | |
| - parameter Modelica.SIunits.TemperatureDifference dTSubCool=4 | |
| + parameter Modelica.Units.SI.TemperatureDifference dTSubCool=4 | |
| "Supercooling of working fluid" | |
| annotation (Dialog(tab="General", group="Condenser")); | |
| - parameter Modelica.SIunits.Density dSec=1000 | |
| + parameter Modelica.Units.SI.Density dSec=1000 | |
| "Constant density of secondary fluid" | |
| annotation (Dialog(tab="General", group="Condenser")); | |
| - parameter Modelica.SIunits.SpecificHeatCapacity cpSec=4.1813e3 | |
| + parameter Modelica.Units.SI.SpecificHeatCapacity cpSec=4.1813e3 | |
| "Constant specific heat capacity of secondary fluid" | |
| annotation (Dialog(tab="General", group="Condenser")); | |
| - parameter Modelica.SIunits.VolumeFlowRate | |
| + parameter Modelica.Units.SI.VolumeFlowRate | |
| V_flowSec=(0.776 + 0.781 + 0.44)/3/3600 | |
| "Constant volume flow of secondary fluid" | |
| annotation (Dialog(tab="General", group="Condenser")); | |
| @@ -94,7 +94,6 @@ | |
| Modelica.Blocks.Continuous.LimPID conPID( | |
| k=0.001, | |
| - limitsAtInit=true, | |
| Ti=10, | |
| controllerType=Modelica.Blocks.Types.SimpleController.P, | |
| yMax=1, | |
| @@ -145,6 +144,7 @@ | |
| origin={-98,0}))); | |
| protected | |
| + | |
| model StaticEvaporator | |
| "Static evaporator assuming constant pinch point at evaporator's outlet" | |
| @@ -160,10 +160,10 @@ | |
| // | |
| parameter Integer nPorts = 1; | |
| - parameter Modelica.SIunits.TemperatureDifference dTPin = 5 | |
| + parameter Modelica.Units.SI.TemperatureDifference dTPin = 5 | |
| "Pinch temperature at evaporator's outlet" | |
| annotation(Dialog(tab="General",group="Evaporator")); | |
| - parameter Modelica.SIunits.TemperatureDifference dTSupHea = 1 | |
| + parameter Modelica.Units.SI.TemperatureDifference dTSupHea = 1 | |
| "Superheating of working fluid" | |
| annotation(Dialog(tab="General",group="Evaporator")); | |
| @@ -246,26 +246,26 @@ | |
| annotation (Placement(transformation(extent={{-96,-8},{-76,12}}))); | |
| public | |
| - Modelica.SIunits.AbsolutePressure pSat | |
| + | |
| + Modelica.Units.SI.AbsolutePressure pSat | |
| "Absolute pressure at evaporator's outlet"; | |
| - Modelica.SIunits.Temperature TSat | |
| + Modelica.Units.SI.Temperature TSat | |
| "Saturation temperature"; | |
| - Modelica.SIunits.SpecificEnthalpy hInl | |
| + Modelica.Units.SI.SpecificEnthalpy hInl | |
| "Specific enthalpy at evaporator's inlet"; | |
| - Modelica.SIunits.SpecificEnthalpy hOut | |
| + Modelica.Units.SI.SpecificEnthalpy hOut | |
| "Specific enthalpy at evaporator's outlet"; | |
| - Modelica.SIunits.Temperature TOut | |
| + Modelica.Units.SI.Temperature TOut | |
| "Temperature at evaporator's outlet"; | |
| - Modelica.SIunits.Temperature TAmb | |
| + Modelica.Units.SI.Temperature TAmb | |
| "Temperature of ambient"; | |
| - Modelica.SIunits.MassFlowRate m_flow | |
| + Modelica.Units.SI.MassFlowRate m_flow | |
| "Mass flow rate"; | |
| - Modelica.SIunits.HeatFlowRate Q_flow | |
| + Modelica.Units.SI.HeatFlowRate Q_flow | |
| "Cooling capacity"; | |
| - | |
| equation | |
| // Connection of ports | |
| // | |
| @@ -388,20 +388,20 @@ | |
| // Definition of parameters describing condenser | |
| // | |
| - parameter Modelica.SIunits.TemperatureDifference dTPin = 5 | |
| + parameter Modelica.Units.SI.TemperatureDifference dTPin = 5 | |
| "Pinch temperature at condenser's outlet" | |
| annotation(Dialog(tab="General",group="Condenser")); | |
| - parameter Modelica.SIunits.TemperatureDifference dTSubCool = 8 | |
| + parameter Modelica.Units.SI.TemperatureDifference dTSubCool = 8 | |
| "Supercooling of working fluid" | |
| annotation(Dialog(tab="General",group="Condenser")); | |
| - parameter Modelica.SIunits.Density dSec = 1000 | |
| + parameter Modelica.Units.SI.Density dSec = 1000 | |
| "Constant density of secondary fluid" | |
| annotation(Dialog(tab="General",group="Condenser")); | |
| - parameter Modelica.SIunits.SpecificHeatCapacity cpSec = 4.1813e3 | |
| + parameter Modelica.Units.SI.SpecificHeatCapacity cpSec = 4.1813e3 | |
| "Constant specific heat capacity of secondary fluid" | |
| annotation(Dialog(tab="General",group="Condenser")); | |
| - parameter Modelica.SIunits.VolumeFlowRate V_flowSec = (0.776+0.781+0.44)/3/3600 | |
| + parameter Modelica.Units.SI.VolumeFlowRate V_flowSec = (0.776+0.781+0.44)/3/3600 | |
| "Constant volume flow of secondary fluid" | |
| annotation(Dialog(tab="General",group="Condenser")); | |
| @@ -471,28 +471,28 @@ | |
| annotation (Placement(transformation(extent={{-90,-8},{-70,12}}))); | |
| public | |
| - Modelica.SIunits.AbsolutePressure pSat | |
| + | |
| + Modelica.Units.SI.AbsolutePressure pSat | |
| "Absolute pressure at condenser's outlet"; | |
| - Modelica.SIunits.Temperature TSat | |
| + Modelica.Units.SI.Temperature TSat | |
| "Saturation temperature"; | |
| - Modelica.SIunits.Temperature TOut | |
| + Modelica.Units.SI.Temperature TOut | |
| "Temperature at condenser's outlet"; | |
| - Modelica.SIunits.SpecificEnthalpy hOut | |
| + Modelica.Units.SI.SpecificEnthalpy hOut | |
| "Specific enthalpy at condenser's outlet"; | |
| - Modelica.SIunits.MassFlowRate m_flow | |
| + Modelica.Units.SI.MassFlowRate m_flow | |
| "Mass flow rate"; | |
| - Modelica.SIunits.HeatFlowRate Q_flow | |
| + Modelica.Units.SI.HeatFlowRate Q_flow | |
| "Heat capacity"; | |
| - Modelica.SIunits.MassFlowRate m_flowSec | |
| + Modelica.Units.SI.MassFlowRate m_flowSec | |
| "Mass flow rate of secondary fluid"; | |
| - Modelica.SIunits.Temperature TFlo | |
| + Modelica.Units.SI.Temperature TFlo | |
| "Temperature flow at heat capacity"; | |
| - Modelica.SIunits.Temperature TRetFlo | |
| + Modelica.Units.SI.Temperature TRetFlo | |
| "Temperature return flow at heat capacity"; | |
| - | |
| equation | |
| // Connection of ports | |
| // | |
| @@ -601,7 +601,6 @@ | |
| fillPattern=FillPattern.CrossDiag, | |
| textString="SH")})); | |
| end StaticCondenser; | |
| - | |
| equation | |
| // Connection of main components | |
| // | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/ModularExpansionValves/ModularExpansionValvesSensors.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/ModularExpansionValves/ModularExpansionValvesSensors.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/ModularExpansionValves/ModularExpansionValvesSensors.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/ModularExpansionValves/ModularExpansionValvesSensors.mo" 2021-04-26 11:51:11.790625984 +0200 | |
| @@ -6,7 +6,7 @@ | |
| // Definition of parameters | |
| // | |
| - parameter Modelica.SIunits.Time tau = 1 | |
| + parameter Modelica.Units.SI.Time tau = 1 | |
| "Time constant at nominal flow rate" | |
| annotation(Dialog(tab="General",group="Sensors"), | |
| HideResult=not show_parSen); | |
| @@ -15,11 +15,11 @@ | |
| "if true, temperature T converges towards TAmb when no flow" | |
| annotation(Dialog(tab="General",group="Sensors"), | |
| HideResult=not show_parSen); | |
| - parameter Modelica.SIunits.Temperature TAmb = Medium.T_default | |
| + parameter Modelica.Units.SI.Temperature TAmb = Medium.T_default | |
| "Fixed ambient temperature for heat transfer" | |
| annotation(Dialog(tab="General",group="Sensors"), | |
| HideResult=not show_parSen); | |
| - parameter Modelica.SIunits.Time tauHeaTra = 1200 | |
| + parameter Modelica.Units.SI.Time tauHeaTra = 1200 | |
| "Time constant for heat transfer, default 20 minutes" | |
| annotation(Dialog(tab="General",group="Sensors"), | |
| HideResult=not show_parSen); | |
| @@ -29,11 +29,11 @@ | |
| "Type of initialization (InitialState and InitialOutput are identical)" | |
| annotation(Dialog(tab="Advanced",group="Initialisation Sensors"), | |
| HideResult=not show_parSen); | |
| - parameter Modelica.SIunits.Temperature T_start = Medium.T_default | |
| + parameter Modelica.Units.SI.Temperature T_start = Medium.T_default | |
| "Initial or guess value of output (= state)" | |
| annotation(Dialog(tab="Advanced",group="Initialisation Sensors"), | |
| HideResult=not show_parSen); | |
| - parameter Modelica.SIunits.SpecificEnthalpy h_out_start= | |
| + parameter Modelica.Units.SI.SpecificEnthalpy h_out_start= | |
| Medium.specificEnthalpy_pTX( | |
| p=Medium.p_default, | |
| T=Medium.T_default, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Utilities/FlowCoefficient/PolynomialFlowCoefficient.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Utilities/FlowCoefficient/PolynomialFlowCoefficient.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Utilities/FlowCoefficient/PolynomialFlowCoefficient.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Utilities/FlowCoefficient/PolynomialFlowCoefficient.mo" 2021-04-26 11:51:11.698625857 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Fluid.Actuators.Valves.ExpansionValves.Utilities.FlowCoefficient; | |
| +within AixLib.Fluid.Actuators.Valves.ExpansionValves.Utilities.FlowCoefficient; | |
| model PolynomialFlowCoefficient | |
| "Model describing flow coefficient based on polynomial approach" | |
| extends BaseClasses.PartialFlowCoefficient; | |
| @@ -19,7 +19,7 @@ | |
| annotation(Dialog(group="Modelling approach", | |
| enable=false)); | |
| - parameter Modelica.SIunits.Diameter dCle = 0.02e-3 | |
| + parameter Modelica.Units.SI.Diameter dCle = 0.02e-3 | |
| "Clearance diameter dCle = d_inner - d_needle" | |
| annotation(Dialog(group="Further geometry data", | |
| enable=if (polyMod == Types.PolynomialModels.ShanweiEtAl2005) | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Utilities/FlowCoefficient/PowerFlowCoefficient.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Utilities/FlowCoefficient/PowerFlowCoefficient.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Utilities/FlowCoefficient/PowerFlowCoefficient.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Utilities/FlowCoefficient/PowerFlowCoefficient.mo" 2021-04-26 11:51:11.682625836 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Fluid.Actuators.Valves.ExpansionValves.Utilities.FlowCoefficient; | |
| +within AixLib.Fluid.Actuators.Valves.ExpansionValves.Utilities.FlowCoefficient; | |
| model PowerFlowCoefficient | |
| "Model describing flow coefficient based on power approach" | |
| extends BaseClasses.PartialFlowCoefficient; | |
| @@ -19,7 +19,7 @@ | |
| annotation(Dialog(group="Modelling approach", | |
| enable=false)); | |
| - parameter Modelica.SIunits.Diameter dCle = 0.02e-3 | |
| + parameter Modelica.Units.SI.Diameter dCle = 0.02e-3 | |
| "Clearance diameter dCle = d_inner - d_needle" | |
| annotation(Dialog(group="Further geometry data", | |
| enable=if (powMod == Types.PowerModels.ShanweiEtAl2005) then | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Utilities/ModularSensors.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Utilities/ModularSensors.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Utilities/ModularSensors.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ExpansionValves/Utilities/ModularSensors.mo" 2021-04-26 11:51:11.570625681 +0200 | |
| @@ -5,17 +5,17 @@ | |
| // Definition of parameters | |
| // | |
| - parameter Modelica.SIunits.Time tau = 1 | |
| + parameter Modelica.Units.SI.Time tau = 1 | |
| "Time constant at nominal flow rate" | |
| annotation(Dialog(tab="Sensors",group="General")); | |
| parameter Boolean transferHeat=false | |
| "if true, temperature T converges towards TAmb when no flow" | |
| annotation(Dialog(tab="Sensors",group="Temperature sensor")); | |
| - parameter Modelica.SIunits.Temperature TAmb=Medium.T_default | |
| + parameter Modelica.Units.SI.Temperature TAmb=Medium.T_default | |
| "Fixed ambient temperature for heat transfer" | |
| annotation(Dialog(tab="Sensors",group="Temperature sensor")); | |
| - parameter Modelica.SIunits.Time tauHeaTra=1200 | |
| + parameter Modelica.Units.SI.Time tauHeaTra=1200 | |
| "Time constant for heat transfer, default 20 minutes" | |
| annotation(Dialog(tab="Sensors",group="Temperature sensor")); | |
| @@ -23,11 +23,11 @@ | |
| Modelica.Blocks.Types.Init.InitialState | |
| "Type of initialization (InitialState and InitialOutput are identical)" | |
| annotation(Dialog(tab="Sensors",group="Initialisation")); | |
| - parameter Modelica.SIunits.Temperature T_start= | |
| + parameter Modelica.Units.SI.Temperature T_start= | |
| Medium.T_default | |
| "Initial or guess value of output (= state)" | |
| annotation(Dialog(tab="Sensors",group="Initialisation")); | |
| - parameter Modelica.SIunits.SpecificEnthalpy h_out_start= | |
| + parameter Modelica.Units.SI.SpecificEnthalpy h_out_start= | |
| Medium.specificEnthalpy_pTX( | |
| p=Medium.p_default, | |
| T=Medium.T_default, | |
| @@ -44,9 +44,9 @@ | |
| Medium.SaturationProperties satPro[nPorts] | |
| "Saturation states for each fluid port"; | |
| - Modelica.SIunits.SpecificEnthalpy bubEnt[nPorts] | |
| + Modelica.Units.SI.SpecificEnthalpy bubEnt[nPorts] | |
| "Bubble enthalpies for each fluid port"; | |
| - Modelica.SIunits.SpecificEnthalpy dewEnt[nPorts] | |
| + Modelica.Units.SI.SpecificEnthalpy dewEnt[nPorts] | |
| "Dew enthalpies for each fluid port"; | |
| Real pTriCri[nPorts] | |
| "Trigger to check if medium exceeds critical pressure"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/MixingValve.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/MixingValve.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/MixingValve.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/MixingValve.mo" 2021-04-26 11:51:11.514625604 +0200 | |
| @@ -9,7 +9,7 @@ | |
| parameter Boolean filteredOpening=false | |
| "= true, if opening is filtered with a 2nd order CriticalDamping filter" | |
| annotation(Dialog(group="Filtered opening"),choices(checkBox=true)); | |
| - parameter Modelica.SIunits.Time riseTime=1 | |
| + parameter Modelica.Units.SI.Time riseTime=1 | |
| "Rise time of the filter (time to reach 99.6 % of an opening step)" | |
| annotation(Dialog(group="Filtered opening",enable=filteredOpening)); | |
| parameter Real leakageOpening(min=0,max=1)=1e-3 | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/SimpleValve.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/SimpleValve.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/SimpleValve.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/SimpleValve.mo" 2021-04-26 11:51:11.474625548 +0200 | |
| @@ -5,7 +5,7 @@ | |
| Modelica.Blocks.Interfaces.RealInput opening "valve opening" annotation(Placement(transformation(extent = {{-20, -20}, {20, 20}}, rotation = 270, origin = {0, 80}))); | |
| protected | |
| - Modelica.SIunits.Density rho "Density of the fluid"; | |
| + Modelica.Units.SI.Density rho "Density of the fluid"; | |
| equation | |
| rho = Medium.density(Medium.setState_phX(port_a.p, inStream(port_a.h_outflow), inStream(port_a.Xi_outflow))); | |
| // Enthalpy flow | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ThermostaticValve.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ThermostaticValve.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ThermostaticValve.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/ThermostaticValve.mo" 2021-04-26 11:51:11.462625531 +0200 | |
| @@ -16,7 +16,7 @@ | |
| Modelica.Blocks.Interfaces.RealInput T_room "temperature in room" annotation(Placement(transformation(extent = {{-20, -20}, {20, 20}}, rotation = 270, origin = {-64, 98}))); | |
| Modelica.Blocks.Interfaces.RealInput T_setRoom "set temperature in room" annotation(Placement(transformation(extent = {{-20, -20}, {20, 20}}, rotation = 270, origin = {56, 98}))); | |
| protected | |
| - Modelica.SIunits.Density rho "Density of the fluid"; | |
| + Modelica.Units.SI.Density rho "Density of the fluid"; | |
| equation | |
| rho = Medium.density(Medium.setState_phX(port_a.p, inStream(port_a.h_outflow), inStream(port_a.Xi_outflow))); | |
| // Enthalpie flow | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo" 2021-04-26 11:51:11.414625464 +0200 | |
| @@ -18,19 +18,19 @@ | |
| "Parameter for avoiding unnecessary computations"; | |
| constant Real y2dd = 0 | |
| "Second derivative at second support point"; | |
| - Modelica.SIunits.MassFlowRate m_flow_set | |
| + | |
| + Modelica.Units.SI.MassFlowRate m_flow_set | |
| "Requested mass flow rate"; | |
| - Modelica.SIunits.PressureDifference dp_min(displayUnit="Pa") | |
| + Modelica.Units.SI.PressureDifference dp_min(displayUnit="Pa") | |
| "Minimum pressure difference required for delivering requested mass flow rate"; | |
| - Modelica.SIunits.PressureDifference dp_x, dp_x1, dp_x2, dp_y2, dp_y1 | |
| + Modelica.Units.SI.PressureDifference dp_x, dp_x1, dp_x2, dp_y2, dp_y1 | |
| "Support points for interpolation flow functions"; | |
| - Modelica.SIunits.MassFlowRate m_flow_x, m_flow_x1, m_flow_x2, m_flow_y2, m_flow_y1 | |
| + Modelica.Units.SI.MassFlowRate m_flow_x, m_flow_x1, m_flow_x2, m_flow_y2, m_flow_y1 | |
| "Support points for interpolation flow functions"; | |
| - Modelica.SIunits.MassFlowRate m_flow_smooth | |
| + Modelica.Units.SI.MassFlowRate m_flow_smooth | |
| "Smooth interpolation result between two flow regimes"; | |
| - Modelica.SIunits.PressureDifference dp_smooth | |
| + Modelica.Units.SI.PressureDifference dp_smooth | |
| "Smooth interpolation result between two flow regimes"; | |
| - | |
| equation | |
| m_flow_set = m_flow_nominal*phi; | |
| kVal = Kv_SI; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/TwoWayTable.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/TwoWayTable.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/TwoWayTable.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/TwoWayTable.mo" 2021-04-26 11:51:11.386625426 +0200 | |
| @@ -11,7 +11,7 @@ | |
| // 1/k^2, the flowCharacteristics.phi[1] must not be zero. | |
| // We therefore set a lower bound. | |
| protected | |
| - Modelica.Blocks.Tables.CombiTable1D phiLooUp( | |
| + Modelica.Blocks.Tables.CombiTable1Dv phiLooUp( | |
| final tableOnFile=false, | |
| final table=[flowCharacteristics.y, cat( | |
| 1, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mo" 2021-04-26 11:51:11.366625398 +0200 | |
| @@ -4,9 +4,9 @@ | |
| extends Modelica.Icons.Example; | |
| package Medium = AixLib.Media.Water "Medium in the component"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.4 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.4 | |
| "Design mass flow rate"; | |
| - parameter Modelica.SIunits.PressureDifference dp_nominal = 4500 | |
| + parameter Modelica.Units.SI.PressureDifference dp_nominal = 4500 | |
| "Design pressure drop"; | |
| parameter Real Kv_SI = m_flow_nominal/sqrt(dp_nominal) | |
| @@ -16,10 +16,10 @@ | |
| "Kv (metric) flow coefficient [m3/h/(bar)^(1/2)]"; | |
| parameter Real Cv = Kv_SI/(rhoStd*0.0631/1000/sqrt(6895)) | |
| "Cv (US) flow coefficient [USG/min/(psi)^(1/2)]"; | |
| - parameter Modelica.SIunits.Area Av = Kv_SI/sqrt(rhoStd) | |
| + parameter Modelica.Units.SI.Area Av = Kv_SI/sqrt(rhoStd) | |
| "Av (metric) flow coefficient"; | |
| - parameter Modelica.SIunits.Density rhoStd= | |
| + parameter Modelica.Units.SI.Density rhoStd= | |
| Medium.density_pTX(101325, 273.15+4, Medium.X_default) | |
| "Standard density"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mo" 2021-04-26 11:51:11.334625355 +0200 | |
| @@ -6,9 +6,9 @@ | |
| package Medium = AixLib.Media.Water; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.4 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.4 | |
| "Design mass flow rate"; | |
| - parameter Modelica.SIunits.PressureDifference dp_nominal = 4500 | |
| + parameter Modelica.Units.SI.PressureDifference dp_nominal = 4500 | |
| "Design pressure drop"; | |
| parameter Real Kv_SI = m_flow_nominal/sqrt(dp_nominal) | |
| @@ -18,10 +18,10 @@ | |
| "Kv (metric) flow coefficient [m3/h/(bar)^(1/2)]"; | |
| parameter Real Cv = Kv_SI/(rhoStd*0.0631/1000/sqrt(6895)) | |
| "Cv (US) flow coefficient [USG/min/(psi)^(1/2)]"; | |
| - parameter Modelica.SIunits.Area Av = Kv_SI/sqrt(rhoStd) | |
| + parameter Modelica.Units.SI.Area Av = Kv_SI/sqrt(rhoStd) | |
| "Av (metric) flow coefficient"; | |
| - parameter Modelica.SIunits.Density rhoStd= | |
| + parameter Modelica.Units.SI.Density rhoStd= | |
| Medium.density_pTX(101325, 273.15+4, Medium.X_default) | |
| "Standard density"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der2.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der2.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der2.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der2.mo" 2021-04-26 11:51:11.202625171 +0200 | |
| @@ -3,11 +3,11 @@ | |
| "2nd derivative of flow function2nd derivative of function that computes mass flow rate for given pressure drop" | |
| extends Modelica.Icons.Function; | |
| - input Modelica.SIunits.PressureDifference dp(displayUnit="Pa") | |
| + input Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") | |
| "Pressure difference between port_a and port_b (= port_a.p - port_b.p)"; | |
| input Real k(min=0, unit="") | |
| "Flow coefficient, k=m_flow/sqrt(dp), with unit=(kg.m)^(1/2)"; | |
| - input Modelica.SIunits.MassFlowRate m_flow_turbulent(min=0) | |
| + input Modelica.Units.SI.MassFlowRate m_flow_turbulent(min=0) | |
| "Mass flow rate where transition to turbulent flow occurs"; | |
| input Real dp_der | |
| "1st derivative of pressure difference between port_a and port_b (= port_a.p - port_b.p)"; | |
| @@ -16,7 +16,7 @@ | |
| output Real m_flow_der2 | |
| "2nd derivative of mass flow rate in design flow direction"; | |
| protected | |
| - Modelica.SIunits.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 | |
| + Modelica.Units.SI.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 | |
| "Pressure where flow changes to turbulent"; | |
| Real dpNorm=dp/dp_turbulent | |
| "Normalised pressure difference"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der.mo" 2021-04-26 11:51:11.210625184 +0200 | |
| @@ -3,18 +3,18 @@ | |
| "1st derivative of function that computes mass flow rate for given pressure drop" | |
| extends Modelica.Icons.Function; | |
| - input Modelica.SIunits.PressureDifference dp(displayUnit="Pa") | |
| + input Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") | |
| "Pressure difference between port_a and port_b (= port_a.p - port_b.p)"; | |
| input Real k(min=0, unit="") | |
| "Flow coefficient, k=m_flow/sqrt(dp), with unit=(kg.m)^(1/2)"; | |
| - input Modelica.SIunits.MassFlowRate m_flow_turbulent(min=0) | |
| + input Modelica.Units.SI.MassFlowRate m_flow_turbulent(min=0) | |
| "Mass flow rate where transition to turbulent flow occurs"; | |
| input Real dp_der | |
| "Derivative of pressure difference between port_a and port_b (= port_a.p - port_b.p)"; | |
| output Real m_flow_der(unit="kg/s2") | |
| "Derivative of mass flow rate in design flow direction"; | |
| protected | |
| - Modelica.SIunits.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 | |
| + Modelica.Units.SI.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 | |
| "Pressure where flow changes to turbulent"; | |
| Real dpNormSq=(dp/dp_turbulent)^2 | |
| "Square of normalised pressure difference"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo" 2021-04-26 11:51:11.222625199 +0200 | |
| @@ -2,16 +2,16 @@ | |
| function basicFlowFunction_dp | |
| "Function that computes mass flow rate for given pressure drop" | |
| - input Modelica.SIunits.PressureDifference dp(displayUnit="Pa") | |
| + input Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") | |
| "Pressure difference between port_a and port_b (= port_a.p - port_b.p)"; | |
| input Real k(min=0, unit="") | |
| "Flow coefficient, k=m_flow/sqrt(dp), with unit=(kg.m)^(1/2)"; | |
| - input Modelica.SIunits.MassFlowRate m_flow_turbulent(min=0) | |
| + input Modelica.Units.SI.MassFlowRate m_flow_turbulent(min=0) | |
| "Mass flow rate where transition to turbulent flow occurs"; | |
| - output Modelica.SIunits.MassFlowRate m_flow | |
| + output Modelica.Units.SI.MassFlowRate m_flow | |
| "Mass flow rate in design flow direction"; | |
| protected | |
| - Modelica.SIunits.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 | |
| + Modelica.Units.SI.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 | |
| "Pressure where flow changes to turbulent"; | |
| Real dpNorm=dp/dp_turbulent | |
| "Normalised pressure difference"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der2.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der2.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der2.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der2.mo" 2021-04-26 11:51:11.170625128 +0200 | |
| @@ -3,11 +3,11 @@ | |
| "2nd derivative of function that computes pressure drop for given mass flow rate" | |
| extends Modelica.Icons.Function; | |
| - input Modelica.SIunits.MassFlowRate m_flow | |
| + input Modelica.Units.SI.MassFlowRate m_flow | |
| "Mass flow rate in design flow direction"; | |
| input Real k(unit="") | |
| "Flow coefficient, k=m_flow/sqrt(dp), with unit=(kg.m)^(1/2)"; | |
| - input Modelica.SIunits.MassFlowRate m_flow_turbulent(min=0) | |
| + input Modelica.Units.SI.MassFlowRate m_flow_turbulent(min=0) | |
| "Mass flow rate where transition to turbulent flow occurs"; | |
| input Real m_flow_der(unit="kg/s2") | |
| "1st derivative of mass flow rate in design flow direction"; | |
| @@ -16,7 +16,7 @@ | |
| output Real dp_der2 | |
| "2nd derivative of pressure difference between port_a and port_b (= port_a.p - port_b.p)"; | |
| protected | |
| - Modelica.SIunits.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 | |
| + Modelica.Units.SI.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 | |
| "Pressure where flow changes to turbulent"; | |
| Real m_flowNorm = m_flow/m_flow_turbulent | |
| "Normalised mass flow rate"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der.mo" 2021-04-26 11:51:11.178625138 +0200 | |
| @@ -3,18 +3,18 @@ | |
| "1st derivative of function that computes pressure drop for given mass flow rate" | |
| extends Modelica.Icons.Function; | |
| - input Modelica.SIunits.MassFlowRate m_flow | |
| + input Modelica.Units.SI.MassFlowRate m_flow | |
| "Mass flow rate in design flow direction"; | |
| input Real k(unit="") | |
| "Flow coefficient, k=m_flow/sqrt(dp), with unit=(kg.m)^(1/2)"; | |
| - input Modelica.SIunits.MassFlowRate m_flow_turbulent(min=0) | |
| + input Modelica.Units.SI.MassFlowRate m_flow_turbulent(min=0) | |
| "Mass flow rate where transition to turbulent flow occurs"; | |
| input Real m_flow_der(unit="kg/s2") | |
| "Derivative of mass flow rate in design flow direction"; | |
| output Real dp_der | |
| "Derivative of pressure difference between port_a and port_b (= port_a.p - port_b.p)"; | |
| protected | |
| - Modelica.SIunits.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 | |
| + Modelica.Units.SI.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 | |
| "Pressure where flow changes to turbulent"; | |
| Real m_flowNormSq = (m_flow/m_flow_turbulent)^2 | |
| "Square of normalised mass flow rate"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo" 2021-04-26 11:51:11.190625156 +0200 | |
| @@ -2,16 +2,16 @@ | |
| function basicFlowFunction_m_flow | |
| "Function that computes pressure drop for given mass flow rate" | |
| - input Modelica.SIunits.MassFlowRate m_flow | |
| + input Modelica.Units.SI.MassFlowRate m_flow | |
| "Mass flow rate in design flow direction"; | |
| input Real k(unit="") | |
| "Flow coefficient, k=m_flow/sqrt(dp), with unit=(kg.m)^(1/2)"; | |
| - input Modelica.SIunits.MassFlowRate m_flow_turbulent(min=0) | |
| + input Modelica.Units.SI.MassFlowRate m_flow_turbulent(min=0) | |
| "Mass flow rate where transition to turbulent flow occurs"; | |
| - output Modelica.SIunits.PressureDifference dp(displayUnit="Pa") | |
| + output Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") | |
| "Pressure difference between port_a and port_b (= port_a.p - port_b.p)"; | |
| protected | |
| - Modelica.SIunits.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 | |
| + Modelica.Units.SI.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2 | |
| "Pressure where flow changes to turbulent"; | |
| Real m_flowNorm = m_flow/m_flow_turbulent | |
| "Normalised mass flow rate"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mo" 2021-04-26 11:51:11.278625278 +0200 | |
| @@ -4,16 +4,16 @@ | |
| extends Modelica.Icons.Example; | |
| parameter Real k = 0.35 "Flow coefficient"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_turbulent = 0.36 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_turbulent = 0.36 | |
| "Mass flow rate where transition to turbulent flow occurs"; | |
| - Modelica.SIunits.MassFlowRate m_flow "Mass flow rate"; | |
| - Modelica.SIunits.MassFlowRate m_flow_comp "Comparison value for m_flow"; | |
| + Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate"; | |
| + Modelica.Units.SI.MassFlowRate m_flow_comp "Comparison value for m_flow"; | |
| Real der_m_flow(unit="kg/s2") "1st order derivative of mass flow rate"; | |
| Real der_m_flow_comp(unit="kg/s2") | |
| "2nd order derivative of comparison value for m_flow"; | |
| - Modelica.SIunits.PressureDifference dp "Pressure drop"; | |
| - Modelica.SIunits.MassFlowRate err_m_flow "Integration error for m_flow"; | |
| + Modelica.Units.SI.PressureDifference dp "Pressure drop"; | |
| + Modelica.Units.SI.MassFlowRate err_m_flow "Integration error for m_flow"; | |
| Real err_der_m_flow(unit="kg/s2") "Integration error for der_m_flow"; | |
| initial equation | |
| m_flow = m_flow_comp; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mo" 2021-04-26 11:51:11.286625288 +0200 | |
| @@ -6,12 +6,12 @@ | |
| constant Real gain = 2 "Gain for computing the mass flow rate"; | |
| parameter Real k = 0.35 "Flow coefficient"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_turbulent = 0.36 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_turbulent = 0.36 | |
| "Mass flow rate where transition to turbulent flow occurs"; | |
| - Modelica.SIunits.MassFlowRate m_flow "Mass flow rate"; | |
| - Modelica.SIunits.MassFlowRate m_flow_comp "Comparison value for m_flow"; | |
| - Modelica.SIunits.PressureDifference dp "Pressure drop"; | |
| - Modelica.SIunits.MassFlowRate err "Integration error"; | |
| + Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate"; | |
| + Modelica.Units.SI.MassFlowRate m_flow_comp "Comparison value for m_flow"; | |
| + Modelica.Units.SI.PressureDifference dp "Pressure drop"; | |
| + Modelica.Units.SI.MassFlowRate err "Integration error"; | |
| initial equation | |
| m_flow = m_flow_comp; | |
| equation | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck2.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck2.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck2.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck2.mo" 2021-04-26 11:51:11.258625250 +0200 | |
| @@ -9,17 +9,17 @@ | |
| threShold=1e-3) | |
| "Block for checking integration error"; | |
| parameter Real k = 0.35 "Flow coefficient"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_turbulent = 0.36 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_turbulent = 0.36 | |
| "Mass flow rate where transition to turbulent flow occurs"; | |
| - Modelica.SIunits.PressureDifference dp "Pressure drop"; | |
| - Modelica.SIunits.PressureDifference dp_comp "Comparison value for dp"; | |
| + Modelica.Units.SI.PressureDifference dp "Pressure drop"; | |
| + Modelica.Units.SI.PressureDifference dp_comp "Comparison value for dp"; | |
| Real der_dp(unit="Pa/s") "1st order derivative of pressure drop"; | |
| Real der_dp_comp(unit="Pa/s") | |
| "2nd order derivative of comparison value for pressure drop"; | |
| - Modelica.SIunits.MassFlowRate m_flow "Mass flow rate"; | |
| + Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate"; | |
| - Modelica.SIunits.PressureDifference err_dp "Integration error for dp"; | |
| + Modelica.Units.SI.PressureDifference err_dp "Integration error for dp"; | |
| Real err_der_dp(unit="Pa/s") "Integration error for der_dp"; | |
| initial equation | |
| dp = dp_comp; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mo" 2021-04-26 11:51:11.270625266 +0200 | |
| @@ -6,12 +6,12 @@ | |
| constant Real gain = 0.5 "Gain for computing the mass flow rate"; | |
| parameter Real k = 0.35 "Flow coefficient"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_turbulent = 0.36 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_turbulent = 0.36 | |
| "Mass flow rate where transition to turbulent flow occurs"; | |
| - Modelica.SIunits.MassFlowRate m_flow "Mass flow rate"; | |
| - Modelica.SIunits.PressureDifference dp "Pressure drop"; | |
| - Modelica.SIunits.PressureDifference dp_comp "Comparison value for dp"; | |
| - Modelica.SIunits.PressureDifference err "Integration error"; | |
| + Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate"; | |
| + Modelica.Units.SI.PressureDifference dp "Pressure drop"; | |
| + Modelica.Units.SI.PressureDifference dp_comp "Comparison value for dp"; | |
| + Modelica.Units.SI.PressureDifference err "Integration error"; | |
| initial equation | |
| dp = dp_comp; | |
| equation | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/Validation/InverseFlowFunctions.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/Validation/InverseFlowFunctions.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/Validation/InverseFlowFunctions.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/Validation/InverseFlowFunctions.mo" 2021-04-26 11:51:11.250625238 +0200 | |
| @@ -1,15 +1,15 @@ | |
| within AixLib.Fluid.BaseClasses.FlowModels.Validation; | |
| model InverseFlowFunctions "Test model for flow function and its inverse" | |
| extends Modelica.Icons.Example; | |
| - Modelica.SIunits.MassFlowRate m_flow; | |
| - Modelica.SIunits.PressureDifference dp(displayUnit="Pa") "Pressure difference"; | |
| - Modelica.SIunits.PressureDifference dpCalc(displayUnit="Pa") | |
| + Modelica.Units.SI.MassFlowRate m_flow; | |
| + Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure difference"; | |
| + Modelica.Units.SI.PressureDifference dpCalc(displayUnit="Pa") | |
| "Pressure difference computed by the flow functions"; | |
| - Modelica.SIunits.Pressure deltaDp(displayUnit="Pa") | |
| + Modelica.Units.SI.Pressure deltaDp(displayUnit="Pa") | |
| "Pressure difference between input and output to the functions"; | |
| - Modelica.SIunits.Time dTime= 2; | |
| + Modelica.Units.SI.Time dTime= 2; | |
| parameter Real k = 0.5; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 1 "Nominal flow rate"; | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 1 "Nominal flow rate"; | |
| equation | |
| dp = (time-0.5)/dTime * 20; | |
| m_flow=FlowModels.basicFlowFunction_dp(dp=dp, k=k, m_flow_turbulent=m_flow_nominal*0.3); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_dp.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_dp.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_dp.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_dp.mo" 2021-04-26 11:51:11.238625222 +0200 | |
| @@ -4,11 +4,11 @@ | |
| extends Modelica.Icons.Example; | |
| parameter Real k = 0.5 "Flow coefficient"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 1.5 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 1.5 | |
| "Nominal mass flow rate"; | |
| - Modelica.SIunits.MassFlowRate m_flow "Mass flow rate"; | |
| - Modelica.SIunits.PressureDifference dp(displayUnit="Pa", start=0) "Pressure difference"; | |
| + Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate"; | |
| + Modelica.Units.SI.PressureDifference dp(displayUnit="Pa", start=0) "Pressure difference"; | |
| equation | |
| m_flow = 4*(time-0.5); | |
| m_flow = FlowModels.basicFlowFunction_dp(dp=dp, k=k, m_flow_turbulent=m_flow_nominal*0.3); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mo" 2021-04-26 11:51:11.230625210 +0200 | |
| @@ -4,11 +4,11 @@ | |
| extends Modelica.Icons.Example; | |
| parameter Real k = 0.5 "Flow coefficient"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.5 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.5 | |
| "Nominal mass flow rate"; | |
| - Modelica.SIunits.MassFlowRate m_flow(start=0) "Mass flow rate"; | |
| - Modelica.SIunits.PressureDifference dp(displayUnit="Pa") "Pressure difference"; | |
| + Modelica.Units.SI.MassFlowRate m_flow(start=0) "Mass flow rate"; | |
| + Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure difference"; | |
| equation | |
| dp = 4*(time-0.5); | |
| dp = FlowModels.basicFlowFunction_m_flow(m_flow=m_flow, k=k, m_flow_turbulent=m_flow_nominal*0.3); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/PartialInnerCycle.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/PartialInnerCycle.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/PartialInnerCycle.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/PartialInnerCycle.mo" 2021-04-26 11:51:11.146625095 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Fluid.BaseClasses; | |
| +within AixLib.Fluid.BaseClasses; | |
| partial model PartialInnerCycle | |
| "Blackbox model of refrigerant cycle of a thermal machine (heat pump or chiller)" | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/PartialResistance.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/PartialResistance.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/PartialResistance.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/PartialResistance.mo" 2021-04-26 11:51:11.134625077 +0200 | |
| @@ -13,7 +13,7 @@ | |
| "= true, use m_flow = f(dp) else dp = f(m_flow)" | |
| annotation (Evaluate=true, Dialog(tab="Advanced")); | |
| - parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa") | |
| + parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa") | |
| "Pressure drop at nominal mass flow rate" | |
| annotation(Dialog(group = "Nominal condition")); | |
| parameter Boolean homotopyInitialization = true "= true, use homotopy method" | |
| @@ -22,18 +22,18 @@ | |
| "= true, use linear relation between m_flow and dp for any flow rate" | |
| annotation(Evaluate=true, Dialog(tab="Advanced")); | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_turbulent(min=0) | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_turbulent(min=0) | |
| "Turbulent flow if |m_flow| >= m_flow_turbulent"; | |
| protected | |
| parameter Medium.ThermodynamicState sta_default= | |
| Medium.setState_pTX(T=Medium.T_default, p=Medium.p_default, X=Medium.X_default); | |
| - parameter Modelica.SIunits.DynamicViscosity eta_default=Medium.dynamicViscosity(sta_default) | |
| + parameter Modelica.Units.SI.DynamicViscosity eta_default=Medium.dynamicViscosity(sta_default) | |
| "Dynamic viscosity, used to compute transition to turbulent flow regime"; | |
| - final parameter Modelica.SIunits.MassFlowRate m_flow_nominal_pos = abs(m_flow_nominal) | |
| + final parameter Modelica.Units.SI.MassFlowRate m_flow_nominal_pos = abs(m_flow_nominal) | |
| "Absolute value of nominal flow rate"; | |
| - final parameter Modelica.SIunits.PressureDifference dp_nominal_pos(displayUnit="Pa") = abs(dp_nominal) | |
| + final parameter Modelica.Units.SI.PressureDifference dp_nominal_pos(displayUnit="Pa") = abs(dp_nominal) | |
| "Absolute value of nominal pressure difference"; | |
| equation | |
| // Isenthalpic state transformation (no storage and no loss of energy) | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/PartialReversibleThermalMachine.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/PartialReversibleThermalMachine.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/PartialReversibleThermalMachine.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/PartialReversibleThermalMachine.mo" 2021-04-26 11:51:11.118625056 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Fluid.BaseClasses; | |
| +within AixLib.Fluid.BaseClasses; | |
| partial model PartialReversibleThermalMachine | |
| "Grey-box model for reversible heat pumps and chillers using a black-box to simulate the refrigeration cycle" | |
| extends AixLib.Fluid.Interfaces.PartialFourPortInterface( | |
| @@ -30,7 +30,7 @@ | |
| parameter Boolean use_autoCalc=false | |
| "Enable automatic estimation of volumes and mass flows?" | |
| annotation(choices(checkBox=true), Dialog(descriptionLabel=true)); | |
| - parameter Modelica.SIunits.Power Q_useNominal(start=0) | |
| + parameter Modelica.Units.SI.Power Q_useNominal(start=0) | |
| "Nominal usable heat flow of the thermal machine (HP: Heating; Chiller: Cooling)" | |
| annotation (Dialog(enable= | |
| use_autoCalc)); | |
| @@ -39,7 +39,7 @@ | |
| "Consider the inertia of the refrigerant cycle" | |
| annotation(choices(checkBox=true), Dialog( | |
| group="Refrigerant inertia")); | |
| - parameter Modelica.SIunits.Frequency refIneFre_constant | |
| + parameter Modelica.Units.SI.Frequency refIneFre_constant | |
| "Cut off frequency for inertia of refrigerant cycle" | |
| annotation (Dialog(enable=use_refIne, group="Refrigerant inertia"),Evaluate=true); | |
| parameter Integer nthOrder=3 "Order of refrigerant cycle interia" annotation (Dialog(enable= | |
| @@ -49,15 +49,15 @@ | |
| //Condenser | |
| - parameter Modelica.SIunits.MassFlowRate mFlow_conNominal | |
| + parameter Modelica.Units.SI.MassFlowRate mFlow_conNominal | |
| "Manual input of the nominal mass flow rate (if not automatically calculated)" | |
| annotation (Dialog(group="Parameters", tab="Condenser", enable=not | |
| use_autoCalc), Evaluate=true); | |
| - parameter Modelica.SIunits.Volume VCon | |
| + parameter Modelica.Units.SI.Volume VCon | |
| "Manual input of the condenser volume (if not automatically calculated)" | |
| annotation (Evaluate=true,Dialog(group="Parameters", tab="Condenser", enable=not | |
| use_autoCalc)); | |
| - parameter Modelica.SIunits.PressureDifference dpCon_nominal | |
| + parameter Modelica.Units.SI.PressureDifference dpCon_nominal | |
| "Pressure drop at nominal mass flow rate" | |
| annotation (Dialog(group="Flow resistance", tab="Condenser"), Evaluate=true); | |
| parameter Real deltaM_con=0.1 | |
| @@ -67,28 +67,28 @@ | |
| "If heat losses at capacitor side are considered or not" | |
| annotation (Dialog(group="Heat Losses", tab="Condenser"), | |
| choices(checkBox=true)); | |
| - parameter Modelica.SIunits.HeatCapacity CCon | |
| + parameter Modelica.Units.SI.HeatCapacity CCon | |
| "Heat capacity of Condenser (= cp*m)" annotation (Evaluate=true,Dialog(group="Heat Losses", | |
| tab="Condenser", | |
| enable=use_conCap)); | |
| - parameter Modelica.SIunits.ThermalConductance GConOut | |
| + parameter Modelica.Units.SI.ThermalConductance GConOut | |
| "Constant parameter for heat transfer to the ambient. Represents a sum of thermal resistances such as conductance, insulation and natural convection" | |
| annotation (Evaluate=true,Dialog(group="Heat Losses", tab="Condenser", | |
| enable=use_conCap)); | |
| - parameter Modelica.SIunits.ThermalConductance GConIns | |
| + parameter Modelica.Units.SI.ThermalConductance GConIns | |
| "Constant parameter for heat transfer to heat exchangers capacity. Represents a sum of thermal resistances such as forced convection and conduction inside of the capacity" | |
| annotation (Evaluate=true,Dialog(group="Heat Losses", tab="Condenser", | |
| enable=use_conCap)); | |
| //Evaporator | |
| - parameter Modelica.SIunits.MassFlowRate mFlow_evaNominal | |
| + parameter Modelica.Units.SI.MassFlowRate mFlow_evaNominal | |
| "Manual input of the nominal mass flow rate (if not automatically calculated)" | |
| annotation (Dialog(group="Parameters", tab="Evaporator", enable=not | |
| use_autoCalc), Evaluate=true); | |
| - parameter Modelica.SIunits.Volume VEva | |
| + parameter Modelica.Units.SI.Volume VEva | |
| "Manual input of the evaporator volume (if not automatically calculated)" | |
| annotation (Evaluate=true,Dialog(group="Parameters", tab="Evaporator", enable=not | |
| use_autoCalc)); | |
| - parameter Modelica.SIunits.PressureDifference dpEva_nominal | |
| + parameter Modelica.Units.SI.PressureDifference dpEva_nominal | |
| "Pressure drop at nominal mass flow rate" | |
| annotation (Dialog(group="Flow resistance", tab="Evaporator"),Evaluate=true); | |
| parameter Real deltaM_eva=0.1 | |
| @@ -98,20 +98,20 @@ | |
| "If heat losses at capacitor side are considered or not" | |
| annotation (Dialog(group="Heat Losses", tab="Evaporator"), | |
| choices(checkBox=true)); | |
| - parameter Modelica.SIunits.HeatCapacity CEva | |
| + parameter Modelica.Units.SI.HeatCapacity CEva | |
| "Heat capacity of Evaporator (= cp*m)" | |
| annotation (Evaluate=true,Dialog(group="Heat Losses", tab="Evaporator", | |
| enable=use_evaCap)); | |
| - parameter Modelica.SIunits.ThermalConductance GEvaOut | |
| + parameter Modelica.Units.SI.ThermalConductance GEvaOut | |
| "Constant parameter for heat transfer to the ambient. Represents a sum of thermal resistances such as conductance, insulation and natural convection" | |
| annotation (Evaluate=true,Dialog(group="Heat Losses", tab="Evaporator", | |
| enable=use_evaCap)); | |
| - parameter Modelica.SIunits.ThermalConductance GEvaIns | |
| + parameter Modelica.Units.SI.ThermalConductance GEvaIns | |
| "Constant parameter for heat transfer to heat exchangers capacity. Represents a sum of thermal resistances such as forced convection and conduction inside of the capacity" | |
| annotation (Evaluate=true,Dialog(group="Heat Losses", tab="Evaporator", | |
| enable=use_evaCap)); | |
| //Assumptions | |
| - parameter Modelica.SIunits.Time tauSenT=1 | |
| + parameter Modelica.Units.SI.Time tauSenT=1 | |
| "Time constant at nominal flow rate (use tau=0 for steady-state sensor, but see user guide for potential problems)" | |
| annotation (Dialog(tab="Assumptions", group="Temperature sensors")); | |
| parameter Boolean transferHeat=true | |
| @@ -123,16 +123,16 @@ | |
| parameter Boolean allowFlowReversalCon=true | |
| "= false to simplify equations, assuming, but not enforcing, no flow reversal" | |
| annotation (Dialog(group="Condenser", tab="Assumptions")); | |
| - parameter Modelica.SIunits.Time tauHeaTraEva=1200 | |
| + parameter Modelica.Units.SI.Time tauHeaTraEva=1200 | |
| "Time constant for heat transfer in temperature sensors in evaporator, default 20 minutes" | |
| annotation (Dialog(tab="Assumptions", group="Temperature sensors",enable=transferHeat), Evaluate=true); | |
| - parameter Modelica.SIunits.Temperature TAmbEva_nominal=273.15 | |
| + parameter Modelica.Units.SI.Temperature TAmbEva_nominal=273.15 | |
| "Fixed ambient temperature for heat transfer of sensors at the evaporator side" | |
| annotation (Dialog(tab="Assumptions", group="Temperature sensors",enable=transferHeat)); | |
| - parameter Modelica.SIunits.Time tauHeaTraCon=1200 | |
| + parameter Modelica.Units.SI.Time tauHeaTraCon=1200 | |
| "Time constant for heat transfer in temperature sensors in condenser, default 20 minutes" | |
| annotation (Dialog(tab="Assumptions", group="Temperature sensors",enable=transferHeat),Evaluate=true); | |
| - parameter Modelica.SIunits.Temperature TAmbCon_nominal=291.15 | |
| + parameter Modelica.Units.SI.Temperature TAmbCon_nominal=291.15 | |
| "Fixed ambient temperature for heat transfer of sensors at the condenser side" | |
| annotation (Dialog(tab="Assumptions", group="Temperature sensors",enable=transferHeat)); | |
| @@ -396,19 +396,19 @@ | |
| //Automatic calculation of mass flow rates and volumes of the evaporator and condenser using linear regressions from data sheets of heat pumps and chillers (water to water) | |
| protected | |
| - parameter Modelica.SIunits.MassFlowRate autoCalc_mFlow_min = 0.3 "Realistic mass flow minimum for simulation plausibility"; | |
| - parameter Modelica.SIunits.Volume autoCalc_Vmin = 0.003 "Realistic volume minimum for simulation plausibility"; | |
| - parameter Modelica.SIunits.MassFlowRate autoCalc_mFlow_eva = if machineType then max(0.00004*Q_useNominal - 0.3177, autoCalc_mFlow_min) else max(0.00005*Q_useNominal - 0.5662, autoCalc_mFlow_min); | |
| - parameter Modelica.SIunits.MassFlowRate autoCalc_mFlow_con = if machineType then max(0.00004*Q_useNominal - 0.6162, autoCalc_mFlow_min) else max(0.00005*Q_useNominal + 0.3161, autoCalc_mFlow_min); | |
| - parameter Modelica.SIunits.MassFlowRate mFlow_evaNominal_final=if use_autoCalc then autoCalc_mFlow_eva else mFlow_evaNominal; | |
| - parameter Modelica.SIunits.MassFlowRate mFlow_conNominal_final=if use_autoCalc then autoCalc_mFlow_con else mFlow_conNominal; | |
| - parameter Modelica.SIunits.Volume autoCalc_VEva = if machineType then max(0.0000001*Q_useNominal - 0.0075, autoCalc_Vmin) else max(0.0000001*Q_useNominal - 0.0066, autoCalc_Vmin); | |
| - parameter Modelica.SIunits.Volume autoCalc_VCon = if machineType then max(0.0000001*Q_useNominal - 0.0094, autoCalc_Vmin) else max(0.0000002*Q_useNominal - 0.0084, autoCalc_Vmin); | |
| - parameter Modelica.SIunits.Volume VEva_final=if use_autoCalc then autoCalc_VEva else VEva; | |
| - parameter Modelica.SIunits.Volume VCon_final=if use_autoCalc then autoCalc_VCon else VCon; | |
| + parameter Modelica.Units.SI.MassFlowRate autoCalc_mFlow_min = 0.3 "Realistic mass flow minimum for simulation plausibility"; | |
| + parameter Modelica.Units.SI.Volume autoCalc_Vmin = 0.003 "Realistic volume minimum for simulation plausibility"; | |
| + parameter Modelica.Units.SI.MassFlowRate autoCalc_mFlow_eva = if machineType then max(0.00004*Q_useNominal - 0.3177, autoCalc_mFlow_min) else max(0.00005*Q_useNominal - 0.5662, autoCalc_mFlow_min); | |
| + parameter Modelica.Units.SI.MassFlowRate autoCalc_mFlow_con = if machineType then max(0.00004*Q_useNominal - 0.6162, autoCalc_mFlow_min) else max(0.00005*Q_useNominal + 0.3161, autoCalc_mFlow_min); | |
| + parameter Modelica.Units.SI.MassFlowRate mFlow_evaNominal_final=if use_autoCalc then autoCalc_mFlow_eva else mFlow_evaNominal; | |
| + parameter Modelica.Units.SI.MassFlowRate mFlow_conNominal_final=if use_autoCalc then autoCalc_mFlow_con else mFlow_conNominal; | |
| + parameter Modelica.Units.SI.Volume autoCalc_VEva = if machineType then max(0.0000001*Q_useNominal - 0.0075, autoCalc_Vmin) else max(0.0000001*Q_useNominal - 0.0066, autoCalc_Vmin); | |
| + parameter Modelica.Units.SI.Volume autoCalc_VCon = if machineType then max(0.0000001*Q_useNominal - 0.0094, autoCalc_Vmin) else max(0.0000002*Q_useNominal - 0.0084, autoCalc_Vmin); | |
| + parameter Modelica.Units.SI.Volume VEva_final=if use_autoCalc then autoCalc_VEva else VEva; | |
| + parameter Modelica.Units.SI.Volume VCon_final=if use_autoCalc then autoCalc_VCon else VCon; | |
| equation | |
| //Control and feedback for the auto-calculation of condenser and evaporator data | |
| assert(not use_autoCalc or (use_autoCalc and Q_useNominal>0), "Can't auto-calculate evaporator and condenser data without a given nominal power flow (Q_useNominal)!", | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/PartialThreeWayResistance.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/PartialThreeWayResistance.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BaseClasses/PartialThreeWayResistance.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BaseClasses/PartialThreeWayResistance.mo" 2021-04-26 11:51:10.982624868 +0200 | |
| @@ -26,11 +26,11 @@ | |
| "Third port, can be either inlet or outlet" | |
| annotation (Placement(transformation(extent={{-10,-110},{10,-90}}))); | |
| - parameter Modelica.SIunits.Time tau=10 | |
| + parameter Modelica.Units.SI.Time tau=10 | |
| "Time constant at nominal flow for dynamic energy and momentum balance" | |
| annotation(Dialog(tab="Dynamics", group="Nominal condition", | |
| enable=not energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState)); | |
| - parameter Modelica.SIunits.MassFlowRate mDyn_flow_nominal | |
| + parameter Modelica.Units.SI.MassFlowRate mDyn_flow_nominal | |
| "Nominal mass flow rate for dynamic momentum and energy balance" | |
| annotation(Dialog(tab="Dynamics", group="Equations", | |
| enable=not energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState)); | |
| @@ -50,7 +50,7 @@ | |
| parameter Boolean verifyFlowReversal = false | |
| "=true, to assert that the flow does not reverse when portFlowDirection_* does not equal Bidirectional" | |
| annotation(Dialog(tab="Advanced")); | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_small | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_small | |
| "Small mass flow rate for checking flow reversal" | |
| annotation(Dialog(tab="Advanced",enable=verifyFlowReversal)); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BaseClasses/CondensingBoilerEfficiency.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BaseClasses/CondensingBoilerEfficiency.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BaseClasses/CondensingBoilerEfficiency.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BaseClasses/CondensingBoilerEfficiency.mo" 2021-04-26 11:51:10.886624735 +0200 | |
| @@ -1,15 +1,15 @@ | |
| -within AixLib.Fluid.BoilerCHP.BaseClasses; | |
| +within AixLib.Fluid.BoilerCHP.BaseClasses; | |
| model CondensingBoilerEfficiency | |
| "Model for temperature depending efficiency of a condensing boiler" | |
| parameter Real lambda=0.01 "Offset variable of weighting coefficients sigmas"; | |
| - parameter Modelica.SIunits.Temperature T_nom=343.15 | |
| + parameter Modelica.Units.SI.Temperature T_nom=343.15 | |
| "Nominal temperature"; | |
| - parameter Modelica.SIunits.Temperature T_part=308.15 | |
| + parameter Modelica.Units.SI.Temperature T_part=308.15 | |
| "Intermediate temperature"; | |
| - parameter Modelica.SIunits.Efficiency eta_nom=1 | |
| + parameter Modelica.Units.SI.Efficiency eta_nom=1 | |
| "Nominal net heating value efficiency"; | |
| - parameter Modelica.SIunits.Efficiency eta_int=1 | |
| + parameter Modelica.Units.SI.Efficiency eta_int=1 | |
| "Intermediate net heating value efficiency"; | |
| parameter Real eta_max=1.11 | |
| "Ratio gross (high) heating value / net (low) heating value defined according to the fuel"; | |
| @@ -20,7 +20,7 @@ | |
| Real sigmaSens; | |
| Real sigmaCond; | |
| Real etaRP; | |
| - Modelica.SIunits.Temperature Tc(start=360, max=380, min=323, nominal=360) | |
| + Modelica.Units.SI.Temperature Tc(start=360, max=380, min=323, nominal=360) | |
| "Temperature of Sensitive and Latent characteristic intersection"; | |
| //start value is important: equation below has two solutions | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BaseClasses/Controllers/ControllerOnOffModularCHP.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BaseClasses/Controllers/ControllerOnOffModularCHP.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BaseClasses/Controllers/ControllerOnOffModularCHP.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BaseClasses/Controllers/ControllerOnOffModularCHP.mo" 2021-04-26 11:51:10.846624680 +0200 | |
| @@ -6,7 +6,7 @@ | |
| CHPEngineModel=DataBase.CHP.ModularCHPEngineData.CHP_ECPowerXRGI15() | |
| "CHP engine data for calculations" | |
| annotation (choicesAllMatching=true, Dialog(group="Unit properties")); | |
| - parameter Modelica.SIunits.Time startTimeChp=0 | |
| + parameter Modelica.Units.SI.Time startTimeChp=0 | |
| "Start time for discontinous simulation tests to heat the Chp unit up to the prescribed return temperature"; | |
| parameter Real modTab[:,2]=[0.0,0.8; 7200,0.8; 7200,0.93; 10800,0.93; 10800, | |
| 0.62; 14400,0.62; 14400,0.8; 18000,0.8; 18000,0.0] | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BaseClasses/Controllers/DelayedOnOffController.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BaseClasses/Controllers/DelayedOnOffController.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BaseClasses/Controllers/DelayedOnOffController.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BaseClasses/Controllers/DelayedOnOffController.mo" 2021-04-26 11:51:10.826624652 +0200 | |
| @@ -1,13 +1,13 @@ | |
| within AixLib.Fluid.BoilerCHP.BaseClasses.Controllers; | |
| model DelayedOnOffController "CHP On/Off controller" | |
| - parameter Modelica.SIunits.Temperature maxTReturn | |
| + parameter Modelica.Units.SI.Temperature maxTReturn | |
| "Maximum return temperature"; | |
| - parameter Modelica.SIunits.ThermodynamicTemperature minDeltaT | |
| + parameter Modelica.Units.SI.ThermodynamicTemperature minDeltaT | |
| "Minimum flow and return temperature difference"; | |
| - parameter Modelica.SIunits.ThermodynamicTemperature TFlowRange | |
| + parameter Modelica.Units.SI.ThermodynamicTemperature TFlowRange | |
| "Range of the flow temperature"; | |
| - parameter Modelica.SIunits.Time delayTime | |
| + parameter Modelica.Units.SI.Time delayTime | |
| "On/Off delay time"; | |
| parameter Boolean initialOutput=false | |
| "Initial output"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BaseClasses/Controllers/ExternalControlNightDayHC.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BaseClasses/Controllers/ExternalControlNightDayHC.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BaseClasses/Controllers/ExternalControlNightDayHC.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BaseClasses/Controllers/ExternalControlNightDayHC.mo" 2021-04-26 11:51:10.774624580 +0200 | |
| @@ -11,13 +11,13 @@ | |
| parameter Real declination | |
| "Declination" | |
| annotation (Dialog( group= "Heating curves")); | |
| - parameter Modelica.SIunits.TemperatureDifference Tdelta_Max | |
| + parameter Modelica.Units.SI.TemperatureDifference Tdelta_Max | |
| "Difference from set flow temperature over which boiler stops" | |
| annotation ( Dialog(group = "OnOff")); | |
| - parameter Modelica.SIunits.TemperatureDifference Tdelta_Min | |
| + parameter Modelica.Units.SI.TemperatureDifference Tdelta_Min | |
| "Difference from set flow temperature under which boiler starts" | |
| annotation ( Dialog(group = "OnOff")); | |
| - parameter Modelica.SIunits.Time Fb | |
| + parameter Modelica.Units.SI.Time Fb | |
| "Period of time for increased set temperature" | |
| annotation ( Dialog(group = "Day/Night Mode")); | |
| parameter Real FA | |
| @@ -60,11 +60,11 @@ | |
| annotation (Placement(transformation(extent={{-84,48},{-76.5,55.5}}))); | |
| protected | |
| - Modelica.Blocks.Tables.CombiTable2D flowTempNight( | |
| + Modelica.Blocks.Tables.CombiTable2Ds flowTempNight( | |
| final table=paramHC.varFlowTempNight) | |
| "Table for setting the flow temperature during night according to the outside temperature" | |
| annotation (Placement(transformation(extent={{-49.5,49.5},{-31.5,67.5}}))); | |
| - Modelica.Blocks.Tables.CombiTable2D flowTempDay( | |
| + Modelica.Blocks.Tables.CombiTable2Ds flowTempDay( | |
| final table=paramHC.varFlowTempDay) | |
| "Table for setting the flow temperature druing day according to the outside temperature" | |
| annotation (Placement(transformation(extent={{-49.5,22.5},{-31.5,40.5}}))); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BaseClasses/Controllers/InternalControl.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BaseClasses/Controllers/InternalControl.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BaseClasses/Controllers/InternalControl.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BaseClasses/Controllers/InternalControl.mo" 2021-04-26 11:51:10.722624509 +0200 | |
| @@ -8,9 +8,9 @@ | |
| choicesAllMatching = true); | |
| parameter Real KR | |
| "Gain of boiler heater"; | |
| - parameter Modelica.SIunits.Time TN | |
| + parameter Modelica.Units.SI.Time TN | |
| "Time constant of boiler heater (T>0 required)"; | |
| - parameter Modelica.SIunits.Time riseTime | |
| + parameter Modelica.Units.SI.Time riseTime | |
| "Rise/fall time for step input(T>0 required)"; | |
| Real outputPower | |
| "Output power"; | |
| @@ -75,7 +75,7 @@ | |
| Utilities.Sensors.EnergyMeter eEnergyMeter_S | |
| "For secondary energy consumption" | |
| annotation (Placement(transformation(extent={{30,82.5},{49.5,103.5}}))); | |
| - Modelica.Blocks.Tables.CombiTable1D efficiencyTable( | |
| + Modelica.Blocks.Tables.CombiTable1Dv efficiencyTable( | |
| final tableOnFile=false, | |
| final table=paramBoiler.eta, | |
| final columns={2}, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BaseClasses/Controllers/PIController.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BaseClasses/Controllers/PIController.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BaseClasses/Controllers/PIController.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BaseClasses/Controllers/PIController.mo" 2021-04-26 11:51:10.694624470 +0200 | |
| @@ -3,7 +3,7 @@ | |
| parameter Real Kc | |
| "Gain of the controller"; | |
| - parameter Modelica.SIunits.Time Tc | |
| + parameter Modelica.Units.SI.Time Tc | |
| "Time constant (T>0 required)"; | |
| parameter Real minCapacity | |
| "Minimum controller output in load operation"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BaseClasses/PartialHeatGenerator.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BaseClasses/PartialHeatGenerator.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BaseClasses/PartialHeatGenerator.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BaseClasses/PartialHeatGenerator.mo" 2021-04-26 11:51:10.654624415 +0200 | |
| @@ -2,22 +2,22 @@ | |
| partial model PartialHeatGenerator "Partial model for heat generators" | |
| extends AixLib.Fluid.Interfaces.PartialTwoPortInterface; | |
| - parameter Modelica.SIunits.Time tau=1 | |
| + parameter Modelica.Units.SI.Time tau=1 | |
| "Time constant of the temperature sensors at nominal flow rate" | |
| annotation (Dialog(tab="Advanced", group="Sensor Properties")); | |
| parameter Modelica.Blocks.Types.Init initType=Modelica.Blocks.Types.Init.InitialState | |
| "Type of initialization (InitialState and InitialOutput are identical)" | |
| annotation (Dialog(tab="Advanced", group="Sensor Properties")); | |
| - parameter Modelica.SIunits.Temperature T_start=Medium.T_default | |
| + parameter Modelica.Units.SI.Temperature T_start=Medium.T_default | |
| "Initial or guess value of output (= state)" | |
| annotation (Dialog(tab="Advanced", group="Initialization")); | |
| parameter Boolean transferHeat=false | |
| "If true, temperature T converges towards TAmb when no flow" | |
| annotation (Dialog(tab="Advanced", group="Sensor Properties")); | |
| - parameter Modelica.SIunits.Temperature TAmb=Medium.T_default | |
| + parameter Modelica.Units.SI.Temperature TAmb=Medium.T_default | |
| "Fixed ambient temperature for heat transfer" | |
| annotation (Dialog(tab="Advanced", group="Sensor Properties")); | |
| - parameter Modelica.SIunits.Time tauHeaTra=1200 | |
| + parameter Modelica.Units.SI.Time tauHeaTra=1200 | |
| "Time constant for heat transfer, default 20 minutes" | |
| annotation (Dialog(tab="Advanced", group="Sensor Properties")); | |
| Sensors.TemperatureTwoPort senTCold( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/Boiler.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/Boiler.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/Boiler.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/Boiler.mo" 2021-04-26 11:51:10.634624387 +0200 | |
| @@ -16,22 +16,22 @@ | |
| parameter Real KR=1 | |
| "Gain of Boiler heater" | |
| annotation (Dialog(tab = "General", group = "Boiler type")); | |
| - parameter Modelica.SIunits.Time TN=0.1 | |
| + parameter Modelica.Units.SI.Time TN=0.1 | |
| "Time Constant of boiler heater (T>0 required)" | |
| annotation (Dialog(tab = "General", group = "Boiler type")); | |
| - parameter Modelica.SIunits.Time riseTime=30 | |
| + parameter Modelica.Units.SI.Time riseTime=30 | |
| "Rise/Fall time for step input(T>0 required)" | |
| annotation (Dialog(tab = "General", group = "Boiler type")); | |
| parameter Real declination=1.1 | |
| "Declination" | |
| annotation(Dialog(tab="External Control")); | |
| - parameter Modelica.SIunits.TemperatureDifference Tdelta_Max=2 | |
| + parameter Modelica.Units.SI.TemperatureDifference Tdelta_Max=2 | |
| "Difference from set flow temperature over which boiler stops" | |
| annotation(Dialog(tab="External Control")); | |
| - parameter Modelica.SIunits.TemperatureDifference Tdelta_Min=2 | |
| + parameter Modelica.Units.SI.TemperatureDifference Tdelta_Min=2 | |
| "Difference from set flow temperature under which boiler starts" | |
| annotation(Dialog(tab="External Control")); | |
| - parameter Modelica.SIunits.Time Fb=3600 | |
| + parameter Modelica.Units.SI.Time Fb=3600 | |
| "Period of time for increased set temperature" | |
| annotation(Dialog(tab="External Control")); | |
| parameter Real FA=0.2 "Increment for increased set temperature" | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BoilerNoControl.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BoilerNoControl.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BoilerNoControl.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/BoilerNoControl.mo" 2021-04-26 11:51:10.598624338 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Fluid.BoilerCHP; | |
| +within AixLib.Fluid.BoilerCHP; | |
| model BoilerNoControl "Boiler model with physics only" | |
| extends AixLib.Fluid.BoilerCHP.BaseClasses.PartialHeatGenerator(pressureDrop(final a=a), | |
| vol(energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, | |
| @@ -7,13 +7,13 @@ | |
| parameter AixLib.DataBase.Boiler.General.BoilerTwoPointBaseDataDefinition | |
| paramBoiler "Parameters for Boiler" annotation (Dialog(tab="General", group= | |
| "Boiler type"), choicesAllMatching=true); | |
| - parameter Modelica.SIunits.ThermalConductance G=0.003*Q_nom/50 | |
| + parameter Modelica.Units.SI.ThermalConductance G=0.003*Q_nom/50 | |
| "Constant thermal conductance to environment(G=Q_loss/dT)"; | |
| - parameter Modelica.SIunits.HeatCapacity C=1.5*Q_nom | |
| + parameter Modelica.Units.SI.HeatCapacity C=1.5*Q_nom | |
| "Heat capacity of metal (J/K)"; | |
| - parameter Modelica.SIunits.Volume V=paramBoiler.volume "Volume"; | |
| + parameter Modelica.Units.SI.Volume V=paramBoiler.volume "Volume"; | |
| - parameter Modelica.SIunits.Power Q_nom=paramBoiler.Q_nom | |
| + parameter Modelica.Units.SI.Power Q_nom=paramBoiler.Q_nom | |
| "Nominal heating power"; | |
| Modelica.Thermal.HeatTransfer.Components.HeatCapacitor internalCapacity( | |
| @@ -58,7 +58,7 @@ | |
| Placement(transformation(extent={{30,-30},{50,-10}}), iconTransformation( | |
| extent={{58,-60},{78,-40}}))); | |
| - Modelica.Blocks.Tables.CombiTable1D efficiencyTableLoadDepending( | |
| + Modelica.Blocks.Tables.CombiTable1Dv efficiencyTableLoadDepending( | |
| final tableOnFile=false, | |
| final table=etaLoadBased, | |
| final columns={2}, | |
| @@ -90,7 +90,7 @@ | |
| extent={{-10,-10},{10,10}}, | |
| rotation=0, | |
| origin={10,50}))); | |
| - Modelica.Blocks.Tables.CombiTable1D efficiencyTableLoadDepending1( | |
| + Modelica.Blocks.Tables.CombiTable1Dv efficiencyTableLoadDepending1( | |
| final tableOnFile=false, | |
| final table=etaTempBased, | |
| final columns={2}, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/CHP.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/CHP.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/CHP.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/CHP.mo" 2021-04-26 11:51:10.554624277 +0200 | |
| @@ -20,22 +20,22 @@ | |
| parameter Boolean ctrlStrategy = true | |
| "True for flow-, false for return- temperature control strategy" | |
| annotation(Dialog(group="Control system")); | |
| - parameter Modelica.SIunits.TemperatureDifference minDeltaT = 10 | |
| + parameter Modelica.Units.SI.TemperatureDifference minDeltaT = 10 | |
| "Minimum flow and return temperature difference" | |
| annotation(Dialog(group="Control system")); | |
| - parameter Modelica.SIunits.TemperatureDifference TFlowRange = 2 | |
| + parameter Modelica.Units.SI.TemperatureDifference TFlowRange = 2 | |
| "Range of allowable flow temperature" | |
| annotation(Dialog(group="Control system")); | |
| - parameter Modelica.SIunits.Time delayTime = 3600 | |
| + parameter Modelica.Units.SI.Time delayTime = 3600 | |
| "Shutdown/Startup delay" | |
| annotation(Dialog(group="Control system")); | |
| parameter Real Kc = 1 | |
| "Gain of the controller" | |
| annotation(Dialog(group="Control system")); | |
| - parameter Modelica.SIunits.Time Tc=60 | |
| + parameter Modelica.Units.SI.Time Tc=60 | |
| "Time Constant (T>0 required)" | |
| annotation(Dialog(group="Control system")); | |
| - parameter Modelica.SIunits.Time delayUnit = 60 | |
| + parameter Modelica.Units.SI.Time delayUnit = 60 | |
| "Delay measurement of the controller output" | |
| annotation(Dialog(group="Control system")); | |
| Modelica.Blocks.Interfaces.RealInput TSet( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/Data.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/Data.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/Data.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/Data.mo" 2021-04-26 11:51:10.498624198 +0200 | |
| @@ -7,10 +7,10 @@ | |
| record EngineMaterialData | |
| extends Modelica.Icons.Record; | |
| - constant Modelica.SIunits.ThermalConductivity lambda = 44.5 "Thermal conductivity of the engine block material (default value is 44.5)"; | |
| - constant Modelica.SIunits.Density rhoEngWall = 7200 "Density of the the engine block material (default value is 72000)"; | |
| - constant Modelica.SIunits.SpecificHeatCapacity c = 535 "Specific heat capacity of the cylinder wall material (default value is 535)"; | |
| + constant Modelica.Units.SI.ThermalConductivity lambda = 44.5 "Thermal conductivity of the engine block material (default value is 44.5)"; | |
| + constant Modelica.Units.SI.Density rhoEngWall = 7200 "Density of the the engine block material (default value is 72000)"; | |
| + constant Modelica.Units.SI.SpecificHeatCapacity c = 535 "Specific heat capacity of the cylinder wall material (default value is 535)"; | |
| annotation (Documentation(revisions="<html><ul> | |
| <li> | |
| <i>April, 2019 </i> by Julian Matthes:<br/> | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/Examples/BoilerNoControlSystem.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/Examples/BoilerNoControlSystem.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/Examples/BoilerNoControlSystem.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/Examples/BoilerNoControlSystem.mo" 2021-04-26 11:51:10.478624170 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Fluid.BoilerCHP.Examples; | |
| +within AixLib.Fluid.BoilerCHP.Examples; | |
| model BoilerNoControlSystem | |
| "Example that illustrates the use of the boiler model without control" | |
| extends Modelica.Icons.Example; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/Examples/BoilerSystem.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/Examples/BoilerSystem.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/Examples/BoilerSystem.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/Examples/BoilerSystem.mo" 2021-04-26 11:51:10.470624160 +0200 | |
| @@ -45,7 +45,7 @@ | |
| annotation (Placement(transformation(extent={{-30,-50},{-10,-30}}))); | |
| Modelica.Blocks.Sources.Sine sine( | |
| amplitude=5, | |
| - freqHz=1/86400, | |
| +f =1/86400, | |
| phase=4.7123889803847, | |
| offset=273.15) | |
| "Ambient air temperature" | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/Examples/ModularCHPSystem.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/Examples/ModularCHPSystem.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/Examples/ModularCHPSystem.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/Examples/ModularCHPSystem.mo" 2021-04-26 11:51:10.434624109 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Fluid.BoilerCHP.Examples; | |
| +within AixLib.Fluid.BoilerCHP.Examples; | |
| model ModularCHPSystem | |
| "Example of the modular CHP power unit model inside a heating circuit" | |
| extends Modelica.Icons.Example; | |
| @@ -28,10 +28,10 @@ | |
| AixLib.Fluid.BoilerCHP.Data.ModularCHP.EngineMaterial_CastIron() | |
| "Thermal engine material data for calculations" | |
| annotation (choicesAllMatching=true, Dialog(group="Unit properties")); | |
| - parameter Modelica.SIunits.Temperature T_amb=293.15 | |
| + parameter Modelica.Units.SI.Temperature T_amb=293.15 | |
| "Default ambient temperature" | |
| annotation (Dialog(group="Ambient Parameters")); | |
| - parameter Modelica.SIunits.AbsolutePressure p_amb=101325 | |
| + parameter Modelica.Units.SI.AbsolutePressure p_amb=101325 | |
| "Default ambient pressure" annotation (Dialog(group="Ambient Parameters")); | |
| parameter Real s_til=abs((cHP_PowerUnit.cHP_PowerUnit.inductionMachine.s_nominal | |
| *(cHP_PowerUnit.cHP_PowerUnit.inductionMachine.M_til/cHP_PowerUnit.cHP_PowerUnit.inductionMachine.M_nominal) | |
| @@ -48,34 +48,34 @@ | |
| "Calibration factor for electric power output (default=1)" | |
| annotation (Dialog(tab="Calibration parameters", | |
| group="Fast calibration - Electric power and fuel usage")); | |
| - parameter Modelica.SIunits.ThermalConductance GEngToCoo=33 | |
| + parameter Modelica.Units.SI.ThermalConductance GEngToCoo=33 | |
| "Thermal conductance of engine housing from the cylinder wall to the water cooling channels" | |
| annotation (Dialog(tab="Calibration parameters",group= | |
| "Fast calibration - Thermal power output")); | |
| - parameter Modelica.SIunits.ThermalConductance GCooExhHex=400 | |
| + parameter Modelica.Units.SI.ThermalConductance GCooExhHex=400 | |
| "Thermal conductance of the coolant heat exchanger at nominal flow" | |
| annotation (Dialog(tab="Calibration parameters",group="Fast calibration - Thermal power output")); | |
| - parameter Modelica.SIunits.HeatCapacity CExhHex=50000 | |
| + parameter Modelica.Units.SI.HeatCapacity CExhHex=50000 | |
| "Heat capacity of exhaust heat exchanger(default= 4000 J/K)" annotation ( | |
| Dialog(tab="Calibration parameters",group= | |
| "Advanced calibration parameters")); | |
| - parameter Modelica.SIunits.Mass Cal_mEng=0 | |
| + parameter Modelica.Units.SI.Mass Cal_mEng=0 | |
| "Added engine mass for calibration purposes of the system´s thermal inertia" | |
| annotation (Dialog(tab="Calibration parameters",group="Advanced calibration parameters")); | |
| - parameter Modelica.SIunits.Area A_surExhHea=100 | |
| + parameter Modelica.Units.SI.Area A_surExhHea=100 | |
| "Surface for exhaust heat transfer" | |
| annotation (Dialog(tab="Calibration parameters",group="Advanced calibration parameters")); | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_Coo=0.4 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_Coo=0.4 | |
| "Nominal mass flow rate of coolant inside the engine cooling circle" annotation ( | |
| Dialog(tab="Calibration parameters",group= | |
| "Advanced calibration parameters")); | |
| - parameter Modelica.SIunits.Thickness dInn=0.01 | |
| + parameter Modelica.Units.SI.Thickness dInn=0.01 | |
| "Typical value for the thickness of the cylinder wall (between combustion chamber and cooling circle)" | |
| annotation (Dialog(tab="Calibration parameters",group="Fast calibration - Thermal power output")); | |
| - parameter Modelica.SIunits.ThermalConductance GEngToAmb=2 | |
| + parameter Modelica.Units.SI.ThermalConductance GEngToAmb=2 | |
| "Thermal conductance from engine housing to the surrounding air" | |
| annotation (Dialog(tab="Calibration parameters",group="Advanced calibration parameters")); | |
| - parameter Modelica.SIunits.ThermalConductance GAmb=10 | |
| + parameter Modelica.Units.SI.ThermalConductance GAmb=10 | |
| "Constant heat transfer coefficient of engine housing to ambient" annotation ( | |
| Dialog(tab="Calibration parameters",group= | |
| "Advanced calibration parameters")); | |
| @@ -83,7 +83,7 @@ | |
| 14400,0.62; 14400,0.8; 18000,0.8; 18000,0.0] | |
| "Table for unit modulation (time = first column; modulation factors = second column)" | |
| annotation (Dialog(tab="Calibration parameters", group="Fast calibration - Electric power and fuel usage")); | |
| - parameter Modelica.SIunits.Temperature T_HeaRet=303.15 | |
| + parameter Modelica.Units.SI.Temperature T_HeaRet=303.15 | |
| "Constant heating circuit return temperature" | |
| annotation (Dialog(tab="Engine Cooling Circle")); | |
| parameter Boolean ConTec=true | |
| @@ -108,15 +108,15 @@ | |
| mCool_flow_small=0.005 | |
| "Small coolant mass flow rate for regularization of zero flow" | |
| annotation (Dialog(tab="Advanced", group="Assumptions")); | |
| - parameter Modelica.SIunits.Efficiency eps=0.9 "Heat exchanger effectiveness" | |
| + parameter Modelica.Units.SI.Efficiency eps=0.9 "Heat exchanger effectiveness" | |
| annotation (Dialog(tab="Calibration parameters", group= | |
| "Advanced calibration parameters")); | |
| - Modelica.SIunits.MassFlowRate m_flow_HeaCir=if not VolCon then CHPEngineModel.m_floCooNominal | |
| + Modelica.Units.SI.MassFlowRate m_flow_HeaCir=if not VolCon then CHPEngineModel.m_floCooNominal | |
| else V_flow_HeaCir*senDen.d | |
| "Nominal mass flow rate inside the heating circuit" | |
| annotation (Dialog(tab="Engine Cooling Circle")); | |
| - Modelica.SIunits.VolumeFlowRate V_flow_HeaCir=0.3/3600 | |
| + Modelica.Units.SI.VolumeFlowRate V_flow_HeaCir=0.3/3600 | |
| "Nominal volume flow rate inside the heating circuit" annotation (Dialog(tab= | |
| "Engine Cooling Circle")); | |
| @@ -183,10 +183,10 @@ | |
| DataBase.CHP.ModularCHPEngineMedia.CHPCombustionMixtureGasNasa | |
| "Exhaust gas medium model used in the CHP plant" annotation(choicesAllMatching=true); | |
| - parameter Modelica.SIunits.Mass mEng=CHPEngineModel.mEng + Cal_mEng | |
| + | |
| + parameter Modelica.Units.SI.Mass mEng=CHPEngineModel.mEng + Cal_mEng | |
| "Total engine mass for heat capacity calculation" | |
| annotation (Dialog(tab="Calibration parameters",group="Advanced calibration parameters")); | |
| - | |
| equation | |
| connect(source.T_in, tempFlowHeating.y) annotation (Line(points={{-62,4},{-68, | |
| 4},{-68,-2},{-72.8,-2}}, color={0,0,127})); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/HeatGeneratorNoControl.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/HeatGeneratorNoControl.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/HeatGeneratorNoControl.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/HeatGeneratorNoControl.mo" 2021-04-26 11:51:10.390624050 +0200 | |
| @@ -35,7 +35,7 @@ | |
| extent={{-10,-10},{10,10}}, | |
| rotation=90, | |
| origin={40,90}))); | |
| - parameter Modelica.SIunits.Volume V | |
| + parameter Modelica.Units.SI.Volume V | |
| "Volume of the heat exchanger inside the heat generator"; | |
| parameter Real coeffPresLoss | |
| "Pressure loss coefficient of the heat generator"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/BaseClassComponents/GasolineEngineChp_EngineHousing_CylToInnerWall.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/BaseClassComponents/GasolineEngineChp_EngineHousing_CylToInnerWall.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/BaseClassComponents/GasolineEngineChp_EngineHousing_CylToInnerWall.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/BaseClassComponents/GasolineEngineChp_EngineHousing_CylToInnerWall.mo" 2021-04-26 11:51:10.286623905 +0200 | |
| @@ -1,15 +1,15 @@ | |
| within AixLib.Fluid.BoilerCHP.ModularCHP.BaseClasses.BaseClassComponents; | |
| model GasolineEngineChp_EngineHousing_CylToInnerWall | |
| - parameter Modelica.SIunits.ThermalConductance GInnWall=lambda*A_WInn/dInn | |
| + parameter Modelica.Units.SI.ThermalConductance GInnWall=lambda*A_WInn/dInn | |
| "Thermal conductance of the inner engine wall" | |
| annotation (Dialog(group="Thermal")); | |
| - parameter Modelica.SIunits.Thickness dInn=0.005 | |
| + parameter Modelica.Units.SI.Thickness dInn=0.005 | |
| "Typical value for the thickness of the cylinder wall (between combustion chamber and cooling circle)" | |
| annotation (Dialog(tab="Structure Calculations")); | |
| - parameter Modelica.SIunits.ThermalConductivity lambda=44.5 | |
| + parameter Modelica.Units.SI.ThermalConductivity lambda=44.5 | |
| "Thermal conductivity of the engine block material" annotation (Dialog(tab="Structure", group="Material Properties")); | |
| - parameter Modelica.SIunits.Area A_WInn | |
| + parameter Modelica.Units.SI.Area A_WInn | |
| "Area of heat transporting surface from cylinder wall to outer engine block" | |
| annotation (Dialog(tab="Structure Calculations")); | |
| parameter Real z=4 | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/BaseClassComponents/GasolineEngineChp_EngineHousing_EngineBlock.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/BaseClassComponents/GasolineEngineChp_EngineHousing_EngineBlock.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/BaseClassComponents/GasolineEngineChp_EngineHousing_EngineBlock.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/BaseClassComponents/GasolineEngineChp_EngineHousing_EngineBlock.mo" 2021-04-26 11:51:10.266623877 +0200 | |
| @@ -1,42 +1,42 @@ | |
| within AixLib.Fluid.BoilerCHP.ModularCHP.BaseClasses.BaseClassComponents; | |
| model GasolineEngineChp_EngineHousing_EngineBlock | |
| - parameter Modelica.SIunits.HeatCapacity CEngBlo=dOut*A_WInn*rhoEngWall*c | |
| + parameter Modelica.Units.SI.HeatCapacity CEngBlo=dOut*A_WInn*rhoEngWall*c | |
| "Heat capacity of the remaining engine body" | |
| annotation (Dialog(group="Thermal")); | |
| - parameter Modelica.SIunits.ThermalConductance GEngToAmb=0.23 | |
| + parameter Modelica.Units.SI.ThermalConductance GEngToAmb=0.23 | |
| "Thermal conductance from the engine block to the ambient" annotation (Dialog(group="Thermal")); | |
| - parameter Modelica.SIunits.ThermalConductance GInnWall=lambda*A_WInn/dInn | |
| + parameter Modelica.Units.SI.ThermalConductance GInnWall=lambda*A_WInn/dInn | |
| "Thermal conductance of the inner engine wall" | |
| annotation (Dialog(group="Thermal")); | |
| - parameter Modelica.SIunits.ThermalConductance GEngBlo=lambda*A_WInn/dOut | |
| + parameter Modelica.Units.SI.ThermalConductance GEngBlo=lambda*A_WInn/dOut | |
| "Thermal conductance of the outer engine wall" | |
| annotation (Dialog(group="Thermal")); | |
| - parameter Modelica.SIunits.Temperature T_Amb=298.15 | |
| + parameter Modelica.Units.SI.Temperature T_Amb=298.15 | |
| "Ambient temperature" | |
| annotation (Dialog(tab="Thermal")); | |
| - parameter Modelica.SIunits.Thickness dInn=0.005 | |
| + parameter Modelica.Units.SI.Thickness dInn=0.005 | |
| "Typical value for the thickness of the cylinder wall (between combustion chamber and cooling circle)" | |
| annotation (Dialog(tab="Structure Calculations")); | |
| - parameter Modelica.SIunits.Thickness dOut=mEngBlo/A_WInn/rhoEngWall | |
| + parameter Modelica.Units.SI.Thickness dOut=mEngBlo/A_WInn/rhoEngWall | |
| "Thickness of outer wall of the remaining engine body" | |
| annotation (Dialog(tab="Structure Calculations")); | |
| - parameter Modelica.SIunits.ThermalConductivity lambda=44.5 | |
| + parameter Modelica.Units.SI.ThermalConductivity lambda=44.5 | |
| "Thermal conductivity of the engine block material" annotation (Dialog(tab="Structure", group="Material Properties")); | |
| - parameter Modelica.SIunits.Density rhoEngWall=72000 | |
| + parameter Modelica.Units.SI.Density rhoEngWall=72000 | |
| "Density of the the engine block material" annotation (Dialog(tab="Structure", group="Material Properties")); | |
| - parameter Modelica.SIunits.SpecificHeatCapacity c=535 | |
| + parameter Modelica.Units.SI.SpecificHeatCapacity c=535 | |
| "Specific heat capacity of the cylinder wall material" annotation (Dialog(tab="Structure", group="Material Properties")); | |
| - parameter Modelica.SIunits.Area A_WInn | |
| + parameter Modelica.Units.SI.Area A_WInn | |
| "Area of heat transporting surface from cylinder wall to outer engine block" | |
| annotation (Dialog(tab="Structure Calculations")); | |
| parameter Real z | |
| annotation (Dialog(tab="Structure", group="Engine Properties")); | |
| - parameter Modelica.SIunits.Mass mEngBlo=mEng - mEngWall | |
| + parameter Modelica.Units.SI.Mass mEngBlo=mEng - mEngWall | |
| annotation (Dialog(tab="Structure Calculations")); | |
| - parameter Modelica.SIunits.Mass mEng | |
| + parameter Modelica.Units.SI.Mass mEng | |
| annotation (Dialog(tab="Structure", group="Engine Properties")); | |
| - parameter Modelica.SIunits.Mass mEngWall=A_WInn*rhoEngWall*dInn | |
| + parameter Modelica.Units.SI.Mass mEngWall=A_WInn*rhoEngWall*dInn | |
| annotation (Dialog(tab="Structure Calculations")); | |
| Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port_a | |
| "Heat port to engine block" annotation ( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/BaseClassComponents/GasolineEngineChp_EngineHousing.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/BaseClassComponents/GasolineEngineChp_EngineHousing.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/BaseClassComponents/GasolineEngineChp_EngineHousing.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/BaseClassComponents/GasolineEngineChp_EngineHousing.mo" 2021-04-26 11:51:10.346623989 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Fluid.BoilerCHP.ModularCHP.BaseClasses.BaseClassComponents; | |
| +within AixLib.Fluid.BoilerCHP.ModularCHP.BaseClasses.BaseClassComponents; | |
| class GasolineEngineChp_EngineHousing | |
| "Engine housing as a simple two layer wall." | |
| @@ -8,7 +8,7 @@ | |
| DataBase.CHP.ModularCHPEngineMedia.CHPCombustionMixtureGasNasa | |
| "Exhaust gas medium model used in the CHP plant" annotation(choicesAllMatching=true); | |
| - parameter Modelica.SIunits.Thickness dInn=0.005 | |
| + parameter Modelica.Units.SI.Thickness dInn=0.005 | |
| "Typical value for the thickness of the cylinder wall (between combustion chamber and cooling circle)" | |
| annotation (Dialog(tab="Calibration properties")); | |
| parameter AixLib.Fluid.BoilerCHP.Data.ModularCHP.EngineMaterialData | |
| @@ -16,54 +16,54 @@ | |
| "Thermal engine material data for calculations (most common is cast iron)" | |
| annotation (choicesAllMatching=true, Dialog(tab="Structure", group= | |
| "Material Properties")); | |
| - constant Modelica.SIunits.ThermalConductivity lambda=EngMatData.lambda | |
| + constant Modelica.Units.SI.ThermalConductivity lambda=EngMatData.lambda | |
| "Thermal conductivity of the engine block material" annotation (Dialog(tab="Structure", group="Material Properties")); | |
| - constant Modelica.SIunits.Density rhoEngWall=EngMatData.rhoEngWall | |
| + constant Modelica.Units.SI.Density rhoEngWall=EngMatData.rhoEngWall | |
| "Density of the the engine block material" annotation (Dialog(tab="Structure", group="Material Properties")); | |
| - constant Modelica.SIunits.SpecificHeatCapacity c=EngMatData.c | |
| + constant Modelica.Units.SI.SpecificHeatCapacity c=EngMatData.c | |
| "Specific heat capacity of the cylinder wall material" annotation (Dialog(tab="Structure", group="Material Properties")); | |
| constant Real z | |
| "Number of engine cylinders" | |
| annotation (Dialog(tab="Structure", group="Engine Properties")); | |
| - constant Modelica.SIunits.Thickness dCyl | |
| + constant Modelica.Units.SI.Thickness dCyl | |
| "Engine cylinder diameter" | |
| annotation (Dialog(tab="Structure", group="Engine Properties")); | |
| - constant Modelica.SIunits.Thickness hStr | |
| + constant Modelica.Units.SI.Thickness hStr | |
| "Engine stroke" | |
| annotation (Dialog(tab="Structure", group="Engine Properties")); | |
| constant Real eps | |
| "Engine compression ratio" | |
| annotation (Dialog(tab="Structure", group="Engine Properties")); | |
| - parameter Modelica.SIunits.Mass mEng | |
| + parameter Modelica.Units.SI.Mass mEng | |
| "Total engine mass" | |
| annotation (Dialog(tab="Structure", group="Engine Properties")); | |
| - parameter Modelica.SIunits.ThermalConductance GEngToAmb=0.23 | |
| + parameter Modelica.Units.SI.ThermalConductance GEngToAmb=0.23 | |
| "Thermal conductance from engine housing to the surrounding air" | |
| annotation (Dialog(tab="Thermal")); | |
| - parameter Modelica.SIunits.Temperature T_Amb=298.15 | |
| + parameter Modelica.Units.SI.Temperature T_Amb=298.15 | |
| "Ambient temperature" | |
| annotation (Dialog(tab="Thermal")); | |
| Real nEng | |
| "Current engine speed" | |
| annotation (Dialog(tab="Structure", group="Engine Properties")); | |
| - Modelica.SIunits.ThermalConductance CalT_Exh | |
| + Modelica.Units.SI.ThermalConductance CalT_Exh | |
| "Calculation variable for the temperature of the exhaust gas"; | |
| - Modelica.SIunits.Temperature T_Com | |
| + Modelica.Units.SI.Temperature T_Com | |
| "Calculated maximum combustion temperature inside the engine" | |
| annotation (Dialog(tab="Thermal")); | |
| - Modelica.SIunits.Temperature T_CylWall | |
| + Modelica.Units.SI.Temperature T_CylWall | |
| "Temperature of cylinder wall"; | |
| /* Modelica.SIunits.Temperature T_LogMeanCool | |
| "Mean logarithmic coolant temperature" annotation (Dialog(tab="Thermal")); */ | |
| - Modelica.SIunits.Temperature T_Exh | |
| + Modelica.Units.SI.Temperature T_Exh | |
| "Inlet temperature of exhaust gas" annotation (Dialog(group="Thermal")); | |
| - Modelica.SIunits.Temperature T_ExhPowUniOut | |
| + Modelica.Units.SI.Temperature T_ExhPowUniOut | |
| "Outlet temperature of exhaust gas" | |
| annotation (Dialog(tab="Thermal")); | |
| type RotationSpeed=Real(final unit="1/s", min=0); | |
| - Modelica.SIunits.MassFlowRate m_Exh | |
| + Modelica.Units.SI.MassFlowRate m_Exh | |
| "Mass flow rate of exhaust gas" annotation (Dialog(tab="Thermal")); | |
| - Modelica.SIunits.SpecificHeatCapacity meanCpExh | |
| + Modelica.Units.SI.SpecificHeatCapacity meanCpExh | |
| "Mean specific heat capacity of the exhaust gas" annotation (Dialog(tab="Thermal")); | |
| Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port_amb | |
| @@ -141,31 +141,31 @@ | |
| origin={0,122}))); | |
| protected | |
| - constant Modelica.SIunits.Area A_WInn=z*(Modelica.Constants.pi*dCyl*(dCyl/2 + hStr*(1 + 1/(eps - 1)))) | |
| + | |
| + constant Modelica.Units.SI.Area A_WInn=z*(Modelica.Constants.pi*dCyl*(dCyl/2 + hStr*(1 + 1/(eps - 1)))) | |
| "Area of heat transporting surface from cylinder wall to outer engine block" | |
| annotation (Dialog(tab="Structure")); | |
| - parameter Modelica.SIunits.Mass mEngWall=A_WInn*rhoEngWall*dInn | |
| + parameter Modelica.Units.SI.Mass mEngWall=A_WInn*rhoEngWall*dInn | |
| "Calculated mass of cylinder wall between combustion chamber and cooling circle" | |
| annotation (Dialog(tab="Structure")); | |
| - parameter Modelica.SIunits.Mass mEngBlo=mEng - mEngWall | |
| + parameter Modelica.Units.SI.Mass mEngBlo=mEng - mEngWall | |
| "Calculated mass of the remaining engine body" | |
| annotation (Dialog(tab="Structure")); | |
| - parameter Modelica.SIunits.Thickness dOut=mEngBlo/A_WInn/rhoEngWall | |
| + parameter Modelica.Units.SI.Thickness dOut=mEngBlo/A_WInn/rhoEngWall | |
| "Thickness of outer wall of the remaining engine body" | |
| annotation (Dialog(tab="Structure")); | |
| - parameter Modelica.SIunits.HeatCapacity CEngWall=dInn*A_WInn*rhoEngWall*c | |
| + parameter Modelica.Units.SI.HeatCapacity CEngWall=dInn*A_WInn*rhoEngWall*c | |
| "Heat capacity of cylinder wall between combustion chamber and cooling circle" | |
| annotation (Dialog(tab="Thermal")); | |
| - parameter Modelica.SIunits.HeatCapacity CEngBlo=dOut*A_WInn*rhoEngWall*c | |
| + parameter Modelica.Units.SI.HeatCapacity CEngBlo=dOut*A_WInn*rhoEngWall*c | |
| "Heat capacity of the remaining engine body" | |
| annotation (Dialog(tab="Thermal")); | |
| - parameter Modelica.SIunits.ThermalConductance GInnWall=lambda*A_WInn/dInn | |
| + parameter Modelica.Units.SI.ThermalConductance GInnWall=lambda*A_WInn/dInn | |
| "Thermal conductance of the inner engine wall" | |
| annotation (Dialog(tab="Thermal")); | |
| - parameter Modelica.SIunits.ThermalConductance GEngBlo=lambda*A_WInn/dOut | |
| + parameter Modelica.Units.SI.ThermalConductance GEngBlo=lambda*A_WInn/dOut | |
| "Thermal conductance of the remaining engine body" | |
| annotation (Dialog(tab="Thermal")); | |
| - | |
| equation | |
| /* if EngOp and m_Exh>0.001 then | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/BaseClassComponents/GasolineEngineChp_EngineModel.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/BaseClassComponents/GasolineEngineChp_EngineModel.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/BaseClassComponents/GasolineEngineChp_EngineModel.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/BaseClassComponents/GasolineEngineChp_EngineModel.mo" 2021-04-26 11:51:10.230623829 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Fluid.BoilerCHP.ModularCHP.BaseClasses.BaseClassComponents; | |
| +within AixLib.Fluid.BoilerCHP.ModularCHP.BaseClasses.BaseClassComponents; | |
| model GasolineEngineChp_EngineModel | |
| "Internal combustion engine model for CHP-applications." | |
| import AixLib; | |
| @@ -24,37 +24,37 @@ | |
| CHPEngData=DataBase.CHP.ModularCHPEngineData.CHP_SenerTecDachsG5_5() | |
| "Needed engine data for calculations" | |
| annotation (choicesAllMatching=true, Dialog(group="Unit properties")); | |
| - constant Modelica.SIunits.Volume VCyl = CHPEngData.VEng/CHPEngData.z "Cylinder displacement"; | |
| + constant Modelica.Units.SI.Volume VCyl = CHPEngData.VEng/CHPEngData.z "Cylinder displacement"; | |
| type RotationSpeed=Real(final unit="1/s", min=0); | |
| constant RotationSpeed nEngNominal = 25.583 "Nominal engine speed at operating point"; | |
| - constant Modelica.SIunits.Power P_mecNominal = CHPEngData.P_mecNominal "Mecanical power output at nominal operating point"; | |
| - parameter Modelica.SIunits.Temperature T_Amb=298.15 "Ambient temperature (matches to fuel and combustion air temperature)"; | |
| + constant Modelica.Units.SI.Power P_mecNominal = CHPEngData.P_mecNominal "Mecanical power output at nominal operating point"; | |
| + parameter Modelica.Units.SI.Temperature T_Amb=298.15 "Ambient temperature (matches to fuel and combustion air temperature)"; | |
| type GasConstant=Real(final unit="J/(mol.K)"); | |
| constant GasConstant R = 8.31446 "Gasconstant for calculation purposes"; | |
| constant Real QuoDCyl = CHPEngData.QuoDCyl; | |
| constant Boolean FuelType = Medium1.isGas "True = Gasoline fuel, False = Liquid fuel"; | |
| - constant Modelica.SIunits.MassFlowRate m_MaxExh=CHPEngData.P_FueNominal/H_U*(1 | |
| + constant Modelica.Units.SI.MassFlowRate m_MaxExh=CHPEngData.P_FueNominal/H_U*(1 | |
| + Lambda*L_St) | |
| "Maximal exhaust gas flow based on the fuel and combustion properties"; | |
| - constant Modelica.SIunits.Mass m_FueEngRot=CHPEngData.P_FueNominal*60/(H_U* | |
| + constant Modelica.Units.SI.Mass m_FueEngRot=CHPEngData.P_FueNominal*60/(H_U* | |
| CHPEngData.nEngMax*CHPEngData.i) | |
| "Injected fuel mass per engine rotation(presumed as constant)"; | |
| - constant Modelica.SIunits.Pressure p_Amb = 101325 "Ambient pressure"; | |
| - constant Modelica.SIunits.Pressure p_mi = p_mfNominal+p_meNominal "Constant indicated mean effective cylinder pressure"; | |
| - constant Modelica.SIunits.Pressure p_meNominal = CHPEngData.p_meNominal "Nominal mean effective cylinder pressure"; | |
| - constant Modelica.SIunits.Pressure ref_p_mfNominal = CHPEngData.ref_p_mfNominal "Friction mean pressure of reference engine for calculation(dCyl=91mm & nEng=3000rpm & TEng=90°C)"; | |
| - constant Modelica.SIunits.Pressure p_mfNominal=ref_p_mfNominal*QuoDCyl^(-0.3) "Nominal friction mean pressure"; | |
| - constant Modelica.SIunits.Temperature T_ExhOut = CHPEngData.T_ExhPowUniOut "Assumed exhaust gas outlet temperature of the CHP unit for heat calculations"; | |
| - constant Modelica.SIunits.SpecificEnergy H_U = Medium1.H_U "Specific calorific value of the fuel"; | |
| + constant Modelica.Units.SI.Pressure p_Amb = 101325 "Ambient pressure"; | |
| + constant Modelica.Units.SI.Pressure p_mi = p_mfNominal+p_meNominal "Constant indicated mean effective cylinder pressure"; | |
| + constant Modelica.Units.SI.Pressure p_meNominal = CHPEngData.p_meNominal "Nominal mean effective cylinder pressure"; | |
| + constant Modelica.Units.SI.Pressure ref_p_mfNominal = CHPEngData.ref_p_mfNominal "Friction mean pressure of reference engine for calculation(dCyl=91mm & nEng=3000rpm & TEng=90°C)"; | |
| + constant Modelica.Units.SI.Pressure p_mfNominal=ref_p_mfNominal*QuoDCyl^(-0.3) "Nominal friction mean pressure"; | |
| + constant Modelica.Units.SI.Temperature T_ExhOut = CHPEngData.T_ExhPowUniOut "Assumed exhaust gas outlet temperature of the CHP unit for heat calculations"; | |
| + constant Modelica.Units.SI.SpecificEnergy H_U = Medium1.H_U "Specific calorific value of the fuel"; | |
| constant Real Lambda=CHPEngData.Lambda "Combustion air ratio"; | |
| constant Real L_St = Medium1.L_st "Stoichiometric air consumption per mass fuel"; | |
| constant Real l_Min = L_St*MM_Fuel/MM_Air "Minimum molar air consumption per mole fuel"; | |
| - constant Modelica.SIunits.MolarMass MM_Fuel = Medium1.MM "Molar mass of the fuel"; | |
| - constant Modelica.SIunits.MolarMass MM_Air = Medium2.MM "Molar mass of the combustion air"; | |
| - constant Modelica.SIunits.MolarMass MM_ComExh[:] = Medium3.data[:].MM "Molar masses of the combustion products: N2, O2, H2O, CO2"; | |
| + constant Modelica.Units.SI.MolarMass MM_Fuel = Medium1.MM "Molar mass of the fuel"; | |
| + constant Modelica.Units.SI.MolarMass MM_Air = Medium2.MM "Molar mass of the combustion air"; | |
| + constant Modelica.Units.SI.MolarMass MM_ComExh[:] = Medium3.data[:].MM "Molar masses of the combustion products: N2, O2, H2O, CO2"; | |
| constant Real expFacCpComExh[:] = {0.11, 0.15, 0.20, 0.30} "Exponential factor for calculating the specific heat capacity of N2, O2, H2O, CO2"; | |
| - constant Modelica.SIunits.SpecificHeatCapacity cpRefComExh[:] = {1000, 900, 1750, 840} "Specific heat capacities of the combustion products at reference state at 0°C"; | |
| - constant Modelica.SIunits.Temperature RefT_Com = 1473.15 "Reference combustion temperature for calculation purposes"; | |
| + constant Modelica.Units.SI.SpecificHeatCapacity cpRefComExh[:] = {1000, 900, 1750, 840} "Specific heat capacities of the combustion products at reference state at 0°C"; | |
| + constant Modelica.Units.SI.Temperature RefT_Com = 1473.15 "Reference combustion temperature for calculation purposes"; | |
| // Exhaust composition for gasoline fuels | |
| @@ -67,38 +67,38 @@ | |
| else Medium1.Fuel.Xi_liq[1]*Medium1.MM/Medium1.Fuel.MMi_liq[1] "Exhaust: Number of molecules CO2 per mole of fuel"; | |
| constant Real n_ComExh[:] = {n_N2Exh, n_O2Exh, n_H2OExh, n_CO2Exh}; | |
| constant Real n_Exh = sum(n_ComExh[j] for j in 1:size(n_ComExh, 1)) "Number of exhaust gas molecules per mole of fuel"; | |
| - constant Modelica.SIunits.MolarMass MM_Exh = sum(n_ComExh[i]*MM_ComExh[i] for i in 1:size(n_ComExh, 1))/sum(n_ComExh[i] for i in 1:size(n_ComExh, 1)) | |
| + constant Modelica.Units.SI.MolarMass MM_Exh = sum(n_ComExh[i]*MM_ComExh[i] for i in 1:size(n_ComExh, 1))/sum(n_ComExh[i] for i in 1:size(n_ComExh, 1)) | |
| "Molar mass of the exhaust gas"; | |
| - constant Modelica.SIunits.MassFraction X_N2Exh = MM_ComExh[1]*n_ComExh[1]/(MM_Exh*n_Exh) "Mass fraction of N2 in the exhaust gas"; | |
| - constant Modelica.SIunits.MassFraction X_O2Exh = MM_ComExh[2]*n_ComExh[2]/(MM_Exh*n_Exh) "Mass fraction of O2 in the exhaust gas"; | |
| - constant Modelica.SIunits.MassFraction X_H2OExh = MM_ComExh[3]*n_ComExh[3]/(MM_Exh*n_Exh) "Mass fraction of H2O in the exhaust gas"; | |
| - constant Modelica.SIunits.MassFraction X_CO2Exh = MM_ComExh[4]*n_ComExh[4]/(MM_Exh*n_Exh) "Mass fraction of CO2 in the exhaust gas"; | |
| - constant Modelica.SIunits.MassFraction Xi_Exh[size(n_ComExh, 1)] = {X_N2Exh, X_O2Exh, X_H2OExh, X_CO2Exh}; | |
| + constant Modelica.Units.SI.MassFraction X_N2Exh = MM_ComExh[1]*n_ComExh[1]/(MM_Exh*n_Exh) "Mass fraction of N2 in the exhaust gas"; | |
| + constant Modelica.Units.SI.MassFraction X_O2Exh = MM_ComExh[2]*n_ComExh[2]/(MM_Exh*n_Exh) "Mass fraction of O2 in the exhaust gas"; | |
| + constant Modelica.Units.SI.MassFraction X_H2OExh = MM_ComExh[3]*n_ComExh[3]/(MM_Exh*n_Exh) "Mass fraction of H2O in the exhaust gas"; | |
| + constant Modelica.Units.SI.MassFraction X_CO2Exh = MM_ComExh[4]*n_ComExh[4]/(MM_Exh*n_Exh) "Mass fraction of CO2 in the exhaust gas"; | |
| + constant Modelica.Units.SI.MassFraction Xi_Exh[size(n_ComExh, 1)] = {X_N2Exh, X_O2Exh, X_H2OExh, X_CO2Exh}; | |
| Boolean SwitchOnOff=true | |
| "Operation switch of the CHP unit (true=On, false=Off)" | |
| annotation (Dialog(group="Modulation")); | |
| RotationSpeed nEng(min=0) "Current engine speed"; | |
| - Modelica.SIunits.MassFlowRate m_flow_Exh "Mass flow rate of exhaust gas"; | |
| - Modelica.SIunits.MassFlowRate m_flow_CO2Exh | |
| + Modelica.Units.SI.MassFlowRate m_flow_Exh "Mass flow rate of exhaust gas"; | |
| + Modelica.Units.SI.MassFlowRate m_flow_CO2Exh | |
| "Mass flow rate of CO2 in the exhaust gas"; | |
| - Modelica.SIunits.MassFlowRate m_flow_Fue(min=0) "Mass flow rate of fuel"; | |
| - Modelica.SIunits.MassFlowRate m_flow_Air(min=0) | |
| + Modelica.Units.SI.MassFlowRate m_flow_Fue(min=0) "Mass flow rate of fuel"; | |
| + Modelica.Units.SI.MassFlowRate m_flow_Air(min=0) | |
| "Mass flow rate of combustion air"; | |
| - Modelica.SIunits.SpecificHeatCapacity meanCpComExh[size(n_ComExh, 1)] "Calculated specific heat capacities of the exhaust gas components for the calculated combustion temperature"; | |
| - Modelica.SIunits.SpecificHeatCapacity meanCpExh "Calculated specific heat capacity of the exhaust gas for the calculated combustion temperature"; | |
| - Modelica.SIunits.SpecificEnergy h_Exh = 1000*(-286 + 1.011*T_ExhCHPOut - 27.29*Lambda + 0.000136*T_ExhCHPOut^2 - 0.0255*T_ExhCHPOut*Lambda + 6.425*Lambda^2) "Specific enthalpy of the exhaust gas"; | |
| - Modelica.SIunits.Power P_eff "Effective(mechanical) engine power"; | |
| - Modelica.SIunits.Power P_Fue(min=0) = m_flow_Fue*H_U | |
| + Modelica.Units.SI.SpecificHeatCapacity meanCpComExh[size(n_ComExh, 1)] "Calculated specific heat capacities of the exhaust gas components for the calculated combustion temperature"; | |
| + Modelica.Units.SI.SpecificHeatCapacity meanCpExh "Calculated specific heat capacity of the exhaust gas for the calculated combustion temperature"; | |
| + Modelica.Units.SI.SpecificEnergy h_Exh = 1000*(-286 + 1.011*T_ExhCHPOut - 27.29*Lambda + 0.000136*T_ExhCHPOut^2 - 0.0255*T_ExhCHPOut*Lambda + 6.425*Lambda^2) "Specific enthalpy of the exhaust gas"; | |
| + Modelica.Units.SI.Power P_eff "Effective(mechanical) engine power"; | |
| + Modelica.Units.SI.Power P_Fue(min=0) = m_flow_Fue*H_U | |
| "Fuel expenses at operating point"; | |
| - Modelica.SIunits.Power H_Exh "Enthalpy stream of the exhaust gas"; | |
| - Modelica.SIunits.Power CalQ_therm "Calculated heat from engine combustion"; | |
| - Modelica.SIunits.Power Q_therm(min=0) "Total heat from engine combustion"; | |
| - Modelica.SIunits.Torque Mmot "Calculated engine torque"; | |
| - Modelica.SIunits.Temperature T_logEngCool=356.15 "Logarithmic mean temperature of coolant inside the engine" | |
| + Modelica.Units.SI.Power H_Exh "Enthalpy stream of the exhaust gas"; | |
| + Modelica.Units.SI.Power CalQ_therm "Calculated heat from engine combustion"; | |
| + Modelica.Units.SI.Power Q_therm(min=0) "Total heat from engine combustion"; | |
| + Modelica.Units.SI.Torque Mmot "Calculated engine torque"; | |
| + Modelica.Units.SI.Temperature T_logEngCool=356.15 "Logarithmic mean temperature of coolant inside the engine" | |
| annotation(Dialog(group="Parameters")); | |
| - Modelica.SIunits.Temperature T_Com(start=T_Amb) "Temperature of the combustion gases"; | |
| - Modelica.SIunits.Temperature T_ExhCHPOut=383.15 "Exhaust gas outlet temperature of CHP unit" | |
| + Modelica.Units.SI.Temperature T_Com(start=T_Amb) "Temperature of the combustion gases"; | |
| + Modelica.Units.SI.Temperature T_ExhCHPOut=383.15 "Exhaust gas outlet temperature of CHP unit" | |
| annotation(Dialog(group="Parameters")); | |
| Real modFac=1 "Modulation factor for energy outuput control of the Chp unit" | |
| annotation (Dialog(group="Modulation")); | |
| @@ -110,8 +110,8 @@ | |
| Real A2 = -4.35*10^(-8)+1.12*10^(-9)*(T_logEngCool-273.15)-4.79*10^(-12)*(T_logEngCool-273.15)^2; | |
| Real B0 = -2.625*10^(-3)+3.75*10^(-7)*(nEng*60)+1.75*10^(-5)*(T_logEngCool-273.15)+2.5*10^(-9)*(T_logEngCool-273.15)*(nEng*60); | |
| Real B1 = 8.95*10^(-3)+1.5*10^(-7)*(nEng*60)+7*10^(-6)*(T_logEngCool-273.15)-10^(-9)*(T_logEngCool-273.15)*(nEng*60); | |
| - Modelica.SIunits.Pressure p_mf = p_mfNominal*((A0+A1*(nEng*60)+A2*(nEng*60)^2)+(B0+B1*(p_meNominal/100000))) "Current friction mean pressure at operating point"; | |
| - Modelica.SIunits.Pressure p_me = (modFac*p_mi)-p_mf "Current mean effective pressure at operating point"; | |
| + Modelica.Units.SI.Pressure p_mf = p_mfNominal*((A0+A1*(nEng*60)+A2*(nEng*60)^2)+(B0+B1*(p_meNominal/100000))) "Current friction mean pressure at operating point"; | |
| + Modelica.Units.SI.Pressure p_me = (modFac*p_mi)-p_mf "Current mean effective pressure at operating point"; | |
| Real etaMec = p_me/p_mi "Current percentage of usable mechanical power compared to inner cylinder power from combustion"; | |
| Modelica.Fluid.Interfaces.FluidPort_b port_exh(redeclare package Medium = | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/CHP_ElectricMachine.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/CHP_ElectricMachine.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/CHP_ElectricMachine.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/CHP_ElectricMachine.mo" 2021-04-26 11:51:10.138623701 +0200 | |
| @@ -9,38 +9,38 @@ | |
| "Needed engine data for calculations" | |
| annotation (choicesAllMatching=true, Dialog(group="Unit properties")); | |
| - parameter Modelica.SIunits.Frequency n0=CHPEngData.n0 | |
| + parameter Modelica.Units.SI.Frequency n0=CHPEngData.n0 | |
| "Idling speed of the electric machine" | |
| annotation (Dialog(group="Machine specifications")); | |
| - parameter Modelica.SIunits.Frequency n_nominal=CHPEngData.n_nominal | |
| + parameter Modelica.Units.SI.Frequency n_nominal=CHPEngData.n_nominal | |
| "Rated rotor speed" | |
| annotation (Dialog(group="Machine specifications")); | |
| - parameter Modelica.SIunits.Frequency f_1=CHPEngData.f_1 | |
| + parameter Modelica.Units.SI.Frequency f_1=CHPEngData.f_1 | |
| "Frequency" | |
| annotation (Dialog(group="Machine specifications")); | |
| - parameter Modelica.SIunits.Voltage U_1=CHPEngData.U_1 | |
| + parameter Modelica.Units.SI.Voltage U_1=CHPEngData.U_1 | |
| "Rated voltage" | |
| annotation (Dialog(group="Machine specifications")); | |
| - parameter Modelica.SIunits.Current I_elNominal=CHPEngData.I_elNominal | |
| + parameter Modelica.Units.SI.Current I_elNominal=CHPEngData.I_elNominal | |
| "Rated current" | |
| annotation (Dialog(group="Machine specifications")); | |
| - parameter Modelica.SIunits.Current I_1_start=if P_Mec_nominal<=15000 then 7.2*I_elNominal else 8*I_elNominal | |
| + parameter Modelica.Units.SI.Current I_1_start=if P_Mec_nominal<=15000 then 7.2*I_elNominal else 8*I_elNominal | |
| "Motor start current (realistic factors used from DIN VDE 2650/2651)" | |
| annotation (Dialog( tab="Calculations")); | |
| - parameter Modelica.SIunits.Power P_elNominal=CHPEngData.P_elNominal | |
| + parameter Modelica.Units.SI.Power P_elNominal=CHPEngData.P_elNominal | |
| "Nominal electrical power of electric machine" | |
| annotation (Dialog(group="Machine specifications")); | |
| - parameter Modelica.SIunits.Power P_Mec_nominal=P_elNominal*(1+s_nominal/0.22) "Nominal mechanical power of electric machine" | |
| + parameter Modelica.Units.SI.Power P_Mec_nominal=P_elNominal*(1+s_nominal/0.22) "Nominal mechanical power of electric machine" | |
| annotation (Dialog(tab="Calculations")); | |
| - parameter Modelica.SIunits.Torque M_nominal=P_Mec_nominal/(2*Modelica.Constants.pi*n_nominal) "Nominal torque of electric machine" | |
| + parameter Modelica.Units.SI.Torque M_nominal=P_Mec_nominal/(2*Modelica.Constants.pi*n_nominal) "Nominal torque of electric machine" | |
| annotation (Dialog(tab="Calculations")); | |
| - parameter Modelica.SIunits.Torque M_til=2*M_nominal "Tilting torque of electric machine (realistic factor used from DIN VDE 2650/2651)" | |
| + parameter Modelica.Units.SI.Torque M_til=2*M_nominal "Tilting torque of electric machine (realistic factor used from DIN VDE 2650/2651)" | |
| annotation (Dialog(tab="Calculations")); | |
| - parameter Modelica.SIunits.Torque M_start=if P_Mec_nominal<=4000 then 1.6*M_nominal | |
| + parameter Modelica.Units.SI.Torque M_start=if P_Mec_nominal<=4000 then 1.6*M_nominal | |
| elseif P_Mec_nominal>=22000 then 1*M_nominal else 1.25*M_nominal | |
| "Starting torque of electric machine (realistic factor used from DIN VDE 2650/2651)" | |
| annotation (Dialog(tab="Calculations")); | |
| - parameter Modelica.SIunits.Inertia J_Gen=1 | |
| + parameter Modelica.Units.SI.Inertia J_Gen=1 | |
| "Moment of inertia of the electric machine (default=1kg.m2)" | |
| annotation (Dialog(group="Calibration")); | |
| parameter Boolean useHeat=CHPEngData.useHeat | |
| @@ -64,16 +64,16 @@ | |
| "Transmission ratio (engine speed / generator speed)" | |
| annotation (Dialog(group="Machine specifications")); | |
| - Modelica.SIunits.Frequency n=inertia.w/(2*Modelica.Constants.pi) "Speed of machine rotor [1/s]"; | |
| - Modelica.SIunits.Current I_1 "Electric current of machine stator"; | |
| - Modelica.SIunits.Power P_E "Electrical power at the electric machine"; | |
| - Modelica.SIunits.Power P_Mec "Mechanical power at the electric machine"; | |
| - Modelica.SIunits.Power CalQ_Loss | |
| + Modelica.Units.SI.Frequency n=inertia.w/(2*Modelica.Constants.pi) "Speed of machine rotor [1/s]"; | |
| + Modelica.Units.SI.Current I_1 "Electric current of machine stator"; | |
| + Modelica.Units.SI.Power P_E "Electrical power at the electric machine"; | |
| + Modelica.Units.SI.Power P_Mec "Mechanical power at the electric machine"; | |
| + Modelica.Units.SI.Power CalQ_Loss | |
| "Calculated heat flow from electric machine"; | |
| - Modelica.SIunits.Power Q_Therm=if useHeat then CalQ_Loss else 0 | |
| + Modelica.Units.SI.Power Q_Therm=if useHeat then CalQ_Loss else 0 | |
| "Heat flow from electric machine" | |
| annotation (Dialog(group="Machine specifications")); | |
| - Modelica.SIunits.Torque M "Torque at electric machine"; | |
| + Modelica.Units.SI.Torque M "Torque at electric machine"; | |
| Real s=1-n*p/f_1 "Current slip of electric machine"; | |
| Real eta "Total efficiency of the electric machine (as motor)"; | |
| Real calI_1 = 1/(1+((k-1)/((s_nominal^2)-k))*((s^2)+rho1*abs(s)+rho0)); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/ExhaustHeatExchanger.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/ExhaustHeatExchanger.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/ExhaustHeatExchanger.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/ExhaustHeatExchanger.mo" 2021-04-26 11:51:10.082623623 +0200 | |
| @@ -28,16 +28,16 @@ | |
| CHPEngData=DataBase.CHP.ModularCHPEngineData.CHP_ECPowerXRGI15() | |
| "Needed engine data for calculations" | |
| annotation (choicesAllMatching=true, Dialog(group="Unit properties")); | |
| - parameter Modelica.SIunits.Time tau=1 | |
| + parameter Modelica.Units.SI.Time tau=1 | |
| "Time constant of the temperature sensors at nominal flow rate" | |
| annotation (Dialog(tab="Advanced", group="Sensor Properties")); | |
| parameter Modelica.Blocks.Types.Init initType=Modelica.Blocks.Types.Init.InitialState | |
| "Type of initialization (InitialState and InitialOutput are identical)" | |
| annotation (Dialog(tab="Advanced", group="Sensor Properties")); | |
| - parameter Modelica.SIunits.Temperature T1_start=T_Amb | |
| + parameter Modelica.Units.SI.Temperature T1_start=T_Amb | |
| "Initial or guess value of output (= state)" | |
| annotation (Dialog(tab="Advanced", group="Initialization")); | |
| - parameter Modelica.SIunits.Temperature T2_start=T_Amb | |
| + parameter Modelica.Units.SI.Temperature T2_start=T_Amb | |
| "Initial or guess value of output (= state)" | |
| annotation (Dialog(tab="Advanced", group="Initialization")); | |
| parameter Modelica.Media.Interfaces.Types.AbsolutePressure p1_start=p_Amb | |
| @@ -52,21 +52,21 @@ | |
| parameter Boolean ConTec=false | |
| "Is condensing technology used and should latent heat be considered?" | |
| annotation (Dialog(tab="Advanced", group="Condensing technology")); | |
| - parameter Modelica.SIunits.Temperature T_Amb=298.15 | |
| + parameter Modelica.Units.SI.Temperature T_Amb=298.15 | |
| "Fixed ambient temperature for heat transfer" | |
| annotation (Dialog(group="Ambient Properties")); | |
| - parameter Modelica.SIunits.Area A_surExhHea=50 | |
| + parameter Modelica.Units.SI.Area A_surExhHea=50 | |
| "Surface for exhaust heat transfer" annotation (Dialog(tab="Calibration parameters")); | |
| - parameter Modelica.SIunits.Length d_iExh=CHPEngData.dExh | |
| + parameter Modelica.Units.SI.Length d_iExh=CHPEngData.dExh | |
| "Inner diameter of exhaust pipe" | |
| annotation (Dialog(group="Nominal condition")); | |
| - parameter Modelica.SIunits.ThermalConductance GAmb=5 | |
| + parameter Modelica.Units.SI.ThermalConductance GAmb=5 | |
| "Constant thermal conductance of material" | |
| annotation (Dialog(tab="Calibration parameters")); | |
| - parameter Modelica.SIunits.ThermalConductance GCoo=850 | |
| + parameter Modelica.Units.SI.ThermalConductance GCoo=850 | |
| "Constant thermal conductance of material" | |
| annotation (Dialog(tab="Calibration parameters")); | |
| - parameter Modelica.SIunits.HeatCapacity CExhHex=4000 | |
| + parameter Modelica.Units.SI.HeatCapacity CExhHex=4000 | |
| "Heat capacity of exhaust heat exchanger(default= 4000 J/K)" | |
| annotation (Dialog(tab="Calibration parameters")); | |
| parameter Modelica.Media.Interfaces.Types.AbsolutePressure p_Amb=101325 | |
| @@ -76,13 +76,13 @@ | |
| CHPEngData.dp_Coo | |
| "Guess value of dp = port_a.p - port_b.p" | |
| annotation (Dialog(tab="Advanced", group="Initialization")); | |
| - parameter Modelica.SIunits.Time tauHeaTra=1200 | |
| + parameter Modelica.Units.SI.Time tauHeaTra=1200 | |
| "Time constant for heat transfer, default 20 minutes" | |
| annotation (Dialog(tab="Advanced", group="Sensor Properties")); | |
| parameter Modelica.Media.Interfaces.PartialMedium.MassFlowRate m_flow_start=0 | |
| "Guess value of m_flow = port_a.m_flow" | |
| annotation (Dialog(tab="Advanced", group="Initialization")); | |
| - constant Modelica.SIunits.MolarMass M_H2O=0.01802 | |
| + constant Modelica.Units.SI.MolarMass M_H2O=0.01802 | |
| "Molar mass of water"; | |
| //Antoine-Parameters needed for the calculation of the saturation vapor pressure xSat_H2OExhDry | |
| @@ -90,13 +90,13 @@ | |
| constant Real B=3874.61; | |
| constant Real C=229.73; | |
| - parameter Modelica.SIunits.Length l_ExhHex=1 | |
| + parameter Modelica.Units.SI.Length l_ExhHex=1 | |
| "Length of the exhaust pipe inside the exhaust heat exchanger" annotation ( | |
| Dialog(tab="Calibration parameters", group="Engine parameters")); | |
| - parameter Modelica.SIunits.PressureDifference dp_CooExhHex=CHPEngData.dp_Coo | |
| + parameter Modelica.Units.SI.PressureDifference dp_CooExhHex=CHPEngData.dp_Coo | |
| "Pressure drop at nominal mass flow rate inside the coolant circle " | |
| annotation (Dialog(group="Nominal condition")); | |
| - parameter Modelica.SIunits.MolarMass M_Exh=1200 | |
| + parameter Modelica.Units.SI.MolarMass M_Exh=1200 | |
| "Molar mass of the exhaust gas" | |
| annotation (Dialog(group="Thermal")); | |
| @@ -108,35 +108,35 @@ | |
| "Water load of the exhaust gas"; | |
| Real xSat_H2OExhDry | |
| "Saturation water load of the exhaust gas"; | |
| - Modelica.SIunits.MassFlowRate m_H2OExh | |
| + Modelica.Units.SI.MassFlowRate m_H2OExh | |
| "Mass flow of water in the exhaust gas"; | |
| - Modelica.SIunits.MassFlowRate m_ExhDry | |
| + Modelica.Units.SI.MassFlowRate m_ExhDry | |
| "Mass flow of dry exhaust gas"; | |
| - Modelica.SIunits.MassFlowRate m_ConH2OExh | |
| + Modelica.Units.SI.MassFlowRate m_ConH2OExh | |
| "Mass flow of condensing water"; | |
| - Modelica.SIunits.AbsolutePressure pExh | |
| + Modelica.Units.SI.AbsolutePressure pExh | |
| "Pressure in the exhaust gas stream (assuming ambient conditions)"; | |
| - Modelica.SIunits.AbsolutePressure pSatH2OExh | |
| + Modelica.Units.SI.AbsolutePressure pSatH2OExh | |
| "Saturation vapor pressure of the exhaust gas water"; | |
| - Modelica.SIunits.SpecificEnthalpy deltaH_Vap | |
| + Modelica.Units.SI.SpecificEnthalpy deltaH_Vap | |
| "Specific enthalpy of vaporization (empirical formula based on table data)"; | |
| - Modelica.SIunits.SpecificHeatCapacity meanCpExh=cHPExhHexBus.calMeaCpExh | |
| + Modelica.Units.SI.SpecificHeatCapacity meanCpExh=cHPExhHexBus.calMeaCpExh | |
| "Calculated specific heat capacity of the exhaust gas for the calculated combustion temperature" | |
| annotation (Dialog(group = "Thermal")); | |
| - Modelica.SIunits.HeatFlowRate Q_Gen=cHPExhHexBus.calThePowGen | |
| + Modelica.Units.SI.HeatFlowRate Q_Gen=cHPExhHexBus.calThePowGen | |
| "Calculated loss heat from the induction machine" | |
| annotation (Dialog(group = "Thermal")); | |
| - Modelica.SIunits.Temperature T_LogMeanExh | |
| + Modelica.Units.SI.Temperature T_LogMeanExh | |
| "Mean logarithmic temperature of exhaust gas"; | |
| //Calculation of the thermodynamic state of the exhaust gas inlet used by the convective heat transfer model | |
| Medium1.ThermodynamicState state1 = Medium1.setState_pTX(senTExhHot.port_b.p,T_LogMeanExh,senTExhHot.port_b.Xi_outflow); | |
| - Modelica.SIunits.SpecificEnthalpy h1_in = Medium1.specificEnthalpy(state1); | |
| - Modelica.SIunits.DynamicViscosity eta1_in = Medium1.dynamicViscosity(state1); | |
| - Modelica.SIunits.Density rho1_in = Medium1.density_phX(state1.p,h1_in,state1.X); | |
| - Modelica.SIunits.Velocity v1_in = senMasFloExh.m_flow/(Modelica.Constants.pi*rho1_in*d_iExh^2/4); | |
| - Modelica.SIunits.ThermalConductivity lambda1_in = Medium1.thermalConductivity(state1); | |
| - Modelica.SIunits.ReynoldsNumber Re1_in = Modelica.Fluid.Pipes.BaseClasses.CharacteristicNumbers.ReynoldsNumber(v1_in,rho1_in,eta1_in,d_iExh); | |
| + Modelica.Units.SI.SpecificEnthalpy h1_in = Medium1.specificEnthalpy(state1); | |
| + Modelica.Units.SI.DynamicViscosity eta1_in = Medium1.dynamicViscosity(state1); | |
| + Modelica.Units.SI.Density rho1_in = Medium1.density_phX(state1.p,h1_in,state1.X); | |
| + Modelica.Units.SI.Velocity v1_in = senMasFloExh.m_flow/(Modelica.Constants.pi*rho1_in*d_iExh^2/4); | |
| + Modelica.Units.SI.ThermalConductivity lambda1_in = Medium1.thermalConductivity(state1); | |
| + Modelica.Units.SI.ReynoldsNumber Re1_in = Modelica.Fluid.Pipes.BaseClasses.CharacteristicNumbers.ReynoldsNumber(v1_in,rho1_in,eta1_in,d_iExh); | |
| Modelica.Blocks.Sources.RealExpression machineIsOff(y=0) | |
| "Calculated heat from generator losses" | |
| @@ -286,10 +286,10 @@ | |
| iconTransformation(extent={{-110,-10},{-90,10}}))); | |
| protected | |
| - parameter Modelica.SIunits.Volume VExhHex=l_ExhHex/4*Modelica.Constants.pi* | |
| + | |
| + parameter Modelica.Units.SI.Volume VExhHex=l_ExhHex/4*Modelica.Constants.pi* | |
| d_iExh^2 | |
| "Exhaust gas volume inside the exhaust heat exchanger" annotation(Dialog(tab="Calibration parameters",group="Engine parameters")); | |
| - | |
| equation | |
| //Calculation of water condensation and its usable latent heat | |
| if ConTec then | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/GasolineEngineChp.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/GasolineEngineChp.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/GasolineEngineChp.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/GasolineEngineChp.mo" 2021-04-26 11:51:09.994623502 +0200 | |
| @@ -24,16 +24,16 @@ | |
| AixLib.Fluid.BoilerCHP.Data.ModularCHP.EngineMaterial_CastIron() | |
| "Thermal engine material data for calculations" | |
| annotation (choicesAllMatching=true, Dialog(group="Unit properties")); | |
| - parameter Modelica.SIunits.Temperature T_amb=298.15 | |
| + parameter Modelica.Units.SI.Temperature T_amb=298.15 | |
| "Default ambient temperature" | |
| annotation (Dialog(group="Ambient Parameters")); | |
| - parameter Modelica.SIunits.Mass mEng=CHPEngineModel.mEng | |
| + parameter Modelica.Units.SI.Mass mEng=CHPEngineModel.mEng | |
| "Total engine mass for heat capacity calculation" | |
| annotation (Dialog(tab="Engine Cooling Circle")); | |
| - parameter Modelica.SIunits.Thickness dInn=0.005 | |
| + parameter Modelica.Units.SI.Thickness dInn=0.005 | |
| "Typical value for the thickness of the cylinder wall (between combustion chamber and cooling circle)" | |
| annotation (Dialog(tab="Engine Cooling Circle")); | |
| - parameter Modelica.SIunits.ThermalConductance GEngToAmb=0.23 | |
| + parameter Modelica.Units.SI.ThermalConductance GEngToAmb=0.23 | |
| "Thermal conductance from engine housing to the surrounding air" | |
| annotation (Dialog(tab="Engine Cooling Circle")); | |
| @@ -108,15 +108,15 @@ | |
| Real modFac=cHPEngBus.modFac | |
| "Modulation factor for energy outuput control of the Chp unit " | |
| annotation (Dialog(group="Engine Parameters")); | |
| - Modelica.SIunits.Temperature T_logEngCoo=(cHPEngBus.meaTemInEng + cHPEngBus.meaTemOutEng) | |
| + | |
| + Modelica.Units.SI.Temperature T_logEngCoo=(cHPEngBus.meaTemInEng + cHPEngBus.meaTemOutEng) | |
| /2 "Logarithmic mean temperature of coolant inside the engine" | |
| annotation (Dialog(group="Engine Parameters")); | |
| - Modelica.SIunits.Temperature T_ExhCHPOut=cHPEngBus.meaTemExhHexOut | |
| + Modelica.Units.SI.Temperature T_ExhCHPOut=cHPEngBus.meaTemExhHexOut | |
| "Exhaust gas outlet temperature of CHP unit" | |
| annotation (Dialog(group="Engine Parameters")); | |
| - Modelica.SIunits.Temperature T_Exh=engineToCoolant.T_Exh "Calculated mean temperature of the exhaust gas inside the cylinders" | |
| + Modelica.Units.SI.Temperature T_Exh=engineToCoolant.T_Exh "Calculated mean temperature of the exhaust gas inside the cylinders" | |
| annotation (Dialog(group="Thermal")); | |
| - | |
| equation | |
| connect(port_exh, cHPCombustionEngine.port_exh) annotation (Line(points={{ | |
| 102,2},{64,2},{64,28},{29.4,28}}, color={0,127,255})); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/ModularCHP_PowerUnit.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/ModularCHP_PowerUnit.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/ModularCHP_PowerUnit.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/ModularCHP_PowerUnit.mo" 2021-04-26 11:51:09.966623462 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Fluid.BoilerCHP.ModularCHP.BaseClasses; | |
| +within AixLib.Fluid.BoilerCHP.ModularCHP.BaseClasses; | |
| model ModularCHP_PowerUnit "Model of modular CHP power unit" | |
| import AixLib; | |
| @@ -21,10 +21,10 @@ | |
| AixLib.Fluid.BoilerCHP.Data.ModularCHP.EngineMaterial_CastIron() | |
| "Thermal engine material data for calculations" | |
| annotation (choicesAllMatching=true, Dialog(group="Unit properties")); | |
| - parameter Modelica.SIunits.Temperature T_amb=298.15 | |
| + parameter Modelica.Units.SI.Temperature T_amb=298.15 | |
| "Default ambient temperature" | |
| annotation (Dialog(group="Ambient Parameters")); | |
| - parameter Modelica.SIunits.AbsolutePressure p_amb=101325 | |
| + parameter Modelica.Units.SI.AbsolutePressure p_amb=101325 | |
| "Default ambient pressure" annotation (Dialog(group="Ambient Parameters")); | |
| /* Modelica.SIunits.Temperature T_CoolRet=exhaustHeatExchanger_Experimental_New.senTCooCold.T | |
| "Coolant return temperature"; | |
| @@ -41,33 +41,33 @@ | |
| "Calibration factor for electric power output (default=1)" | |
| annotation (Dialog(tab="Calibration parameters", | |
| group="Fast calibration - Electric power and fuel usage")); | |
| - parameter Modelica.SIunits.ThermalConductance GEngToCoo=33 | |
| + parameter Modelica.Units.SI.ThermalConductance GEngToCoo=33 | |
| "Thermal conductance of engine housing from the cylinder wall to the water cooling channels" | |
| annotation (Dialog(tab="Calibration parameters",group= | |
| "Fast calibration - Thermal power output")); | |
| - parameter Modelica.SIunits.ThermalConductance GCooExhHex=400 | |
| + parameter Modelica.Units.SI.ThermalConductance GCooExhHex=400 | |
| "Thermal conductance of exhaust heat exchanger to cooling circuit" | |
| annotation (Dialog(tab="Calibration parameters",group= | |
| "Fast calibration - Thermal power output")); | |
| - parameter Modelica.SIunits.Mass mEng=CHPEngineModel.mEng | |
| + parameter Modelica.Units.SI.Mass mEng=CHPEngineModel.mEng | |
| "Total engine mass for heat capacity calculation" | |
| annotation (Dialog(tab="Calibration parameters",group="Advanced calibration parameters")); | |
| - parameter Modelica.SIunits.HeatCapacity CExhHex=50000 | |
| + parameter Modelica.Units.SI.HeatCapacity CExhHex=50000 | |
| "Heat capacity of exhaust heat exchanger(default= 4000 J/K)" annotation ( | |
| Dialog(tab="Calibration parameters",group= | |
| "Advanced calibration parameters")); | |
| - parameter Modelica.SIunits.Thickness dInn=0.01 | |
| + parameter Modelica.Units.SI.Thickness dInn=0.01 | |
| "Typical value for the thickness of the cylinder wall (between combustion chamber and cooling circle)" | |
| annotation (Dialog(tab="Calibration parameters",group="Fast calibration - Thermal power output")); | |
| - parameter Modelica.SIunits.ThermalConductance GEngToAmb=0.23 | |
| + parameter Modelica.Units.SI.ThermalConductance GEngToAmb=0.23 | |
| "Thermal conductance from engine housing to the surrounding air" | |
| annotation (Dialog(tab="Calibration parameters",group= | |
| "Advanced calibration parameters")); | |
| - parameter Modelica.SIunits.ThermalConductance GAmb=5 | |
| + parameter Modelica.Units.SI.ThermalConductance GAmb=5 | |
| "Constant thermal conductance of material" annotation (Dialog(tab= | |
| "Calibration parameters", | |
| group="Advanced calibration parameters")); | |
| - parameter Modelica.SIunits.Area A_surExhHea=50 | |
| + parameter Modelica.Units.SI.Area A_surExhHea=50 | |
| "Surface for exhaust heat transfer" | |
| annotation (Dialog(tab="Calibration parameters",group="Advanced calibration parameters")); | |
| parameter Modelica.Media.Interfaces.PartialMedium.MassFlowRate m_flow= | |
| @@ -95,23 +95,23 @@ | |
| "Small coolant mass flow rate for regularization of zero flow" | |
| annotation (Dialog(tab="Advanced", group="Assumptions")); | |
| - Modelica.SIunits.Power Q_Therm=if (submodelCooling.heatPort_outside.Q_flow + | |
| + Modelica.Units.SI.Power Q_Therm=if (submodelCooling.heatPort_outside.Q_flow + | |
| exhaustHeatExchanger.pipeCoolant.heatPort_outside.Q_flow) > 10 then | |
| submodelCooling.heatPort_outside.Q_flow + exhaustHeatExchanger.pipeCoolant.heatPort_outside.Q_flow | |
| else 1 "Thermal power output of the CHP unit"; | |
| - Modelica.SIunits.Power P_Mech=gasolineEngineChp.cHPCombustionEngine.P_eff | |
| + Modelica.Units.SI.Power P_Mech=gasolineEngineChp.cHPCombustionEngine.P_eff | |
| "Mechanical power output of the CHP unit"; | |
| - Modelica.SIunits.Power P_El=-inductionMachine.P_E | |
| + Modelica.Units.SI.Power P_El=-inductionMachine.P_E | |
| "Electrical power output of the CHP unit"; | |
| - Modelica.SIunits.Power P_Fuel=if (gasolineEngineChp.cHPEngBus.isOn) then | |
| + Modelica.Units.SI.Power P_Fuel=if (gasolineEngineChp.cHPEngBus.isOn) then | |
| m_flow_Fue*Medium_Fuel.H_U else 0 "CHP fuel expenses"; | |
| - Modelica.SIunits.Power Q_TotUnused=gasolineEngineChp.cHPCombustionEngine.Q_therm | |
| + Modelica.Units.SI.Power Q_TotUnused=gasolineEngineChp.cHPCombustionEngine.Q_therm | |
| - gasolineEngineChp.engineToCoolant.actualHeatFlowEngine.Q_flow + | |
| exhaustHeatExchanger.volExhaust.heatPort.Q_flow | |
| "Total heat error of the CHP unit"; | |
| - Modelica.SIunits.MassFlowRate m_flow_CO2=gasolineEngineChp.cHPCombustionEngine.m_flow_CO2Exh | |
| + Modelica.Units.SI.MassFlowRate m_flow_CO2=gasolineEngineChp.cHPCombustionEngine.m_flow_CO2Exh | |
| "CO2 emission output rate"; | |
| - Modelica.SIunits.MassFlowRate m_flow_Fue=if (gasolineEngineChp.cHPCombustionEngine.m_flow_Fue) | |
| + Modelica.Units.SI.MassFlowRate m_flow_Fue=if (gasolineEngineChp.cHPCombustionEngine.m_flow_Fue) | |
| > 0.0001 then gasolineEngineChp.cHPCombustionEngine.m_flow_Fue else 0.0001 | |
| "Fuel consumption rate of CHP unit"; | |
| type SpecificEmission=Real(final unit="g/(kW.h)", min=0.0001); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/SubmodelCooling.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/SubmodelCooling.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/SubmodelCooling.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/BaseClasses/SubmodelCooling.mo" 2021-04-26 11:51:09.866623325 +0200 | |
| @@ -14,7 +14,7 @@ | |
| parameter Modelica.Media.Interfaces.PartialMedium.MassFlowRate m_flow= | |
| CHPEngineModel.m_floCooNominal | |
| "Nominal mass flow rate of coolant inside the engine cooling circle" annotation (Dialog(tab="Engine Cooling Circle")); | |
| - parameter Modelica.SIunits.ThermalConductance GEngToCoo=45 | |
| + parameter Modelica.Units.SI.ThermalConductance GEngToCoo=45 | |
| "Thermal conductance of engine housing from the cylinder wall to the water cooling channels" | |
| annotation (Dialog(tab="Engine Cooling Circle", group= | |
| "Calibration Parameters")); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/ModularCHPIntegrated.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/ModularCHPIntegrated.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/ModularCHPIntegrated.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/BoilerCHP/ModularCHP/ModularCHPIntegrated.mo" 2021-04-26 11:51:09.838623286 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Fluid.BoilerCHP.ModularCHP; | |
| +within AixLib.Fluid.BoilerCHP.ModularCHP; | |
| model ModularCHPIntegrated | |
| "Modular combined heat and power system model integrated into a heating circuit" | |
| import AixLib; | |
| @@ -29,10 +29,10 @@ | |
| AixLib.Fluid.BoilerCHP.Data.ModularCHP.EngineMaterial_CastIron() | |
| "Thermal engine material data for calculations" | |
| annotation (choicesAllMatching=true, Dialog(group="Unit properties")); | |
| - parameter Modelica.SIunits.Temperature T_amb=293.15 | |
| + parameter Modelica.Units.SI.Temperature T_amb=293.15 | |
| "Default ambient temperature" | |
| annotation (Dialog(group="Ambient Parameters")); | |
| - parameter Modelica.SIunits.AbsolutePressure p_amb=101325 | |
| + parameter Modelica.Units.SI.AbsolutePressure p_amb=101325 | |
| "Default ambient pressure" annotation (Dialog(group="Ambient Parameters")); | |
| parameter Real s_til=abs((cHP_PowerUnit.inductionMachine.s_nominal*( | |
| cHP_PowerUnit.inductionMachine.M_til/cHP_PowerUnit.inductionMachine.M_nominal) | |
| @@ -47,36 +47,36 @@ | |
| "Calibration factor for electric power output (default=1)" | |
| annotation (Dialog(tab="Calibration parameters", | |
| group="Fast calibration - Electric power and fuel usage")); | |
| - parameter Modelica.SIunits.ThermalConductance GEngToCoo=33 | |
| + parameter Modelica.Units.SI.ThermalConductance GEngToCoo=33 | |
| "Thermal conductance of engine housing from the cylinder wall to the water cooling channels" | |
| annotation (Dialog(tab="Calibration parameters",group= | |
| "Fast calibration - Thermal power output")); | |
| - parameter Modelica.SIunits.ThermalConductance GCooExhHex=400 | |
| + parameter Modelica.Units.SI.ThermalConductance GCooExhHex=400 | |
| "Thermal conductance of the coolant heat exchanger at nominal flow" | |
| annotation (Dialog(tab="Calibration parameters",group= | |
| "Fast calibration - Thermal power output")); | |
| - parameter Modelica.SIunits.HeatCapacity CExhHex=50000 | |
| + parameter Modelica.Units.SI.HeatCapacity CExhHex=50000 | |
| "Heat capacity of exhaust heat exchanger(default= 4000 J/K)" annotation ( | |
| Dialog(tab="Calibration parameters",group= | |
| "Advanced calibration parameters")); | |
| - parameter Modelica.SIunits.Mass Cal_mEng=0 | |
| + parameter Modelica.Units.SI.Mass Cal_mEng=0 | |
| "Added engine mass for calibration purposes of the system´s thermal inertia" | |
| annotation (Dialog(tab="Calibration parameters",group="Advanced calibration parameters")); | |
| - parameter Modelica.SIunits.Area A_surExhHea=100 | |
| + parameter Modelica.Units.SI.Area A_surExhHea=100 | |
| "Surface for exhaust heat transfer" | |
| annotation (Dialog(tab="Calibration parameters",group="Advanced calibration parameters")); | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_Coo=0.4 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_Coo=0.4 | |
| "Nominal mass flow rate of coolant inside the engine cooling circle" annotation ( | |
| Dialog(tab="Calibration parameters",group= | |
| "Advanced calibration parameters")); | |
| - parameter Modelica.SIunits.Thickness dInn=0.01 | |
| + parameter Modelica.Units.SI.Thickness dInn=0.01 | |
| "Typical value for the thickness of the cylinder wall (between combustion chamber and cooling circle)" | |
| annotation (Dialog(tab="Calibration parameters",group="Fast calibration - Thermal power output")); | |
| - parameter Modelica.SIunits.ThermalConductance GEngToAmb=2 | |
| + parameter Modelica.Units.SI.ThermalConductance GEngToAmb=2 | |
| "Thermal conductance from engine housing to the surrounding air" | |
| annotation (Dialog(tab="Calibration parameters",group= | |
| "Advanced calibration parameters")); | |
| - parameter Modelica.SIunits.ThermalConductance GAmb=10 | |
| + parameter Modelica.Units.SI.ThermalConductance GAmb=10 | |
| "Constant heat transfer coefficient of engine housing to ambient" annotation ( | |
| Dialog(tab="Calibration parameters",group= | |
| "Advanced calibration parameters")); | |
| @@ -105,17 +105,17 @@ | |
| "Small coolant mass flow rate for regularization of zero flow" | |
| annotation (Dialog(tab="Advanced", group="Assumptions")); | |
| - Modelica.SIunits.Temperature T_Ret=temRetFlo.T "Coolant return temperature"; | |
| - Modelica.SIunits.Temperature T_Sup=temSupFlo.T "Coolant supply temperature"; | |
| - Modelica.SIunits.Power Q_Therm_th=cHP_PowerUnit.Q_Therm "Thermal power output of the CHP unit to the coolant media"; | |
| - Modelica.SIunits.Power Q_Therm=coolantHex.Q2_flow "Effective thermal power output of the CHP unit to the heating circuit"; | |
| - Modelica.SIunits.Power P_Mech=cHP_PowerUnit.P_Mech "Mechanical power output of the CHP unit"; | |
| - Modelica.SIunits.Power P_El=cHP_PowerUnit.P_El "Electrical power output of the CHP unit"; | |
| - Modelica.SIunits.Power P_Fuel=cHP_PowerUnit.P_Fuel "CHP fuel expenses"; | |
| - Modelica.SIunits.Power Q_TotUnused=cHP_PowerUnit.Q_TotUnused "Total heat error of the CHP unit"; | |
| - Modelica.SIunits.MassFlowRate m_flow_CO2=cHP_PowerUnit.m_flow_CO2 | |
| + Modelica.Units.SI.Temperature T_Ret=temRetFlo.T "Coolant return temperature"; | |
| + Modelica.Units.SI.Temperature T_Sup=temSupFlo.T "Coolant supply temperature"; | |
| + Modelica.Units.SI.Power Q_Therm_th=cHP_PowerUnit.Q_Therm "Thermal power output of the CHP unit to the coolant media"; | |
| + Modelica.Units.SI.Power Q_Therm=coolantHex.Q2_flow "Effective thermal power output of the CHP unit to the heating circuit"; | |
| + Modelica.Units.SI.Power P_Mech=cHP_PowerUnit.P_Mech "Mechanical power output of the CHP unit"; | |
| + Modelica.Units.SI.Power P_El=cHP_PowerUnit.P_El "Electrical power output of the CHP unit"; | |
| + Modelica.Units.SI.Power P_Fuel=cHP_PowerUnit.P_Fuel "CHP fuel expenses"; | |
| + Modelica.Units.SI.Power Q_TotUnused=cHP_PowerUnit.Q_TotUnused "Total heat error of the CHP unit"; | |
| + Modelica.Units.SI.MassFlowRate m_flow_CO2=cHP_PowerUnit.m_flow_CO2 | |
| "CO2 emission output rate"; | |
| - Modelica.SIunits.MassFlowRate m_flow_Fue=cHP_PowerUnit.m_flow_Fue | |
| + Modelica.Units.SI.MassFlowRate m_flow_Fue=cHP_PowerUnit.m_flow_Fue | |
| "Fuel consumption rate of CHP unit"; | |
| Real FueUtiRate = cHP_PowerUnit.FueUtiRate "Fuel utilization rate of the CHP unit"; | |
| Real PowHeatRatio = cHP_PowerUnit.PowHeatRatio "Power to heat ration of the CHP unit"; | |
| @@ -215,10 +215,10 @@ | |
| DataBase.CHP.ModularCHPEngineMedia.CHPCombustionMixtureGasNasa | |
| "Exhaust gas medium model used in the CHP plant" annotation(choicesAllMatching=true); | |
| - parameter Modelica.SIunits.Mass mEng=CHPEngineModel.mEng + Cal_mEng | |
| + | |
| + parameter Modelica.Units.SI.Mass mEng=CHPEngineModel.mEng + Cal_mEng | |
| "Total engine mass for heat capacity calculation" | |
| annotation (Dialog(tab="Calibration parameters",group="Advanced calibration parameters")); | |
| - | |
| equation | |
| connect(coolantHex.port_a2, temRetFlo.port_b) | |
| annotation (Line(points={{-20,-64},{-42,-64}}, color={0,127,255})); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Chillers/BaseClasses/Carnot.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Chillers/BaseClasses/Carnot.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Chillers/BaseClasses/Carnot.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Chillers/BaseClasses/Carnot.mo" 2021-04-26 11:51:09.766623187 +0200 | |
| @@ -4,17 +4,17 @@ | |
| m1_flow_nominal = QCon_flow_nominal/cp1_default/dTCon_nominal, | |
| m2_flow_nominal = QEva_flow_nominal/cp2_default/dTEva_nominal); | |
| - parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal(max=0) | |
| + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal(max=0) | |
| "Nominal cooling heat flow rate (QEva_flow_nominal < 0)" | |
| annotation (Dialog(group="Nominal condition")); | |
| - parameter Modelica.SIunits.HeatFlowRate QCon_flow_nominal(min=0) | |
| + parameter Modelica.Units.SI.HeatFlowRate QCon_flow_nominal(min=0) | |
| "Nominal heating flow rate" | |
| annotation (Dialog(group="Nominal condition")); | |
| - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal( | |
| + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal( | |
| final max=0) = -10 "Temperature difference evaporator outlet-inlet" | |
| annotation (Dialog(group="Nominal condition")); | |
| - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal( | |
| + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal( | |
| final min=0) = 10 "Temperature difference condenser outlet-inlet" | |
| annotation (Dialog(group="Nominal condition")); | |
| @@ -32,10 +32,10 @@ | |
| "Coefficient of performance at TEva_nominal and TCon_nominal, used if use_eta_Carnot_nominal = false" | |
| annotation (Dialog(group="Efficiency", enable=not use_eta_Carnot_nominal)); | |
| - parameter Modelica.SIunits.Temperature TCon_nominal = 303.15 | |
| + parameter Modelica.Units.SI.Temperature TCon_nominal = 303.15 | |
| "Condenser temperature used to compute COP_nominal if use_eta_Carnot_nominal=false" | |
| annotation (Dialog(group="Efficiency", enable=not use_eta_Carnot_nominal)); | |
| - parameter Modelica.SIunits.Temperature TEva_nominal = 278.15 | |
| + parameter Modelica.Units.SI.Temperature TEva_nominal = 278.15 | |
| "Evaporator temperature used to compute COP_nominal if use_eta_Carnot_nominal=false" | |
| annotation (Dialog(group="Efficiency", enable=not use_eta_Carnot_nominal)); | |
| @@ -43,18 +43,18 @@ | |
| "Coefficients for efficiency curve (need p(a=a, yPL=1)=1)" | |
| annotation (Dialog(group="Efficiency")); | |
| - parameter Modelica.SIunits.Pressure dp1_nominal(displayUnit="Pa") | |
| + parameter Modelica.Units.SI.Pressure dp1_nominal(displayUnit="Pa") | |
| "Pressure difference over condenser" | |
| annotation (Dialog(group="Nominal condition")); | |
| - parameter Modelica.SIunits.Pressure dp2_nominal(displayUnit="Pa") | |
| + parameter Modelica.Units.SI.Pressure dp2_nominal(displayUnit="Pa") | |
| "Pressure difference over evaporator" | |
| annotation (Dialog(group="Nominal condition")); | |
| - parameter Modelica.SIunits.TemperatureDifference TAppCon_nominal(min=0) = if cp1_default < 1500 then 5 else 2 | |
| + parameter Modelica.Units.SI.TemperatureDifference TAppCon_nominal(min=0) = if cp1_default < 1500 then 5 else 2 | |
| "Temperature difference between refrigerant and working fluid outlet in condenser" | |
| annotation (Dialog(group="Efficiency")); | |
| - parameter Modelica.SIunits.TemperatureDifference TAppEva_nominal(min=0) = if cp2_default < 1500 then 5 else 2 | |
| + parameter Modelica.Units.SI.TemperatureDifference TAppEva_nominal(min=0) = if cp2_default < 1500 then 5 else 2 | |
| "Temperature difference between refrigerant and working fluid outlet in evaporator" | |
| annotation (Dialog(group="Efficiency")); | |
| @@ -82,17 +82,17 @@ | |
| "Fraction of nominal flow rate where flow transitions to laminar" | |
| annotation (Dialog(tab="Flow resistance", group="Evaporator")); | |
| - parameter Modelica.SIunits.Time tau1=60 | |
| + parameter Modelica.Units.SI.Time tau1=60 | |
| "Time constant at nominal flow rate (used if energyDynamics1 <> Modelica.Fluid.Types.Dynamics.SteadyState)" | |
| annotation (Dialog(tab="Dynamics", group="Condenser")); | |
| - parameter Modelica.SIunits.Time tau2=60 | |
| + parameter Modelica.Units.SI.Time tau2=60 | |
| "Time constant at nominal flow rate (used if energyDynamics2 <> Modelica.Fluid.Types.Dynamics.SteadyState)" | |
| annotation (Dialog(tab="Dynamics", group="Evaporator")); | |
| - parameter Modelica.SIunits.Temperature T1_start=Medium1.T_default | |
| + parameter Modelica.Units.SI.Temperature T1_start=Medium1.T_default | |
| "Initial or guess value of set point" | |
| annotation (Dialog(tab="Dynamics", group="Condenser")); | |
| - parameter Modelica.SIunits.Temperature T2_start=Medium2.T_default | |
| + parameter Modelica.Units.SI.Temperature T2_start=Medium2.T_default | |
| "Initial or guess value of set point" | |
| annotation (Dialog(tab="Dynamics", group="Evaporator")); | |
| @@ -136,11 +136,11 @@ | |
| x2=TConAct - TEvaAct, | |
| deltaX=0.25) "Carnot efficiency"; | |
| - Modelica.SIunits.Temperature TConAct(start=TCon_nominal + TAppCon_nominal)= | |
| + Modelica.Units.SI.Temperature TConAct(start=TCon_nominal + TAppCon_nominal)= | |
| Medium1.temperature(staB1) + QCon_flow/QCon_flow_nominal*TAppCon_nominal | |
| "Condenser temperature used to compute efficiency, taking into account pinch temperature between fluid and refrigerant"; | |
| - Modelica.SIunits.Temperature TEvaAct(start=TEva_nominal - TAppEva_nominal)= | |
| + Modelica.Units.SI.Temperature TEvaAct(start=TEva_nominal - TAppEva_nominal)= | |
| Medium2.temperature(staB2) - QEva_flow/QEva_flow_nominal*TAppEva_nominal | |
| "Evaporator temperature used to compute efficiency, taking into account pinch temperature between fluid and refrigerant"; | |
| @@ -162,22 +162,22 @@ | |
| "Flag, true if etaPL should be computed as it depends on yPL" | |
| annotation(Evaluate=true); | |
| - final parameter Modelica.SIunits.Temperature TUseAct_nominal= | |
| + final parameter Modelica.Units.SI.Temperature TUseAct_nominal= | |
| if COP_is_for_cooling | |
| then TEva_nominal - TAppEva_nominal | |
| else TCon_nominal + TAppCon_nominal | |
| "Nominal evaporator temperature for chiller or condenser temperature for heat pump, taking into account pinch temperature between fluid and refrigerant"; | |
| - Modelica.SIunits.Temperature TUseAct=if COP_is_for_cooling then TEvaAct else TConAct | |
| + Modelica.Units.SI.Temperature TUseAct=if COP_is_for_cooling then TEvaAct else TConAct | |
| "Temperature of useful heat (evaporator for chiller, condenser for heat pump), taking into account pinch temperature between fluid and refrigerant"; | |
| - final parameter Modelica.SIunits.SpecificHeatCapacity cp1_default= | |
| + final parameter Modelica.Units.SI.SpecificHeatCapacity cp1_default= | |
| Medium1.specificHeatCapacityCp(Medium1.setState_pTX( | |
| p = Medium1.p_default, | |
| T = Medium1.T_default, | |
| X = Medium1.X_default)) | |
| "Specific heat capacity of medium 1 at default medium state"; | |
| - final parameter Modelica.SIunits.SpecificHeatCapacity cp2_default= | |
| + final parameter Modelica.Units.SI.SpecificHeatCapacity cp2_default= | |
| Medium2.specificHeatCapacityCp(Medium2.setState_pTX( | |
| p = Medium2.p_default, | |
| T = Medium2.T_default, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo" 2021-04-26 11:51:09.682623070 +0200 | |
| @@ -29,7 +29,7 @@ | |
| final homotopyInitialization=homotopyInitialization, | |
| final Q_flow_nominal=QEva_flow_nominal)); | |
| - parameter Modelica.SIunits.Power P_nominal(min=0) | |
| + parameter Modelica.Units.SI.Power P_nominal(min=0) | |
| "Nominal compressor power (at y=1)" | |
| annotation (Dialog(group="Nominal condition")); | |
| @@ -38,9 +38,9 @@ | |
| annotation (Placement(transformation(extent={{-140,70},{-100,110}}))); | |
| protected | |
| - Modelica.SIunits.HeatFlowRate QCon_flow_internal(start=QCon_flow_nominal)= | |
| + Modelica.Units.SI.HeatFlowRate QCon_flow_internal(start=QCon_flow_nominal)= | |
| P - QEva_flow_internal "Condenser heat input"; | |
| - Modelica.SIunits.HeatFlowRate QEva_flow_internal(start=QEva_flow_nominal)= | |
| + Modelica.Units.SI.HeatFlowRate QEva_flow_internal(start=QEva_flow_nominal)= | |
| if COP_is_for_cooling then -COP * P else (1-COP)*P "Evaporator heat input"; | |
| Modelica.Blocks.Sources.RealExpression yEva_flow_in( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Chillers/Carnot_TEva.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Chillers/Carnot_TEva.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Chillers/Carnot_TEva.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Chillers/Carnot_TEva.mo" 2021-04-26 11:51:09.646623021 +0200 | |
| @@ -26,7 +26,7 @@ | |
| final energyDynamics=energyDynamics, | |
| final homotopyInitialization=homotopyInitialization)); | |
| - parameter Modelica.SIunits.HeatFlowRate QEva_flow_min( | |
| + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_min( | |
| max=0) = -Modelica.Constants.inf | |
| "Maximum heat flow rate for cooling (negative)"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Chillers/Examples/Carnot_TEva.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Chillers/Examples/Carnot_TEva.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Chillers/Examples/Carnot_TEva.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Chillers/Examples/Carnot_TEva.mo" 2021-04-26 11:51:09.606622965 +0200 | |
| @@ -5,14 +5,14 @@ | |
| package Medium1 = AixLib.Media.Water "Medium model"; | |
| package Medium2 = AixLib.Media.Water "Medium model"; | |
| - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-10 | |
| + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-10 | |
| "Temperature difference evaporator outlet-inlet"; | |
| - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10 | |
| + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10 | |
| "Temperature difference condenser outlet-inlet"; | |
| parameter Real COPc_nominal = 3 "Chiller COP"; | |
| - parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal = -100E3 | |
| + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal = -100E3 | |
| "Evaporator heat flow rate"; | |
| - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal= | |
| + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal= | |
| QEva_flow_nominal/dTEva_nominal/4200 | |
| "Nominal mass flow rate at chilled water side"; | |
| @@ -68,7 +68,7 @@ | |
| Modelica.Blocks.Math.Add QCon_flow(k2=-1) "Condenser heat flow rate" | |
| annotation (Placement(transformation(extent={{48,-50},{68,-30}}))); | |
| - final parameter Modelica.SIunits.SpecificHeatCapacity cp1_default= | |
| + final parameter Modelica.Units.SI.SpecificHeatCapacity cp1_default= | |
| Medium1.specificHeatCapacityCp(Medium1.setState_pTX( | |
| Medium1.p_default, | |
| Medium1.T_default, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Chillers/Examples/Carnot_y.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Chillers/Examples/Carnot_y.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Chillers/Examples/Carnot_y.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Chillers/Examples/Carnot_y.mo" 2021-04-26 11:51:09.582622932 +0200 | |
| @@ -4,18 +4,18 @@ | |
| package Medium1 = AixLib.Media.Water "Medium model"; | |
| package Medium2 = AixLib.Media.Water "Medium model"; | |
| - parameter Modelica.SIunits.Power P_nominal=10E3 | |
| + parameter Modelica.Units.SI.Power P_nominal=10E3 | |
| "Nominal compressor power (at y=1)"; | |
| - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-10 | |
| + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-10 | |
| "Temperature difference evaporator outlet-inlet"; | |
| - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10 | |
| + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10 | |
| "Temperature difference condenser outlet-inlet"; | |
| parameter Real COPc_nominal = 3 "Chiller COP"; | |
| - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal= | |
| + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal= | |
| -P_nominal*COPc_nominal/dTEva_nominal/4200 | |
| "Nominal mass flow rate at chilled water side"; | |
| - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal= | |
| + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal= | |
| m2_flow_nominal*(COPc_nominal+1)/COPc_nominal | |
| "Nominal mass flow rate at condenser water wide"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Chillers/Examples/Chiller.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Chillers/Examples/Chiller.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Chillers/Examples/Chiller.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Chillers/Examples/Chiller.mo" 2021-04-26 11:51:09.562622904 +0200 | |
| @@ -78,7 +78,7 @@ | |
| rotation=0, | |
| origin={54,-38}))); | |
| Modelica.Blocks.Sources.Sine sine( | |
| - freqHz=1/3600, | |
| + f =1/3600, | |
| amplitude=500, | |
| offset=500, | |
| phase=3.1415926535898) | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mo" 2021-04-26 11:51:09.446622744 +0200 | |
| @@ -5,18 +5,18 @@ | |
| package Medium = AixLib.Media.Water "Medium model"; | |
| - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-4 | |
| + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-4 | |
| "Temperature difference evaporator outlet-inlet"; | |
| - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=4 | |
| + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=4 | |
| "Temperature difference condenser outlet-inlet"; | |
| parameter Real COPc_nominal = 3 "Chiller COP"; | |
| - parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal = -100E3 | |
| + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal = -100E3 | |
| "Evaporator heat flow rate"; | |
| - final parameter Modelica.SIunits.MassFlowRate m2_flow_nominal= | |
| + final parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal= | |
| QEva_flow_nominal/dTEva_nominal/4200 | |
| "Nominal mass flow rate at chilled water side"; | |
| - final parameter Modelica.SIunits.MassFlowRate m1_flow_nominal= | |
| + final parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal= | |
| -m2_flow_nominal/dTCon_nominal*dTEva_nominal | |
| "Nominal mass flow rate at condeser water side"; | |
| @@ -56,15 +56,15 @@ | |
| replaceable package Medium2 = Modelica.Media.Interfaces.PartialMedium | |
| "Medium model"; | |
| - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal | |
| + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal | |
| "Temperature difference evaporator outlet-inlet"; | |
| - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal | |
| + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal | |
| "Temperature difference condenser outlet-inlet"; | |
| - parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal | |
| + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal | |
| "Evaporator heat flow rate"; | |
| - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal | |
| + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal | |
| "Nominal mass flow rate at condeser water side"; | |
| - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal | |
| + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal | |
| "Nominal mass flow rate at chilled water side"; | |
| AixLib.Fluid.Sources.MassFlowSource_T sou1( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mo" 2021-04-26 11:51:09.362622629 +0200 | |
| @@ -5,17 +5,17 @@ | |
| package Medium1 = AixLib.Media.Water "Medium model"; | |
| package Medium2 = AixLib.Media.Water "Medium model"; | |
| - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-10 | |
| + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-10 | |
| "Temperature difference evaporator inlet-outlet"; | |
| - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10 | |
| + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10 | |
| "Temperature difference condenser outlet-inlet"; | |
| parameter Real COPc_nominal = 3 "Chiller COP"; | |
| - parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal = -100E3 | |
| + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal = -100E3 | |
| "Evaporator heat flow rate"; | |
| - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal= | |
| + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal= | |
| QEva_flow_nominal/dTEva_nominal/4200 | |
| "Nominal mass flow rate at chilled water side"; | |
| - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal= | |
| + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal= | |
| m2_flow_nominal*(COPc_nominal+1)/COPc_nominal | |
| "Nominal mass flow rate at condenser water wide"; | |
| @@ -71,7 +71,7 @@ | |
| Modelica.Blocks.Math.Add QCon_flow(k2=-1) "Condenser heat flow rate" | |
| annotation (Placement(transformation(extent={{40,-50},{60,-30}}))); | |
| - final parameter Modelica.SIunits.SpecificHeatCapacity cp1_default= | |
| + final parameter Modelica.Units.SI.SpecificHeatCapacity cp1_default= | |
| Medium1.specificHeatCapacityCp(Medium1.setState_pTX( | |
| Medium1.p_default, | |
| Medium1.T_default, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Chillers/Validation/CarnotVerifyCOP.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Chillers/Validation/CarnotVerifyCOP.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Chillers/Validation/CarnotVerifyCOP.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Chillers/Validation/CarnotVerifyCOP.mo" 2021-04-26 11:51:09.514622838 +0200 | |
| @@ -7,32 +7,32 @@ | |
| parameter Real COP_nominal = 3 "Coefficient of performance"; | |
| - parameter Modelica.SIunits.Temperature TCon_nominal = 273.15+30 | |
| + parameter Modelica.Units.SI.Temperature TCon_nominal = 273.15+30 | |
| "Nominal condensor temperature"; | |
| - parameter Modelica.SIunits.Temperature TEva_nominal = 273.15 + 5 | |
| + parameter Modelica.Units.SI.Temperature TEva_nominal = 273.15 + 5 | |
| "Nominal evaporator temperature"; | |
| - parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal=-10E3 | |
| + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal=-10E3 | |
| "Nominal evaporator heat flow rate (QEva_flow_nominal < 0)"; | |
| - parameter Modelica.SIunits.HeatFlowRate QCon_flow_nominal=-QEva_flow_nominal * (1+1/COP_nominal) | |
| + parameter Modelica.Units.SI.HeatFlowRate QCon_flow_nominal=-QEva_flow_nominal * (1+1/COP_nominal) | |
| "Nominal condenser heat flow rate (QCon_flow_nominal > 0)"; | |
| - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-10 | |
| + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-10 | |
| "Temperature difference evaporator outlet-inlet"; | |
| - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10 | |
| + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10 | |
| "Temperature difference condenser outlet-inlet"; | |
| - parameter Modelica.SIunits.MassFlowRate mCon_flow_nominal= | |
| + parameter Modelica.Units.SI.MassFlowRate mCon_flow_nominal= | |
| QCon_flow_nominal/cp_default/dTCon_nominal | |
| "Nominal mass flow rate at condenser"; | |
| - parameter Modelica.SIunits.MassFlowRate mEva_flow_nominal= | |
| + parameter Modelica.Units.SI.MassFlowRate mEva_flow_nominal= | |
| QEva_flow_nominal/cp_default/dTEva_nominal | |
| "Nominal mass flow rate of evaporator"; | |
| - final parameter Modelica.SIunits.SpecificHeatCapacity cp_default= | |
| + final parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= | |
| Medium.specificHeatCapacityCp(Medium.setState_pTX( | |
| p = Medium.p_default, | |
| T = Medium.T_default, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Chillers/Validation/CarnotVerifyEtaCarnot.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Chillers/Validation/CarnotVerifyEtaCarnot.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Chillers/Validation/CarnotVerifyEtaCarnot.mo" 2021-03-15 12:05:56.615860836 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Chillers/Validation/CarnotVerifyEtaCarnot.mo" 2021-04-26 11:51:09.486622800 +0200 | |
| @@ -8,42 +8,42 @@ | |
| parameter Real etaCarnot_nominal=0.315046 | |
| "Carnot effectiveness (=COP/COP_Carnot) used if use_eta_Carnot_nominal = true"; | |
| - parameter Modelica.SIunits.TemperatureDifference TAppCon_nominal=2 | |
| + parameter Modelica.Units.SI.TemperatureDifference TAppCon_nominal=2 | |
| "Temperature difference between refrigerant and working fluid outlet in condenser"; | |
| - parameter Modelica.SIunits.TemperatureDifference TAppEva_nominal=2 | |
| + parameter Modelica.Units.SI.TemperatureDifference TAppEva_nominal=2 | |
| "Temperature difference between refrigerant and working fluid outlet in evaporator"; | |
| parameter Real COP_nominal = etaCarnot_nominal * (TEva_nominal-TAppEva_nominal)/ | |
| (TCon_nominal + TAppCon_nominal - (TEva_nominal-TAppEva_nominal)) "Coefficient of performance"; | |
| - parameter Modelica.SIunits.Temperature TCon_nominal = 273.15+30 | |
| + parameter Modelica.Units.SI.Temperature TCon_nominal = 273.15+30 | |
| "Nominal condensor temperature"; | |
| - parameter Modelica.SIunits.Temperature TEva_nominal = 273.15 + 5 | |
| + parameter Modelica.Units.SI.Temperature TEva_nominal = 273.15 + 5 | |
| "Nominal evaporator temperature"; | |
| - parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal=-10E3 | |
| + parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal=-10E3 | |
| "Nominal evaporator heat flow rate (QEva_flow_nominal < 0)"; | |
| - parameter Modelica.SIunits.HeatFlowRate QCon_flow_nominal=-QEva_flow_nominal * (1+1/COP_nominal) | |
| + parameter Modelica.Units.SI.HeatFlowRate QCon_flow_nominal=-QEva_flow_nominal * (1+1/COP_nominal) | |
| "Nominal condenser heat flow rate (QCon_flow_nominal > 0)"; | |
| - parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-10 | |
| + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-10 | |
| "Temperature difference evaporator outlet-inlet"; | |
| - parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10 | |
| + parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10 | |
| "Temperature difference condenser outlet-inlet"; | |
| - parameter Modelica.SIunits.MassFlowRate mCon_flow_nominal= | |
| + parameter Modelica.Units.SI.MassFlowRate mCon_flow_nominal= | |
| QCon_flow_nominal/cp_default/dTCon_nominal | |
| "Nominal mass flow rate at condenser"; | |
| - parameter Modelica.SIunits.MassFlowRate mEva_flow_nominal= | |
| + parameter Modelica.Units.SI.MassFlowRate mEva_flow_nominal= | |
| QEva_flow_nominal/cp_default/dTEva_nominal | |
| "Nominal mass flow rate of evaporator"; | |
| - final parameter Modelica.SIunits.SpecificHeatCapacity cp_default= | |
| + final parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= | |
| Medium.specificHeatCapacityCp(Medium.setState_pTX( | |
| p = Medium.p_default, | |
| T = Medium.T_default, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Delays/DelayFirstOrder.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Delays/DelayFirstOrder.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Delays/DelayFirstOrder.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Delays/DelayFirstOrder.mo" 2021-04-26 11:51:09.326622578 +0200 | |
| @@ -4,11 +4,11 @@ | |
| extends AixLib.Fluid.MixingVolumes.MixingVolume(final V=V_nominal, | |
| final mSenFac=1); | |
| - parameter Modelica.SIunits.Time tau = 60 "Time constant at nominal flow" | |
| + parameter Modelica.Units.SI.Time tau = 60 "Time constant at nominal flow" | |
| annotation (Dialog(tab="Dynamics", group="Nominal condition")); | |
| protected | |
| - parameter Modelica.SIunits.Volume V_nominal = m_flow_nominal*tau/rho_default | |
| + parameter Modelica.Units.SI.Volume V_nominal = m_flow_nominal*tau/rho_default | |
| "Volume of delay element"; | |
| annotation ( Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100, | |
| 100}}), graphics={Ellipse( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/FlowSystem/Basic.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/FlowSystem/Basic.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/FlowSystem/Basic.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/FlowSystem/Basic.mo" 2021-04-26 11:51:09.286622522 +0200 | |
| @@ -109,7 +109,7 @@ | |
| Modelica.Blocks.Sources.Sine sine( | |
| amplitude=0.5, | |
| offset=0.5, | |
| - freqHz=0.001) | |
| +f =0.001) | |
| "Valve control signal" | |
| annotation (Placement(transformation(extent={{-140,20},{-120,40}}))); | |
| AixLib.Fluid.Actuators.Valves.ThreeWayLinear valSouth( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/GeothermalHeatPump/BaseClasses/GeothermalHeatPumpBase.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/GeothermalHeatPump/BaseClasses/GeothermalHeatPumpBase.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/GeothermalHeatPump/BaseClasses/GeothermalHeatPumpBase.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/GeothermalHeatPump/BaseClasses/GeothermalHeatPumpBase.mo" 2021-04-26 11:51:09.150622334 +0200 | |
| @@ -6,13 +6,13 @@ | |
| replaceable package Medium = AixLib.Media.Water | |
| "Medium model used for hydronic components"; | |
| - parameter Modelica.SIunits.Temperature T_start_cold[5] = 300*ones(5) | |
| + parameter Modelica.Units.SI.Temperature T_start_cold[5] = 300*ones(5) | |
| "Initial temperature of cold components"; | |
| - parameter Modelica.SIunits.Temperature T_start_warm[5] = 300*ones(5) | |
| + parameter Modelica.Units.SI.Temperature T_start_warm[5] = 300*ones(5) | |
| "Initial temperature of warm components"; | |
| - parameter Modelica.SIunits.Temperature T_start_hot = 300 | |
| + parameter Modelica.Units.SI.Temperature T_start_hot = 300 | |
| "Initial temperature of high temperature components"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/GeothermalHeatPump/Control/geothermalFieldController.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/GeothermalHeatPump/Control/geothermalFieldController.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/GeothermalHeatPump/Control/geothermalFieldController.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/GeothermalHeatPump/Control/geothermalFieldController.mo" 2021-04-26 11:51:08.998622125 +0200 | |
| @@ -2,13 +2,13 @@ | |
| model geothermalFieldController | |
| "Controls the heat exchange with a heat or cold source by setting two valves" | |
| - parameter Modelica.SIunits.Temperature temperature_low=273.15 + 40 | |
| + parameter Modelica.Units.SI.Temperature temperature_low=273.15 + 40 | |
| "Lower temperature threshold for hysteresis"; | |
| - parameter Modelica.SIunits.Temperature temperature_high=273.15 + 45 | |
| + parameter Modelica.Units.SI.Temperature temperature_high=273.15 + 45 | |
| "Upper temperature threshold for hysteresis"; | |
| parameter Boolean warmSide=true | |
| "true = hysteresis with negation = for warm side"; | |
| - parameter Modelica.SIunits.Time delayTime=10 | |
| + parameter Modelica.Units.SI.Time delayTime=10 | |
| "Time delay between opening of valve 1 and 2"; | |
| Modelica.Blocks.Logical.Switch switch | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/GeothermalHeatPump/Control/PumpControlBus.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/GeothermalHeatPump/Control/PumpControlBus.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/GeothermalHeatPump/Control/PumpControlBus.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/GeothermalHeatPump/Control/PumpControlBus.mo" 2021-04-26 11:51:09.010622140 +0200 | |
| @@ -3,17 +3,17 @@ | |
| "Bus for all the pump set points in the geothermal heat pump" | |
| extends Modelica.Icons.SignalBus; | |
| - Modelica.SIunits.Pressure p_pumpGeothermalSource | |
| + | |
| + Modelica.Units.SI.Pressure p_pumpGeothermalSource | |
| "Pressure set point of pump moving fluid from geothermal source into system"; | |
| - Modelica.SIunits.Pressure p_pumpCondenser | |
| + Modelica.Units.SI.Pressure p_pumpCondenser | |
| "Pressure set point of pump moving fluid from storage tank to condenser of heat pump"; | |
| - Modelica.SIunits.Pressure p_pumpEvaporator | |
| + Modelica.Units.SI.Pressure p_pumpEvaporator | |
| "Pressure set point of pump moving fluid from storage tank to evaporator of heat pump"; | |
| - Modelica.SIunits.Pressure p_pumpColdConsumer | |
| + Modelica.Units.SI.Pressure p_pumpColdConsumer | |
| "Pressure set point of pump moving fluid from storage tank to cold consumers"; | |
| - Modelica.SIunits.Pressure p_pumpHeatConsumer | |
| + Modelica.Units.SI.Pressure p_pumpHeatConsumer | |
| "Pressure set point of pump moving fluid from storage tank to heat consumers"; | |
| - | |
| annotation ( | |
| Icon(coordinateSystem(preserveAspectRatio=false)), | |
| Diagram(coordinateSystem(preserveAspectRatio=false)), | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/Example1v2.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/Example1v2.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/Example1v2.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/Example1v2.mo" 2021-04-26 11:51:08.922622020 +0200 | |
| @@ -1,7 +1,7 @@ | |
| within AixLib.Fluid.Examples.Performance; | |
| model Example1v2 "Example 1 model with mixing volume" | |
| extends AixLib.Fluid.Examples.Performance.BaseClasses.Example1; | |
| - parameter Modelica.SIunits.Time tau=10 "Time constant at nominal flow"; | |
| + parameter Modelica.Units.SI.Time tau=10 "Time constant at nominal flow"; | |
| Fluid.Delays.DelayFirstOrder[nRes.k] vol( | |
| redeclare each package Medium = Medium, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/Example2.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/Example2.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/Example2.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/Example2.mo" 2021-04-26 11:51:08.910622003 +0200 | |
| @@ -3,9 +3,9 @@ | |
| extends Modelica.Icons.Example; | |
| package Medium = Modelica.Media.Water.ConstantPropertyLiquidWater; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 | |
| "Nominal mass flow rate"; | |
| - parameter Modelica.SIunits.PressureDifference dp_nominal=1 | |
| + parameter Modelica.Units.SI.PressureDifference dp_nominal=1 | |
| "Pressure drop at nominal mass flow rate"; | |
| Fluid.Movers.FlowControlled_dp pump_dp( | |
| redeclare package Medium = Medium, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/Example3.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/Example3.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/Example3.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/Example3.mo" 2021-04-26 11:51:08.894621980 +0200 | |
| @@ -4,9 +4,9 @@ | |
| extends Modelica.Icons.Example; | |
| package Medium = Modelica.Media.Water.ConstantPropertyLiquidWater; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 | |
| "Nominal mass flow rate"; | |
| - parameter Modelica.SIunits.PressureDifference dp_nominal=1 | |
| + parameter Modelica.Units.SI.PressureDifference dp_nominal=1 | |
| "Pressure drop at nominal mass flow rate"; | |
| Fluid.Movers.FlowControlled_m_flow pump( | |
| redeclare package Medium = Medium, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/Example4.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/Example4.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/Example4.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/Example4.mo" 2021-04-26 11:51:08.874621954 +0200 | |
| @@ -6,7 +6,7 @@ | |
| parameter Boolean allowFlowReversal=false | |
| "= false to simplify equations, assuming, but not enforcing, no flow reversal"; | |
| - Modelica.SIunits.MassFlowRate m_condens = min(0, -vol.ports[1].m_flow*(bou.X[1] - xSat.X[1])) | |
| + Modelica.Units.SI.MassFlowRate m_condens = min(0, -vol.ports[1].m_flow*(bou.X[1] - xSat.X[1])) | |
| "Water vapor mass flow rate"; | |
| Fluid.MixingVolumes.MixingVolumeMoistAir vol( | |
| nPorts=2, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/PressureDrop/ParallelDp.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/PressureDrop/ParallelDp.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/PressureDrop/ParallelDp.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/PressureDrop/ParallelDp.mo" 2021-04-26 11:51:08.810621865 +0200 | |
| @@ -4,9 +4,9 @@ | |
| extends Modelica.Icons.Example; | |
| package Medium = AixLib.Media.Air; | |
| parameter Integer nRes(min=2) = 10 "Number of resistances"; | |
| - parameter Modelica.SIunits.PressureDifference dp_nominal=1 | |
| + parameter Modelica.Units.SI.PressureDifference dp_nominal=1 | |
| "Pressure drop at nominal mass flow rate"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 | |
| "Nominal mass flow rate"; | |
| Sources.Boundary_pT sou( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/PressureDrop/ParallelFlow.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/PressureDrop/ParallelFlow.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/PressureDrop/ParallelFlow.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/PressureDrop/ParallelFlow.mo" 2021-04-26 11:51:08.790621837 +0200 | |
| @@ -4,9 +4,9 @@ | |
| extends Modelica.Icons.Example; | |
| package Medium = AixLib.Media.Air; | |
| parameter Integer nRes(min=2) = 10 "Number of resistances"; | |
| - parameter Modelica.SIunits.PressureDifference dp_nominal=1 | |
| + parameter Modelica.Units.SI.PressureDifference dp_nominal=1 | |
| "Pressure drop at nominal mass flow rate"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 | |
| "Nominal mass flow rate"; | |
| Sources.MassFlowSource_T sou( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/PressureDrop/SeriesDp.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/PressureDrop/SeriesDp.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/PressureDrop/SeriesDp.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/PressureDrop/SeriesDp.mo" 2021-04-26 11:51:08.770621809 +0200 | |
| @@ -4,9 +4,9 @@ | |
| extends Modelica.Icons.Example; | |
| package Medium = AixLib.Media.Air; | |
| parameter Integer nRes(min=2) = 10 "Number of resistances"; | |
| - parameter Modelica.SIunits.PressureDifference dp_nominal=1 | |
| + parameter Modelica.Units.SI.PressureDifference dp_nominal=1 | |
| "Pressure drop at nominal mass flow rate"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 | |
| "Nominal mass flow rate"; | |
| Sources.Boundary_pT sou( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/PressureDrop/SeriesFlow.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/PressureDrop/SeriesFlow.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/PressureDrop/SeriesFlow.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/PressureDrop/SeriesFlow.mo" 2021-04-26 11:51:08.746621776 +0200 | |
| @@ -4,9 +4,9 @@ | |
| extends Modelica.Icons.Example; | |
| package Medium = AixLib.Media.Air; | |
| parameter Integer nRes(min=2) = 10 "Number of resistances"; | |
| - parameter Modelica.SIunits.PressureDifference dp_nominal=1 | |
| + parameter Modelica.Units.SI.PressureDifference dp_nominal=1 | |
| "Pressure drop at nominal mass flow rate"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 | |
| "Nominal mass flow rate"; | |
| Sources.MassFlowSource_T sou( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/PressureDrop/SeriesParallelDp.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/PressureDrop/SeriesParallelDp.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/PressureDrop/SeriesParallelDp.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/PressureDrop/SeriesParallelDp.mo" 2021-04-26 11:51:08.730621753 +0200 | |
| @@ -4,9 +4,9 @@ | |
| extends Modelica.Icons.Example; | |
| package Medium = AixLib.Media.Air; | |
| parameter Integer nRes(min=2) = 10 "Number of resistances"; | |
| - parameter Modelica.SIunits.PressureDifference dp_nominal=1 | |
| + parameter Modelica.Units.SI.PressureDifference dp_nominal=1 | |
| "Pressure drop at nominal mass flow rate"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 | |
| "Nominal mass flow rate"; | |
| Sources.Boundary_pT sou( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/PressureDrop/SeriesParallelFlow.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/PressureDrop/SeriesParallelFlow.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/PressureDrop/SeriesParallelFlow.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/Performance/PressureDrop/SeriesParallelFlow.mo" 2021-04-26 11:51:08.706621720 +0200 | |
| @@ -4,9 +4,9 @@ | |
| extends Modelica.Icons.Example; | |
| package Medium = AixLib.Media.Air; | |
| parameter Integer nRes(min=2) = 10 "Number of resistances"; | |
| - parameter Modelica.SIunits.PressureDifference dp_nominal=1 | |
| + parameter Modelica.Units.SI.PressureDifference dp_nominal=1 | |
| "Pressure drop at nominal mass flow rate"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 | |
| "Nominal mass flow rate"; | |
| Sources.MassFlowSource_T sou( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/PumpRadiatorThermostaticValve.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/PumpRadiatorThermostaticValve.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/PumpRadiatorThermostaticValve.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/PumpRadiatorThermostaticValve.mo" 2021-04-26 11:51:08.686621692 +0200 | |
| @@ -45,7 +45,7 @@ | |
| Modelica.Thermal.HeatTransfer.Sources.PrescribedTemperature AirTemp annotation(Placement(transformation(extent = {{100, 58}, {112, 70}}))); | |
| Modelica.Thermal.HeatTransfer.Sources.PrescribedTemperature RadTemp annotation(Placement(transformation(extent = {{148, 58}, {136, 70}}))); | |
| Modelica.Blocks.Sources.Constant Source_Temp(k = 273.15 + 20) annotation(Placement(transformation(extent = {{56, 80}, {76, 100}}))); | |
| - Modelica.Blocks.Sources.Sine Source_opening(freqHz = 1 / 86400, amplitude = 1, startTime = 0, offset = 273.15 + 18.5) annotation(Placement(transformation(extent = {{10, 60}, {30, 80}}))); | |
| + Modelica.Blocks.Sources.Sine Source_opening(f = 1 / 86400, amplitude = 1, startTime = 0, offset = 273.15 + 18.5) annotation(Placement(transformation(extent = {{10, 60}, {30, 80}}))); | |
| Modelica.Blocks.Sources.Constant Source_TempSet_Boiler(k = 273.15 + 75) annotation(Placement(transformation(extent = {{0, 60}, {-20, 80}}))); | |
| AixLib.Fluid.HeatExchangers.Heater_T hea( | |
| redeclare package Medium = Medium, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/PumpRadiatorValve.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/PumpRadiatorValve.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/PumpRadiatorValve.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/PumpRadiatorValve.mo" 2021-04-26 11:51:08.658621654 +0200 | |
| @@ -39,7 +39,7 @@ | |
| Modelica.Thermal.HeatTransfer.Sources.PrescribedTemperature AirTemp annotation(Placement(transformation(extent = {{100, 58}, {112, 70}}))); | |
| Modelica.Thermal.HeatTransfer.Sources.PrescribedTemperature RadTemp annotation(Placement(transformation(extent = {{148, 58}, {136, 70}}))); | |
| Modelica.Blocks.Sources.Constant Source_Temp(k = 273.15 + 20) annotation(Placement(transformation(extent = {{60, 80}, {80, 100}}))); | |
| - Modelica.Blocks.Sources.Sine Source_opening(freqHz = 1 / 86400, offset = 0.5, startTime = -21600, amplitude = 0.49) annotation(Placement(transformation(extent = {{10, 60}, {30, 80}}))); | |
| + Modelica.Blocks.Sources.Sine Source_opening(f = 1 / 86400, offset = 0.5, startTime = -21600, amplitude = 0.49) annotation(Placement(transformation(extent = {{10, 60}, {30, 80}}))); | |
| Modelica.Blocks.Sources.Constant Source_TempSet_Boiler(k = 273.15 + 75) annotation(Placement(transformation(extent = {{0, 60}, {-20, 80}}))); | |
| AixLib.Fluid.HeatExchangers.Heater_T hea( | |
| redeclare package Medium = Medium, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/SimpleHouse.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/SimpleHouse.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Examples/SimpleHouse.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Examples/SimpleHouse.mo" 2021-04-26 11:51:08.614621593 +0200 | |
| @@ -6,18 +6,18 @@ | |
| package MediumAir = AixLib.Media.Air; | |
| package MediumWater = AixLib.Media.Water; | |
| - parameter Modelica.SIunits.Area A_wall = 100 "Wall area"; | |
| - parameter Modelica.SIunits.Area A_win = 5 "Window area"; | |
| + parameter Modelica.Units.SI.Area A_wall = 100 "Wall area"; | |
| + parameter Modelica.Units.SI.Area A_win = 5 "Window area"; | |
| parameter Real g_win(min=0, max=1, unit="1") = 0.3 "Solar heat gain coefficient of window"; | |
| - parameter Modelica.SIunits.Volume V_zone = A_wall*3 "Wall area"; | |
| - parameter Modelica.SIunits.HeatFlowRate QHea_nominal = 700 | |
| + parameter Modelica.Units.SI.Volume V_zone = A_wall*3 "Wall area"; | |
| + parameter Modelica.Units.SI.HeatFlowRate QHea_nominal = 700 | |
| "Nominal capacity of heating system"; | |
| - parameter Modelica.SIunits.MassFlowRate mWat_flow_nominal=QHea_nominal/10/4200 | |
| + parameter Modelica.Units.SI.MassFlowRate mWat_flow_nominal=QHea_nominal/10/4200 | |
| "Nominal mass flow rate for water loop"; | |
| - parameter Modelica.SIunits.MassFlowRate mAir_flow_nominal=V_zone*2*1.2/3600 | |
| + parameter Modelica.Units.SI.MassFlowRate mAir_flow_nominal=V_zone*2*1.2/3600 | |
| "Nominal mass flow rate for air loop"; | |
| - parameter Modelica.SIunits.PressureDifference dpAir_nominal=200 | |
| + parameter Modelica.Units.SI.PressureDifference dpAir_nominal=200 | |
| "Pressure drop at nominal mass flow rate for air loop"; | |
| parameter Boolean allowFlowReversal=false | |
| "= false because flow will not reverse in these circuits"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo" 2021-04-26 11:51:07.422619945 +0200 | |
| @@ -3,23 +3,23 @@ | |
| "Pipe model using spatialDistribution for temperature delay with modified delay tracker" | |
| extends AixLib.Fluid.Interfaces.PartialTwoPort; | |
| - parameter Modelica.SIunits.Length dh | |
| + parameter Modelica.Units.SI.Length dh | |
| "Hydraulic diameter (assuming a round cross section area)"; | |
| - parameter Modelica.SIunits.Velocity v_nominal | |
| + parameter Modelica.Units.SI.Velocity v_nominal | |
| "Velocity at m_flow_nominal (used to compute default value for hydraulic diameter dh)" | |
| annotation(Dialog(group="Nominal condition")); | |
| - parameter Modelica.SIunits.Length length(min=0) "Pipe length"; | |
| + parameter Modelica.Units.SI.Length length(min=0) "Pipe length"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal(min=0) | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal(min=0) | |
| "Nominal mass flow rate" annotation (Dialog(group="Nominal condition")); | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_small(min=0) = 1E-4*abs( | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_small(min=0) = 1E-4*abs( | |
| m_flow_nominal) "Small mass flow rate for regularization of zero flow" | |
| annotation (Dialog(tab="Advanced")); | |
| - parameter Modelica.SIunits.Height roughness=2.5e-5 | |
| + parameter Modelica.Units.SI.Height roughness=2.5e-5 | |
| "Average height of surface asperities (default: smooth steel pipe)" | |
| annotation (Dialog(group="Geometry")); | |
| @@ -36,18 +36,18 @@ | |
| parameter Boolean from_dp=false | |
| "= true, use m_flow = f(dp) else dp = f(m_flow)" | |
| annotation (Evaluate=true, Dialog(tab="Advanced")); | |
| - parameter Modelica.SIunits.Length thickness(min=0) "Pipe wall thickness"; | |
| + parameter Modelica.Units.SI.Length thickness(min=0) "Pipe wall thickness"; | |
| - parameter Modelica.SIunits.Temperature T_start_in=Medium.T_default | |
| + parameter Modelica.Units.SI.Temperature T_start_in=Medium.T_default | |
| "Initialization temperature at pipe inlet" | |
| annotation (Dialog(tab="Initialization")); | |
| - parameter Modelica.SIunits.Temperature T_start_out=Medium.T_default | |
| + parameter Modelica.Units.SI.Temperature T_start_out=Medium.T_default | |
| "Initialization temperature at pipe outlet" | |
| annotation (Dialog(tab="Initialization")); | |
| parameter Boolean initDelay=false | |
| "Initialize delay for a constant mass flow rate if true, otherwise start from 0" | |
| annotation (Dialog(tab="Initialization")); | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_start=0 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_start=0 | |
| annotation (Dialog(tab="Initialization", enable=initDelay)); | |
| parameter Real ReC=4000 | |
| @@ -127,13 +127,13 @@ | |
| annotation (Placement(transformation(extent={{-10,90},{10,110}}))); | |
| protected | |
| - parameter Modelica.SIunits.Density rho_default=Medium.density_pTX( | |
| + | |
| + parameter Modelica.Units.SI.Density rho_default=Medium.density_pTX( | |
| p=Medium.p_default, | |
| T=Medium.T_default, | |
| X=Medium.X_default) | |
| "Default density (e.g., rho_liquidWater = 995, rho_air = 1.2)" | |
| annotation (Dialog(group="Advanced")); | |
| - | |
| equation | |
| connect(senMasFlo.m_flow, timDel.m_flow) annotation (Line( | |
| points={{-40,-11},{-40,-40},{-12,-40}}, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/BaseClasses/PlugFlowHeatLoss.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/BaseClasses/PlugFlowHeatLoss.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/BaseClasses/PlugFlowHeatLoss.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/BaseClasses/PlugFlowHeatLoss.mo" 2021-04-26 11:51:07.378619884 +0200 | |
| @@ -11,11 +11,11 @@ | |
| parameter Real R(unit="(m.K)/W") | |
| "Thermal resistance per unit length from fluid to boundary temperature"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal "Nominal mass flow rate"; | |
| - parameter Modelica.SIunits.Temperature T_start | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate"; | |
| + parameter Modelica.Units.SI.Temperature T_start | |
| "Initial output temperature"; | |
| - final parameter Modelica.SIunits.Time tau_char=R*C "Characteristic delay time"; | |
| + final parameter Modelica.Units.SI.Time tau_char=R*C "Characteristic delay time"; | |
| Modelica.Blocks.Interfaces.RealInput tau(unit="s") "Time delay at pipe level" | |
| annotation (Placement(transformation( | |
| @@ -26,21 +26,21 @@ | |
| "Heat port to connect environment (negative if heat is lost to ambient)" | |
| annotation (Placement(transformation(extent={{-10,90},{10,110}}))); | |
| - Modelica.SIunits.Temperature T_a_inflow(start=T_start) | |
| + Modelica.Units.SI.Temperature T_a_inflow(start=T_start) | |
| "Temperature at port_a for inflowing fluid"; | |
| - Modelica.SIunits.Temperature T_b_outflow(start=T_start) | |
| + Modelica.Units.SI.Temperature T_b_outflow(start=T_start) | |
| "Temperature at port_b for outflowing fluid"; | |
| - Modelica.SIunits.Temperature TAmb=heatPort.T "Environment temperature"; | |
| + Modelica.Units.SI.Temperature TAmb=heatPort.T "Environment temperature"; | |
| protected | |
| parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX( | |
| T=Medium.T_default, | |
| p=Medium.p_default, | |
| X=Medium.X_default) "Default medium state"; | |
| - parameter Modelica.SIunits.SpecificHeatCapacity cp_default= | |
| + | |
| + parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= | |
| Medium.specificHeatCapacityCp(state=sta_default) | |
| "Heat capacity of medium"; | |
| - | |
| equation | |
| dp = 0; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/BaseClasses/PlugFlow.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/BaseClasses/PlugFlow.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/BaseClasses/PlugFlow.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/BaseClasses/PlugFlow.mo" 2021-04-26 11:51:07.442619971 +0200 | |
| @@ -3,27 +3,27 @@ | |
| "Lossless pipe model with spatialDistribution plug flow implementation" | |
| extends AixLib.Fluid.Interfaces.PartialTwoPort; | |
| - parameter Modelica.SIunits.Length dh | |
| + parameter Modelica.Units.SI.Length dh | |
| "Hydraulic diameter (assuming a round cross section area)"; | |
| - parameter Modelica.SIunits.Length length(min=0) "Pipe length"; | |
| - final parameter Modelica.SIunits.Area A=Modelica.Constants.pi*(dh/2)^2 | |
| + parameter Modelica.Units.SI.Length length(min=0) "Pipe length"; | |
| + final parameter Modelica.Units.SI.Area A=Modelica.Constants.pi*(dh/2)^2 | |
| "Cross-sectional area of pipe"; | |
| parameter Medium.MassFlowRate m_flow_small | |
| "Small mass flow rate for regularization of zero flow" | |
| annotation(Dialog(tab = "Advanced")); | |
| - parameter Modelica.SIunits.Temperature T_start_in=Medium.T_default | |
| + parameter Modelica.Units.SI.Temperature T_start_in=Medium.T_default | |
| "Initial temperature in pipe at inlet" | |
| annotation (Dialog(group="Initialization")); | |
| - parameter Modelica.SIunits.Temperature T_start_out=Medium.T_default | |
| + parameter Modelica.Units.SI.Temperature T_start_out=Medium.T_default | |
| "Initial temperature in pipe at outlet" | |
| annotation (Dialog(group="Initialization")); | |
| - Modelica.SIunits.Length x | |
| + Modelica.Units.SI.Length x | |
| "Spatial coordinate for spatialDistribution operator"; | |
| - Modelica.SIunits.Velocity v "Flow velocity of medium in pipe"; | |
| + Modelica.Units.SI.Velocity v "Flow velocity of medium in pipe"; | |
| - Modelica.SIunits.VolumeFlowRate V_flow= | |
| + Modelica.Units.SI.VolumeFlowRate V_flow= | |
| port_a.m_flow/Modelica.Fluid.Utilities.regStep(port_a.m_flow, | |
| Medium.density( | |
| Medium.setState_phX( | |
| @@ -40,13 +40,13 @@ | |
| protected | |
| - parameter Modelica.SIunits.SpecificEnthalpy h_ini_in=Medium.specificEnthalpy( | |
| + parameter Modelica.Units.SI.SpecificEnthalpy h_ini_in=Medium.specificEnthalpy( | |
| Medium.setState_pTX( | |
| T=T_start_in, | |
| p=Medium.p_default, | |
| X=Medium.X_default)) "For initialization of spatialDistribution inlet"; | |
| - parameter Modelica.SIunits.SpecificEnthalpy h_ini_out=Medium.specificEnthalpy( | |
| + parameter Modelica.Units.SI.SpecificEnthalpy h_ini_out=Medium.specificEnthalpy( | |
| Medium.setState_pTX( | |
| T=T_start_out, | |
| p=Medium.p_default, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo" 2021-04-26 11:51:07.354619850 +0200 | |
| @@ -1,34 +1,34 @@ | |
| within AixLib.Fluid.FixedResistances.BaseClasses; | |
| model PlugFlowTransportDelay "Delay time for given normalized velocity" | |
| - parameter Modelica.SIunits.Length length "Pipe length"; | |
| - parameter Modelica.SIunits.Length dh | |
| + parameter Modelica.Units.SI.Length length "Pipe length"; | |
| + parameter Modelica.Units.SI.Length dh | |
| "Hydraulic diameter (assuming a round cross section area)"; | |
| - parameter Modelica.SIunits.Density rho "Standard density of fluid"; | |
| + parameter Modelica.Units.SI.Density rho "Standard density of fluid"; | |
| parameter Boolean initDelay=false | |
| "Initialize delay for a constant m_flow_start if true, otherwise start from 0" | |
| annotation (Dialog(group="Initialization")); | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_start=0 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_start=0 | |
| "Initialization of mass flow rate to calculate initial time delay" | |
| annotation (Dialog(group="Initialization", enable=initDelay)); | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal(min=0) | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal(min=0) | |
| "Nominal mass flow rate" annotation (Dialog(group="Nominal condition")); | |
| - final parameter Modelica.SIunits.Time t_in_start= | |
| + final parameter Modelica.Units.SI.Time t_in_start= | |
| if initDelay and (abs(m_flow_start) > 1E-10*m_flow_nominal) | |
| then min(length/m_flow_start*(rho*dh^2/4*Modelica.Constants.pi), 0) else 0 | |
| "Initial value of input time at inlet"; | |
| - final parameter Modelica.SIunits.Time t_out_start= | |
| + final parameter Modelica.Units.SI.Time t_out_start= | |
| if initDelay and (abs(m_flow_start) > 1E-10*m_flow_nominal) | |
| then min(-length/m_flow_start*(rho*dh^2/4*Modelica.Constants.pi), 0) else 0 | |
| "Initial value of input time at outlet"; | |
| - Modelica.SIunits.Time time_out_rev "Reverse flow direction output time"; | |
| - Modelica.SIunits.Time time_out_des "Design flow direction output time"; | |
| + Modelica.Units.SI.Time time_out_rev "Reverse flow direction output time"; | |
| + Modelica.Units.SI.Time time_out_des "Design flow direction output time"; | |
| Real x(start=0) "Spatial coordinate for spatialDistribution operator"; | |
| - Modelica.SIunits.Frequency u "Normalized fluid velocity (1/s)"; | |
| + Modelica.Units.SI.Frequency u "Normalized fluid velocity (1/s)"; | |
| Modelica.Blocks.Interfaces.RealInput m_flow "Mass flow of fluid" annotation ( | |
| Placement(transformation(extent={{-140,-20},{-100,20}}), | |
| @@ -41,8 +41,8 @@ | |
| annotation (Placement(transformation(extent={{100,30},{120,50}}))); | |
| protected | |
| - parameter Modelica.SIunits.Time t0(fixed = false) "Start time of the simulation"; | |
| + parameter Modelica.Units.SI.Time t0(fixed = false) "Start time of the simulation"; | |
| initial equation | |
| x = 0; | |
| t0 = time; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mo" 2021-04-26 11:51:07.314619795 +0200 | |
| @@ -4,16 +4,16 @@ | |
| replaceable package Medium = AixLib.Media.Water "Medium in pipes" | |
| annotation ( | |
| choicesAllMatching=true); | |
| - parameter Modelica.SIunits.Length dh=0.1 | |
| + parameter Modelica.Units.SI.Length dh=0.1 | |
| "Hydraulic diameter (assuming a round cross section area)"; | |
| - parameter Modelica.SIunits.Length dIns = 0.05 | |
| + parameter Modelica.Units.SI.Length dIns = 0.05 | |
| "Thickness of pipe insulation"; | |
| - parameter Modelica.SIunits.ThermalConductivity kIns= 0.028 | |
| + parameter Modelica.Units.SI.ThermalConductivity kIns= 0.028 | |
| "Heat conductivity of pipe insulation"; | |
| - parameter Modelica.SIunits.SpecificHeatCapacity cPip=500 | |
| + parameter Modelica.Units.SI.SpecificHeatCapacity cPip=500 | |
| "Specific heat of pipe wall material. 2300 for PE, 500 for steel"; | |
| - parameter Modelica.SIunits.Density rhoPip=8000 | |
| + parameter Modelica.Units.SI.Density rhoPip=8000 | |
| "Density of pipe wall material. 930 for PE, 8000 for steel"; | |
| parameter Real R=1/(kIns*2*Modelica.Constants.pi/ | |
| @@ -23,7 +23,7 @@ | |
| parameter Real C=rho_default*Modelica.Constants.pi*( | |
| dh/2)^2*cp_default "Thermal capacity per unit length of water in pipe"; | |
| - parameter Modelica.SIunits.Density rho_default=Medium.density_pTX( | |
| + parameter Modelica.Units.SI.Density rho_default=Medium.density_pTX( | |
| p=Medium.p_default, | |
| T=Medium.T_default, | |
| X=Medium.X_default) | |
| @@ -35,7 +35,7 @@ | |
| p=Medium.p_default, | |
| X=Medium.X_default) "Default medium state"; | |
| - parameter Modelica.SIunits.SpecificHeatCapacity cp_default= | |
| + parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= | |
| Medium.specificHeatCapacityCp(state=sta_default) | |
| "Heat capacity of medium"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/CheckValve.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/CheckValve.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/CheckValve.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/CheckValve.mo" 2021-04-26 11:51:07.290619761 +0200 | |
| @@ -10,12 +10,12 @@ | |
| extends AixLib.Fluid.Actuators.BaseClasses.ValveParameters( | |
| rhoStd=Medium.density_pTX(101325, 273.15 + 4, Medium.X_default)); | |
| - parameter Modelica.SIunits.PressureDifference dpFixed_nominal( | |
| + parameter Modelica.Units.SI.PressureDifference dpFixed_nominal( | |
| displayUnit="Pa", min=0) = 0 | |
| "Pressure drop of pipe and other resistances that are in series" | |
| annotation (Dialog(group="Nominal condition")); | |
| - parameter Modelica.SIunits.PressureDifference dpValve_closing = dpValve_nominal/2 | |
| + parameter Modelica.Units.SI.PressureDifference dpValve_closing = dpValve_nominal/2 | |
| "Pressure drop when the check valve starts to close" | |
| annotation(Dialog(group="Nominal condition")); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/HydraulicDiameter.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/HydraulicDiameter.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/HydraulicDiameter.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/HydraulicDiameter.mo" 2021-04-26 11:51:07.186619617 +0200 | |
| @@ -4,25 +4,25 @@ | |
| final deltaM = eta_default*dh/4*Modelica.Constants.pi*ReC/m_flow_nominal_pos, | |
| final dp_nominal=fac*dpStraightPipe_nominal); | |
| - parameter Modelica.SIunits.Length dh=sqrt(4*m_flow_nominal/rho_default/v_nominal/Modelica.Constants.pi) | |
| + parameter Modelica.Units.SI.Length dh=sqrt(4*m_flow_nominal/rho_default/v_nominal/Modelica.Constants.pi) | |
| "Hydraulic diameter (assuming a round cross section area)"; | |
| - parameter Modelica.SIunits.Length length "Length of the pipe"; | |
| + parameter Modelica.Units.SI.Length length "Length of the pipe"; | |
| parameter Real ReC(min=0)=4000 | |
| "Reynolds number where transition to turbulent starts"; | |
| - parameter Modelica.SIunits.Velocity v_nominal = if rho_default < 500 then 1.5 else 0.15 | |
| + parameter Modelica.Units.SI.Velocity v_nominal = if rho_default < 500 then 1.5 else 0.15 | |
| "Velocity at m_flow_nominal (used to compute default value for hydraulic diameter dh)" | |
| annotation(Dialog(group="Nominal condition")); | |
| - parameter Modelica.SIunits.Length roughness(min=0) = 2.5e-5 | |
| + parameter Modelica.Units.SI.Length roughness(min=0) = 2.5e-5 | |
| "Absolute roughness of pipe, with a default for a smooth steel pipe (dummy if use_roughness = false)"; | |
| parameter Real fac(min=1) = 2 | |
| "Factor to take into account resistance of bends etc., fac=dp_nominal/dpStraightPipe_nominal"; | |
| - final parameter Modelica.SIunits.PressureDifference dpStraightPipe_nominal(displayUnit="Pa")= | |
| + final parameter Modelica.Units.SI.PressureDifference dpStraightPipe_nominal(displayUnit="Pa")= | |
| Modelica.Fluid.Pipes.BaseClasses.WallFriction.Detailed.pressureLoss_m_flow( | |
| m_flow=m_flow_nominal, | |
| rho_a=rho_default, | |
| @@ -35,11 +35,11 @@ | |
| m_flow_small=m_flow_small) | |
| "Pressure loss of a straight pipe at m_flow_nominal"; | |
| - Modelica.SIunits.Velocity v = m_flow/(rho_default*ARound) | |
| + Modelica.Units.SI.Velocity v = m_flow/(rho_default*ARound) | |
| "Flow velocity (assuming a round cross section area)"; | |
| protected | |
| - parameter Modelica.SIunits.Area ARound = dh^2*Modelica.Constants.pi/4 | |
| + parameter Modelica.Units.SI.Area ARound = dh^2*Modelica.Constants.pi/4 | |
| "Cross sectional area (assuming a round cross section area)"; | |
| parameter Medium.ThermodynamicState state_default= | |
| @@ -48,10 +48,10 @@ | |
| p=Medium.p_default, | |
| X=Medium.X_default[1:Medium.nXi]) "Default state"; | |
| - parameter Modelica.SIunits.Density rho_default = Medium.density(state_default) | |
| + parameter Modelica.Units.SI.Density rho_default = Medium.density(state_default) | |
| "Density at nominal condition"; | |
| - parameter Modelica.SIunits.DynamicViscosity mu_default = Medium.dynamicViscosity( | |
| + parameter Modelica.Units.SI.DynamicViscosity mu_default = Medium.dynamicViscosity( | |
| state_default) | |
| "Dynamic viscosity at nominal condition"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/HydraulicResistance.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/HydraulicResistance.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/HydraulicResistance.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/HydraulicResistance.mo" 2021-04-26 11:51:07.166619589 +0200 | |
| @@ -13,8 +13,8 @@ | |
| parameter Real zeta(min=0, unit="") | |
| "Pressure loss factor for flow of port_a -> port_b"; | |
| - parameter Modelica.SIunits.Diameter diameter "Diameter of component"; | |
| - parameter Modelica.SIunits.PressureDifference dp_start(displayUnit="Pa") = 0 | |
| + parameter Modelica.Units.SI.Diameter diameter "Diameter of component"; | |
| + parameter Modelica.Units.SI.PressureDifference dp_start(displayUnit="Pa") = 0 | |
| "Guess value of dp = port_a.p - port_b.p" | |
| annotation (Dialog(tab="Advanced")); | |
| parameter Medium.MassFlowRate m_flow_start=0 | |
| @@ -27,16 +27,16 @@ | |
| D=diameter, | |
| zeta=zeta) | |
| "Calculate loss coefficient based on diameter and zeta"; | |
| - parameter Modelica.SIunits.PressureDifference dp_small=1E-4*abs(dp_nominal) | |
| + | |
| + parameter Modelica.Units.SI.PressureDifference dp_small=1E-4*abs(dp_nominal) | |
| "Small pressure difference for regularization of zero pressure difference"; | |
| - parameter Modelica.SIunits.Density rho_default=Medium.density_pTX( | |
| + parameter Modelica.Units.SI.Density rho_default=Medium.density_pTX( | |
| p=Medium.p_default, | |
| T=Medium.T_default, | |
| X=Medium.X_default[1:Medium.nXi]) "Density at nominal condition"; | |
| - Modelica.SIunits.Density rho_a "Density of the fluid at port_a"; | |
| - Modelica.SIunits.Density rho_b "Density of the fluid at port_b"; | |
| - | |
| + Modelica.Units.SI.Density rho_a "Density of the fluid at port_a"; | |
| + Modelica.Units.SI.Density rho_b "Density of the fluid at port_b"; | |
| initial equation | |
| assert(m_flow_nominal_pos > 0, | |
| "m_flow_nominal_pos must be non-zero. Check parameters."); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Junction.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Junction.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Junction.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Junction.mo" 2021-04-26 11:51:07.142619556 +0200 | |
| @@ -26,11 +26,11 @@ | |
| homotopyInitialization=homotopyInitialization, | |
| deltaM=deltaM)); | |
| - parameter Modelica.SIunits.MassFlowRate[3] m_flow_nominal | |
| + parameter Modelica.Units.SI.MassFlowRate[3] m_flow_nominal | |
| "Mass flow rate. Set negative at outflowing ports." | |
| annotation(Dialog(group = "Nominal condition")); | |
| - parameter Modelica.SIunits.Pressure[3] dp_nominal(each displayUnit = "Pa") | |
| + parameter Modelica.Units.SI.Pressure[3] dp_nominal(each displayUnit = "Pa") | |
| "Pressure drop at nominal mass flow rate, set to zero or negative number at outflowing ports." | |
| annotation(Dialog(group = "Nominal condition")); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Pipe.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Pipe.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Pipe.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Pipe.mo" 2021-04-26 11:51:07.110619512 +0200 | |
| @@ -1,4 +1,4 @@ | |
| -within AixLib.Fluid.FixedResistances; | |
| +within AixLib.Fluid.FixedResistances; | |
| model Pipe "Discretized DynamicPipe with heat loss to ambient" | |
| extends Interfaces.PartialTwoPort; | |
| import Modelica.Fluid.Types.ModelStructure; | |
| @@ -8,20 +8,20 @@ | |
| parameter Integer nParallel = 1 "Number of identical parallel pipes" annotation(Dialog(group = "Geometry")); | |
| - parameter Modelica.SIunits.Length length=1 "Length" | |
| + parameter Modelica.Units.SI.Length length=1 "Length" | |
| annotation(Dialog(group = "Geometry")); | |
| parameter Boolean isCircular = true | |
| "=true if cross sectional area is circular" annotation(Dialog(group = "Geometry")); | |
| - parameter Modelica.SIunits.Diameter diameter=parameterPipe.d_i | |
| + parameter Modelica.Units.SI.Diameter diameter=parameterPipe.d_i | |
| "Diameter of circular pipe" annotation(Dialog, enable = isCircular); | |
| - parameter Modelica.SIunits.Area crossArea=Modelica.Constants.pi* | |
| + parameter Modelica.Units.SI.Area crossArea=Modelica.Constants.pi* | |
| diameter*diameter/4 "Inner cross section area" annotation(Dialog(group = "Geometry")); | |
| - parameter Modelica.SIunits.Length perimeter=Modelica.Constants.pi* | |
| + parameter Modelica.Units.SI.Length perimeter=Modelica.Constants.pi* | |
| diameter "Inner perimeter" annotation(Dialog(group = "Geometry")); | |
| - parameter Modelica.SIunits.Height roughness=2.5e-5 | |
| + parameter Modelica.Units.SI.Height roughness=2.5e-5 | |
| "Average height of surface asperities (default: smooth steel pipe)" annotation(Dialog(group = "Geometry")); | |
| - parameter Modelica.SIunits.Length height_ab=0 | |
| + parameter Modelica.Units.SI.Length height_ab=0 | |
| "Height(port_b)-Height(port_a)" annotation(Dialog(group = "Static head")); | |
| replaceable model FlowModel = | |
| @@ -55,7 +55,7 @@ | |
| Modelica.Fluid.Pipes.BaseClasses.HeatTransfer.PartialFlowHeatTransfer | |
| "Wall heat transfer" | |
| annotation (Dialog(tab="Heat transfer",enable=use_HeatTransfer),choicesAllMatching=true); | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hCon_i=1000 "Heat tranfer coefficient from fluid to pipe wall"; | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hCon_i=1000 "Heat tranfer coefficient from fluid to pipe wall"; | |
| parameter AixLib.DataBase.Pipes.PipeBaseDataDefinition parameterPipe= | |
| AixLib.DataBase.Pipes.Copper.Copper_6x1() "Pipe type" | |
| annotation (choicesAllMatching=true, Dialog(tab="Heat transfer")); | |
| @@ -63,7 +63,7 @@ | |
| AixLib.DataBase.Pipes.Insulation.Iso0pc() "Insulation Type" | |
| annotation (choicesAllMatching=true, Dialog(tab="Heat transfer")); | |
| - parameter Modelica.SIunits.CoefficientOfHeatTransfer hCon=8 "Heat transfer coefficient to ambient" | |
| + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hCon=8 "Heat transfer coefficient to ambient" | |
| annotation (Dialog(tab="Heat transfer", enable=Heat_Loss_To_Ambient)); | |
| Utilities.HeatTransfer.CylindricHeatTransfer PipeWall[nNodes]( | |
| rho=fill(parameterPipe.d, nNodes), | |
| @@ -196,7 +196,7 @@ | |
| extent={{-10,-10},{10,10}}, | |
| rotation=90, | |
| origin={-58,28}))); | |
| -parameter Modelica.SIunits.Emissivity eps = 0.8 "Emissivity" | |
| +parameter Modelica.Units.SI.Emissivity eps = 0.8 "Emissivity" | |
| annotation (Dialog(tab="Heat transfer", enable = Heat_Loss_To_Ambient)); | |
| Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a heatPort_outside annotation (Placement(transformation(extent={{26,72}, | |
| {46,92}}), | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/PlugFlowPipe.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/PlugFlowPipe.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/PlugFlowPipe.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/PlugFlowPipe.mo" 2021-04-26 11:51:07.030619402 +0200 | |
| @@ -7,61 +7,61 @@ | |
| "= true, use m_flow = f(dp) else dp = f(m_flow)" | |
| annotation (Dialog(tab="Advanced")); | |
| - parameter Modelica.SIunits.Length dh=sqrt(4*m_flow_nominal/rho_default/v_nominal/Modelica.Constants.pi) | |
| + parameter Modelica.Units.SI.Length dh=sqrt(4*m_flow_nominal/rho_default/v_nominal/Modelica.Constants.pi) | |
| "Hydraulic diameter (assuming a round cross section area)" | |
| annotation (Dialog(group="Material")); | |
| - parameter Modelica.SIunits.Velocity v_nominal = 1.5 | |
| + parameter Modelica.Units.SI.Velocity v_nominal = 1.5 | |
| "Velocity at m_flow_nominal (used to compute default value for hydraulic diameter dh)" | |
| annotation(Dialog(group="Nominal condition")); | |
| parameter Real ReC=4000 | |
| "Reynolds number where transition to turbulent starts"; | |
| - parameter Modelica.SIunits.Height roughness=2.5e-5 | |
| + parameter Modelica.Units.SI.Height roughness=2.5e-5 | |
| "Average height of surface asperities (default: smooth steel pipe)" | |
| annotation (Dialog(group="Material")); | |
| - parameter Modelica.SIunits.Length length "Pipe length" | |
| + parameter Modelica.Units.SI.Length length "Pipe length" | |
| annotation (Dialog(group="Material")); | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal | |
| "Nominal mass flow rate" annotation (Dialog(group="Nominal condition")); | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_small = 1E-4*abs( | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_small = 1E-4*abs( | |
| m_flow_nominal) "Small mass flow rate for regularization of zero flow" | |
| annotation (Dialog(tab="Advanced")); | |
| - parameter Modelica.SIunits.Length dIns | |
| + parameter Modelica.Units.SI.Length dIns | |
| "Thickness of pipe insulation, used to compute R" | |
| annotation (Dialog(group="Thermal resistance")); | |
| - parameter Modelica.SIunits.ThermalConductivity kIns | |
| + parameter Modelica.Units.SI.ThermalConductivity kIns | |
| "Heat conductivity of pipe insulation, used to compute R" | |
| annotation (Dialog(group="Thermal resistance")); | |
| - parameter Modelica.SIunits.SpecificHeatCapacity cPip=2300 | |
| + parameter Modelica.Units.SI.SpecificHeatCapacity cPip=2300 | |
| "Specific heat of pipe wall material. 2300 for PE, 500 for steel" | |
| annotation (Dialog(group="Material")); | |
| - parameter Modelica.SIunits.Density rhoPip(displayUnit="kg/m3")=930 | |
| + parameter Modelica.Units.SI.Density rhoPip(displayUnit="kg/m3")=930 | |
| "Density of pipe wall material. 930 for PE, 8000 for steel" | |
| annotation (Dialog(group="Material")); | |
| - parameter Modelica.SIunits.Length thickness = 0.0035 | |
| + parameter Modelica.Units.SI.Length thickness = 0.0035 | |
| "Pipe wall thickness" | |
| annotation (Dialog(group="Material")); | |
| - parameter Modelica.SIunits.Temperature T_start_in(start=Medium.T_default)= | |
| + parameter Modelica.Units.SI.Temperature T_start_in(start=Medium.T_default)= | |
| Medium.T_default "Initialization temperature at pipe inlet" | |
| annotation (Dialog(tab="Initialization")); | |
| - parameter Modelica.SIunits.Temperature T_start_out(start=Medium.T_default)= | |
| + parameter Modelica.Units.SI.Temperature T_start_out(start=Medium.T_default)= | |
| T_start_in "Initialization temperature at pipe outlet" | |
| annotation (Dialog(tab="Initialization")); | |
| parameter Boolean initDelay(start=false) = false | |
| "Initialize delay for a constant mass flow rate if true, otherwise start from 0" | |
| annotation (Dialog(tab="Initialization")); | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_start=0 "Initial value of mass flow rate through pipe" | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_start=0 "Initial value of mass flow rate through pipe" | |
| annotation (Dialog(tab="Initialization", enable=initDelay)); | |
| parameter Real R(unit="(m.K)/W")=1/(kIns*2*Modelica.Constants.pi/ | |
| @@ -125,10 +125,10 @@ | |
| annotation (Placement(transformation(extent={{60,20},{80,40}}))); | |
| protected | |
| - parameter Modelica.SIunits.HeatCapacity CPip= | |
| + parameter Modelica.Units.SI.HeatCapacity CPip= | |
| length*((dh + 2*thickness)^2 - dh^2)*Modelica.Constants.pi/4*cPip*rhoPip "Heat capacity of pipe wall"; | |
| - final parameter Modelica.SIunits.Volume VEqu=CPip/(rho_default*cp_default) | |
| + final parameter Modelica.Units.SI.Volume VEqu=CPip/(rho_default*cp_default) | |
| "Equivalent water volume to represent pipe wall thermal inertia"; | |
| parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX( | |
| @@ -136,7 +136,7 @@ | |
| p=Medium.p_default, | |
| X=Medium.X_default) "Default medium state"; | |
| - parameter Modelica.SIunits.SpecificHeatCapacity cp_default= | |
| + parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= | |
| Medium.specificHeatCapacityCp(state=sta_default) | |
| "Heat capacity of medium"; | |
| @@ -144,13 +144,13 @@ | |
| rho_default*Modelica.Constants.pi*(dh/2)^2*cp_default | |
| "Thermal capacity per unit length of water in pipe"; | |
| - parameter Modelica.SIunits.Density rho_default=Medium.density_pTX( | |
| + | |
| + parameter Modelica.Units.SI.Density rho_default=Medium.density_pTX( | |
| p=Medium.p_default, | |
| T=Medium.T_default, | |
| X=Medium.X_default) | |
| "Default density (e.g., rho_liquidWater = 995, rho_air = 1.2)" | |
| annotation (Dialog(group="Advanced")); | |
| - | |
| equation | |
| for i in 1:nPorts loop | |
| connect(vol.ports[i + 1], ports_b[i]) | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/PipeDataULg.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/PipeDataULg.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/PipeDataULg.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/PipeDataULg.mo" 2021-04-26 11:51:06.906619230 +0200 | |
| @@ -1,11 +1,11 @@ | |
| within AixLib.Fluid.FixedResistances.Validation.PlugFlowPipes.Data.BaseClasses; | |
| partial record PipeDataULg "Base class for ULg experimental data" | |
| extends PipeDataBaseDefinition; | |
| - parameter Modelica.SIunits.Temp_C T_start_in = 20 | |
| + parameter Modelica.Units.NonSI.Temperature_degC T_start_in = 20 | |
| "Initial temperature at inlet"; | |
| - parameter Modelica.SIunits.Temp_C T_start_out = 20 | |
| + parameter Modelica.Units.NonSI.Temperature_degC T_start_out = 20 | |
| "Initial temperature at outlet"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flowIni = 0 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flowIni = 0 | |
| "Mass flow initialization"; | |
| annotation (Documentation(info="<html> | |
| <p> | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT2Nodes.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT2Nodes.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT2Nodes.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT2Nodes.mo" 2021-04-26 11:51:06.466618621 +0200 | |
| @@ -245,11 +245,11 @@ | |
| extent={{-10,-10},{10,10}}, | |
| rotation=90, | |
| origin={-28,68}))); | |
| - parameter Modelica.SIunits.ThermalConductivity kIns=0.024 | |
| + parameter Modelica.Units.SI.ThermalConductivity kIns=0.024 | |
| "Heat conductivity"; | |
| - parameter Modelica.SIunits.Length dIns=0.045 | |
| + parameter Modelica.Units.SI.Length dIns=0.045 | |
| "Thickness of pipe insulation"; | |
| - parameter Modelica.SIunits.Diameter diameter=0.089 | |
| + parameter Modelica.Units.SI.Diameter diameter=0.089 | |
| "Outer diameter of pipe"; | |
| Fluid.Sensors.TemperatureTwoPort | |
| senTem_p2(redeclare package Medium = Medium, | |
| @@ -290,9 +290,9 @@ | |
| rotation=90, | |
| origin={18,112}))); | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 | |
| "Nominal mass flow rate, used for regularization near zero flow"; | |
| - parameter Modelica.SIunits.Time tauHeaTra=6500 | |
| + parameter Modelica.Units.SI.Time tauHeaTra=6500 | |
| "Time constant for heat transfer, default 20 minutes"; | |
| Modelica.Blocks.Logical.Switch switch | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT.mo" 2021-04-26 11:51:06.558618748 +0200 | |
| @@ -83,10 +83,10 @@ | |
| origin={124,-8}))); | |
| inner Modelica.Fluid.System system | |
| annotation (Placement(transformation(extent={{-140,140},{-120,160}}))); | |
| - parameter Modelica.SIunits.ThermalResistance R= | |
| + parameter Modelica.Units.SI.ThermalResistance R= | |
| 1/(2*kIns*Modelica.Constants.pi)*log(0.18/0.0899) + 1/(2*2.4*Modelica.Constants.pi)*log(2/0.18) | |
| "Thermal resistance of main pipes"; | |
| - parameter Modelica.SIunits.ThermalResistance R80= | |
| + parameter Modelica.Units.SI.ThermalResistance R80= | |
| 1/(2*0.024*Modelica.Constants.pi)*log(0.07/0.0337) + 1/(2*2.4*Modelica.Constants.pi)*log(2/0.07) | |
| "Thermal resistance of service pipes"; | |
| @@ -246,11 +246,11 @@ | |
| extent={{-10,-10},{10,10}}, | |
| rotation=90, | |
| origin={-22,62}))); | |
| - parameter Modelica.SIunits.ThermalConductivity kIns=0.024 | |
| + parameter Modelica.Units.SI.ThermalConductivity kIns=0.024 | |
| "Heat conductivity of pipe insulation material"; | |
| - parameter Modelica.SIunits.Length dIns=0.045 | |
| + parameter Modelica.Units.SI.Length dIns=0.045 | |
| "Thickness of pipe insulation"; | |
| - parameter Modelica.SIunits.Diameter diameter=0.089 | |
| + parameter Modelica.Units.SI.Diameter diameter=0.089 | |
| "Outer diameter of pipe"; | |
| Fluid.Sensors.TemperatureTwoPort | |
| senTem_p2(redeclare package Medium = Medium, | |
| @@ -291,9 +291,9 @@ | |
| rotation=90, | |
| origin={42,80}))); | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 | |
| "Nominal mass flow rate, used for regularization near zero flow"; | |
| - parameter Modelica.SIunits.Time tauHeaTra=6500 | |
| + parameter Modelica.Units.SI.Time tauHeaTra=6500 | |
| "Time constant for heat transfer, default 20 minutes"; | |
| Fluid.Sources.MassFlowSource_T Point5( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo" 2021-04-26 11:51:06.378618499 +0200 | |
| @@ -3,7 +3,7 @@ | |
| "Validation pipe against data from Austrian Institute of Technology" | |
| extends Modelica.Icons.Example; | |
| package Medium = AixLib.Media.Water; | |
| - parameter Modelica.SIunits.Length Lcap=1 | |
| + parameter Modelica.Units.SI.Length Lcap=1 | |
| "Length over which transient effects typically take place"; | |
| parameter Real R80(unit="(m.K)/W")=1/(2*0.024*Modelica.Constants.pi) | |
| *log(0.07/0.0337) + 1/(2*2.4*Modelica.Constants.pi)*log(2/0.07) "Thermal resistance per unit length of service pipes"; | |
| @@ -12,12 +12,12 @@ | |
| "Flag to decide whether volumes are included at the end points of the pipe"; | |
| parameter Boolean allowFlowReversal=true | |
| "= true to allow flow reversal, false restricts to design direction (port_a -> port_b)"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 | |
| "Nominal mass flow rate, used for regularization near zero flow"; | |
| - parameter Modelica.SIunits.Time tauHeaTra=6500 | |
| + parameter Modelica.Units.SI.Time tauHeaTra=6500 | |
| "Time constant for heat transfer, default 20 minutes"; | |
| - parameter Modelica.SIunits.Length thickness=0.0032 "Pipe wall thickness"; | |
| + parameter Modelica.Units.SI.Length thickness=0.0032 "Pipe wall thickness"; | |
| Fluid.Sources.MassFlowSource_T Point1( | |
| redeclare package Medium = Medium, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mo" 2021-04-26 11:51:06.278618361 +0200 | |
| @@ -3,13 +3,13 @@ | |
| extends Modelica.Icons.Example; | |
| package Medium = AixLib.Media.Water; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1 | |
| "Nominal mass flow rate, used for regularization near zero flow"; | |
| - parameter Modelica.SIunits.Temperature T_start_in=pipeDataULg.T_start_in + 273.15 | |
| + parameter Modelica.Units.SI.Temperature T_start_in=pipeDataULg.T_start_in + 273.15 | |
| "Initial temperature at pipe inlet"; | |
| - parameter Modelica.SIunits.Temperature T_start_out=pipeDataULg.T_start_out + 273.15 | |
| + parameter Modelica.Units.SI.Temperature T_start_out=pipeDataULg.T_start_out + 273.15 | |
| "Initial temperature at pipe outlet"; | |
| - parameter Modelica.SIunits.SpecificHeatCapacity cp_default= | |
| + parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= | |
| Medium.specificHeatCapacityCp(state=sta_default) | |
| "Heat capacity of medium"; | |
| parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mo" 2021-04-26 11:51:06.238618305 +0200 | |
| @@ -6,7 +6,7 @@ | |
| package MediumA = AixLib.Media.Air(extraPropertiesNames={"CO2"}) | |
| "Medium in the duct"; | |
| - parameter Modelica.SIunits.Length length=20 "Pipe length"; | |
| + parameter Modelica.Units.SI.Length length=20 "Pipe length"; | |
| Modelica.Blocks.Sources.Step Tin( | |
| startTime=100, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Validation/PressureDropsSeries.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Validation/PressureDropsSeries.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Validation/PressureDropsSeries.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FixedResistances/Validation/PressureDropsSeries.mo" 2021-04-26 11:51:06.178618221 +0200 | |
| @@ -6,7 +6,7 @@ | |
| parameter Integer nRes(min=2) = 10 "Number of resistances"; | |
| - parameter Modelica.SIunits.PressureDifference dp_nominal = 5 | |
| + parameter Modelica.Units.SI.PressureDifference dp_nominal = 5 | |
| "Nominal pressure drop for each resistance"; | |
| Modelica.Blocks.Sources.Ramp P( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mo" 2021-04-26 11:51:08.534621483 +0200 | |
| @@ -10,12 +10,12 @@ | |
| "Adaptor for an HVAC system that is exposed through an FMI interface" | |
| annotation (Placement(transformation(extent={{20,0},{40,20}}))); | |
| - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 30*6*6 | |
| + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 30*6*6 | |
| "Nominal heat loss of the room"; | |
| - parameter Modelica.SIunits.Volume VRoo = 6*6*2.7 "Room volume"; | |
| + parameter Modelica.Units.SI.Volume VRoo = 6*6*2.7 "Room volume"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=VRoo*2*1.2/3600 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=VRoo*2*1.2/3600 | |
| "Nominal mass flow rate"; | |
| AixLib.Fluid.FMI.Adaptors.ThermalZone con( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo" 2021-04-26 11:51:08.254621096 +0200 | |
| @@ -8,9 +8,9 @@ | |
| false, | |
| energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)); | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.01 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.01 | |
| "Nominal mass flow rate"; | |
| - parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=500 | |
| + parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=500 | |
| "Pressure drop at nominal mass flow rate"; | |
| Modelica.Blocks.Interfaces.RealInput dp_in(min=0, final unit="Pa") | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/HeaterCooler_u.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/HeaterCooler_u.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/HeaterCooler_u.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/HeaterCooler_u.mo" 2021-04-26 11:51:08.118620907 +0200 | |
| @@ -10,11 +10,11 @@ | |
| massDynamics=Modelica.Fluid.Types.Dynamics.SteadyState, | |
| energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)); | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.01 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.01 | |
| "Nominal mass flow rate"; | |
| - parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=0 | |
| + parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=0 | |
| "Pressure"; | |
| - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal=100 | |
| + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal=100 | |
| "Heat flow rate at u=1, positive for heating"; | |
| Modelica.Blocks.Interfaces.RealInput u(min=0, max=1, unit="1") | |
| "Control input" | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/Heater_T.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/Heater_T.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/Heater_T.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/Heater_T.mo" 2021-04-26 11:51:08.102620885 +0200 | |
| @@ -9,13 +9,13 @@ | |
| final QMax_flow=QMax_flow, | |
| final energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)); | |
| - parameter Modelica.SIunits.HeatFlowRate QMax_flow=Modelica.Constants.inf | |
| + parameter Modelica.Units.SI.HeatFlowRate QMax_flow=Modelica.Constants.inf | |
| "Maximum heat flow rate for heating (positive)"; | |
| - parameter Modelica.SIunits.HeatFlowRate QMin_flow=-Modelica.Constants.inf | |
| + parameter Modelica.Units.SI.HeatFlowRate QMin_flow=-Modelica.Constants.inf | |
| "Maximum heat flow rate for cooling (negative)"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.01 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.01 | |
| "Nominal mass flow rate"; | |
| - parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=0 | |
| + parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=0 | |
| "Pressure"; | |
| Modelica.Blocks.Interfaces.RealInput TSet(unit="K", displayUnit="degC") | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/Humidifier_u.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/Humidifier_u.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/Humidifier_u.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/Humidifier_u.mo" 2021-04-26 11:51:08.082620857 +0200 | |
| @@ -10,13 +10,13 @@ | |
| massDynamics=Modelica.Fluid.Types.Dynamics.SteadyState, | |
| final energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)); | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.01 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.01 | |
| "Nominal mass flow rate"; | |
| - parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=0 | |
| + parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=0 | |
| "Pressure"; | |
| - parameter Modelica.SIunits.MassFlowRate mWat_flow_nominal=0.01*0.005 | |
| + parameter Modelica.Units.SI.MassFlowRate mWat_flow_nominal=0.01*0.005 | |
| "Water mass flow rate at u=1, positive for humidification"; | |
| Modelica.Blocks.Interfaces.RealInput u(min=0, max=1, unit="1") | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZone.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZone.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZone.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZone.mo" 2021-04-26 11:51:08.230621063 +0200 | |
| @@ -17,40 +17,40 @@ | |
| ///////////////////////////////////////////////////////// | |
| // Air temperatures at design conditions | |
| - parameter Modelica.SIunits.Temperature TASup_nominal = 273.15+18 | |
| + parameter Modelica.Units.SI.Temperature TASup_nominal = 273.15+18 | |
| "Nominal air temperature supplied to room"; | |
| - parameter Modelica.SIunits.Temperature TRooSet = 273.15+24 | |
| + parameter Modelica.Units.SI.Temperature TRooSet = 273.15+24 | |
| "Nominal room air temperature"; | |
| - parameter Modelica.SIunits.Temperature TOut_nominal = 273.15+30 | |
| + parameter Modelica.Units.SI.Temperature TOut_nominal = 273.15+30 | |
| "Design outlet air temperature"; | |
| - parameter Modelica.SIunits.Temperature THeaRecLvg= | |
| + parameter Modelica.Units.SI.Temperature THeaRecLvg= | |
| TOut_nominal - eps*(TOut_nominal-TRooSet) | |
| "Air temperature leaving the heat recovery"; | |
| ///////////////////////////////////////////////////////// | |
| // Cooling loads and air mass flow rates | |
| parameter Real UA(unit="W/K") = 10E3 "Average UA-value of the room"; | |
| - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow= | |
| + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow= | |
| 1000 "Internal heat gains of the room"; | |
| - parameter Modelica.SIunits.HeatFlowRate QRooC_flow_nominal= | |
| + parameter Modelica.Units.SI.HeatFlowRate QRooC_flow_nominal= | |
| -QRooInt_flow-UA/30*(TOut_nominal-TRooSet) | |
| "Nominal cooling load of the room"; | |
| - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal= | |
| + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal= | |
| 1.3*QRooC_flow_nominal/1006/(TASup_nominal-TRooSet) | |
| "Nominal air mass flow rate, increased by factor 1.3 to allow for recovery after temperature setback"; | |
| - parameter Modelica.SIunits.TemperatureDifference dTFan = 2 | |
| + parameter Modelica.Units.SI.TemperatureDifference dTFan = 2 | |
| "Estimated temperature raise across fan that needs to be made up by the cooling coil"; | |
| - parameter Modelica.SIunits.HeatFlowRate QCoiC_flow_nominal=4* | |
| + parameter Modelica.Units.SI.HeatFlowRate QCoiC_flow_nominal=4* | |
| (QRooC_flow_nominal + mA_flow_nominal*(TASup_nominal-THeaRecLvg-dTFan)*1006) | |
| "Cooling load of coil, taking into account economizer, and increased due to latent heat removal"; | |
| ///////////////////////////////////////////////////////// | |
| // Water temperatures and mass flow rates | |
| - parameter Modelica.SIunits.Temperature TWSup_nominal = 273.15+16 | |
| + parameter Modelica.Units.SI.Temperature TWSup_nominal = 273.15+16 | |
| "Water supply temperature"; | |
| - parameter Modelica.SIunits.Temperature TWRet_nominal = 273.15+12 | |
| + parameter Modelica.Units.SI.Temperature TWRet_nominal = 273.15+12 | |
| "Water return temperature"; | |
| - parameter Modelica.SIunits.MassFlowRate mW_flow_nominal= | |
| + parameter Modelica.Units.SI.MassFlowRate mW_flow_nominal= | |
| QCoiC_flow_nominal/(TWRet_nominal-TWSup_nominal)/4200 | |
| "Nominal water mass flow rate"; | |
| ///////////////////////////////////////////////////////// | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo" 2021-04-26 11:51:08.182620996 +0200 | |
| @@ -20,40 +20,40 @@ | |
| ///////////////////////////////////////////////////////// | |
| // Air temperatures at design conditions | |
| - parameter Modelica.SIunits.Temperature TASup_nominal = 273.15+18 | |
| + parameter Modelica.Units.SI.Temperature TASup_nominal = 273.15+18 | |
| "Nominal air temperature supplied to room"; | |
| - parameter Modelica.SIunits.Temperature TRooSet = 273.15+24 | |
| + parameter Modelica.Units.SI.Temperature TRooSet = 273.15+24 | |
| "Nominal room air temperature"; | |
| - parameter Modelica.SIunits.Temperature TOut_nominal = 273.15+30 | |
| + parameter Modelica.Units.SI.Temperature TOut_nominal = 273.15+30 | |
| "Design outlet air temperature"; | |
| - parameter Modelica.SIunits.Temperature THeaRecLvg= | |
| + parameter Modelica.Units.SI.Temperature THeaRecLvg= | |
| TOut_nominal - eps*(TOut_nominal-TRooSet) | |
| "Air temperature leaving the heat recovery"; | |
| ///////////////////////////////////////////////////////// | |
| // Cooling loads and air mass flow rates | |
| parameter Real UA(unit="W/K") = 10E3 "Average UA-value of the room"; | |
| - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow= | |
| + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow= | |
| 1000 "Internal heat gains of the room"; | |
| - parameter Modelica.SIunits.HeatFlowRate QRooC_flow_nominal= | |
| + parameter Modelica.Units.SI.HeatFlowRate QRooC_flow_nominal= | |
| -QRooInt_flow-UA/30*(TOut_nominal-TRooSet) | |
| "Nominal cooling load of the room"; | |
| - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal= | |
| + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal= | |
| 1.3*QRooC_flow_nominal/1006/(TASup_nominal-TRooSet) | |
| "Nominal air mass flow rate, increased by factor 1.3 to allow for recovery after temperature setback"; | |
| - parameter Modelica.SIunits.TemperatureDifference dTFan = 2 | |
| + parameter Modelica.Units.SI.TemperatureDifference dTFan = 2 | |
| "Estimated temperature raise across fan that needs to be made up by the cooling coil"; | |
| - parameter Modelica.SIunits.HeatFlowRate QCoiC_flow_nominal=4* | |
| + parameter Modelica.Units.SI.HeatFlowRate QCoiC_flow_nominal=4* | |
| (QRooC_flow_nominal + mA_flow_nominal*(TASup_nominal-THeaRecLvg-dTFan)*1006) | |
| "Cooling load of coil, taking into account economizer, and increased due to latent heat removal"; | |
| ///////////////////////////////////////////////////////// | |
| // Water temperatures and mass flow rates | |
| - parameter Modelica.SIunits.Temperature TWSup_nominal = 273.15+16 | |
| + parameter Modelica.Units.SI.Temperature TWSup_nominal = 273.15+16 | |
| "Water supply temperature"; | |
| - parameter Modelica.SIunits.Temperature TWRet_nominal = 273.15+12 | |
| + parameter Modelica.Units.SI.Temperature TWRet_nominal = 273.15+12 | |
| "Water return temperature"; | |
| - parameter Modelica.SIunits.MassFlowRate mW_flow_nominal= | |
| + parameter Modelica.Units.SI.MassFlowRate mW_flow_nominal= | |
| QCoiC_flow_nominal/(TWRet_nominal-TWSup_nominal)/4200 | |
| "Nominal water mass flow rate"; | |
| ///////////////////////////////////////////////////////// | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/MixingVolume.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/MixingVolume.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/MixingVolume.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/MixingVolume.mo" 2021-04-26 11:51:08.058620824 +0200 | |
| @@ -3,10 +3,10 @@ | |
| extends AixLib.Fluid.FMI.ExportContainers.PartialTwoPort( | |
| redeclare package Medium = AixLib.Media.Air); | |
| - parameter Modelica.SIunits.Volume V=1 "Volume"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.01 | |
| - "Nominal mass flow rate"; | |
| + parameter Modelica.Units.SI.Volume V=1 "Volume"; | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.01 | |
| + "Nominal mass flow rate"; | |
| protected | |
| AixLib.Fluid.FMI.Adaptors.Inlet bouIn( | |
| redeclare final package Medium=Medium, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/PressureDrop.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/PressureDrop.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/PressureDrop.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/PressureDrop.mo" 2021-04-26 11:51:08.046620808 +0200 | |
| @@ -6,9 +6,9 @@ | |
| AixLib.Fluid.FixedResistances.PressureDrop com(final m_flow_nominal= | |
| m_flow_nominal, final dp_nominal=if use_p_in then dp_nominal else 0)); | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.01 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.01 | |
| "Nominal mass flow rate"; | |
| - parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=100 | |
| + parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=100 | |
| "Pressure drop at nominal mass flow rate"; | |
| annotation ( | |
| Documentation(info="<html> | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/ResistanceVolume.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/ResistanceVolume.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/ResistanceVolume.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/ResistanceVolume.mo" 2021-04-26 11:51:08.034620790 +0200 | |
| @@ -4,10 +4,10 @@ | |
| extends AixLib.Fluid.FMI.ExportContainers.PartialTwoPort( | |
| redeclare package Medium = AixLib.Media.Air); | |
| - parameter Modelica.SIunits.Volume V=1 "Volume"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.01 | |
| + parameter Modelica.Units.SI.Volume V=1 "Volume"; | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.01 | |
| "Nominal mass flow rate"; | |
| - parameter Modelica.SIunits.PressureDifference dp_nominal=100 | |
| + parameter Modelica.Units.SI.PressureDifference dp_nominal=100 | |
| "Nominal pressure drop"; | |
| Modelica.Blocks.Sources.RealExpression dpCom(y=res.port_a.p - res.port_b.p) if | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZone.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZone.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZone.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZone.mo" 2021-04-26 11:51:08.014620762 +0200 | |
| @@ -7,25 +7,25 @@ | |
| replaceable package MediumA = AixLib.Media.Air "Medium for air"; | |
| - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; | |
| + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; | |
| ///////////////////////////////////////////////////////// | |
| // Air temperatures at design conditions | |
| - parameter Modelica.SIunits.Temperature TASup_nominal = 273.15+18 | |
| + parameter Modelica.Units.SI.Temperature TASup_nominal = 273.15+18 | |
| "Nominal air temperature supplied to room"; | |
| - parameter Modelica.SIunits.Temperature TRooSet = 273.15+24 | |
| + parameter Modelica.Units.SI.Temperature TRooSet = 273.15+24 | |
| "Nominal room air temperature"; | |
| - parameter Modelica.SIunits.Temperature TOut_nominal = 273.15+30 | |
| + parameter Modelica.Units.SI.Temperature TOut_nominal = 273.15+30 | |
| "Design outlet air temperature"; | |
| ///////////////////////////////////////////////////////// | |
| // Cooling loads and air mass flow rates | |
| - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow= | |
| + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow= | |
| 1000 "Internal heat gains of the room"; | |
| - parameter Modelica.SIunits.HeatFlowRate QRooC_flow_nominal= | |
| + parameter Modelica.Units.SI.HeatFlowRate QRooC_flow_nominal= | |
| -QRooInt_flow-10E3/30*(TOut_nominal-TRooSet) | |
| "Nominal cooling load of the room"; | |
| - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal= | |
| + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal= | |
| 1.3*QRooC_flow_nominal/1006/(TASup_nominal-TRooSet) | |
| "Nominal air mass flow rate, increased by factor 1.3 to allow for recovery after temperature setback"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZones.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZones.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZones.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZones.mo" 2021-04-26 11:51:07.986620724 +0200 | |
| @@ -8,25 +8,25 @@ | |
| replaceable package MediumA = AixLib.Media.Air "Medium for air"; | |
| - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; | |
| + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; | |
| ///////////////////////////////////////////////////////// | |
| // Air temperatures at design conditions | |
| - parameter Modelica.SIunits.Temperature TASup_nominal = 273.15+18 | |
| + parameter Modelica.Units.SI.Temperature TASup_nominal = 273.15+18 | |
| "Nominal air temperature supplied to room"; | |
| - parameter Modelica.SIunits.Temperature TRooSet = 273.15+24 | |
| + parameter Modelica.Units.SI.Temperature TRooSet = 273.15+24 | |
| "Nominal room air temperature"; | |
| - parameter Modelica.SIunits.Temperature TOut_nominal = 273.15+30 | |
| + parameter Modelica.Units.SI.Temperature TOut_nominal = 273.15+30 | |
| "Design outlet air temperature"; | |
| ///////////////////////////////////////////////////////// | |
| // Cooling loads and air mass flow rates | |
| - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow= | |
| + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow= | |
| 1000 "Internal heat gains of the room"; | |
| - parameter Modelica.SIunits.HeatFlowRate QRooC_flow_nominal= | |
| + parameter Modelica.Units.SI.HeatFlowRate QRooC_flow_nominal= | |
| -QRooInt_flow-10E3/30*(TOut_nominal-TRooSet) | |
| "Nominal cooling load of the room"; | |
| - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal= | |
| + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal= | |
| 1.3*QRooC_flow_nominal/1006/(TASup_nominal-TRooSet) | |
| "Nominal air mass flow rate, increased by factor 1.3 to allow for recovery after temperature setback"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Validation/FMUs/ThermalZoneAir1.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Validation/FMUs/ThermalZoneAir1.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Validation/FMUs/ThermalZoneAir1.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/ExportContainers/Validation/FMUs/ThermalZoneAir1.mo" 2021-04-26 11:51:07.750620398 +0200 | |
| @@ -4,25 +4,25 @@ | |
| redeclare package Medium = AixLib.Media.Air, | |
| nPorts = 2); | |
| - parameter Modelica.SIunits.Volume V=6*10*3 "Room volume"; | |
| + parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume"; | |
| ///////////////////////////////////////////////////////// | |
| // Air temperatures at design conditions | |
| - parameter Modelica.SIunits.Temperature TASup_nominal = 273.15+18 | |
| + parameter Modelica.Units.SI.Temperature TASup_nominal = 273.15+18 | |
| "Nominal air temperature supplied to room"; | |
| - parameter Modelica.SIunits.Temperature TRooSet = 273.15+24 | |
| + parameter Modelica.Units.SI.Temperature TRooSet = 273.15+24 | |
| "Nominal room air temperature"; | |
| - parameter Modelica.SIunits.Temperature TOut_nominal = 273.15+30 | |
| + parameter Modelica.Units.SI.Temperature TOut_nominal = 273.15+30 | |
| "Design outlet air temperature"; | |
| ///////////////////////////////////////////////////////// | |
| // Cooling loads and air mass flow rates | |
| - parameter Modelica.SIunits.HeatFlowRate QRooInt_flow= | |
| + parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow= | |
| 1000 "Internal heat gains of the room"; | |
| - parameter Modelica.SIunits.HeatFlowRate QRooC_flow_nominal= | |
| + parameter Modelica.Units.SI.HeatFlowRate QRooC_flow_nominal= | |
| -QRooInt_flow-10E3/30*(TOut_nominal-TRooSet) | |
| "Nominal cooling load of the room"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal= | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= | |
| 1.3*QRooC_flow_nominal/1006/(TASup_nominal-TRooSet) | |
| "Nominal air mass flow rate, increased by factor 1.3 to allow for recovery after temperature setback"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/FlowSplitter_u.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/FlowSplitter_u.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/FlowSplitter_u.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/FlowSplitter_u.mo" 2021-04-26 11:51:07.690620314 +0200 | |
| @@ -13,7 +13,7 @@ | |
| X_a=0.40) | |
| "Propylene glycol water, 40% mass fraction"))); | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal[nout]( | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal[nout]( | |
| each min=0) "Nominal mass flow rate for each outlet"; | |
| parameter Boolean allowFlowReversal = true | |
| "= true to allow flow reversal, false restricts to design direction (inlet -> outlet)" | |
| @@ -41,7 +41,7 @@ | |
| annotation (Placement(transformation(extent={{-140,60},{-100,100}}), | |
| iconTransformation(extent={{-120,70},{-100,90}}))); | |
| protected | |
| - final parameter Modelica.SIunits.MassFlowRate mAve_flow_nominal= | |
| + final parameter Modelica.Units.SI.MassFlowRate mAve_flow_nominal= | |
| sum(m_flow_nominal)/nout "Average nominal mass flow rate"; | |
| protected | |
| AixLib.Fluid.FMI.Interfaces.FluidProperties bacPro_internal( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/Interfaces/MassFractionConnector.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/Interfaces/MassFractionConnector.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/Interfaces/MassFractionConnector.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/Interfaces/MassFractionConnector.mo" 2021-04-26 11:51:07.646620253 +0200 | |
| @@ -1,6 +1,6 @@ | |
| within AixLib.Fluid.FMI.Interfaces; | |
| connector MassFractionConnector = | |
| - Modelica.SIunits.MassFraction | |
| + Modelica.Units.SI.MassFraction | |
| "Connector for mass fraction of water vapor per kg total mass" | |
| annotation ( | |
| defaultComponentName="X_w", | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/Interfaces/PressureInput.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/Interfaces/PressureInput.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/Interfaces/PressureInput.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/Interfaces/PressureInput.mo" 2021-04-26 11:51:07.626620225 +0200 | |
| @@ -1,6 +1,6 @@ | |
| within AixLib.Fluid.FMI.Interfaces; | |
| connector PressureInput = | |
| - input Modelica.SIunits.AbsolutePressure(displayUnit="Pa") | |
| + input Modelica.Units.SI.AbsolutePressure(displayUnit="Pa") | |
| "Connector for pressure input" | |
| annotation ( | |
| defaultComponentName="p", | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/Interfaces/PressureOutput.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/Interfaces/PressureOutput.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/Interfaces/PressureOutput.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/Interfaces/PressureOutput.mo" 2021-04-26 11:51:07.618620215 +0200 | |
| @@ -1,6 +1,6 @@ | |
| within AixLib.Fluid.FMI.Interfaces; | |
| connector PressureOutput = | |
| - output Modelica.SIunits.AbsolutePressure(displayUnit="Pa") | |
| + output Modelica.Units.SI.AbsolutePressure(displayUnit="Pa") | |
| "Connector for pressure output" | |
| annotation ( | |
| defaultComponentName="p", | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/Validation/FlowSplitter_u.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/Validation/FlowSplitter_u.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/Validation/FlowSplitter_u.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/Validation/FlowSplitter_u.mo" 2021-04-26 11:51:07.562620138 +0200 | |
| @@ -3,7 +3,7 @@ | |
| extends Modelica.Icons.Example; | |
| package Medium = AixLib.Media.Air "Medium model"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.1 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.1 | |
| "Nominal mass flow rate"; | |
| parameter Boolean use_p_in = false | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/Validation/HeaterFan.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/Validation/HeaterFan.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/Validation/HeaterFan.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/Validation/HeaterFan.mo" 2021-04-26 11:51:07.542620110 +0200 | |
| @@ -4,11 +4,11 @@ | |
| extends Modelica.Icons.Example; | |
| package Medium = AixLib.Media.Air "Medium model"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=Q_flow_nominal/1000/10 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=Q_flow_nominal/1000/10 | |
| "Nominal mass flow rate"; | |
| - parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=2000 | |
| + parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=2000 | |
| "Pressure"; | |
| - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 1000 | |
| + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 1000 | |
| "Heat flow rate at u=1, positive for heating"; | |
| parameter Boolean use_p_in = true | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mo" 2021-04-26 11:51:07.482620027 +0200 | |
| @@ -11,11 +11,11 @@ | |
| "= true to use a pressure from connector, false to output Medium.p_default" | |
| annotation(Evaluate=true); | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=Q_flow_nominal/1000/10 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=Q_flow_nominal/1000/10 | |
| "Nominal mass flow rate"; | |
| - parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=2000 | |
| + parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=2000 | |
| "Pressure"; | |
| - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 1000 | |
| + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 1000 | |
| "Heat flow rate at u=1, positive for heating"; | |
| ExportContainers.Examples.FMUs.Fan floMac( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/Validation/HeaterFanPressureDriven.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/Validation/HeaterFanPressureDriven.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/FMI/Validation/HeaterFanPressureDriven.mo" 2021-03-15 12:05:56.619860840 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/FMI/Validation/HeaterFanPressureDriven.mo" 2021-04-26 11:51:07.514620072 +0200 | |
| @@ -4,11 +4,11 @@ | |
| extends Modelica.Icons.Example; | |
| package Medium = AixLib.Media.Air "Medium model"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=Q_flow_nominal/1000/10 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=Q_flow_nominal/1000/10 | |
| "Nominal mass flow rate"; | |
| - parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=2000 | |
| + parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=2000 | |
| "Pressure"; | |
| - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 1000 | |
| + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 1000 | |
| "Heat flow rate at u=1, positive for heating"; | |
| constant Boolean use_p_in = true | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXOneUTube.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXOneUTube.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXOneUTube.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXOneUTube.mo" 2021-04-26 11:51:06.130618155 +0200 | |
| @@ -5,7 +5,7 @@ | |
| parameter Integer nSeg(min=1) = 10 | |
| "Number of segments to use in vertical discretization of the boreholes"; | |
| - parameter Modelica.SIunits.Length hSeg = borFieDat.conDat.hBor/nSeg | |
| + parameter Modelica.Units.SI.Length hSeg = borFieDat.conDat.hBor/nSeg | |
| "Length of the internal heat exchanger"; | |
| package Medium = Modelica.Media.Water.ConstantPropertyLiquidWater; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mo" 2021-04-26 11:51:06.102618117 +0200 | |
| @@ -5,7 +5,7 @@ | |
| parameter Integer nSeg(min=1) = 10 | |
| "Number of segments to use in vertical discretization of the boreholes"; | |
| - parameter Modelica.SIunits.Length hSeg = borFieDat.conDat.hBor/nSeg | |
| + parameter Modelica.Units.SI.Length hSeg = borFieDat.conDat.hBor/nSeg | |
| "Length of the internal heat exchanger"; | |
| package Medium = Modelica.Media.Water.ConstantPropertyLiquidWater; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesOneUTube.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesOneUTube.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesOneUTube.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesOneUTube.mo" 2021-04-26 11:51:06.074618078 +0200 | |
| @@ -4,12 +4,12 @@ | |
| parameter Integer nSeg(min=1) = 10 | |
| "Number of segments to use in vertical discretization of the boreholes"; | |
| - parameter Modelica.SIunits.Length hSeg = borFieDat.conDat.hBor/nSeg | |
| + parameter Modelica.Units.SI.Length hSeg = borFieDat.conDat.hBor/nSeg | |
| "Length of the internal heat exchanger"; | |
| - parameter Modelica.SIunits.ThermalResistance Rgb_val=0.0430511 "Grout node to borehole wall thermal resistance"; | |
| - parameter Modelica.SIunits.ThermalResistance Rgg_val=0.00605573 "Grout node to grout node thermal resistance"; | |
| - parameter Modelica.SIunits.ThermalResistance RCondGro_val=0.14285 "Pipe to grout node thermal resistance"; | |
| - parameter Modelica.SIunits.Temperature T_start=298.15 "Initial temperature"; | |
| + parameter Modelica.Units.SI.ThermalResistance Rgb_val=0.0430511 "Grout node to borehole wall thermal resistance"; | |
| + parameter Modelica.Units.SI.ThermalResistance Rgg_val=0.00605573 "Grout node to grout node thermal resistance"; | |
| + parameter Modelica.Units.SI.ThermalResistance RCondGro_val=0.14285 "Pipe to grout node thermal resistance"; | |
| + parameter Modelica.Units.SI.Temperature T_start=298.15 "Initial temperature"; | |
| AixLib.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.InternalResistancesOneUTube | |
| intRes1UTub( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesTwoUTube.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesTwoUTube.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesTwoUTube.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesTwoUTube.mo" 2021-04-26 11:51:06.058618056 +0200 | |
| @@ -4,14 +4,14 @@ | |
| parameter Integer nSeg(min=1) = 10 | |
| "Number of segments to use in vertical discretization of the boreholes"; | |
| - parameter Modelica.SIunits.Length hSeg = borFieDat.conDat.hBor/nSeg | |
| + parameter Modelica.Units.SI.Length hSeg = borFieDat.conDat.hBor/nSeg | |
| "Length of the internal heat exchanger"; | |
| - parameter Modelica.SIunits.ThermalResistance Rgb_val=0.572601 "Grout node to borehole wall thermal resistance"; | |
| - parameter Modelica.SIunits.ThermalResistance Rgg1_val=0.0406121 "Grout node to grout node thermal resistance"; | |
| - parameter Modelica.SIunits.ThermalResistance Rgg2_val=0.216904 | |
| + parameter Modelica.Units.SI.ThermalResistance Rgb_val=0.572601 "Grout node to borehole wall thermal resistance"; | |
| + parameter Modelica.Units.SI.ThermalResistance Rgg1_val=0.0406121 "Grout node to grout node thermal resistance"; | |
| + parameter Modelica.Units.SI.ThermalResistance Rgg2_val=0.216904 | |
| "Thermal resistance between two grout nodes opposite to each other"; | |
| - parameter Modelica.SIunits.ThermalResistance RCondGro_val=0.195099 "Pipe to grout node thermal resistance"; | |
| - parameter Modelica.SIunits.Temperature T_start=298.15 "Initial temperature"; | |
| + parameter Modelica.Units.SI.ThermalResistance RCondGro_val=0.195099 "Pipe to grout node thermal resistance"; | |
| + parameter Modelica.Units.SI.Temperature T_start=298.15 "Initial temperature"; | |
| Modelica.Thermal.HeatTransfer.Sources.FixedTemperature TWal(T=T_start) | |
| "Borehole wall temperature" | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/convectionResistanceCircularPipe.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/convectionResistanceCircularPipe.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/convectionResistanceCircularPipe.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/convectionResistanceCircularPipe.mo" 2021-04-26 11:51:05.926617873 +0200 | |
| @@ -3,32 +3,32 @@ | |
| "Thermal resistance from the fluid in pipes and the grout zones (Bauer et al. 2011)" | |
| // Geometry of the borehole | |
| - input Modelica.SIunits.Height hSeg "Height of the element"; | |
| - input Modelica.SIunits.Radius rTub "Tube radius"; | |
| - input Modelica.SIunits.Length eTub "Tube thickness"; | |
| + input Modelica.Units.SI.Height hSeg "Height of the element"; | |
| + input Modelica.Units.SI.Radius rTub "Tube radius"; | |
| + input Modelica.Units.SI.Length eTub "Tube thickness"; | |
| // thermal properties | |
| - input Modelica.SIunits.ThermalConductivity kMed | |
| + input Modelica.Units.SI.ThermalConductivity kMed | |
| "Thermal conductivity of the fluid"; | |
| - input Modelica.SIunits.DynamicViscosity muMed | |
| + input Modelica.Units.SI.DynamicViscosity muMed | |
| "Dynamic viscosity of the fluid"; | |
| - input Modelica.SIunits.SpecificHeatCapacity cpMed | |
| + input Modelica.Units.SI.SpecificHeatCapacity cpMed | |
| "Specific heat capacity of the fluid"; | |
| - input Modelica.SIunits.MassFlowRate m_flow "Mass flow rate"; | |
| - input Modelica.SIunits.MassFlowRate m_flow_nominal "Nominal mass flow rate"; | |
| + input Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate"; | |
| + input Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate"; | |
| // Outputs | |
| - output Modelica.SIunits.ThermalResistance RFluPip | |
| + output Modelica.Units.SI.ThermalResistance RFluPip | |
| "Convection resistance (or conduction in fluid if no mass flow)"; | |
| protected | |
| - parameter Modelica.SIunits.Radius rTub_in = rTub - eTub | |
| + parameter Modelica.Units.SI.Radius rTub_in = rTub - eTub | |
| "Pipe inner radius"; | |
| - Modelica.SIunits.CoefficientOfHeatTransfer h | |
| + Modelica.Units.SI.CoefficientOfHeatTransfer h | |
| "Convective heat transfer coefficient of the fluid"; | |
| Real k(unit="s/kg") | |
| "Coefficient used in the computation of the convective heat transfer coefficient"; | |
| - Modelica.SIunits.MassFlowRate m_flow_abs = AixLib.Utilities.Math.Functions.spliceFunction(m_flow,-m_flow,m_flow,m_flow_nominal/30); | |
| + Modelica.Units.SI.MassFlowRate m_flow_abs = AixLib.Utilities.Math.Functions.spliceFunction(m_flow,-m_flow,m_flow,m_flow_nominal/30); | |
| Real Re "Reynolds number"; | |
| Real NuTurb "Nusselt at Re=2400"; | |
| Real Nu "Nusselt"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesOneUTube.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesOneUTube.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesOneUTube.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesOneUTube.mo" 2021-04-26 11:51:05.910617852 +0200 | |
| @@ -5,22 +5,22 @@ | |
| AixLib.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.partialInternalResistances; | |
| // Outputs | |
| - output Modelica.SIunits.ThermalResistance Rgb | |
| + output Modelica.Units.SI.ThermalResistance Rgb | |
| "Thermal resistance between grout zone and borehole wall"; | |
| - output Modelica.SIunits.ThermalResistance Rgg | |
| + output Modelica.Units.SI.ThermalResistance Rgg | |
| "Thermal resistance between the two grout zones"; | |
| - output Modelica.SIunits.ThermalResistance RCondGro | |
| + output Modelica.Units.SI.ThermalResistance RCondGro | |
| "Thermal resistance between: pipe wall to capacity in grout"; | |
| protected | |
| Real[2,2] RDelta(each unit="(m.K)/W") "Delta-circuit thermal resistances"; | |
| Real[2,2] R(each unit="(m.K)/W") "Internal thermal resistances"; | |
| - Modelica.SIunits.Position[2] xPip = {-sha, sha} "x-Coordinates of pipes"; | |
| - Modelica.SIunits.Position[2] yPip = {0., 0.} "y-Coordinates of pipes"; | |
| - Modelica.SIunits.Radius[2] rPip = {rTub, rTub} "Outer radius of pipes"; | |
| + Modelica.Units.SI.Position[2] xPip = {-sha, sha} "x-Coordinates of pipes"; | |
| + Modelica.Units.SI.Position[2] yPip = {0., 0.} "y-Coordinates of pipes"; | |
| + Modelica.Units.SI.Radius[2] rPip = {rTub, rTub} "Outer radius of pipes"; | |
| Real[2] RFluPip(each unit="(m.K)/W") = {RCondPipe+RConv, RCondPipe+RConv} "Fluid to pipe wall thermal resistances"; | |
| - Modelica.SIunits.ThermalResistance Rg | |
| + Modelica.Units.SI.ThermalResistance Rg | |
| "Thermal resistance between outer borehole wall and one tube"; | |
| - Modelica.SIunits.ThermalResistance Rar | |
| + Modelica.Units.SI.ThermalResistance Rar | |
| "Thermal resistance between the two pipe outer walls"; | |
| Real Ra(unit="(m.K)/W") | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesTwoUTube.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesTwoUTube.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesTwoUTube.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesTwoUTube.mo" 2021-04-26 11:51:05.894617829 +0200 | |
| @@ -5,32 +5,32 @@ | |
| AixLib.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.partialInternalResistances; | |
| // Outputs | |
| - output Modelica.SIunits.ThermalResistance Rgb | |
| + output Modelica.Units.SI.ThermalResistance Rgb | |
| "Thermal resistance between a grout capacity and the borehole wall, as defined by Bauer et al (2010)"; | |
| - output Modelica.SIunits.ThermalResistance Rgg1 | |
| + output Modelica.Units.SI.ThermalResistance Rgg1 | |
| "Thermal resistance between two neightbouring grout capacities, as defined by Bauer et al (2010)"; | |
| - output Modelica.SIunits.ThermalResistance Rgg2 | |
| + output Modelica.Units.SI.ThermalResistance Rgg2 | |
| "Thermal resistance between two grout capacities opposite to each other, as defined by Bauer et al (2010)"; | |
| - output Modelica.SIunits.ThermalResistance RCondGro | |
| + output Modelica.Units.SI.ThermalResistance RCondGro | |
| "Thermal resistance between a pipe wall and the grout capacity, as defined by Bauer et al (2010)"; | |
| protected | |
| Real[4,4] RDelta(each unit="(m.K)/W") "Delta-circuit thermal resistances"; | |
| Real[4,4] R(each unit="(m.K)/W") "Internal thermal resistances"; | |
| - Modelica.SIunits.Position[4] xPip = {-sha, sha, 0., 0.} "x-Coordinates of pipes"; | |
| - Modelica.SIunits.Position[4] yPip = {0., 0., -sha, sha} "y-Coordinates of pipes"; | |
| - Modelica.SIunits.Radius[4] rPip = {rTub, rTub, rTub, rTub} "Outer radius of pipes"; | |
| + Modelica.Units.SI.Position[4] xPip = {-sha, sha, 0., 0.} "x-Coordinates of pipes"; | |
| + Modelica.Units.SI.Position[4] yPip = {0., 0., -sha, sha} "y-Coordinates of pipes"; | |
| + Modelica.Units.SI.Radius[4] rPip = {rTub, rTub, rTub, rTub} "Outer radius of pipes"; | |
| Real[4] RFluPip(each unit="(m.K)/W") = {RCondPipe+RConv, RCondPipe+RConv, RCondPipe+RConv, RCondPipe+RConv} "Fluid to pipe wall thermal resistances"; | |
| Real Ra( unit="(m.K)/W") | |
| "Grout-to-grout resistance (2D) as defined by Hellstrom. Interaction between the different grout parts"; | |
| - Modelica.SIunits.ThermalResistance Rg | |
| + | |
| + Modelica.Units.SI.ThermalResistance Rg | |
| "Thermal resistance between outer borehole wall and one tube"; | |
| - Modelica.SIunits.ThermalResistance Rar1 | |
| + Modelica.Units.SI.ThermalResistance Rar1 | |
| "Thermal resistance between the two closest pipe outer walls"; | |
| - Modelica.SIunits.ThermalResistance Rar2 | |
| + Modelica.Units.SI.ThermalResistance Rar2 | |
| "Thermal resistance between the two farthest pipe outer walls"; | |
| - | |
| algorithm | |
| // Internal thermal resistances | |
| (RDelta, R) := | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFluidTemperature.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFluidTemperature.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFluidTemperature.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFluidTemperature.mo" 2021-04-26 11:51:05.870617796 +0200 | |
| @@ -4,19 +4,19 @@ | |
| input Integer nPip "Number of pipes"; | |
| input Integer J "Number of multipoles"; | |
| - input Modelica.SIunits.Position xPip[nPip] "x-Coordinates of pipes"; | |
| - input Modelica.SIunits.Position yPip[nPip] "y-Coordinates of pipes"; | |
| + input Modelica.Units.SI.Position xPip[nPip] "x-Coordinates of pipes"; | |
| + input Modelica.Units.SI.Position yPip[nPip] "y-Coordinates of pipes"; | |
| input Real QPip_flow[nPip](each unit="W/m") "Heat flow in pipes"; | |
| - input Modelica.SIunits.Temperature TBor "Average borehole wall temperature"; | |
| - input Modelica.SIunits.Radius rBor "Borehole radius"; | |
| - input Modelica.SIunits.Radius rPip[nPip] "Outter radius of pipes"; | |
| - input Modelica.SIunits.ThermalConductivity kFil "Thermal conductivity of grouting material"; | |
| - input Modelica.SIunits.ThermalConductivity kSoi "Thermal conductivity of soil material"; | |
| + input Modelica.Units.SI.Temperature TBor "Average borehole wall temperature"; | |
| + input Modelica.Units.SI.Radius rBor "Borehole radius"; | |
| + input Modelica.Units.SI.Radius rPip[nPip] "Outter radius of pipes"; | |
| + input Modelica.Units.SI.ThermalConductivity kFil "Thermal conductivity of grouting material"; | |
| + input Modelica.Units.SI.ThermalConductivity kSoi "Thermal conductivity of soil material"; | |
| input Real RFluPip[nPip](each unit="(m.K)/W") "Fluid to pipe wall thermal resistances"; | |
| input Real eps=1.0e-5 "Iteration relative accuracy"; | |
| input Integer it_max=100 "Maximum number of iterations"; | |
| - output Modelica.SIunits.Temperature TFlu[nPip] "Fluid temperature in pipes"; | |
| + output Modelica.Units.SI.Temperature TFlu[nPip] "Fluid temperature in pipes"; | |
| protected | |
| Real pikFil(unit="(m.K)/W")=1/(2*Modelica.Constants.pi*kFil) "Coefficient based on grout thermal conductivity"; | |
| @@ -36,7 +36,7 @@ | |
| Real R0[nPip,nPip](each unit="(m.K)/W") "Line source approximation of thermal resistances"; | |
| Complex deltaTFlu "Fluid temperature difference with line source approximation"; | |
| Real rbm "Intermediate coefficient"; | |
| - Modelica.SIunits.Distance dz "Pipe to pipe distance"; | |
| + Modelica.Units.SI.Distance dz "Pipe to pipe distance"; | |
| Real coeff[nPip,J] "Coefficient for multiplication with matrix F_mk"; | |
| Real diff "Difference in subsequent multipole evaluations"; | |
| Real diff_max "Maximum difference in subsequent multipole evaluations"; | |
| @@ -46,18 +46,17 @@ | |
| Real eps_max "Convergence variable"; | |
| algorithm | |
| - // Thermal resistance matrix from 0th order multipole | |
| +// Thermal resistance matrix from 0th order multipole | |
| for i in 1:nPip loop | |
| zPip_i := Complex(xPip[i], yPip[i]); | |
| - rbm := rBor^2/(rBor^2 - Modelica.ComplexMath.'abs'(zPip_i)^2); | |
| - R0[i, i] := pikFil*(log(rBor/rPip[i]) + betaPip[i] + sigma*log(rbm)); | |
| + rbm := rBor ^ 2 / (rBor ^ 2 - Modelica.ComplexMath.abs(zPip_i) ^ 2); | |
| + R0[i, i] := pikFil * (log(rBor / rPip[i]) + betaPip[i] + sigma * log(rbm)); | |
| for j in 1:nPip loop | |
| zPip_j := Complex(xPip[j], yPip[j]); | |
| if i <> j then | |
| - dz := Modelica.ComplexMath.'abs'(zPip_i - zPip_j); | |
| - rbm := rBor^2/Modelica.ComplexMath.'abs'(rBor^2 - zPip_j* | |
| - Modelica.ComplexMath.conj(zPip_i)); | |
| - R0[i, j] := pikFil*(log(rBor/dz) + sigma*log(rbm)); | |
| + dz := Modelica.ComplexMath.abs(zPip_i - zPip_j); | |
| + rbm := rBor ^ 2 / Modelica.ComplexMath.abs(rBor ^ 2 - zPip_j * Modelica.ComplexMath.conj(zPip_i)); | |
| + R0[i, j] := pikFil * (log(rBor / dz) + sigma * log(rbm)); | |
| end if; | |
| end for; | |
| end for; | |
| @@ -65,34 +64,22 @@ | |
| // Initialize maximum error and iteration counter | |
| eps_max := 1.0e99; | |
| it := 0; | |
| - // Multipoles | |
| +// Multipoles | |
| if J > 0 then | |
| for m in 1:nPip loop | |
| for k in 1:J loop | |
| - coeff[m, k] := -(1 - k*betaPip[m])/(1 + k*betaPip[m]); | |
| + coeff[m, k] := -(1 - k * betaPip[m]) / (1 + k * betaPip[m]); | |
| PRea[m, k] := 0; | |
| PIma[m, k] := 0; | |
| end for; | |
| end for; | |
| while eps_max > eps and it < it_max loop | |
| it := it + 1; | |
| - (FRea, FIma) := | |
| - AixLib.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.multipoleFmk( | |
| - nPip, | |
| - J, | |
| - QPip_flow, | |
| - PRea, | |
| - PIma, | |
| - rBor, | |
| - rPip, | |
| - xPip, | |
| - yPip, | |
| - kFil, | |
| - kSoi); | |
| + (FRea, FIma) := AixLib.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.multipoleFmk(nPip, J, QPip_flow, PRea, PIma, rBor, rPip, xPip, yPip, kFil, kSoi); | |
| for m in 1:nPip loop | |
| for k in 1:J loop | |
| F_mk := Complex(FRea[m, k], FIma[m, k]); | |
| - P_nj_new := coeff[m, k]*Modelica.ComplexMath.conj(F_mk); | |
| + P_nj_new := coeff[m, k] * Modelica.ComplexMath.conj(F_mk); | |
| PRea_new[m, k] := Modelica.ComplexMath.real(P_nj_new); | |
| PIma_new[m, k] := Modelica.ComplexMath.imag(P_nj_new); | |
| end for; | |
| @@ -103,17 +90,15 @@ | |
| for k in 1:J loop | |
| P_nj := Complex(PRea[m, k], PIma[m, k]); | |
| P_nj_new := Complex(PRea_new[m, k], PIma_new[m, k]); | |
| - diff_max := max(diff_max, | |
| - Modelica.ComplexMath.'abs'(P_nj_new - P_nj)); | |
| - diff_min := min(diff_min, | |
| - Modelica.ComplexMath.'abs'(P_nj_new - P_nj)); | |
| + diff_max := max(diff_max, Modelica.ComplexMath.abs(P_nj_new - P_nj)); | |
| + diff_min := min(diff_min, Modelica.ComplexMath.abs(P_nj_new - P_nj)); | |
| end for; | |
| end for; | |
| diff := diff_max - diff_min; | |
| if it == 1 then | |
| - diff0 :=diff; | |
| + diff0 := diff; | |
| end if; | |
| - eps_max := diff/diff0; | |
| + eps_max := diff / diff0; | |
| PRea := PRea_new; | |
| PIma := PIma_new; | |
| end while; | |
| @@ -123,26 +108,23 @@ | |
| TFlu := TBor .+ R0*QPip_flow; | |
| if J > 0 then | |
| for m in 1:nPip loop | |
| - zPip_i :=Complex(xPip[m], yPip[m]); | |
| + zPip_i := Complex(xPip[m], yPip[m]); | |
| deltaTFlu := Complex(0, 0); | |
| for n in 1:nPip loop | |
| - zPip_j :=Complex(xPip[n], yPip[n]); | |
| + zPip_j := Complex(xPip[n], yPip[n]); | |
| for j in 1:J loop | |
| P_nj := Complex(PRea[n, j], PIma[n, j]); | |
| if n <> m then | |
| - // Second term | |
| - deltaTFlu := deltaTFlu + P_nj*(rPip[n]/(zPip_i - zPip_j))^j; | |
| + deltaTFlu := deltaTFlu + P_nj * (rPip[n] / (zPip_i - zPip_j)) ^ j; | |
| end if; | |
| - // Third term | |
| - deltaTFlu := deltaTFlu + sigma*P_nj*(rPip[n]* | |
| - Modelica.ComplexMath.conj(zPip_i)/(rBor^2 - zPip_j* | |
| - Modelica.ComplexMath.conj(zPip_i)))^j; | |
| + deltaTFlu := deltaTFlu + sigma * P_nj * (rPip[n] * Modelica.ComplexMath.conj(zPip_i) / (rBor ^ 2 - zPip_j * Modelica.ComplexMath.conj(zPip_i))) ^ j; | |
| end for; | |
| end for; | |
| TFlu[m] := TFlu[m] + Modelica.ComplexMath.real(deltaTFlu); | |
| end for; | |
| end if; | |
| - | |
| +// Second term | |
| +// Third term | |
| annotation (Documentation(info="<html> | |
| <p> This model evaluates the fluid temperatures using the multipole method of Claesson and Hellstrom (2011). | |
| </p> | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFmk.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFmk.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFmk.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFmk.mo" 2021-04-26 11:51:05.838617750 +0200 | |
| @@ -7,12 +7,12 @@ | |
| input Real QPip_flow[nPip](each unit="W/m") "Heat flow in pipes"; | |
| input Real PRea[nPip,J] "Multipoles (Real part)"; | |
| input Real PIma[nPip,J] "Multipoles (Imaginary part)"; | |
| - input Modelica.SIunits.Radius rBor "Borehole radius"; | |
| - input Modelica.SIunits.Radius rPip[nPip] "Outter radius of pipes"; | |
| - input Modelica.SIunits.Position xPip[nPip] "x-Coordinates of pipes"; | |
| - input Modelica.SIunits.Position yPip[nPip] "y-Coordinates of pipes"; | |
| - input Modelica.SIunits.ThermalConductivity kFil "Thermal conductivity of grouting material"; | |
| - input Modelica.SIunits.ThermalConductivity kSoi "Thermal conductivity of soil material"; | |
| + input Modelica.Units.SI.Radius rBor "Borehole radius"; | |
| + input Modelica.Units.SI.Radius rPip[nPip] "Outter radius of pipes"; | |
| + input Modelica.Units.SI.Position xPip[nPip] "x-Coordinates of pipes"; | |
| + input Modelica.Units.SI.Position yPip[nPip] "y-Coordinates of pipes"; | |
| + input Modelica.Units.SI.ThermalConductivity kFil "Thermal conductivity of grouting material"; | |
| + input Modelica.Units.SI.ThermalConductivity kSoi "Thermal conductivity of soil material"; | |
| output Real FRea[nPip,J] "Multipole coefficients"; | |
| output Real FIma[nPip,J] "Multipole coefficients"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleThermalResistances.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleThermalResistances.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleThermalResistances.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleThermalResistances.mo" 2021-04-26 11:51:05.818617724 +0200 | |
| @@ -5,21 +5,21 @@ | |
| input Integer nPip "Number of pipes"; | |
| input Integer J "Number of multipoles"; | |
| - input Modelica.SIunits.Position xPip[nPip] "x-Coordinates of pipes"; | |
| - input Modelica.SIunits.Position yPip[nPip] "y-Coordinates of pipes"; | |
| - input Modelica.SIunits.Radius rBor "Borehole radius"; | |
| - input Modelica.SIunits.Radius rPip[nPip] "Outter radius of pipes"; | |
| - input Modelica.SIunits.ThermalConductivity kFil "Thermal conductivity of grouting material"; | |
| - input Modelica.SIunits.ThermalConductivity kSoi "Thermal conductivity of soil material"; | |
| + input Modelica.Units.SI.Position xPip[nPip] "x-Coordinates of pipes"; | |
| + input Modelica.Units.SI.Position yPip[nPip] "y-Coordinates of pipes"; | |
| + input Modelica.Units.SI.Radius rBor "Borehole radius"; | |
| + input Modelica.Units.SI.Radius rPip[nPip] "Outter radius of pipes"; | |
| + input Modelica.Units.SI.ThermalConductivity kFil "Thermal conductivity of grouting material"; | |
| + input Modelica.Units.SI.ThermalConductivity kSoi "Thermal conductivity of soil material"; | |
| input Real RFluPip[nPip](each unit="(m.K)/W") "Fluid to pipe wall thermal resistances"; | |
| - input Modelica.SIunits.Temperature TBor=0 "Average borehole wall temperature"; | |
| + input Modelica.Units.SI.Temperature TBor=0 "Average borehole wall temperature"; | |
| output Real RDelta[nPip,nPip](each unit="(m.K)/W") "Delta-circuit thermal resistances"; | |
| output Real R[nPip,nPip](each unit="(m.K)/W") "Internal thermal resistances"; | |
| protected | |
| Real QPip_flow[nPip](each unit="W/m") "Pipe heat transfer rates"; | |
| - Modelica.SIunits.Temperature TFlu[nPip] "Fluid temperatures"; | |
| + Modelica.Units.SI.Temperature TFlu[nPip] "Fluid temperatures"; | |
| Real K[nPip,nPip](each unit="W/(m.K)") "Internal thermal conductances"; | |
| algorithm | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo" 2021-04-26 11:51:05.798617697 +0200 | |
| @@ -7,28 +7,28 @@ | |
| input Boolean use_Rb = false | |
| "True if the value Rb should be used instead of calculated"; | |
| input Real Rb(unit="(m.K)/W") "Borehole thermal resistance"; | |
| - input Modelica.SIunits.Height hSeg "Height of the element"; | |
| - input Modelica.SIunits.Radius rBor "Radius of the borehole"; | |
| + input Modelica.Units.SI.Height hSeg "Height of the element"; | |
| + input Modelica.Units.SI.Radius rBor "Radius of the borehole"; | |
| // Geometry of the pipe | |
| - input Modelica.SIunits.Radius rTub "Radius of the tube"; | |
| - input Modelica.SIunits.Length eTub "Thickness of the tubes"; | |
| - input Modelica.SIunits.Length sha | |
| + input Modelica.Units.SI.Radius rTub "Radius of the tube"; | |
| + input Modelica.Units.SI.Length eTub "Thickness of the tubes"; | |
| + input Modelica.Units.SI.Length sha | |
| "Shank spacing, defined as the distance between the center of a pipe and the center of the borehole"; | |
| // Thermal properties | |
| - input Modelica.SIunits.ThermalConductivity kFil | |
| + input Modelica.Units.SI.ThermalConductivity kFil | |
| "Thermal conductivity of the grout"; | |
| - input Modelica.SIunits.ThermalConductivity kSoi | |
| + input Modelica.Units.SI.ThermalConductivity kSoi | |
| "Thermal conductivity of the soi"; | |
| - input Modelica.SIunits.ThermalConductivity kTub | |
| + input Modelica.Units.SI.ThermalConductivity kTub | |
| "Thermal conductivity of the tube"; | |
| - input Modelica.SIunits.ThermalConductivity kMed | |
| + input Modelica.Units.SI.ThermalConductivity kMed | |
| "Thermal conductivity of the fluid"; | |
| - input Modelica.SIunits.DynamicViscosity muMed | |
| + input Modelica.Units.SI.DynamicViscosity muMed | |
| "Dynamic viscosity of the fluid"; | |
| - input Modelica.SIunits.SpecificHeatCapacity cpMed | |
| + input Modelica.Units.SI.SpecificHeatCapacity cpMed | |
| "Specific heat capacity of the fluid"; | |
| - input Modelica.SIunits.MassFlowRate m_flow_nominal "Nominal mass flow rate"; | |
| + input Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate"; | |
| input Boolean printDebug=false | |
| "Print resistances values in log for debug purposes."; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/ConvectionResistanceCircularPipe.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/ConvectionResistanceCircularPipe.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/ConvectionResistanceCircularPipe.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/ConvectionResistanceCircularPipe.mo" 2021-04-26 11:51:06.026618012 +0200 | |
| @@ -3,24 +3,24 @@ | |
| "Validation of the correlation used to evaluate the convection resistance in circular pipes" | |
| extends Modelica.Icons.Example; | |
| - parameter Modelica.SIunits.Height hSeg = 1.0 "Height of the element"; | |
| - parameter Modelica.SIunits.Radius rTub = 0.02 "Tube radius"; | |
| - parameter Modelica.SIunits.Length eTub = 0.002 "Tube thickness"; | |
| + parameter Modelica.Units.SI.Height hSeg = 1.0 "Height of the element"; | |
| + parameter Modelica.Units.SI.Radius rTub = 0.02 "Tube radius"; | |
| + parameter Modelica.Units.SI.Length eTub = 0.002 "Tube thickness"; | |
| // thermal properties | |
| - parameter Modelica.SIunits.ThermalConductivity kMed = 0.6 | |
| + parameter Modelica.Units.SI.ThermalConductivity kMed = 0.6 | |
| "Thermal conductivity of the fluid"; | |
| - parameter Modelica.SIunits.DynamicViscosity muMed = 1.002e-3 | |
| + parameter Modelica.Units.SI.DynamicViscosity muMed = 1.002e-3 | |
| "Dynamic viscosity of the fluid"; | |
| - parameter Modelica.SIunits.SpecificHeatCapacity cpMed = 4182 | |
| + parameter Modelica.Units.SI.SpecificHeatCapacity cpMed = 4182 | |
| "Specific heat capacity of the fluid"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 1 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 1 | |
| "Nominal mass flow rate"; | |
| Real Re "Reynolds number"; | |
| Real Nu "Reynolds number"; | |
| - Modelica.SIunits.MassFlowRate m_flow "Mass flow rate"; | |
| - Modelica.SIunits.ThermalResistance RConv "Convection resistance"; | |
| + Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate"; | |
| + Modelica.Units.SI.ThermalResistance RConv "Convection resistance"; | |
| equation | |
| Re = time; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo" 2021-04-26 11:51:06.018618000 +0200 | |
| @@ -7,41 +7,41 @@ | |
| // Geometry of the borehole | |
| parameter Real Rb(unit="(m.K)/W") = 0.0 | |
| "Borehole thermal resistance (Not used)"; | |
| - parameter Modelica.SIunits.Height hSeg = 1.0 "Height of the element"; | |
| - parameter Modelica.SIunits.Radius rBor = 0.07 "Radius of the borehole"; | |
| + parameter Modelica.Units.SI.Height hSeg = 1.0 "Height of the element"; | |
| + parameter Modelica.Units.SI.Radius rBor = 0.07 "Radius of the borehole"; | |
| // Geometry of the pipe | |
| - parameter Modelica.SIunits.Radius rTub = 0.02 "Radius of the tube"; | |
| - parameter Modelica.SIunits.Length eTub = 0.002 "Thickness of the tubes"; | |
| - parameter Modelica.SIunits.Length sha = 0.03 | |
| + parameter Modelica.Units.SI.Radius rTub = 0.02 "Radius of the tube"; | |
| + parameter Modelica.Units.SI.Length eTub = 0.002 "Thickness of the tubes"; | |
| + parameter Modelica.Units.SI.Length sha = 0.03 | |
| "Shank spacing, defined as the distance between the center of a pipe and the center of the borehole"; | |
| // Thermal properties (Solids) | |
| - parameter Modelica.SIunits.ThermalConductivity kFil = 1.5 | |
| + parameter Modelica.Units.SI.ThermalConductivity kFil = 1.5 | |
| "Thermal conductivity of the grout"; | |
| - parameter Modelica.SIunits.ThermalConductivity kSoi = 2.5 | |
| + parameter Modelica.Units.SI.ThermalConductivity kSoi = 2.5 | |
| "Thermal conductivity of the soi"; | |
| - parameter Modelica.SIunits.ThermalConductivity kTub = 0.4 | |
| + parameter Modelica.Units.SI.ThermalConductivity kTub = 0.4 | |
| "Thermal conductivity of the tube"; | |
| // Thermal properties (Fluid) | |
| - parameter Modelica.SIunits.ThermalConductivity kMed = 0.6 | |
| + parameter Modelica.Units.SI.ThermalConductivity kMed = 0.6 | |
| "Thermal conductivity of the fluid"; | |
| - parameter Modelica.SIunits.DynamicViscosity muMed = 1.0e-3 | |
| + parameter Modelica.Units.SI.DynamicViscosity muMed = 1.0e-3 | |
| "Dynamic viscosity of the fluid"; | |
| - parameter Modelica.SIunits.SpecificHeatCapacity cpMed = 4180.0 | |
| + parameter Modelica.Units.SI.SpecificHeatCapacity cpMed = 4180.0 | |
| "Specific heat capacity of the fluid"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.25 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.25 | |
| "Nominal mass flow rate"; | |
| // Outputs | |
| parameter Real x(fixed=false) "Capacity location"; | |
| - parameter Modelica.SIunits.ThermalResistance Rgb(fixed=false) | |
| + | |
| + parameter Modelica.Units.SI.ThermalResistance Rgb(fixed=false) | |
| "Thermal resistance between grout zone and borehole wall"; | |
| - parameter Modelica.SIunits.ThermalResistance Rgg(fixed=false) | |
| + parameter Modelica.Units.SI.ThermalResistance Rgg(fixed=false) | |
| "Thermal resistance between the two grout zones"; | |
| - parameter Modelica.SIunits.ThermalResistance RCondGro(fixed=false) | |
| + parameter Modelica.Units.SI.ThermalResistance RCondGro(fixed=false) | |
| "Thermal resistance between: pipe wall to capacity in grout"; | |
| - | |
| initial equation | |
| (x, Rgb, Rgg, RCondGro) = | |
| AixLib.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.internalResistancesOneUTube( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTubeNegative.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTubeNegative.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTubeNegative.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTubeNegative.mo" 2021-04-26 11:51:06.002617979 +0200 | |
| @@ -6,41 +6,41 @@ | |
| // Geometry of the borehole | |
| parameter Real Rb(unit="(m.K)/W") = 0.0 | |
| "Borehole thermal resistance (Not used)"; | |
| - parameter Modelica.SIunits.Height hSeg = 1.0 "Height of the element"; | |
| - parameter Modelica.SIunits.Radius rBor = 0.07 "Radius of the borehole"; | |
| + parameter Modelica.Units.SI.Height hSeg = 1.0 "Height of the element"; | |
| + parameter Modelica.Units.SI.Radius rBor = 0.07 "Radius of the borehole"; | |
| // Geometry of the pipe | |
| - parameter Modelica.SIunits.Radius rTub = 0.02 "Radius of the tube"; | |
| - parameter Modelica.SIunits.Length eTub = 0.002 "Thickness of the tubes"; | |
| - parameter Modelica.SIunits.Length sha = 0.05 | |
| + parameter Modelica.Units.SI.Radius rTub = 0.02 "Radius of the tube"; | |
| + parameter Modelica.Units.SI.Length eTub = 0.002 "Thickness of the tubes"; | |
| + parameter Modelica.Units.SI.Length sha = 0.05 | |
| "Shank spacing, defined as the distance between the center of a pipe and the center of the borehole"; | |
| // Thermal properties (Solids) | |
| - parameter Modelica.SIunits.ThermalConductivity kFil = 1.5 | |
| + parameter Modelica.Units.SI.ThermalConductivity kFil = 1.5 | |
| "Thermal conductivity of the grout"; | |
| - parameter Modelica.SIunits.ThermalConductivity kSoi = 2.5 | |
| + parameter Modelica.Units.SI.ThermalConductivity kSoi = 2.5 | |
| "Thermal conductivity of the soi"; | |
| - parameter Modelica.SIunits.ThermalConductivity kTub = 0.4 | |
| + parameter Modelica.Units.SI.ThermalConductivity kTub = 0.4 | |
| "Thermal conductivity of the tube"; | |
| // Thermal properties (Fluid) | |
| - parameter Modelica.SIunits.ThermalConductivity kMed = 0.6 | |
| + parameter Modelica.Units.SI.ThermalConductivity kMed = 0.6 | |
| "Thermal conductivity of the fluid"; | |
| - parameter Modelica.SIunits.DynamicViscosity muMed = 1.0e-3 | |
| + parameter Modelica.Units.SI.DynamicViscosity muMed = 1.0e-3 | |
| "Dynamic viscosity of the fluid"; | |
| - parameter Modelica.SIunits.SpecificHeatCapacity cpMed = 4180.0 | |
| + parameter Modelica.Units.SI.SpecificHeatCapacity cpMed = 4180.0 | |
| "Specific heat capacity of the fluid"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.25 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.25 | |
| "Nominal mass flow rate"; | |
| // Outputs | |
| parameter Real x(fixed=false) "Capacity location"; | |
| - parameter Modelica.SIunits.ThermalResistance Rgb(fixed=false) | |
| + | |
| + parameter Modelica.Units.SI.ThermalResistance Rgb(fixed=false) | |
| "Thermal resistance between grout zone and borehole wall"; | |
| - parameter Modelica.SIunits.ThermalResistance Rgg(fixed=false) | |
| + parameter Modelica.Units.SI.ThermalResistance Rgg(fixed=false) | |
| "Thermal resistance between the two grout zones"; | |
| - parameter Modelica.SIunits.ThermalResistance RCondGro(fixed=false) | |
| + parameter Modelica.Units.SI.ThermalResistance RCondGro(fixed=false) | |
| "Thermal resistance between: pipe wall to capacity in grout"; | |
| - | |
| initial equation | |
| (x, Rgb, Rgg, RCondGro) = | |
| AixLib.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.internalResistancesOneUTube( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTube.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTube.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTube.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTube.mo" 2021-04-26 11:51:05.986617956 +0200 | |
| @@ -6,43 +6,43 @@ | |
| // Geometry of the borehole | |
| parameter Real Rb(unit="(m.K)/W") = 0.0 | |
| "Borehole thermal resistance (Not used)"; | |
| - parameter Modelica.SIunits.Height hSeg = 1.0 "Height of the element"; | |
| - parameter Modelica.SIunits.Radius rBor = 0.07 "Radius of the borehole"; | |
| + parameter Modelica.Units.SI.Height hSeg = 1.0 "Height of the element"; | |
| + parameter Modelica.Units.SI.Radius rBor = 0.07 "Radius of the borehole"; | |
| // Geometry of the pipe | |
| - parameter Modelica.SIunits.Radius rTub = 0.02 "Radius of the tube"; | |
| - parameter Modelica.SIunits.Length eTub = 0.002 "Thickness of the tubes"; | |
| - parameter Modelica.SIunits.Length sha = 0.025 | |
| + parameter Modelica.Units.SI.Radius rTub = 0.02 "Radius of the tube"; | |
| + parameter Modelica.Units.SI.Length eTub = 0.002 "Thickness of the tubes"; | |
| + parameter Modelica.Units.SI.Length sha = 0.025 | |
| "Shank spacing, defined as the distance between the center of a pipe and the center of the borehole"; | |
| // Thermal properties (Solids) | |
| - parameter Modelica.SIunits.ThermalConductivity kFil = 0.5 | |
| + parameter Modelica.Units.SI.ThermalConductivity kFil = 0.5 | |
| "Thermal conductivity of the grout"; | |
| - parameter Modelica.SIunits.ThermalConductivity kSoi = 2.5 | |
| + parameter Modelica.Units.SI.ThermalConductivity kSoi = 2.5 | |
| "Thermal conductivity of the soi"; | |
| - parameter Modelica.SIunits.ThermalConductivity kTub = 0.4 | |
| + parameter Modelica.Units.SI.ThermalConductivity kTub = 0.4 | |
| "Thermal conductivity of the tube"; | |
| // Thermal properties (Fluid) | |
| - parameter Modelica.SIunits.ThermalConductivity kMed = 0.6 | |
| + parameter Modelica.Units.SI.ThermalConductivity kMed = 0.6 | |
| "Thermal conductivity of the fluid"; | |
| - parameter Modelica.SIunits.DynamicViscosity muMed = 1.0e-3 | |
| + parameter Modelica.Units.SI.DynamicViscosity muMed = 1.0e-3 | |
| "Dynamic viscosity of the fluid"; | |
| - parameter Modelica.SIunits.SpecificHeatCapacity cpMed = 4180.0 | |
| + parameter Modelica.Units.SI.SpecificHeatCapacity cpMed = 4180.0 | |
| "Specific heat capacity of the fluid"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.25 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.25 | |
| "Nominal mass flow rate"; | |
| // Outputs | |
| parameter Real x(fixed=false) "Capacity location"; | |
| - parameter Modelica.SIunits.ThermalResistance Rgb(fixed=false) | |
| + | |
| + parameter Modelica.Units.SI.ThermalResistance Rgb(fixed=false) | |
| "Thermal resistance between grout zone and borehole wall"; | |
| - parameter Modelica.SIunits.ThermalResistance Rgg1(fixed=false) | |
| + parameter Modelica.Units.SI.ThermalResistance Rgg1(fixed=false) | |
| "Thermal resistance between the two adjacent grout zones"; | |
| - parameter Modelica.SIunits.ThermalResistance Rgg2(fixed=false) | |
| + parameter Modelica.Units.SI.ThermalResistance Rgg2(fixed=false) | |
| "Thermal resistance between the two opposite grout zones"; | |
| - parameter Modelica.SIunits.ThermalResistance RCondGro(fixed=false) | |
| + parameter Modelica.Units.SI.ThermalResistance RCondGro(fixed=false) | |
| "Thermal resistance between: pipe wall to capacity in grout"; | |
| - | |
| initial equation | |
| (x, Rgb, Rgg1, Rgg2, RCondGro) = | |
| AixLib.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.internalResistancesTwoUTube( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTubeNegative.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTubeNegative.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTubeNegative.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTubeNegative.mo" 2021-04-26 11:51:05.970617934 +0200 | |
| @@ -6,43 +6,43 @@ | |
| // Geometry of the borehole | |
| parameter Real Rb(unit="(m.K)/W") = 0.0 | |
| "Borehole thermal resistance (Not used)"; | |
| - parameter Modelica.SIunits.Height hSeg = 1.0 "Height of the element"; | |
| - parameter Modelica.SIunits.Radius rBor = 0.07 "Radius of the borehole"; | |
| + parameter Modelica.Units.SI.Height hSeg = 1.0 "Height of the element"; | |
| + parameter Modelica.Units.SI.Radius rBor = 0.07 "Radius of the borehole"; | |
| // Geometry of the pipe | |
| - parameter Modelica.SIunits.Radius rTub = 0.02 "Radius of the tube"; | |
| - parameter Modelica.SIunits.Length eTub = 0.002 "Thickness of the tubes"; | |
| - parameter Modelica.SIunits.Length sha = 0.05 | |
| + parameter Modelica.Units.SI.Radius rTub = 0.02 "Radius of the tube"; | |
| + parameter Modelica.Units.SI.Length eTub = 0.002 "Thickness of the tubes"; | |
| + parameter Modelica.Units.SI.Length sha = 0.05 | |
| "Shank spacing, defined as the distance between the center of a pipe and the center of the borehole"; | |
| // Thermal properties (Solids) | |
| - parameter Modelica.SIunits.ThermalConductivity kFil = 1.5 | |
| + parameter Modelica.Units.SI.ThermalConductivity kFil = 1.5 | |
| "Thermal conductivity of the grout"; | |
| - parameter Modelica.SIunits.ThermalConductivity kSoi = 2.5 | |
| + parameter Modelica.Units.SI.ThermalConductivity kSoi = 2.5 | |
| "Thermal conductivity of the soi"; | |
| - parameter Modelica.SIunits.ThermalConductivity kTub = 0.4 | |
| + parameter Modelica.Units.SI.ThermalConductivity kTub = 0.4 | |
| "Thermal conductivity of the tube"; | |
| // Thermal properties (Fluid) | |
| - parameter Modelica.SIunits.ThermalConductivity kMed = 0.6 | |
| + parameter Modelica.Units.SI.ThermalConductivity kMed = 0.6 | |
| "Thermal conductivity of the fluid"; | |
| - parameter Modelica.SIunits.DynamicViscosity muMed = 1.0e-3 | |
| + parameter Modelica.Units.SI.DynamicViscosity muMed = 1.0e-3 | |
| "Dynamic viscosity of the fluid"; | |
| - parameter Modelica.SIunits.SpecificHeatCapacity cpMed = 4180.0 | |
| + parameter Modelica.Units.SI.SpecificHeatCapacity cpMed = 4180.0 | |
| "Specific heat capacity of the fluid"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.25 | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.25 | |
| "Nominal mass flow rate"; | |
| // Outputs | |
| parameter Real x(fixed=false) "Capacity location"; | |
| - parameter Modelica.SIunits.ThermalResistance Rgb(fixed=false) | |
| + | |
| + parameter Modelica.Units.SI.ThermalResistance Rgb(fixed=false) | |
| "Thermal resistance between grout zone and borehole wall"; | |
| - parameter Modelica.SIunits.ThermalResistance Rgg1(fixed=false) | |
| + parameter Modelica.Units.SI.ThermalResistance Rgg1(fixed=false) | |
| "Thermal resistance between the two adjacent grout zones"; | |
| - parameter Modelica.SIunits.ThermalResistance Rgg2(fixed=false) | |
| + parameter Modelica.Units.SI.ThermalResistance Rgg2(fixed=false) | |
| "Thermal resistance between the two opposite grout zones"; | |
| - parameter Modelica.SIunits.ThermalResistance RCondGro(fixed=false) | |
| + parameter Modelica.Units.SI.ThermalResistance RCondGro(fixed=false) | |
| "Thermal resistance between: pipe wall to capacity in grout"; | |
| - | |
| initial equation | |
| (x, Rgb, Rgg1, Rgg2, RCondGro) = | |
| AixLib.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.internalResistancesTwoUTube( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_OneUTube.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_OneUTube.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_OneUTube.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_OneUTube.mo" 2021-04-26 11:51:05.954617913 +0200 | |
| @@ -5,21 +5,21 @@ | |
| parameter Integer nPip=2 "Number of pipes"; | |
| parameter Integer J=3 "Number of multipoles"; | |
| - parameter Modelica.SIunits.Position[nPip] xPip={0.03, -0.03} | |
| + parameter Modelica.Units.SI.Position[nPip] xPip={0.03, -0.03} | |
| "x-Coordinates of pipes"; | |
| - parameter Modelica.SIunits.Position[nPip] yPip={0.00, 0.02} | |
| + parameter Modelica.Units.SI.Position[nPip] yPip={0.00, 0.02} | |
| "y-Coordinates of pipes"; | |
| - parameter Modelica.SIunits.Radius rBor=0.07 "Borehole radius"; | |
| - parameter Modelica.SIunits.Radius[nPip] rPip=fill(0.02, nPip) | |
| + parameter Modelica.Units.SI.Radius rBor=0.07 "Borehole radius"; | |
| + parameter Modelica.Units.SI.Radius[nPip] rPip=fill(0.02, nPip) | |
| "Outter radius of pipes"; | |
| - parameter Modelica.SIunits.ThermalConductivity kFil=1.5 | |
| + parameter Modelica.Units.SI.ThermalConductivity kFil=1.5 | |
| "Thermal conductivity of grouting material"; | |
| - parameter Modelica.SIunits.ThermalConductivity kSoi=2.5 | |
| + parameter Modelica.Units.SI.ThermalConductivity kSoi=2.5 | |
| "Thermal conductivity of soil material"; | |
| parameter Real[nPip] RFluPip(each unit="(m.K)/W")= | |
| fill(1.2/(2*Modelica.Constants.pi*kFil), nPip) | |
| "Fluid to pipe wall thermal resistances"; | |
| - parameter Modelica.SIunits.Temperature TBor=0 | |
| + parameter Modelica.Units.SI.Temperature TBor=0 | |
| "Average borehole wall temperature"; | |
| parameter Real[nPip,nPip] RDelta_Ref(each unit="(m.K)/W")= | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_TwoUTube.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_TwoUTube.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_TwoUTube.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_TwoUTube.mo" 2021-04-26 11:51:05.942617895 +0200 | |
| @@ -5,21 +5,21 @@ | |
| parameter Integer nPip=4 "Number of pipes"; | |
| parameter Integer J=3 "Number of multipoles"; | |
| - parameter Modelica.SIunits.Position[nPip] xPip={0.03, -0.03, -0.03, 0.03} | |
| + parameter Modelica.Units.SI.Position[nPip] xPip={0.03, -0.03, -0.03, 0.03} | |
| "x-Coordinates of pipes"; | |
| - parameter Modelica.SIunits.Position[nPip] yPip={0.03, 0.03, -0.03, -0.03} | |
| + parameter Modelica.Units.SI.Position[nPip] yPip={0.03, 0.03, -0.03, -0.03} | |
| "y-Coordinates of pipes"; | |
| - parameter Modelica.SIunits.Radius rBor=0.07 "Borehole radius"; | |
| - parameter Modelica.SIunits.Radius[nPip] rPip=fill(0.02, nPip) | |
| + parameter Modelica.Units.SI.Radius rBor=0.07 "Borehole radius"; | |
| + parameter Modelica.Units.SI.Radius[nPip] rPip=fill(0.02, nPip) | |
| "Outter radius of pipes"; | |
| - parameter Modelica.SIunits.ThermalConductivity kFil=1.5 | |
| + parameter Modelica.Units.SI.ThermalConductivity kFil=1.5 | |
| "Thermal conductivity of grouting material"; | |
| - parameter Modelica.SIunits.ThermalConductivity kSoi=2.5 | |
| + parameter Modelica.Units.SI.ThermalConductivity kSoi=2.5 | |
| "Thermal conductivity of soil material"; | |
| parameter Real[nPip] RFluPip(each unit="(m.K)/W")= | |
| fill(1.2/(2*Modelica.Constants.pi*kFil), nPip) | |
| "Fluid to pipe wall thermal resistances"; | |
| - parameter Modelica.SIunits.Temperature TBor=0 | |
| + parameter Modelica.Units.SI.Temperature TBor=0 | |
| "Average borehole wall temperature"; | |
| parameter Real[nPip,nPip] RDelta_Ref(each unit="(m.K)/W")= | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesOneUTube.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesOneUTube.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesOneUTube.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesOneUTube.mo" 2021-04-26 11:51:05.746617623 +0200 | |
| @@ -4,8 +4,8 @@ | |
| extends | |
| AixLib.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.PartialInternalResistances; | |
| - parameter Modelica.SIunits.ThermalResistance Rgg_val "Thermal resistance between the two grout zones"; | |
| - parameter Modelica.SIunits.HeatCapacity Co_fil=borFieDat.filDat.dFil*borFieDat.filDat.cFil*hSeg*Modelica.Constants.pi | |
| + parameter Modelica.Units.SI.ThermalResistance Rgg_val "Thermal resistance between the two grout zones"; | |
| + parameter Modelica.Units.SI.HeatCapacity Co_fil=borFieDat.filDat.dFil*borFieDat.filDat.cFil*hSeg*Modelica.Constants.pi | |
| *(borFieDat.conDat.rBor^2 - 2*borFieDat.conDat.rTub^2) | |
| "Heat capacity of the whole filling material"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesTwoUTube.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesTwoUTube.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesTwoUTube.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesTwoUTube.mo" 2021-04-26 11:51:05.722617590 +0200 | |
| @@ -4,11 +4,11 @@ | |
| extends | |
| AixLib.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.PartialInternalResistances; | |
| - parameter Modelica.SIunits.ThermalResistance Rgg1_val | |
| + parameter Modelica.Units.SI.ThermalResistance Rgg1_val | |
| "Thermal resistance between two neightbouring grout capacities, as defined by Bauer et al (2010)"; | |
| - parameter Modelica.SIunits.ThermalResistance Rgg2_val | |
| + parameter Modelica.Units.SI.ThermalResistance Rgg2_val | |
| "Thermal resistance between two grout capacities opposite to each other, as defined by Bauer et al (2010)"; | |
| - parameter Modelica.SIunits.HeatCapacity Co_fil=borFieDat.filDat.dFil*borFieDat.filDat.cFil*hSeg*Modelica.Constants.pi | |
| + parameter Modelica.Units.SI.HeatCapacity Co_fil=borFieDat.filDat.dFil*borFieDat.filDat.cFil*hSeg*Modelica.Constants.pi | |
| *(borFieDat.conDat.rBor^2 - 4*borFieDat.conDat.rTub^2) | |
| "Heat capacity of the whole filling material"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialBorehole.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialBorehole.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialBorehole.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialBorehole.mo" 2021-04-26 11:51:05.666617513 +0200 | |
| @@ -21,11 +21,11 @@ | |
| parameter Integer nSeg(min=1) = 10 | |
| "Number of segments to use in vertical discretization of the boreholes"; | |
| - parameter Modelica.SIunits.Temperature TGro_start[nSeg] | |
| + parameter Modelica.Units.SI.Temperature TGro_start[nSeg] | |
| "Start value of grout temperature" | |
| annotation (Dialog(tab="Initialization")); | |
| - parameter Modelica.SIunits.Temperature TFlu_start[nSeg] = TGro_start | |
| + parameter Modelica.Units.SI.Temperature TFlu_start[nSeg] = TGro_start | |
| "Start value of fluid temperature" | |
| annotation (Dialog(tab="Initialization")); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalHEX.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalHEX.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalHEX.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalHEX.mo" 2021-04-26 11:51:05.650617491 +0200 | |
| @@ -18,31 +18,31 @@ | |
| parameter Boolean dynFil=true | |
| "Set to false to remove the dynamics of the filling material" | |
| annotation (Dialog(tab="Dynamics")); | |
| - parameter Modelica.SIunits.Length hSeg | |
| + parameter Modelica.Units.SI.Length hSeg | |
| "Length of the internal heat exchanger"; | |
| - parameter Modelica.SIunits.Volume VTubSeg = hSeg*Modelica.Constants.pi*(borFieDat.conDat.rTub-borFieDat.conDat.eTub)^2 | |
| + parameter Modelica.Units.SI.Volume VTubSeg = hSeg*Modelica.Constants.pi*(borFieDat.conDat.rTub-borFieDat.conDat.eTub)^2 | |
| "Fluid volume in each tube"; | |
| - parameter Modelica.SIunits.Temperature TFlu_start | |
| + parameter Modelica.Units.SI.Temperature TFlu_start | |
| "Start value of fluid temperature" | |
| annotation (Dialog(tab="Initialization")); | |
| - parameter Modelica.SIunits.Temperature TGro_start | |
| + parameter Modelica.Units.SI.Temperature TGro_start | |
| "Start value of grout temperature" | |
| annotation (Dialog(tab="Initialization")); | |
| Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port_wall | |
| "Thermal connection for borehole wall" | |
| annotation (Placement(transformation(extent={{-10,90},{10,110}}))); | |
| protected | |
| - parameter Modelica.SIunits.SpecificHeatCapacity cpMed= | |
| + parameter Modelica.Units.SI.SpecificHeatCapacity cpMed= | |
| Medium.specificHeatCapacityCp(Medium.setState_pTX( | |
| Medium.p_default, | |
| Medium.T_default, | |
| Medium.X_default)) "Specific heat capacity of the fluid"; | |
| - parameter Modelica.SIunits.ThermalConductivity kMed= | |
| + parameter Modelica.Units.SI.ThermalConductivity kMed= | |
| Medium.thermalConductivity(Medium.setState_pTX( | |
| Medium.p_default, | |
| Medium.T_default, | |
| Medium.X_default)) "Thermal conductivity of the fluid"; | |
| - parameter Modelica.SIunits.DynamicViscosity muMed=Medium.dynamicViscosity( | |
| + parameter Modelica.Units.SI.DynamicViscosity muMed=Medium.dynamicViscosity( | |
| Medium.setState_pTX( | |
| Medium.p_default, | |
| Medium.T_default, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalResistances.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalResistances.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalResistances.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalResistances.mo" 2021-04-26 11:51:05.634617468 +0200 | |
| @@ -1,15 +1,15 @@ | |
| within AixLib.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses; | |
| partial model PartialInternalResistances | |
| "Partial model to implement borehole segment internal resistance models" | |
| - parameter Modelica.SIunits.Length hSeg | |
| + parameter Modelica.Units.SI.Length hSeg | |
| "Length of the internal heat exchanger"; | |
| - parameter Modelica.SIunits.Temperature T_start | |
| + parameter Modelica.Units.SI.Temperature T_start | |
| "Initial temperature of the filling material"; | |
| parameter Data.Borefield.Template borFieDat "Borefield data" | |
| annotation (Placement(transformation(extent={{-100,-100},{-80,-80}}))); | |
| - parameter Modelica.SIunits.ThermalResistance Rgb_val | |
| + parameter Modelica.Units.SI.ThermalResistance Rgb_val | |
| "Thermal resistance between grout zone and borehole wall"; | |
| - parameter Modelica.SIunits.ThermalResistance RCondGro_val | |
| + parameter Modelica.Units.SI.ThermalResistance RCondGro_val | |
| "Thermal resistance between: pipe wall to capacity in grout"; | |
| parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial | |
| "Type of energy balance: dynamic (3 initialization options) or steady state" | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BaseClasses/PartialBorehole.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BaseClasses/PartialBorehole.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BaseClasses/PartialBorehole.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BaseClasses/PartialBorehole.mo" 2021-04-26 11:51:05.606617430 +0200 | |
| @@ -4,7 +4,7 @@ | |
| parameter Integer nSeg(min=1) = 10 | |
| "Number of segments to use in vertical discretization of the boreholes"; | |
| - parameter Modelica.SIunits.Temperature T_start = 273.15 + 22 | |
| + parameter Modelica.Units.SI.Temperature T_start = 273.15 + 22 | |
| "Initial soil temperature"; | |
| parameter AixLib.Fluid.Geothermal.Borefields.Data.Borefield.Example | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeDynamics.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeDynamics.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeDynamics.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeDynamics.mo" 2021-04-26 11:51:05.582617397 +0200 | |
| @@ -5,7 +5,7 @@ | |
| parameter Integer nSeg(min=1) = 10 | |
| "Number of segments to use in vertical discretization of the boreholes"; | |
| - parameter Modelica.SIunits.Temperature T_start = 273.15 + 22 | |
| + parameter Modelica.Units.SI.Temperature T_start = 273.15 + 22 | |
| "Initial soil temperature"; | |
| AixLib.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.OneUTube | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Cylindrical.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Cylindrical.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Cylindrical.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Cylindrical.mo" 2021-04-26 11:51:05.442617203 +0200 | |
| @@ -4,14 +4,14 @@ | |
| parameter AixLib.Fluid.Geothermal.Borefields.Data.Soil.Template soiDat | |
| annotation (Placement(transformation(extent={{-100,-100},{-80,-80}}))); | |
| - parameter Modelica.SIunits.Height h "Height of the cylinder"; | |
| - parameter Modelica.SIunits.Radius r_a "Internal radius"; | |
| - parameter Modelica.SIunits.Radius r_b "External radius"; | |
| + parameter Modelica.Units.SI.Height h "Height of the cylinder"; | |
| + parameter Modelica.Units.SI.Radius r_a "Internal radius"; | |
| + parameter Modelica.Units.SI.Radius r_b "External radius"; | |
| parameter Integer nSta(min=1) = 10 "Number of state variables"; | |
| - parameter Modelica.SIunits.Temperature TInt_start | |
| + parameter Modelica.Units.SI.Temperature TInt_start | |
| "Initial temperature at port_a, used if steadyStateInitial = false" | |
| annotation (Dialog(group="Initialization", enable=not steadyStateInitial)); | |
| - parameter Modelica.SIunits.Temperature TExt_start | |
| + parameter Modelica.Units.SI.Temperature TExt_start | |
| "Initial temperature at port_b, used if steadyStateInitial = false" | |
| annotation (Dialog(group="Initialization", enable=not steadyStateInitial)); | |
| parameter Boolean steadyStateInitial=false | |
| @@ -20,7 +20,7 @@ | |
| parameter Real gridFac(min=1) = 2 "Grid factor for spacing"; | |
| - parameter Modelica.SIunits.Radius r[nSta + 1](each fixed=false) | |
| + parameter Modelica.Units.SI.Radius r[nSta + 1](each fixed=false) | |
| "Radius to the boundary of the i-th domain"; | |
| Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port_a(T(start=TInt_start)) | |
| @@ -30,31 +30,31 @@ | |
| "Heat port at surface b" annotation (Placement(transformation(extent={{90,-10}, | |
| {110,10}},rotation=0))); | |
| - Modelica.SIunits.Temperature T[nSta]( | |
| + Modelica.Units.SI.Temperature T[nSta]( | |
| start={TInt_start + | |
| (TExt_start - TInt_start)/Modelica.Math.log(r_b/r_a)* | |
| Modelica.Math.log((r_a + (r_b - r_a)/(nSta)*(i - 0.5))/r_a) for i in 1:nSta}) | |
| "Temperature of the states"; | |
| - Modelica.SIunits.TemperatureDifference dT "port_a.T - port_b.T"; | |
| + Modelica.Units.SI.TemperatureDifference dT "port_a.T - port_b.T"; | |
| - Modelica.SIunits.HeatFlowRate Q_flow[nSta + 1] | |
| + Modelica.Units.SI.HeatFlowRate Q_flow[nSta + 1] | |
| "Heat flow rate from state i to i+1"; | |
| protected | |
| - parameter Modelica.SIunits.Radius rC[nSta](each fixed=false) | |
| + parameter Modelica.Units.SI.Radius rC[nSta](each fixed=false) | |
| "Radius to the center of the i-th domain"; | |
| - final parameter Modelica.SIunits.SpecificHeatCapacity c=soiDat.cSoi | |
| + final parameter Modelica.Units.SI.SpecificHeatCapacity c=soiDat.cSoi | |
| "Specific heat capacity"; | |
| - final parameter Modelica.SIunits.ThermalConductivity k=soiDat.kSoi | |
| + final parameter Modelica.Units.SI.ThermalConductivity k=soiDat.kSoi | |
| "Thermal conductivity of the material"; | |
| - final parameter Modelica.SIunits.Density d=soiDat.dSoi | |
| + final parameter Modelica.Units.SI.Density d=soiDat.dSoi | |
| "Density of the material"; | |
| - parameter Modelica.SIunits.ThermalConductance G[nSta + 1](each fixed=false) | |
| + parameter Modelica.Units.SI.ThermalConductance G[nSta + 1](each fixed=false) | |
| "Heat conductance between the temperature nodes"; | |
| - parameter Modelica.SIunits.HeatCapacity C[nSta](each fixed=false) | |
| + parameter Modelica.Units.SI.HeatCapacity C[nSta](each fixed=false) | |
| "Heat capacity of each state"; | |
| parameter Real gridFac_sum(fixed=false); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/GroundTemperatureResponse.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/GroundTemperatureResponse.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/GroundTemperatureResponse.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/GroundTemperatureResponse.mo" 2021-04-26 11:51:05.394617137 +0200 | |
| @@ -1,6 +1,6 @@ | |
| within AixLib.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer; | |
| model GroundTemperatureResponse "Model calculating discrete load aggregation" | |
| - parameter Modelica.SIunits.Time tLoaAgg(final min = Modelica.Constants.eps)=3600 | |
| + parameter Modelica.Units.SI.Time tLoaAgg(final min = Modelica.Constants.eps)=3600 | |
| "Time resolution of load aggregation"; | |
| parameter Integer nCel(min=1)=5 "Number of cells per aggregation level"; | |
| parameter Boolean forceGFunCalc = false | |
| @@ -41,7 +41,7 @@ | |
| nTimSho=nTimSho, | |
| nTimLon=nTimLon, | |
| ttsMax=ttsMax) "String with encrypted g-function arguments"; | |
| - parameter Modelica.SIunits.Time timFin= | |
| + parameter Modelica.Units.SI.Time timFin= | |
| (borFieDat.conDat.hBor^2/(9*borFieDat.soiDat.aSoi))*ttsMax | |
| "Final time for g-function calculation"; | |
| parameter Integer i(min=1)= | |
| @@ -53,29 +53,29 @@ | |
| "Number of aggregation cells"; | |
| final parameter Real[nTimTot,2] timSer(each fixed=false) | |
| "g-function input from matrix, with the second column as temperature Tstep"; | |
| - final parameter Modelica.SIunits.Time t_start(fixed=false) "Simulation start time"; | |
| - final parameter Modelica.SIunits.Time[i] nu(each fixed=false) | |
| + final parameter Modelica.Units.SI.Time t_start(fixed=false) "Simulation start time"; | |
| + final parameter Modelica.Units.SI.Time[i] nu(each fixed=false) | |
| "Time vector for load aggregation"; | |
| final parameter Real[i] kappa(each fixed=false) | |
| "Weight factor for each aggregation cell"; | |
| final parameter Real[i] rCel(each fixed=false) "Cell widths"; | |
| - discrete Modelica.SIunits.HeatFlowRate[i] QAgg_flow | |
| + discrete Modelica.Units.SI.HeatFlowRate[i] QAgg_flow | |
| "Vector of aggregated loads"; | |
| - discrete Modelica.SIunits.HeatFlowRate[i] QAggShi_flow | |
| + discrete Modelica.Units.SI.HeatFlowRate[i] QAggShi_flow | |
| "Shifted vector of aggregated loads"; | |
| discrete Integer curCel "Current occupied cell"; | |
| - discrete Modelica.SIunits.TemperatureDifference delTBor0 | |
| + discrete Modelica.Units.SI.TemperatureDifference delTBor0 | |
| "Previous time step's temperature difference current borehole wall temperature minus initial borehole temperature"; | |
| discrete Real derDelTBor0(unit="K/s") | |
| "Derivative of wall temperature change from previous time steps"; | |
| final parameter Real dTStepdt(fixed=false) | |
| "Time derivative of g/(2*pi*H*Nb*ks) within most recent cell"; | |
| - Modelica.SIunits.Heat U "Accumulated heat flow from all boreholes"; | |
| - discrete Modelica.SIunits.Heat U_old "Accumulated heat flow from all boreholes at last aggregation step"; | |
| + Modelica.Units.SI.Heat U "Accumulated heat flow from all boreholes"; | |
| + discrete Modelica.Units.SI.Heat U_old "Accumulated heat flow from all boreholes at last aggregation step"; | |
| initial equation | |
| QAgg_flow = zeros(i); | |
| curCel = 1; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationCellTimes.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationCellTimes.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationCellTimes.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationCellTimes.mo" 2021-04-26 11:51:05.294616997 +0200 | |
| @@ -6,10 +6,10 @@ | |
| input Integer i "Size of time vector"; | |
| input Real lvlBas "Base for growth between each level, e.g. 2"; | |
| input Integer nCel "Number of cells of same size per level"; | |
| - input Modelica.SIunits.Time tLoaAgg(final min=Modelica.Constants.small) "Time resolution of load aggregation"; | |
| - input Modelica.SIunits.Time timFin "Total simulation max length"; | |
| + input Modelica.Units.SI.Time tLoaAgg(final min=Modelica.Constants.small) "Time resolution of load aggregation"; | |
| + input Modelica.Units.SI.Time timFin "Total simulation max length"; | |
| - output Modelica.SIunits.Time nu[i] "Time vector nu of size i"; | |
| + output Modelica.Units.SI.Time nu[i] "Time vector nu of size i"; | |
| output Real rCel[i](each unit="1") "Cell width vector of size i"; | |
| protected | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationWeightingFactors.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationWeightingFactors.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationWeightingFactors.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationWeightingFactors.mo" 2021-04-26 11:51:05.286616987 +0200 | |
| @@ -5,14 +5,14 @@ | |
| input Integer i "Size of aggregation vector"; | |
| input Integer nTimTot "Size of g-function time table"; | |
| - input Modelica.SIunits.ThermalResistance TStep[nTimTot,2] "Time matrix with TStep"; | |
| - input Modelica.SIunits.Time nu[i] "Aggregation time vector nu"; | |
| + input Modelica.Units.SI.ThermalResistance TStep[nTimTot,2] "Time matrix with TStep"; | |
| + input Modelica.Units.SI.Time nu[i] "Aggregation time vector nu"; | |
| - output Modelica.SIunits.ThermalResistance kappa[i] "Weighting factors vector"; | |
| + output Modelica.Units.SI.ThermalResistance kappa[i] "Weighting factors vector"; | |
| protected | |
| - Modelica.SIunits.ThermalResistance prevT "Interpolated value of TStep at previous cell"; | |
| - Modelica.SIunits.ThermalResistance curT "Interpolated value of TStep at current cell"; | |
| + Modelica.Units.SI.ThermalResistance prevT "Interpolated value of TStep at previous cell"; | |
| + Modelica.Units.SI.ThermalResistance curT "Interpolated value of TStep at current cell"; | |
| Integer curInt "Integer to select data interval"; | |
| Real[size(TStep[:,1], 1)] d(each unit="K/J") "Derivatives at the support points"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/countAggregationCells.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/countAggregationCells.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/countAggregationCells.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/countAggregationCells.mo" 2021-04-26 11:51:05.270616964 +0200 | |
| @@ -5,15 +5,15 @@ | |
| input Real lvlBas "Base for growth between each level, e.g. 2"; | |
| input Integer nCel(min=1) "Number of cells of same size per level"; | |
| - input Modelica.SIunits.Time timFin "Total simulation max length"; | |
| - input Modelica.SIunits.Time tLoaAgg "Time resolution of load aggregation"; | |
| + input Modelica.Units.SI.Time timFin "Total simulation max length"; | |
| + input Modelica.Units.SI.Time tLoaAgg "Time resolution of load aggregation"; | |
| output Integer i(min=1) "Size of aggregation vectors"; | |
| protected | |
| - Modelica.SIunits.Duration width_i "Width of current aggregation cell"; | |
| - Modelica.SIunits.Time nu_i "End time of current aggregation cell"; | |
| + Modelica.Units.SI.Duration width_i "Width of current aggregation cell"; | |
| + Modelica.Units.SI.Time nu_i "End time of current aggregation cell"; | |
| algorithm | |
| assert(timFin > 0, "Total simulation time must be bigger than 0."); | |
| width_i := 0; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/shiftAggregationCells.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/shiftAggregationCells.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/shiftAggregationCells.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/shiftAggregationCells.mo" 2021-04-26 11:51:05.262616954 +0200 | |
| @@ -4,14 +4,14 @@ | |
| extends Modelica.Icons.Function; | |
| input Integer i "Number of aggregation cells"; | |
| - input Modelica.SIunits.HeatFlowRate QAgg_flow[i] "Vector of aggregated loads"; | |
| + input Modelica.Units.SI.HeatFlowRate QAgg_flow[i] "Vector of aggregated loads"; | |
| input Real rCel[i](each min=Modelica.Constants.small) "Aggregation cell widths"; | |
| - input Modelica.SIunits.Time nu[i] "Cell aggregation times"; | |
| - input Modelica.SIunits.Time curTim "Current simulation time"; | |
| + input Modelica.Units.SI.Time nu[i] "Cell aggregation times"; | |
| + input Modelica.Units.SI.Time curTim "Current simulation time"; | |
| output Integer curCel "Current occupied aggregation cell"; | |
| - output Modelica.SIunits.HeatFlowRate QAggShi_flow[i] "Shifted vector of aggregated loads"; | |
| + output Modelica.Units.SI.HeatFlowRate QAggShi_flow[i] "Shifted vector of aggregated loads"; | |
| algorithm | |
| curCel := 1; | |
| for j in (i-1):-1:1 loop | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temperatureResponseMatrix.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temperatureResponseMatrix.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temperatureResponseMatrix.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temperatureResponseMatrix.mo" 2021-04-26 11:51:05.254616943 +0200 | |
| @@ -5,12 +5,12 @@ | |
| input Integer nBor "Number of boreholes"; | |
| input Real cooBor[nBor, 2] "Borehole coordinates"; | |
| - input Modelica.SIunits.Height hBor "Borehole length"; | |
| - input Modelica.SIunits.Height dBor "Borehole buried depth"; | |
| - input Modelica.SIunits.Radius rBor "Borehole radius"; | |
| - input Modelica.SIunits.ThermalDiffusivity aSoi | |
| + input Modelica.Units.SI.Height hBor "Borehole length"; | |
| + input Modelica.Units.SI.Height dBor "Borehole buried depth"; | |
| + input Modelica.Units.SI.Radius rBor "Borehole radius"; | |
| + input Modelica.Units.SI.ThermalDiffusivity aSoi | |
| "Thermal diffusivity of soil"; | |
| - input Modelica.SIunits.ThermalConductivity kSoi | |
| + input Modelica.Units.SI.ThermalConductivity kSoi | |
| "Thermal conductivity of soil"; | |
| input Integer nSeg "Number of line source segments per borehole"; | |
| input Integer nTimSho "Number of time steps in short time region"; | |
| @@ -21,11 +21,11 @@ | |
| input Boolean forceGFunCalc | |
| "Set to true to force the thermal response to be calculated at the start"; | |
| - output Modelica.SIunits.ThermalResistance TStep[nTimTot, 2] "Temperature step-response time series"; | |
| + output Modelica.Units.SI.ThermalResistance TStep[nTimTot, 2] "Temperature step-response time series"; | |
| protected | |
| String pathSave "Path of the folder used to save the g-function"; | |
| - Modelica.SIunits.Time[nTimTot] tGFun "g-function evaluation times"; | |
| + Modelica.Units.SI.Time[nTimTot] tGFun "g-function evaluation times"; | |
| Real[nTimTot] gFun "g-function vector"; | |
| Boolean writegFun = false "True if g-function was succesfully written to file"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temporalSuperposition.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temporalSuperposition.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temporalSuperposition.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temporalSuperposition.mo" 2021-04-26 11:51:05.230616910 +0200 | |
| @@ -4,14 +4,14 @@ | |
| extends Modelica.Icons.Function; | |
| input Integer i "Number of aggregation cells"; | |
| - input Modelica.SIunits.HeatFlowRate QAgg_flow[i] | |
| + input Modelica.Units.SI.HeatFlowRate QAgg_flow[i] | |
| "Vector of aggregated loads"; | |
| - input Modelica.SIunits.ThermalResistance kappa[i] | |
| + input Modelica.Units.SI.ThermalResistance kappa[i] | |
| "Weighting factors for each aggregation cell"; | |
| input Integer curCel "Current occupied aggregation cell"; | |
| - output Modelica.SIunits.TemperatureDifference deltaTb "Delta T at wall"; | |
| + output Modelica.Units.SI.TemperatureDifference deltaTb "Delta T at wall"; | |
| algorithm | |
| deltaTb := QAgg_flow[1:curCel]*kappa[1:curCel]; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationCellTimes.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationCellTimes.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationCellTimes.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationCellTimes.mo" 2021-04-26 11:51:05.350617076 +0200 | |
| @@ -4,13 +4,13 @@ | |
| extends Modelica.Icons.Example; | |
| parameter Integer i = 6 "Number of aggregation cells"; | |
| - parameter Modelica.SIunits.Time tLoaAgg=10 "Time resolution of load aggregation"; | |
| - final parameter Modelica.SIunits.Time[i] nu(each fixed=false) | |
| - "Time vector for load aggregation"; | |
| - final parameter Modelica.SIunits.Time[i] rCel(each fixed=false) "Cell widths"; | |
| - Modelica.SIunits.Time nu_error,rCel_error "Error on chosen values"; | |
| + parameter Modelica.Units.SI.Time tLoaAgg=10 "Time resolution of load aggregation"; | |
| + final parameter Modelica.Units.SI.Time[i] nu(each fixed=false) | |
| + "Time vector for load aggregation"; | |
| + final parameter Modelica.Units.SI.Time[i] rCel(each fixed=false) "Cell widths"; | |
| + Modelica.Units.SI.Time nu_error,rCel_error "Error on chosen values"; | |
| initial equation | |
| (nu,rCel) = AixLib.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.LoadAggregation.aggregationCellTimes( | |
| i=i, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationWeightingFactors.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationWeightingFactors.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationWeightingFactors.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationWeightingFactors.mo" 2021-04-26 11:51:05.342617065 +0200 | |
| @@ -11,7 +11,7 @@ | |
| 6.27297603019976, 2.43435015306157e-05; | |
| 9.21672932384307, 3.00295537091117e-05] | |
| "Complete time matrix with TStep"; | |
| - Modelica.SIunits.ThermalResistance[10] kappa | |
| + Modelica.Units.SI.ThermalResistance[10] kappa | |
| "Weight factor for each aggregation cell"; | |
| equation | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/ShiftAggregationCells.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/ShiftAggregationCells.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/ShiftAggregationCells.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/ShiftAggregationCells.mo" 2021-04-26 11:51:05.326617042 +0200 | |
| @@ -3,7 +3,7 @@ | |
| extends Modelica.Icons.Example; | |
| discrete Integer curCel "Current occupied cell"; | |
| - discrete Modelica.SIunits.HeatFlowRate[5] QAggShi_flow | |
| + discrete Modelica.Units.SI.HeatFlowRate[5] QAggShi_flow | |
| "Shifted vector of aggregated loads"; | |
| initial equation | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemperatureResponseMatrix.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemperatureResponseMatrix.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemperatureResponseMatrix.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemperatureResponseMatrix.mo" 2021-04-26 11:51:05.318617032 +0200 | |
| @@ -3,7 +3,8 @@ | |
| "This validation case test the calculation, writing and reading of the temperature step response" | |
| extends Modelica.Icons.Example; | |
| - parameter Modelica.SIunits.Time timSer[26+50,2]= | |
| + | |
| + parameter Modelica.Units.SI.Time timSer[26+50,2]= | |
| AixLib.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.LoadAggregation.temperatureResponseMatrix( | |
| nBor=1, | |
| cooBor={{0,0}}, | |
| @@ -19,8 +20,7 @@ | |
| ttsMax=exp(5), | |
| sha="TemperatureResponseMatrix_validation", | |
| forceGFunCalc=true) "Resulting temperature response matrix"; | |
| - Modelica.SIunits.ThermalResistance TStep "Temperature step response"; | |
| - | |
| + Modelica.Units.SI.ThermalResistance TStep "Temperature step response"; | |
| equation | |
| TStep = Modelica.Math.Vectors.interpolate(timSer[:,1],timSer[:,2],time); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemporalSuperposition.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemporalSuperposition.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemporalSuperposition.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemporalSuperposition.mo" 2021-04-26 11:51:05.310617020 +0200 | |
| @@ -2,13 +2,13 @@ | |
| model TemporalSuperposition "This validation case applies temporal superposition with truncated vectors" | |
| extends Modelica.Icons.Example; | |
| - parameter Modelica.SIunits.TemperatureDifference supPos = AixLib.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.LoadAggregation.temporalSuperposition( | |
| + | |
| + parameter Modelica.Units.SI.TemperatureDifference supPos = AixLib.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.LoadAggregation.temporalSuperposition( | |
| i=6, | |
| QAgg_flow={2,1e6,3,1e6,1e6}, | |
| kappa={0.4,0,0.2,1,0}, | |
| curCel=3) "Temporal superposition"; | |
| - Modelica.SIunits.TemperatureDifference supPosErr; | |
| - | |
| + Modelica.Units.SI.TemperatureDifference supPosErr; | |
| equation | |
| supPosErr = abs((2*0.4+3*0.2)-supPos); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/cylindricalHeatSource.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/cylindricalHeatSource.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/cylindricalHeatSource.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/cylindricalHeatSource.mo" 2021-04-26 11:51:05.066616681 +0200 | |
| @@ -3,10 +3,10 @@ | |
| "Cylindrical heat source solution from Carslaw and Jaeger" | |
| extends Modelica.Icons.Function; | |
| - input Modelica.SIunits.Time t "Time"; | |
| - input Modelica.SIunits.ThermalDiffusivity aSoi "Ground thermal diffusivity"; | |
| - input Modelica.SIunits.Distance dis "Radial distance between borehole axes"; | |
| - input Modelica.SIunits.Radius rBor "Radius of emitting borehole"; | |
| + input Modelica.Units.SI.Time t "Time"; | |
| + input Modelica.Units.SI.ThermalDiffusivity aSoi "Ground thermal diffusivity"; | |
| + input Modelica.Units.SI.Distance dis "Radial distance between borehole axes"; | |
| + input Modelica.Units.SI.Radius rBor "Radius of emitting borehole"; | |
| output Real G "Thermal response factor of borehole 1 on borehole 2"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource_Integrand.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource_Integrand.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource_Integrand.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource_Integrand.mo" 2021-04-26 11:51:05.030616633 +0200 | |
| @@ -4,11 +4,11 @@ | |
| extends Modelica.Icons.Function; | |
| input Real u(unit="1/m") "Integration variable"; | |
| - input Modelica.SIunits.Distance dis "Radial distance between borehole axes"; | |
| - input Modelica.SIunits.Height len1 "Length of emitting borehole"; | |
| - input Modelica.SIunits.Height burDep1 "Buried depth of emitting borehole"; | |
| - input Modelica.SIunits.Height len2 "Length of receiving borehole"; | |
| - input Modelica.SIunits.Height burDep2 "Buried depth of receiving borehole"; | |
| + input Modelica.Units.SI.Distance dis "Radial distance between borehole axes"; | |
| + input Modelica.Units.SI.Height len1 "Length of emitting borehole"; | |
| + input Modelica.Units.SI.Height burDep1 "Buried depth of emitting borehole"; | |
| + input Modelica.Units.SI.Height len2 "Length of receiving borehole"; | |
| + input Modelica.Units.SI.Height burDep2 "Buried depth of receiving borehole"; | |
| input Boolean includeRealSource = true "true if contribution of real source is included"; | |
| input Boolean includeMirrorSource = true "true if contribution of mirror source is included"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource.mo" 2021-04-26 11:51:05.050616661 +0200 | |
| @@ -3,13 +3,13 @@ | |
| "Finite line source solution of Claesson and Javed" | |
| extends Modelica.Icons.Function; | |
| - input Modelica.SIunits.Time t "Time"; | |
| - input Modelica.SIunits.ThermalDiffusivity aSoi "Ground thermal diffusivity"; | |
| - input Modelica.SIunits.Distance dis "Radial distance between borehole axes"; | |
| - input Modelica.SIunits.Height len1 "Length of emitting borehole"; | |
| - input Modelica.SIunits.Height burDep1 "Buried depth of emitting borehole"; | |
| - input Modelica.SIunits.Height len2 "Length of receiving borehole"; | |
| - input Modelica.SIunits.Height burDep2 "Buried depth of receiving borehole"; | |
| + input Modelica.Units.SI.Time t "Time"; | |
| + input Modelica.Units.SI.ThermalDiffusivity aSoi "Ground thermal diffusivity"; | |
| + input Modelica.Units.SI.Distance dis "Radial distance between borehole axes"; | |
| + input Modelica.Units.SI.Height len1 "Length of emitting borehole"; | |
| + input Modelica.Units.SI.Height burDep1 "Buried depth of emitting borehole"; | |
| + input Modelica.Units.SI.Height len2 "Length of receiving borehole"; | |
| + input Modelica.Units.SI.Height burDep2 "Buried depth of receiving borehole"; | |
| input Boolean includeRealSource = true "True if contribution of real source is included"; | |
| input Boolean includeMirrorSource = true "True if contribution of mirror source is included"; | |
| @@ -19,10 +19,10 @@ | |
| Real lowBou(unit="m-1") "Lower bound of integration"; | |
| // Upper bound is infinite | |
| Real uppBou(unit="m-1") = max(100.0, 10.0/dis) "Upper bound of integration"; | |
| - Modelica.SIunits.Distance disMin | |
| - "Minimum distance between sources and receiving line"; | |
| - Modelica.SIunits.Time timTre "Time treshold for evaluation of the solution"; | |
| + Modelica.Units.SI.Distance disMin | |
| + "Minimum distance between sources and receiving line"; | |
| + Modelica.Units.SI.Time timTre "Time treshold for evaluation of the solution"; | |
| algorithm | |
| h_21 := 0; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/gFunction.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/gFunction.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/gFunction.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/gFunction.mo" 2021-04-26 11:51:05.018616615 +0200 | |
| @@ -3,34 +3,34 @@ | |
| extends Modelica.Icons.Function; | |
| input Integer nBor "Number of boreholes"; | |
| - input Modelica.SIunits.Position cooBor[nBor, 2] "Coordinates of boreholes"; | |
| - input Modelica.SIunits.Height hBor "Borehole length"; | |
| - input Modelica.SIunits.Height dBor "Borehole buried depth"; | |
| - input Modelica.SIunits.Radius rBor "Borehole radius"; | |
| - input Modelica.SIunits.ThermalDiffusivity aSoi "Ground thermal diffusivity used in g-function evaluation"; | |
| + input Modelica.Units.SI.Position cooBor[nBor, 2] "Coordinates of boreholes"; | |
| + input Modelica.Units.SI.Height hBor "Borehole length"; | |
| + input Modelica.Units.SI.Height dBor "Borehole buried depth"; | |
| + input Modelica.Units.SI.Radius rBor "Borehole radius"; | |
| + input Modelica.Units.SI.ThermalDiffusivity aSoi "Ground thermal diffusivity used in g-function evaluation"; | |
| input Integer nSeg "Number of line source segments per borehole"; | |
| input Integer nTimSho "Number of time steps in short time region"; | |
| input Integer nTimLon "Number of time steps in long time region"; | |
| input Real ttsMax "Maximum adimensional time for gfunc calculation"; | |
| input Real relTol = 0.02 "Relative tolerance on distance between boreholes"; | |
| - output Modelica.SIunits.Time tGFun[nTimSho+nTimLon] "Time of g-function evaluation"; | |
| + output Modelica.Units.SI.Time tGFun[nTimSho+nTimLon] "Time of g-function evaluation"; | |
| output Real g[nTimSho+nTimLon] "g-function"; | |
| protected | |
| - Modelica.SIunits.Time ts = hBor^2/(9*aSoi) "Characteristic time"; | |
| - Modelica.SIunits.Time tSho_min = 1 "Minimum time for short time calculations"; | |
| - Modelica.SIunits.Time tSho_max = 3600 "Maximum time for short time calculations"; | |
| - Modelica.SIunits.Time tLon_min = tSho_max "Minimum time for long time calculations"; | |
| - Modelica.SIunits.Time tLon_max = ts*ttsMax "Maximum time for long time calculations"; | |
| - Modelica.SIunits.Time tSho[nTimSho] "Time vector for short time calculations"; | |
| - Modelica.SIunits.Time tLon[nTimLon] "Time vector for long time calculations"; | |
| - Modelica.SIunits.Distance dis "Separation distance between boreholes"; | |
| - Modelica.SIunits.Distance dis_mn "Separation distance for comparison"; | |
| - Modelica.SIunits.Radius rLin=0.0005*hBor "Radius for evaluation of same-borehole line source solutions"; | |
| + Modelica.Units.SI.Time ts = hBor^2/(9*aSoi) "Characteristic time"; | |
| + Modelica.Units.SI.Time tSho_min = 1 "Minimum time for short time calculations"; | |
| + Modelica.Units.SI.Time tSho_max = 3600 "Maximum time for short time calculations"; | |
| + Modelica.Units.SI.Time tLon_min = tSho_max "Minimum time for long time calculations"; | |
| + Modelica.Units.SI.Time tLon_max = ts*ttsMax "Maximum time for long time calculations"; | |
| + Modelica.Units.SI.Time tSho[nTimSho] "Time vector for short time calculations"; | |
| + Modelica.Units.SI.Time tLon[nTimLon] "Time vector for long time calculations"; | |
| + Modelica.Units.SI.Distance dis "Separation distance between boreholes"; | |
| + Modelica.Units.SI.Distance dis_mn "Separation distance for comparison"; | |
| + Modelica.Units.SI.Radius rLin=0.0005*hBor "Radius for evaluation of same-borehole line source solutions"; | |
| Real hSegRea[nSeg] "Real part of the FLS solution"; | |
| Real hSegMir[2*nSeg-1] "Mirror part of the FLS solution"; | |
| - Modelica.SIunits.Height dSeg "Buried depth of borehole segment"; | |
| + Modelica.Units.SI.Height dSeg "Buried depth of borehole segment"; | |
| Integer Done[nBor, nBor] "Matrix for tracking of FLS evaluations"; | |
| Real A[nSeg*nBor+1, nSeg*nBor+1] "Coefficient matrix for system of equations"; | |
| Real B[nSeg*nBor+1] "Coefficient vector for system of equations"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/shaGFunction.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/shaGFunction.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/shaGFunction.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/shaGFunction.mo" 2021-04-26 11:51:04.974616554 +0200 | |
| @@ -3,11 +3,11 @@ | |
| "Returns a SHA1 encryption of the formatted arguments for the g-function generation" | |
| extends Modelica.Icons.Function; | |
| input Integer nBor "Number of boreholes"; | |
| - input Modelica.SIunits.Position cooBor[nBor, 2] "Coordinates of boreholes"; | |
| - input Modelica.SIunits.Height hBor "Borehole length"; | |
| - input Modelica.SIunits.Height dBor "Borehole buried depth"; | |
| - input Modelica.SIunits.Radius rBor "Borehole radius"; | |
| - input Modelica.SIunits.ThermalDiffusivity aSoi "Ground thermal diffusivity used in g-function evaluation"; | |
| + input Modelica.Units.SI.Position cooBor[nBor, 2] "Coordinates of boreholes"; | |
| + input Modelica.Units.SI.Height hBor "Borehole length"; | |
| + input Modelica.Units.SI.Height dBor "Borehole buried depth"; | |
| + input Modelica.Units.SI.Radius rBor "Borehole radius"; | |
| + input Modelica.Units.SI.ThermalDiffusivity aSoi "Ground thermal diffusivity used in g-function evaluation"; | |
| input Integer nSeg "Number of line source segments per borehole"; | |
| input Integer nTimSho "Number of time steps in short time region"; | |
| input Integer nTimLon "Number of time steps in long time region"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/timeGeometric.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/timeGeometric.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/timeGeometric.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/timeGeometric.mo" 2021-04-26 11:51:04.958616533 +0200 | |
| @@ -2,8 +2,8 @@ | |
| function timeGeometric "Geometric expansion of time steps" | |
| extends Modelica.Icons.Function; | |
| - input Modelica.SIunits.Duration dt "Minimum time step"; | |
| - input Modelica.SIunits.Time t_max "Maximum value of time"; | |
| + input Modelica.Units.SI.Duration dt "Minimum time step"; | |
| + input Modelica.Units.SI.Time t_max "Maximum value of time"; | |
| input Integer nTim "Number of time values"; | |
| output Real t[nTim] "Time vector"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/CylindricalHeatSource.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/CylindricalHeatSource.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/CylindricalHeatSource.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/CylindricalHeatSource.mo" 2021-04-26 11:51:05.210616882 +0200 | |
| @@ -2,11 +2,11 @@ | |
| model CylindricalHeatSource "Test case for cylindrical heat source" | |
| extends Modelica.Icons.Example; | |
| - parameter Modelica.SIunits.ThermalDiffusivity aSoi = 1.0e-6 "Ground thermal diffusivity"; | |
| - parameter Modelica.SIunits.Radius rSource = 0.075 "Radius of cylinder source"; | |
| - parameter Modelica.SIunits.Radius[5] r = {rSource, 2*rSource, 5*rSource, 10*rSource, 20*rSource} | |
| + parameter Modelica.Units.SI.ThermalDiffusivity aSoi = 1.0e-6 "Ground thermal diffusivity"; | |
| + parameter Modelica.Units.SI.Radius rSource = 0.075 "Radius of cylinder source"; | |
| + parameter Modelica.Units.SI.Radius[5] r = {rSource, 2*rSource, 5*rSource, 10*rSource, 20*rSource} | |
| "Radial position of evaluation of the solution"; | |
| - Modelica.SIunits.Time t "Time"; | |
| + Modelica.Units.SI.Time t "Time"; | |
| Real[5] G "Cylindrical heat source solution"; | |
| equation | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand_Length.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand_Length.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand_Length.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand_Length.mo" 2021-04-26 11:51:05.166616821 +0200 | |
| @@ -4,12 +4,12 @@ | |
| extends Modelica.Icons.Example; | |
| parameter Real dis_over_len = 0.0005 "Radial distance between borehole axes"; | |
| - parameter Modelica.SIunits.Height len150 = 150.0 "Length of emitting borehole"; | |
| - parameter Modelica.SIunits.Height len75 = 75.0 "Length of emitting borehole"; | |
| - parameter Modelica.SIunits.Height len25 = 25.0 "Length of emitting borehole"; | |
| - parameter Modelica.SIunits.Height len5 = 5.0 "Length of emitting borehole"; | |
| - parameter Modelica.SIunits.Height len1 = 1.0 "Length of emitting borehole"; | |
| - parameter Modelica.SIunits.Height burDep = 4. "Buried depth of emitting borehole"; | |
| + parameter Modelica.Units.SI.Height len150 = 150.0 "Length of emitting borehole"; | |
| + parameter Modelica.Units.SI.Height len75 = 75.0 "Length of emitting borehole"; | |
| + parameter Modelica.Units.SI.Height len25 = 25.0 "Length of emitting borehole"; | |
| + parameter Modelica.Units.SI.Height len5 = 5.0 "Length of emitting borehole"; | |
| + parameter Modelica.Units.SI.Height len1 = 1.0 "Length of emitting borehole"; | |
| + parameter Modelica.Units.SI.Height burDep = 4. "Buried depth of emitting borehole"; | |
| Real u "Integration variable"; | |
| Real logy150 "Logarithm of finite line source integrand"; | |
| Real logy75 "Logarithm of finite line source integrand"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand.mo" 2021-04-26 11:51:05.174616831 +0200 | |
| @@ -3,11 +3,11 @@ | |
| "Test case for finite line source integrand function" | |
| extends Modelica.Icons.Example; | |
| - parameter Modelica.SIunits.Distance dis = 0.075 "Radial distance between borehole axes"; | |
| - parameter Modelica.SIunits.Height len1 = 150.0 "Length of emitting borehole"; | |
| - parameter Modelica.SIunits.Height burDep1 = 4.0 "Buried depth of emitting borehole"; | |
| - parameter Modelica.SIunits.Height len2 = 150.0 "Length of receiving borehole"; | |
| - parameter Modelica.SIunits.Height burDep2 = 4.0 "Buried depth of receiving borehole"; | |
| + parameter Modelica.Units.SI.Distance dis = 0.075 "Radial distance between borehole axes"; | |
| + parameter Modelica.Units.SI.Height len1 = 150.0 "Length of emitting borehole"; | |
| + parameter Modelica.Units.SI.Height burDep1 = 4.0 "Buried depth of emitting borehole"; | |
| + parameter Modelica.Units.SI.Height len2 = 150.0 "Length of receiving borehole"; | |
| + parameter Modelica.Units.SI.Height burDep2 = 4.0 "Buried depth of receiving borehole"; | |
| Real u "Integration variable"; | |
| Real y "Finite line source integrand"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource.mo" 2021-04-26 11:51:05.194616859 +0200 | |
| @@ -2,17 +2,17 @@ | |
| model FiniteLineSource "Test case for finite line source" | |
| extends Modelica.Icons.Example; | |
| - parameter Modelica.SIunits.ThermalDiffusivity aSoi = 1.0e-6 "Ground thermal diffusivity"; | |
| - parameter Modelica.SIunits.Distance[2] r = {0.075, 7.0} | |
| + parameter Modelica.Units.SI.ThermalDiffusivity aSoi = 1.0e-6 "Ground thermal diffusivity"; | |
| + parameter Modelica.Units.SI.Distance[2] r = {0.075, 7.0} | |
| "Radial position of evaluation of the solution"; | |
| - parameter Modelica.SIunits.Height len1 = 12.5 "Length of emitting source"; | |
| - parameter Modelica.SIunits.Height burDep1 = 29.0 | |
| + parameter Modelica.Units.SI.Height len1 = 12.5 "Length of emitting source"; | |
| + parameter Modelica.Units.SI.Height burDep1 = 29.0 | |
| "Buried depth of emitting source"; | |
| - parameter Modelica.SIunits.Height[7] len2 = {12.5, 8.0, 15.0, 14.0, 6.0, 20.0, 3.0} | |
| + parameter Modelica.Units.SI.Height[7] len2 = {12.5, 8.0, 15.0, 14.0, 6.0, 20.0, 3.0} | |
| "Length of receiving line"; | |
| - parameter Modelica.SIunits.Height[7] burDep2 = {29.0, 25.0, 34.0, 2.0, 32.0, 27.0, 44.0} | |
| + parameter Modelica.Units.SI.Height[7] burDep2 = {29.0, 25.0, 34.0, 2.0, 32.0, 27.0, 44.0} | |
| "Buried depth of receiving line"; | |
| - Modelica.SIunits.Time t "Time"; | |
| + Modelica.Units.SI.Time t "Time"; | |
| Real[2,7] hRea "Finite line source solution (Real part)"; | |
| Real[2,7] hMir "Finite line source solution (Mirror part)"; | |
| Real[2,7] h "Finite line source solution"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_100boreholes.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_100boreholes.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_100boreholes.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_100boreholes.mo" 2021-04-26 11:51:05.150616798 +0200 | |
| @@ -4,12 +4,12 @@ | |
| extends Modelica.Icons.Example; | |
| parameter Integer nBor = 100 "Number of boreholes"; | |
| - parameter Modelica.SIunits.Position cooBor[nBor, 2] = {{7.5*mod(i-1,10), 7.5*floor((i-1)/10)} for i in 1:nBor} | |
| + parameter Modelica.Units.SI.Position cooBor[nBor, 2] = {{7.5*mod(i-1,10), 7.5*floor((i-1)/10)} for i in 1:nBor} | |
| "Coordinates of boreholes"; | |
| - parameter Modelica.SIunits.Height hBor = 150 "Borehole length"; | |
| - parameter Modelica.SIunits.Height dBor = 4 "Borehole buried depth"; | |
| - parameter Modelica.SIunits.Radius rBor = 0.075 "Borehole radius"; | |
| - parameter Modelica.SIunits.ThermalDiffusivity aSoi = 1e-6 "Ground thermal diffusivity used in g-function evaluation"; | |
| + parameter Modelica.Units.SI.Height hBor = 150 "Borehole length"; | |
| + parameter Modelica.Units.SI.Height dBor = 4 "Borehole buried depth"; | |
| + parameter Modelica.Units.SI.Radius rBor = 0.075 "Borehole radius"; | |
| + parameter Modelica.Units.SI.ThermalDiffusivity aSoi = 1e-6 "Ground thermal diffusivity used in g-function evaluation"; | |
| parameter Integer nSeg = 12 "Number of line source segments per borehole"; | |
| parameter Integer nTimSho = 26 "Number of time steps in short time region"; | |
| parameter Integer nTimLon = 50 "Number of time steps in long time region"; | |
| @@ -18,19 +18,19 @@ | |
| final parameter Integer nTimTot=nTimSho+nTimLon; | |
| final parameter Real[nTimTot] gFun(each fixed=false); | |
| final parameter Real[nTimTot] lntts(each fixed=false); | |
| - final parameter Modelica.SIunits.Time[nTimTot] tGFun(each fixed=false); | |
| + final parameter Modelica.Units.SI.Time[nTimTot] tGFun(each fixed=false); | |
| final parameter Real[nTimTot] dspline(each fixed=false); | |
| Real gFun_int "Interpolated value of g-function"; | |
| Real lntts_int "Non-dimensional logarithmic time for interpolation"; | |
| discrete Integer k "Current interpolation interval"; | |
| - discrete Modelica.SIunits.Time t1 "Previous value of time for interpolation"; | |
| - discrete Modelica.SIunits.Time t2 "Next value of time for interpolation"; | |
| + discrete Modelica.Units.SI.Time t1 "Previous value of time for interpolation"; | |
| + discrete Modelica.Units.SI.Time t2 "Next value of time for interpolation"; | |
| discrete Real gFun1 "Previous g-function value for interpolation"; | |
| discrete Real gFun2 "Next g-function value for interpolation"; | |
| - parameter Modelica.SIunits.Time ts = hBor^2/(9*aSoi) "Bore field characteristic time"; | |
| + parameter Modelica.Units.SI.Time ts = hBor^2/(9*aSoi) "Bore field characteristic time"; | |
| initial equation | |
| // Evaluate g-function for the specified bore field configuration | |
| (tGFun,gFun) = | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_1borehole_5meters.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_1borehole_5meters.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_1borehole_5meters.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_1borehole_5meters.mo" 2021-04-26 11:51:05.126616765 +0200 | |
| @@ -4,12 +4,12 @@ | |
| extends Modelica.Icons.Example; | |
| parameter Integer nBor = 1 "Number of boreholes"; | |
| - parameter Modelica.SIunits.Position cooBor[nBor, 2] = {{5.*mod(i-1,3), 5.*floor((i-1)/3)} for i in 1:nBor} | |
| + parameter Modelica.Units.SI.Position cooBor[nBor, 2] = {{5.*mod(i-1,3), 5.*floor((i-1)/3)} for i in 1:nBor} | |
| "Coordinates of boreholes"; | |
| - parameter Modelica.SIunits.Height hBor = 5 "Borehole length"; | |
| - parameter Modelica.SIunits.Height dBor = 1 "Borehole buried depth"; | |
| - parameter Modelica.SIunits.Radius rBor = 0.075 "Borehole radius"; | |
| - parameter Modelica.SIunits.ThermalDiffusivity aSoi = 1e-6 "Ground thermal diffusivity used in g-function evaluation"; | |
| + parameter Modelica.Units.SI.Height hBor = 5 "Borehole length"; | |
| + parameter Modelica.Units.SI.Height dBor = 1 "Borehole buried depth"; | |
| + parameter Modelica.Units.SI.Radius rBor = 0.075 "Borehole radius"; | |
| + parameter Modelica.Units.SI.ThermalDiffusivity aSoi = 1e-6 "Ground thermal diffusivity used in g-function evaluation"; | |
| parameter Integer nSeg = 12 "Number of line source segments per borehole"; | |
| parameter Integer nTimSho = 26 "Number of time steps in short time region"; | |
| parameter Integer nTimLon = 50 "Number of time steps in long time region"; | |
| @@ -18,19 +18,19 @@ | |
| final parameter Integer nTimTot=nTimSho+nTimLon; | |
| final parameter Real[nTimTot] gFun(each fixed=false); | |
| final parameter Real[nTimTot] lntts(each fixed=false); | |
| - final parameter Modelica.SIunits.Time[nTimTot] tGFun(each fixed=false); | |
| + final parameter Modelica.Units.SI.Time[nTimTot] tGFun(each fixed=false); | |
| final parameter Real[nTimTot] dspline(each fixed=false); | |
| Real gFun_int "Interpolated value of g-function"; | |
| Real lntts_int "Non-dimensional logarithmic time for interpolation"; | |
| discrete Integer k "Current interpolation interval"; | |
| - discrete Modelica.SIunits.Time t1 "Previous value of time for interpolation"; | |
| - discrete Modelica.SIunits.Time t2 "Next value of time for interpolation"; | |
| + discrete Modelica.Units.SI.Time t1 "Previous value of time for interpolation"; | |
| + discrete Modelica.Units.SI.Time t2 "Next value of time for interpolation"; | |
| discrete Real gFun1 "Previous g-function value for interpolation"; | |
| discrete Real gFun2 "Next g-function value for interpolation"; | |
| - parameter Modelica.SIunits.Time ts = hBor^2/(9*aSoi) "Bore field characteristic time"; | |
| + parameter Modelica.Units.SI.Time ts = hBor^2/(9*aSoi) "Bore field characteristic time"; | |
| initial equation | |
| // Evaluate g-function for the specified bore field configuration | |
| (tGFun,gFun) = | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_SmallScaleValidation.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_SmallScaleValidation.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_SmallScaleValidation.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_SmallScaleValidation.mo" 2021-04-26 11:51:05.110616742 +0200 | |
| @@ -6,12 +6,12 @@ | |
| parameter AixLib.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.Validation.BaseClasses.SmallScale_Borefield borFieDat | |
| "Record of borehole configuration data"; | |
| parameter Integer nBor = borFieDat.conDat.nBor "Number of boreholes"; | |
| - parameter Modelica.SIunits.Position cooBor[nBor, 2] = borFieDat.conDat.cooBor | |
| + parameter Modelica.Units.SI.Position cooBor[nBor, 2] = borFieDat.conDat.cooBor | |
| "Coordinates of boreholes"; | |
| - parameter Modelica.SIunits.Height hBor = borFieDat.conDat.hBor "Borehole length"; | |
| - parameter Modelica.SIunits.Height dBor = borFieDat.conDat.dBor "Borehole buried depth"; | |
| - parameter Modelica.SIunits.Radius rBor = borFieDat.conDat.rBor "Borehole radius"; | |
| - parameter Modelica.SIunits.ThermalDiffusivity aSoi = borFieDat.soiDat.kSoi/(borFieDat.soiDat.dSoi*borFieDat.soiDat.cSoi) | |
| + parameter Modelica.Units.SI.Height hBor = borFieDat.conDat.hBor "Borehole length"; | |
| + parameter Modelica.Units.SI.Height dBor = borFieDat.conDat.dBor "Borehole buried depth"; | |
| + parameter Modelica.Units.SI.Radius rBor = borFieDat.conDat.rBor "Borehole radius"; | |
| + parameter Modelica.Units.SI.ThermalDiffusivity aSoi = borFieDat.soiDat.kSoi/(borFieDat.soiDat.dSoi*borFieDat.soiDat.cSoi) | |
| "Ground thermal diffusivity used in g-function evaluation"; | |
| parameter Integer nSeg = 12 "Number of line source segments per borehole"; | |
| parameter Integer nTimSho = 26 "Number of time steps in short time region"; | |
| @@ -21,19 +21,19 @@ | |
| final parameter Integer nTimTot=nTimSho+nTimLon; | |
| final parameter Real[nTimTot] gFun(each fixed=false); | |
| final parameter Real[nTimTot] lntts(each fixed=false); | |
| - final parameter Modelica.SIunits.Time[nTimTot] tGFun(each fixed=false); | |
| + final parameter Modelica.Units.SI.Time[nTimTot] tGFun(each fixed=false); | |
| final parameter Real[nTimTot] dspline(each fixed=false); | |
| Real gFun_int "Interpolated value of g-function"; | |
| Real lntts_int "Non-dimensional logarithmic time for interpolation"; | |
| discrete Integer k "Current interpolation interval"; | |
| - discrete Modelica.SIunits.Time t1 "Previous value of time for interpolation"; | |
| - discrete Modelica.SIunits.Time t2 "Next value of time for interpolation"; | |
| + discrete Modelica.Units.SI.Time t1 "Previous value of time for interpolation"; | |
| + discrete Modelica.Units.SI.Time t2 "Next value of time for interpolation"; | |
| discrete Real gFun1 "Previous g-function value for interpolation"; | |
| discrete Real gFun2 "Next g-function value for interpolation"; | |
| - parameter Modelica.SIunits.Time ts = hBor^2/(9*aSoi) "Bore field characteristic time"; | |
| + parameter Modelica.Units.SI.Time ts = hBor^2/(9*aSoi) "Bore field characteristic time"; | |
| initial equation | |
| // Evaluate g-function for the specified bore field configuration | |
| (tGFun,gFun) = | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/InfiniteLineSource.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/InfiniteLineSource.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/InfiniteLineSource.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/InfiniteLineSource.mo" 2021-04-26 11:51:05.090616716 +0200 | |
| @@ -2,11 +2,11 @@ | |
| model InfiniteLineSource "Test case for infinite line source" | |
| extends Modelica.Icons.Example; | |
| - parameter Modelica.SIunits.ThermalDiffusivity aSoi = 1.0e-6 "Ground thermal diffusivity"; | |
| - parameter Modelica.SIunits.Radius rSource = 0.075 "Minimum radius"; | |
| - parameter Modelica.SIunits.Radius[5] r = {rSource, 2*rSource, 5*rSource, 10*rSource, 20*rSource} | |
| + parameter Modelica.Units.SI.ThermalDiffusivity aSoi = 1.0e-6 "Ground thermal diffusivity"; | |
| + parameter Modelica.Units.SI.Radius rSource = 0.075 "Minimum radius"; | |
| + parameter Modelica.Units.SI.Radius[5] r = {rSource, 2*rSource, 5*rSource, 10*rSource, 20*rSource} | |
| "Radial position of evaluation of the solution"; | |
| - Modelica.SIunits.Time t "Time"; | |
| + Modelica.Units.SI.Time t "Time"; | |
| Real[5] E "Infinite line source solution"; | |
| equation | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/TimeGeometric.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/TimeGeometric.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/TimeGeometric.mo" 2021-03-15 12:05:56.623860843 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/TimeGeometric.mo" 2021-04-26 11:51:05.074616694 +0200 | |
| @@ -3,12 +3,12 @@ | |
| "Test case for geometric expansion of time vector" | |
| extends Modelica.Icons.Example; | |
| - parameter Modelica.SIunits.Duration dt = 2.0 "Minimum time step"; | |
| - parameter Modelica.SIunits.Time t_max = 20.0 "Maximum value of time"; | |
| + parameter Modelica.Units.SI.Duration dt = 2.0 "Minimum time step"; | |
| + parameter Modelica.Units.SI.Time t_max = 20.0 "Maximum value of time"; | |
| parameter Integer nTim = 5 "Number of time values"; | |
| - final parameter Modelica.SIunits.Time[nTim] t(each fixed=false) "Time vector"; | |
| + final parameter Modelica.Units.SI.Time[nTim] t(each fixed=false) "Time vector"; | |
| initial equation | |
| t = AixLib.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.timeGeometric( | |
| dt=dt, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Cylindrical.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Cylindrical.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Cylindrical.mo" 2021-03-15 12:05:56.627860847 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Cylindrical.mo" 2021-04-26 11:51:04.874616416 +0200 | |
| @@ -3,7 +3,7 @@ | |
| "Comparison of the Cylindrical with the GroundTemperatureResponse" | |
| extends Modelica.Icons.Example; | |
| - parameter Modelica.SIunits.Temperature T_start = 295.15 | |
| + parameter Modelica.Units.SI.Temperature T_start = 295.15 | |
| "Initial soil temperature"; | |
| parameter AixLib.Fluid.Geothermal.Borefields.Data.Borefield.Template borFieDat= | |
| AixLib.Fluid.Geothermal.Borefields.Validation.BaseClasses.SandBox_Borefield() | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/FiniteDifference_1Week.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/FiniteDifference_1Week.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/FiniteDifference_1Week.mo" 2021-03-15 12:05:56.627860847 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/FiniteDifference_1Week.mo" 2021-04-26 11:51:04.858616394 +0200 | |
| @@ -3,7 +3,7 @@ | |
| "Short term validation of ground temperature response model" | |
| extends Modelica.Icons.Example; | |
| - parameter Modelica.SIunits.Temperature T_start = 283.15 | |
| + parameter Modelica.Units.SI.Temperature T_start = 283.15 | |
| "Initial soil temperature"; | |
| AixLib.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.Cylindrical soi( | |
| final steadyStateInitial=false, | |
| @@ -47,7 +47,7 @@ | |
| annotation (Placement(transformation(extent={{-90,-88},{-70,-68}}))); | |
| Modelica.Blocks.Sources.Sine sine( | |
| - freqHz=1/(24*3600), | |
| + f =1/(24*3600), | |
| startTime=21600, | |
| amplitude=1e8) "Heat flow signal" | |
| annotation (Placement(transformation(extent={{-92,-10},{-72,10}}))); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/PartialBorefield.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/PartialBorefield.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/PartialBorefield.mo" 2021-03-15 12:05:56.627860847 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/BaseClasses/PartialBorefield.mo" 2021-04-26 11:51:04.818616340 +0200 | |
| @@ -21,18 +21,18 @@ | |
| constant Real mSenFac(min=1)=1 | |
| "Factor for scaling the sensible thermal mass of the volume"; | |
| - // Assumptions | |
| +// Assumptions | |
| parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial | |
| "Type of energy balance: dynamic (3 initialization options) or steady state" | |
| annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations")); | |
| - // Initialization | |
| +// Initialization | |
| parameter Medium.AbsolutePressure p_start = Medium.p_default | |
| "Start value of pressure" | |
| annotation(Dialog(tab = "Initialization")); | |
| // Simulation parameters | |
| - parameter Modelica.SIunits.Time tLoaAgg=300 "Time resolution of load aggregation"; | |
| + parameter Modelica.Units.SI.Time tLoaAgg=300 "Time resolution of load aggregation"; | |
| parameter Integer nCel(min=1)=5 "Number of cells per aggregation level"; | |
| parameter Integer nSeg(min=1)=10 | |
| "Number of segments to use in vertical discretization of the boreholes"; | |
| @@ -40,35 +40,35 @@ | |
| "Set to true to force the thermal response to be calculated at the start instead of checking whether this has been pre-computed" | |
| annotation (Dialog(tab="Advanced")); | |
| - // General parameters of borefield | |
| +// General parameters of borefield | |
| parameter AixLib.Fluid.Geothermal.Borefields.Data.Borefield.Template borFieDat "Borefield data" | |
| annotation (choicesAllMatching=true,Placement(transformation(extent={{-80,-80},{-60,-60}}))); | |
| // Temperature gradient in undisturbed soil | |
| - parameter Modelica.SIunits.Temperature TExt0_start=283.15 | |
| + parameter Modelica.Units.SI.Temperature TExt0_start=283.15 | |
| "Initial far field temperature" | |
| annotation (Dialog(tab="Initialization", group="Soil")); | |
| - parameter Modelica.SIunits.Temperature TExt_start[nSeg]= | |
| + parameter Modelica.Units.SI.Temperature TExt_start[nSeg]= | |
| {if z[i] >= z0 then TExt0_start + (z[i] - z0)*dT_dz else TExt0_start for i in 1:nSeg} | |
| "Temperature of the undisturbed ground" | |
| annotation (Dialog(tab="Initialization", group="Soil")); | |
| - parameter Modelica.SIunits.Temperature TGro_start[nSeg]=TExt_start | |
| + parameter Modelica.Units.SI.Temperature TGro_start[nSeg]=TExt_start | |
| "Start value of grout temperature" | |
| annotation (Dialog(tab="Initialization", group="Filling material")); | |
| - parameter Modelica.SIunits.Temperature TFlu_start[nSeg]=TGro_start | |
| + parameter Modelica.Units.SI.Temperature TFlu_start[nSeg]=TGro_start | |
| "Start value of fluid temperature" | |
| annotation (Dialog(tab="Initialization")); | |
| - parameter Modelica.SIunits.Height z0=10 | |
| + parameter Modelica.Units.SI.Height z0=10 | |
| "Depth below which the temperature gradient starts" | |
| annotation (Dialog(tab="Initialization", group="Temperature profile")); | |
| parameter Real dT_dz(final unit="K/m", min=0) = 0.01 | |
| "Vertical temperature gradient of the undisturbed soil for h below z0" | |
| annotation (Dialog(tab="Initialization", group="Temperature profile")); | |
| - // Dynamics of filling material | |
| +// Dynamics of filling material | |
| parameter Boolean dynFil=true | |
| "Set to false to remove the dynamics of the filling material." | |
| annotation (Dialog(tab="Dynamics")); | |
| @@ -111,7 +111,7 @@ | |
| annotation (Placement(transformation(extent={{-10,-50},{10,-30}}))); | |
| protected | |
| - parameter Modelica.SIunits.Height z[nSeg]={borFieDat.conDat.hBor/nSeg*(i - 0.5) for i in 1:nSeg} | |
| + parameter Modelica.Units.SI.Height z[nSeg]={borFieDat.conDat.hBor/nSeg*(i - 0.5) for i in 1:nSeg} | |
| "Distance from the surface to the considered segment"; | |
| AixLib.Fluid.BaseClasses.MassFlowRateMultiplier masFloDiv( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/Data/Configuration/Template.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/Data/Configuration/Template.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/Data/Configuration/Template.mo" 2021-03-15 12:05:56.627860847 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/Data/Configuration/Template.mo" 2021-04-26 11:51:04.726616210 +0200 | |
| @@ -11,50 +11,50 @@ | |
| parameter Real Rb(unit="(m.K)/W") = 0.0 | |
| "Borehole thermal resistance Rb. Only to fill in if known" | |
| annotation(Dialog(enable=use_Rb)); | |
| - parameter Modelica.SIunits.MassFlowRate mBor_flow_nominal | |
| + parameter Modelica.Units.SI.MassFlowRate mBor_flow_nominal | |
| "Nominal mass flow rate per borehole" | |
| annotation (Dialog(group="Nominal condition")); | |
| - parameter Modelica.SIunits.MassFlowRate mBorFie_flow_nominal = mBor_flow_nominal*nBor | |
| + parameter Modelica.Units.SI.MassFlowRate mBorFie_flow_nominal = mBor_flow_nominal*nBor | |
| "Nominal mass flow of borefield" | |
| annotation (Dialog(group="Nominal condition")); | |
| - parameter Modelica.SIunits.Pressure dp_nominal(displayUnit="Pa") | |
| + parameter Modelica.Units.SI.Pressure dp_nominal(displayUnit="Pa") | |
| "Pressure losses for the entire borefield" | |
| annotation (Dialog(group="Nominal condition")); | |
| //------------------------- Geometrical parameters --------------------------- | |
| - parameter Modelica.SIunits.Height hBor "Total height of the borehole" | |
| + parameter Modelica.Units.SI.Height hBor "Total height of the borehole" | |
| annotation (Dialog(group="Borehole")); | |
| - parameter Modelica.SIunits.Radius rBor "Radius of the borehole" | |
| + parameter Modelica.Units.SI.Radius rBor "Radius of the borehole" | |
| annotation (Dialog(group="Borehole")); | |
| - parameter Modelica.SIunits.Height dBor "Borehole buried depth" | |
| + parameter Modelica.Units.SI.Height dBor "Borehole buried depth" | |
| annotation (Dialog(group="Borehole")); | |
| parameter Integer nBor = size(cooBor, 1) "Total number of boreholes" | |
| annotation (Dialog(group="Borehole")); | |
| - parameter Modelica.SIunits.Length[:,2] cooBor | |
| + | |
| + parameter Modelica.Units.SI.Length[:,2] cooBor | |
| "Cartesian coordinates of the boreholes in meters" | |
| annotation (Dialog(group="Borehole")); | |
| // -- Tube | |
| - parameter Modelica.SIunits.Radius rTub "Outer radius of the tubes" | |
| + parameter Modelica.Units.SI.Radius rTub "Outer radius of the tubes" | |
| annotation (Dialog(group="Tubes")); | |
| - parameter Modelica.SIunits.ThermalConductivity kTub "Thermal conductivity of the tube" | |
| + parameter Modelica.Units.SI.ThermalConductivity kTub "Thermal conductivity of the tube" | |
| annotation (Dialog(group="Tubes")); | |
| - parameter Modelica.SIunits.Length eTub "Thickness of a tube" | |
| + parameter Modelica.Units.SI.Length eTub "Thickness of a tube" | |
| annotation (Dialog(group="Tubes")); | |
| - parameter Modelica.SIunits.Length xC | |
| + parameter Modelica.Units.SI.Length xC | |
| "Shank spacing, defined as the distance between the center of a pipe and the center of the borehole" | |
| annotation (Dialog(group="Tubes")); | |
| //------------------------- Advanced parameters ------------------------------ | |
| /*--------Flow: */ | |
| - parameter Modelica.SIunits.MassFlowRate mBor_flow_small(min=0) = 1E-4*abs(mBor_flow_nominal) | |
| + parameter Modelica.Units.SI.MassFlowRate mBor_flow_small(min=0) = 1E-4*abs(mBor_flow_nominal) | |
| "Small mass flow rate for regularization of zero flow" | |
| annotation (Dialog(tab="Advanced")); | |
| - | |
| annotation ( | |
| defaultComponentPrefixes="parameter", | |
| defaultComponentName="conDat", | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/Data/Filling/Template.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/Data/Filling/Template.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/Data/Filling/Template.mo" 2021-03-15 12:05:56.627860847 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/Data/Filling/Template.mo" 2021-04-26 11:51:04.694616167 +0200 | |
| @@ -2,16 +2,16 @@ | |
| record Template | |
| "Template for filling data records" | |
| extends Modelica.Icons.Record; | |
| - parameter Modelica.SIunits.ThermalConductivity kFil | |
| + parameter Modelica.Units.SI.ThermalConductivity kFil | |
| "Thermal conductivity of the borehole filling material"; | |
| - parameter Modelica.SIunits.SpecificHeatCapacity cFil | |
| + parameter Modelica.Units.SI.SpecificHeatCapacity cFil | |
| "Specific heat capacity of the borehole filling material"; | |
| - parameter Modelica.SIunits.Density dFil(displayUnit="kg/m3") | |
| + parameter Modelica.Units.SI.Density dFil(displayUnit="kg/m3") | |
| "Density of the borehole filling material"; | |
| parameter Boolean steadyState = (cFil < Modelica.Constants.eps or dFil < Modelica.Constants.eps) | |
| "Flag, if true, then material is computed using steady-state heat conduction" | |
| annotation(Evaluate=true); | |
| - final parameter Modelica.SIunits.ThermalDiffusivity aFil = kFil/(dFil*cFil) | |
| + final parameter Modelica.Units.SI.ThermalDiffusivity aFil = kFil/(dFil*cFil) | |
| "Heat diffusion coefficient of the borehole filling material"; | |
| annotation ( | |
| defaultComponentPrefixes="parameter", | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/Data/Soil/Template.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/Data/Soil/Template.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/Data/Soil/Template.mo" 2021-03-15 12:05:56.627860847 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/Data/Soil/Template.mo" 2021-04-26 11:51:04.674616139 +0200 | |
| @@ -2,16 +2,16 @@ | |
| record Template | |
| "Template for soil data records" | |
| extends Modelica.Icons.Record; | |
| - parameter Modelica.SIunits.ThermalConductivity kSoi | |
| + parameter Modelica.Units.SI.ThermalConductivity kSoi | |
| "Thermal conductivity of the soil material"; | |
| - parameter Modelica.SIunits.SpecificHeatCapacity cSoi | |
| + parameter Modelica.Units.SI.SpecificHeatCapacity cSoi | |
| "Specific heat capacity of the soil material"; | |
| - parameter Modelica.SIunits.Density dSoi(displayUnit="kg/m3") | |
| + parameter Modelica.Units.SI.Density dSoi(displayUnit="kg/m3") | |
| "Density of the soil material"; | |
| parameter Boolean steadyState = (cSoi < Modelica.Constants.eps or dSoi < Modelica.Constants.eps) | |
| "Flag, if true, then material is computed using steady-state heat conduction" | |
| annotation(Evaluate=true); | |
| - final parameter Modelica.SIunits.ThermalDiffusivity aSoi=kSoi/(dSoi*cSoi) | |
| + final parameter Modelica.Units.SI.ThermalDiffusivity aSoi=kSoi/(dSoi*cSoi) | |
| "Heat diffusion coefficient of the soil material"; | |
| annotation ( | |
| defaultComponentPrefixes="parameter", | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/Examples/Borefields.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/Examples/Borefields.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/Examples/Borefields.mo" 2021-03-15 12:05:56.627860847 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/Examples/Borefields.mo" 2021-04-26 11:51:04.662616123 +0200 | |
| @@ -5,10 +5,10 @@ | |
| package Medium = AixLib.Media.Water; | |
| - parameter Modelica.SIunits.Time tLoaAgg=300 | |
| + parameter Modelica.Units.SI.Time tLoaAgg=300 | |
| "Time resolution of load aggregation"; | |
| - parameter Modelica.SIunits.Temperature TGro = 283.15 | |
| + parameter Modelica.Units.SI.Temperature TGro = 283.15 | |
| "Ground temperature"; | |
| AixLib.Fluid.Geothermal.Borefields.TwoUTubes borFie2UTubPar( | |
| redeclare package Medium = Medium, | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo" 2021-03-15 12:05:56.627860847 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo" 2021-04-26 11:51:04.630616078 +0200 | |
| @@ -4,25 +4,25 @@ | |
| package Medium = AixLib.Media.Water "Medium model"; | |
| - parameter Modelica.SIunits.Time tLoaAgg=300 | |
| + parameter Modelica.Units.SI.Time tLoaAgg=300 | |
| "Time resolution of load aggregation"; | |
| - parameter Modelica.SIunits.Temperature TGro = 283.15 | |
| + parameter Modelica.Units.SI.Temperature TGro = 283.15 | |
| "Ground temperature"; | |
| - parameter Modelica.SIunits.Velocity v_nominal = 1 "Nominal velocity"; | |
| - parameter Modelica.SIunits.MassFlowRate m_flow_nominal = nBorHol*v_nominal*rTub^2*3.14*1000 | |
| + parameter Modelica.Units.SI.Velocity v_nominal = 1 "Nominal velocity"; | |
| + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = nBorHol*v_nominal*rTub^2*3.14*1000 | |
| "Nominal mass flow rate"; | |
| - parameter Modelica.SIunits.Pressure dpBorFie_nominal = (hBor+(xBorFie+yBorFie)/2)*2 | |
| + parameter Modelica.Units.SI.Pressure dpBorFie_nominal = (hBor+(xBorFie+yBorFie)/2)*2 | |
| "Pressure losses for the entire borefield"; | |
| - parameter Modelica.SIunits.Pressure dpHex_nominal = 10000 "Pressure drop heat exchanger"; | |
| - parameter Modelica.SIunits.Pressure dp_nominal = dpBorFie_nominal + dpHex_nominal | |
| + parameter Modelica.Units.SI.Pressure dpHex_nominal = 10000 "Pressure drop heat exchanger"; | |
| + parameter Modelica.Units.SI.Pressure dp_nominal = dpBorFie_nominal + dpHex_nominal | |
| "Total pressure drop"; | |
| - parameter Modelica.SIunits.Height hBor = 100 "Total height of the borehole"; | |
| - parameter Modelica.SIunits.Radius rTub = 0.02 "Outer radius of the tubes"; | |
| - parameter Modelica.SIunits.Length xBorFie = 10 "Borefield length"; | |
| - parameter Modelica.SIunits.Length yBorFie = 30 "Borefield width"; | |
| - parameter Modelica.SIunits.Length dBorHol = 5 "Distance between two boreholes"; | |
| + parameter Modelica.Units.SI.Height hBor = 100 "Total height of the borehole"; | |
| + parameter Modelica.Units.SI.Radius rTub = 0.02 "Outer radius of the tubes"; | |
| + parameter Modelica.Units.SI.Length xBorFie = 10 "Borefield length"; | |
| + parameter Modelica.Units.SI.Length yBorFie = 30 "Borefield width"; | |
| + parameter Modelica.Units.SI.Length dBorHol = 5 "Distance between two boreholes"; | |
| final parameter Integer nXBorHol = integer((xBorFie+dBorHol)/dBorHol) "Number of boreholes in x-direction"; | |
| final parameter Integer nYBorHol = integer((yBorFie+dBorHol)/dBorHol) "Number of boreholes in y-direction"; | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/Validation/ConstantHeatInjection_100Boreholes.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/Validation/ConstantHeatInjection_100Boreholes.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/Validation/ConstantHeatInjection_100Boreholes.mo" 2021-03-15 12:05:56.627860847 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/Validation/ConstantHeatInjection_100Boreholes.mo" 2021-04-26 11:51:04.518615923 +0200 | |
| @@ -4,7 +4,7 @@ | |
| extends Modelica.Icons.Example; | |
| package Medium = AixLib.Media.Water; | |
| - parameter Modelica.SIunits.Temperature T_start = 273.15 | |
| + parameter Modelica.Units.SI.Temperature T_start = 273.15 | |
| "Initial temperature of the soil"; | |
| AixLib.Fluid.Geothermal.Borefields.OneUTube borHol( | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/Validation/Sandbox.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/Validation/Sandbox.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/Validation/Sandbox.mo" 2021-03-15 12:05:56.627860847 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/Geothermal/Borefields/Validation/Sandbox.mo" 2021-04-26 11:51:04.498615895 +0200 | |
| @@ -3,7 +3,7 @@ | |
| extends Modelica.Icons.Example; | |
| package Medium = AixLib.Media.Water; | |
| - parameter Modelica.SIunits.Temperature T_start = 273.15 + 22.09 | |
| + parameter Modelica.Units.SI.Temperature T_start = 273.15 + 22.09 | |
| "Initial temperature of the sandbox"; | |
| // mSenFac is set to its numerical value because it is a constant in the borehole model. | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Convector.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Convector.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Convector.mo" 2021-03-15 12:05:56.627860847 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Convector.mo" 2021-04-26 11:51:04.458615841 +0200 | |
| @@ -12,7 +12,7 @@ | |
| parameter Integer nBeams(min=1) "Number of beams in parallel"; | |
| - parameter Modelica.SIunits.Time tau = 30 | |
| + parameter Modelica.Units.SI.Time tau = 30 | |
| "Time constant at nominal flow (if energyDynamics <> SteadyState)" | |
| annotation (Dialog(tab = "Dynamics", group="Nominal condition")); | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/DerivateCubicSpline.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/DerivateCubicSpline.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/DerivateCubicSpline.mo" 2021-03-15 12:05:56.627860847 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/DerivateCubicSpline.mo" 2021-04-26 11:51:04.410615773 +0200 | |
| @@ -2,7 +2,7 @@ | |
| model DerivateCubicSpline | |
| extends Modelica.Icons.Example; | |
| - Modelica.Blocks.Sources.Clock clock "Clock" | |
| + Modelica.Blocks.Sources.ContinuousClock clock "Clock" | |
| annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); | |
| AixLib.Fluid.HeatExchangers.ActiveBeams.BaseClasses.DerivativesCubicSpline | |
| cubSpl "Derivatives of cubic spline" | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/HeatExchangers/ActiveBeams/CoolingAndHeating.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/HeatExchangers/ActiveBeams/CoolingAndHeating.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/HeatExchangers/ActiveBeams/CoolingAndHeating.mo" 2021-03-15 12:05:56.627860847 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/HeatExchangers/ActiveBeams/CoolingAndHeating.mo" 2021-04-26 11:51:04.322615652 +0200 | |
| @@ -42,7 +42,7 @@ | |
| noEvent(actualStream(watHea_b.Xi_outflow))) if | |
| show_T "Medium properties in port watHea_b"; | |
| - Modelica.SIunits.PressureDifference dpWatHea(displayUnit="Pa") = watHea_a.p - watHea_b.p | |
| + Modelica.Units.SI.PressureDifference dpWatHea(displayUnit="Pa") = watHea_a.p - watHea_b.p | |
| "Pressure difference between watHea_a and watHea_b"; | |
| protected | |
| diff -ur "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/HeatExchangers/ActiveBeams/Cooling.mo" "converted-libraries/AixLib 0.9.1-master/Fluid/HeatExchangers/ActiveBeams/Cooling.mo" | |
| --- "/home/martin/.openmodelica/libraries/AixLib 0.9.1-master/Fluid/HeatExchangers/ActiveBeams/Cooling.mo" 2021-03-15 12:05:56.627860847 +0100 | |
| +++ "converted-libraries/AixLib 0.9.1-master/Fluid/HeatExchangers/ActiveBeams/Cooling.mo" 2021-04-26 11:51:04.374615724 +0200 | |
| @@ -25,7 +25,7 @@ | |
| "= true to allow flow reversal in air circuit, false restricts to design direction (port_a -> port_b)" | |
| annotation(Dialog(tab="Assumptions"), Evaluate=true); | |
| - parameter Modelica.SIunits.Time tau = 30 | |
| + parameter Modelica.Units.SI.Time tau = 30 | |
| "Time constant at nominal flow (if energyDynamics <> SteadyState)" | |
| annotation (Dia |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment