diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/AirCurtain/AirCurtainSimplified.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/AirCurtain/AirCurtainSimplified.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/AirCurtain/AirCurtainSimplified.mo" 2022-03-10 09:57:39.052144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/AirCurtain/AirCurtainSimplified.mo" 2022-03-10 09:59:42.872159938 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/AirHandlingUnit/AHU.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/AirHandlingUnit/AHU.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/AirHandlingUnit/AHU.mo" 2022-03-10 09:57:39.052144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/AirHandlingUnit/AHU.mo" 2022-03-10 09:59:42.848159935 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/AirHandlingUnit/BaseClasses/PartialAHU.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/AirHandlingUnit/BaseClasses/PartialAHU.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/AirHandlingUnit/BaseClasses/PartialAHU.mo" 2022-03-10 09:57:39.052144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/AirHandlingUnit/BaseClasses/PartialAHU.mo" 2022-03-10 09:59:42.688159915 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/AirHandlingUnit/Examples/AHU.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/AirHandlingUnit/Examples/AHU.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/AirHandlingUnit/Examples/AHU.mo" 2022-03-10 09:57:39.052144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/AirHandlingUnit/Examples/AHU.mo" 2022-03-10 09:59:42.668159913 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/FacadeVentilationUnit/BaseClasses/SetPower.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/FacadeVentilationUnit/BaseClasses/SetPower.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/FacadeVentilationUnit/BaseClasses/SetPower.mo" 2022-03-10 09:57:39.052144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/FacadeVentilationUnit/BaseClasses/SetPower.mo" 2022-03-10 09:59:42.640159908 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/FacadeVentilationUnit/DataBase/FVUBaseRecord.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/FacadeVentilationUnit/DataBase/FVUBaseRecord.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/FacadeVentilationUnit/DataBase/FVUBaseRecord.mo" 2022-03-10 09:57:39.052144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/FacadeVentilationUnit/DataBase/FVUBaseRecord.mo" 2022-03-10 09:59:42.620159906 +0000 @@ -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="

Overview

diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/FacadeVentilationUnit/Examples/FacadeVentilationUnit.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/FacadeVentilationUnit/Examples/FacadeVentilationUnit.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/FacadeVentilationUnit/Examples/FacadeVentilationUnit.mo" 2022-03-10 09:57:39.052144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/FacadeVentilationUnit/Examples/FacadeVentilationUnit.mo" 2022-03-10 09:59:42.612159905 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/FacadeVentilationUnit/FacadeVentilationUnit.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/FacadeVentilationUnit/FacadeVentilationUnit.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/FacadeVentilationUnit/FacadeVentilationUnit.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/FacadeVentilationUnit/FacadeVentilationUnit.mo" 2022-03-10 09:59:42.584159901 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/Door.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/Door.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/Door.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/Door.mo" 2022-03-10 09:59:42.540159897 +0000 @@ -16,29 +16,29 @@ annotation (choices( choice(redeclare package Medium = AixLib.Media.Air "Moist air"))); - 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.PressureDifference dp_turbulent( + parameter Modelica.Units.SI.PressureDifference dp_turbulent( min=0, displayUnit="Pa") = 0.01 "Pressure difference where laminar and turbulent flow relation coincide" annotation(Dialog(tab="Advanced")); - 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"; - input Modelica.SIunits.Velocity vAB(nominal=0.01) "Average velocity from A to B"; - input Modelica.SIunits.Velocity vBA(nominal=0.01) "Average velocity from B to A"; + input Modelica.Units.SI.Velocity vAB(nominal=0.01) "Average velocity from A to B"; + input Modelica.Units.SI.Velocity vBA(nominal=0.01) "Average velocity from B to A"; protected - final parameter Modelica.SIunits.Area AOpe = wOpe*hOpe "Open aperture area"; + final parameter Modelica.Units.SI.Area AOpe = wOpe*hOpe "Open aperture area"; - constant Real conTP = AixLib.Media.Air.dStp*Modelica.Media.IdealGases.Common.SingleGasesData.Air.R + constant Real conTP = AixLib.Media.Air.dStp* Modelica.Media.IdealGases.Common.SingleGasesData.Air.R_s "Conversion factor for converting temperature difference to pressure difference"; parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX( @@ -46,14 +46,14 @@ 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"; - Modelica.SIunits.VolumeFlowRate VABp_flow(nominal=0.001) + Modelica.Units.SI.VolumeFlowRate VABp_flow(nominal=0.001) "Volume flow rate from A to B if positive due to static pressure difference"; - Modelica.SIunits.MassFlowRate mABt_flow(nominal=0.001) + Modelica.Units.SI.MassFlowRate mABt_flow(nominal=0.001) "Mass flow rate from A to B if positive due to buoyancy"; - equation // Net flow rate port_a1.m_flow = (rho_default * VABp_flow/2 + mABt_flow); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/DoorDiscretized.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/DoorDiscretized.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/DoorDiscretized.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/DoorDiscretized.mo" 2022-03-10 09:59:42.528159895 +0000 @@ -5,27 +5,27 @@ parameter Integer nCom=10 "Number of compartments for the discretization"; - parameter Modelica.SIunits.PressureDifference dp_turbulent( + parameter Modelica.Units.SI.PressureDifference dp_turbulent( min=0, displayUnit="Pa") = 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")= @@ -35,23 +35,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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/Examples/PowerLaw.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/Examples/PowerLaw.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/Examples/PowerLaw.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/Examples/PowerLaw.mo" 2022-03-10 09:59:42.508159892 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/Examples/PowerLawFixedM.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/Examples/PowerLawFixedM.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/Examples/PowerLawFixedM.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/Examples/PowerLawFixedM.mo" 2022-03-10 09:59:42.500159891 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/Examples/WindPressureLowRise.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/Examples/WindPressureLowRise.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/Examples/WindPressureLowRise.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/Examples/WindPressureLowRise.mo" 2022-03-10 09:59:42.492159890 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/PowerLawResistance.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/PowerLawResistance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/PowerLawResistance.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/PowerLawResistance.mo" 2022-03-10 09:59:42.484159890 +0000 @@ -14,14 +14,14 @@ 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")); - 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 @@ -34,9 +34,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"; @@ -50,7 +50,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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/TwoWayFlowElement.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/TwoWayFlowElement.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/TwoWayFlowElement.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/TwoWayFlowElement.mo" 2022-03-10 09:59:42.472159888 +0000 @@ -16,34 +16,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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/TwoWayFlowElementBuoyancy.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/TwoWayFlowElementBuoyancy.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/TwoWayFlowElementBuoyancy.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/TwoWayFlowElementBuoyancy.mo" 2022-03-10 09:59:42.460159886 +0000 @@ -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="

This is a partial model for models that describe the bi-directional diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/powerLaw.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/powerLaw.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/powerLaw.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/powerLaw.mo" 2022-03-10 09:59:42.448159884 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" 2022-03-10 09:59:42.444159884 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" 2022-03-10 09:59:42.392159877 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/DoorDiscretizedOperable.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/DoorDiscretizedOperable.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/DoorDiscretizedOperable.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/DoorDiscretizedOperable.mo" 2022-03-10 09:59:42.376159876 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/DoorOpen.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/DoorOpen.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/DoorOpen.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/DoorOpen.mo" 2022-03-10 09:59:42.368159874 +0000 @@ -29,7 +29,7 @@ sqrt(Modelica.Constants.g_n /(Medium.T_default*conTP) * hOpe) "Constant coefficient for buoyancy driven air flow rate"; - parameter Modelica.SIunits.MassFlowRate m_flow_turbulent= + parameter Modelica.Units.SI.MassFlowRate m_flow_turbulent= kVal * rho_default * sqrt(dp_turbulent) "Mass flow rate where regularization to laminar flow occurs for temperature-driven flow"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/DoorOperable.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/DoorOperable.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/DoorOperable.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/DoorOperable.mo" 2022-03-10 09:59:42.360159873 +0000 @@ -11,14 +11,14 @@ parameter Real mOpe = 0.5 "Flow exponent for door of open door" annotation (Dialog(group="Open door")); - 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")); parameter Real mClo= 0.65 "Flow exponent for crack of closed door" annotation (Dialog(group="Closed door")); - 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="Closed door rating conditions")); @@ -43,7 +43,7 @@ parameter Real d[2] = {1/8*m^2 - gamma - m + 15.0/8 for m in {mOpe, mClo}} "Polynomial coefficient for regularized implementation of flow resistance"; - parameter Modelica.SIunits.Area AClo = LClo * dpCloRat^(0.5-mClo) "Closed area"; + parameter Modelica.Units.SI.Area AClo = LClo * dpCloRat^(0.5-mClo) "Closed area"; parameter Real kVal[2]={ CDOpe *AOpe*sqrt(2/rho_default), CDCloRat*AClo*sqrt(2/rho_default)} @@ -53,16 +53,16 @@ sqrt(Modelica.Constants.g_n /(Medium.T_default*conTP) * hOpe) "Constant coefficient for buoyancy driven air flow rate"; - parameter Modelica.SIunits.MassFlowRate m_flow_turbulent= + parameter Modelica.Units.SI.MassFlowRate m_flow_turbulent= kVal[1] * rho_default * sqrt(dp_turbulent) "Mass flow rate where regularization to laminar flow occurs for temperature-driven flow"; - Modelica.SIunits.VolumeFlowRate VABpOpeClo_flow[2](each nominal=0.001) + Modelica.Units.SI.VolumeFlowRate VABpOpeClo_flow[2](each nominal=0.001) "Volume flow rate from A to B if positive due to static pressure difference"; - Modelica.SIunits.VolumeFlowRate VABp_flow(nominal=0.001) + Modelica.Units.SI.VolumeFlowRate VABp_flow(nominal=0.001) "Volume flow rate from A to B if positive due to static pressure difference"; - Modelica.SIunits.Area A "Current opening area"; + Modelica.Units.SI.Area A "Current opening area"; equation // Air flow rate due to static pressure difference VABpOpeClo_flow = AixLib.Airflow.Multizone.BaseClasses.powerLawFixedM( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/EffectiveAirLeakageArea.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/EffectiveAirLeakageArea.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/EffectiveAirLeakageArea.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/EffectiveAirLeakageArea.mo" 2022-03-10 09:59:42.348159872 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/Examples/ClosedDoors.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/Examples/ClosedDoors.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/Examples/ClosedDoors.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/Examples/ClosedDoors.mo" 2022-03-10 09:59:42.312159867 +0000 @@ -28,7 +28,7 @@ Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHeaFlo "Prescribed heat flow rate boundary condition" annotation (Placement(transformation(extent={{4,40},{24,60}}))); - Modelica.Blocks.Sources.Sine sinBou(freqHz=1/3600) + Modelica.Blocks.Sources.Sine sinBou(f =1/3600) "Signal for heat flow rate boundary condition" annotation (Placement(transformation(extent={{-68,40},{-48,60}}))); Modelica.Blocks.Math.Gain gai(k=100) "Gain for heat flow boundary condition" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" 2022-03-10 09:59:42.288159865 +0000 @@ -22,7 +22,7 @@ Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHeaFlo "Prescribed heat flow rate boundary condition" annotation (Placement(transformation(extent={{0,20},{20,40}}))); - Modelica.Blocks.Sources.Sine heaFloBou(freqHz=1/3600) + Modelica.Blocks.Sources.Sine heaFloBou(f =1/3600) "Signal for heat flow rate boundary condition" annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); Modelica.Blocks.Math.Gain gai(k=100) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/Examples/OneOpenDoor.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/Examples/OneOpenDoor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/Examples/OneOpenDoor.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/Examples/OneOpenDoor.mo" 2022-03-10 09:59:42.280159863 +0000 @@ -27,7 +27,7 @@ Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHeaFlo "Prescribed heat flow rate boundary condition" annotation (Placement(transformation(extent={{14,60},{34,80}}))); - Modelica.Blocks.Sources.Sine heaSou(freqHz=1/3600) + Modelica.Blocks.Sources.Sine heaSou(f =1/3600) "Signal for heat flow rate boundary condition" annotation (Placement( transformation(extent={{-60,60},{-40,80}}))); Modelica.Blocks.Math.Gain gai(k=100) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/Examples/ZonalFlow.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/Examples/ZonalFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/Examples/ZonalFlow.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/Examples/ZonalFlow.mo" 2022-03-10 09:59:42.228159856 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/MediumColumn.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/MediumColumn.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/MediumColumn.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/MediumColumn.mo" 2022-03-10 09:59:42.212159855 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/MediumColumnDynamic.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/MediumColumnDynamic.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/MediumColumnDynamic.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/MediumColumnDynamic.mo" 2022-03-10 09:59:42.196159852 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/Orifice.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/Orifice.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/Orifice.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/Orifice.mo" 2022-03-10 09:59:42.184159851 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/ZonalFlow_ACS.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/ZonalFlow_ACS.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/ZonalFlow_ACS.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Airflow/Multizone/ZonalFlow_ACS.mo" 2022-03-10 09:59:42.092159840 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/GroundTemperature/GroundTemperatureKusuda.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/GroundTemperature/GroundTemperatureKusuda.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/GroundTemperature/GroundTemperatureKusuda.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/GroundTemperature/GroundTemperatureKusuda.mo" 2022-03-10 09:59:42.052159834 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/BaseClasses/PartialInternalGain.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/BaseClasses/PartialInternalGain.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/BaseClasses/PartialInternalGain.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/BaseClasses/PartialInternalGain.mo" 2022-03-10 09:59:41.992159827 +0000 @@ -3,7 +3,7 @@ "Partial model to build a heat source with convective and radiative component" parameter Real ratioConv(final min=0, final max=1) = 0.6 "Ratio convective to total heat release" annotation(Dialog(descriptionLabel = true)); - parameter Modelica.SIunits.Emissivity emissivity(min=0, max=1) = 0.95 + parameter Modelica.Units.SI.Emissivity emissivity(min=0, max=1) = 0.95 "Emissivity of radiative heat source surface"; Modelica.Blocks.Interfaces.RealInput uRel(min=0, max=1) "Relative input related to max. value (might be a ratio related to number of people [-] or room area and specific heat flow [W/m2] or maximal heat flow [W]" annotation (Placement(transformation(extent={{-120,-20},{-80,20}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/CO2/CO2Balance.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/CO2/CO2Balance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/CO2/CO2Balance.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/CO2/CO2Balance.mo" 2022-03-10 09:59:41.976159824 +0000 @@ -1,13 +1,13 @@ within AixLib.BoundaryConditions.InternalGains.CO2; model CO2Balance "Calculation of CO2 concentration within a thermal zone" - parameter Modelica.SIunits.Area areaZon "Zone area"; + parameter Modelica.Units.SI.Area areaZon "Zone area"; parameter Real actDeg = 1.8 "Activity degree (Met units)"; - parameter Modelica.SIunits.Volume VZon "Zone volume"; - parameter Modelica.SIunits.MassFraction XCO2_amb=6.12157E-4 + parameter Modelica.Units.SI.Volume VZon "Zone volume"; + parameter Modelica.Units.SI.MassFraction XCO2_amb=6.12157E-4 "Massfraction of CO2 in atmosphere (equals 403ppm)"; - parameter Modelica.SIunits.Area areaBod=1.8 + parameter Modelica.Units.SI.Area areaBod=1.8 "Body surface area source SIA 2024:2015"; - parameter Modelica.SIunits.DensityOfHeatFlowRate metOnePerSit=58 + parameter Modelica.Units.SI.DensityOfHeatFlowRate metOnePerSit=58 "Metabolic rate of a relaxed seated person in Met (1 Met = 58 W/m^2)"; parameter Real spePeo(unit="1/(m.m)") = 0.05 "Specific persons per square metre room area"; @@ -39,25 +39,25 @@ annotation (Placement(transformation(extent={{100,-70},{120,-50}}))); protected - constant Modelica.SIunits.MolarMass MolCO2=0.04401; - constant Modelica.SIunits.MolarMass MolAir=0.028949; + constant Modelica.Units.SI.MolarMass MolCO2=0.04401; + constant Modelica.Units.SI.MolarMass MolAir=0.028949; constant Real CalEqu=5.617*3600*1000 "caloric equivalent in J/m^3"; constant Real ResQuo=0.83 "respiratory quotient in m^3_CO2/ m^3_O2"; - constant Modelica.SIunits.Pressure pAir=101325; - constant Modelica.SIunits.Density rhoAir=1.2041; + constant Modelica.Units.SI.Pressure pAir=101325; + constant Modelica.Units.SI.Density rhoAir=1.2041; Real numPeo "Number of people in the thermal zone"; - Modelica.SIunits.VolumeFlowRate VCO2OnePer_flow + + Modelica.Units.SI.VolumeFlowRate VCO2OnePer_flow "Pure CO2 emission of an adult person"; - Modelica.SIunits.DensityOfHeatFlowRate metOnePerAct + Modelica.Units.SI.DensityOfHeatFlowRate metOnePerAct "Metabolic heat production rate considering activity degree in W/m^2"; - Modelica.SIunits.MassFlowRate mCO2Peo_flow; - Modelica.SIunits.MassFlowRate mAirExc_flow + Modelica.Units.SI.MassFlowRate mCO2Peo_flow; + Modelica.Units.SI.MassFlowRate mAirExc_flow "Massflowrate of ventilation and infiltration in kg/s"; - Modelica.SIunits.Density rhoCO2 "CO2 density"; - Modelica.SIunits.MassFlowRate mCO2OnePer_flow + Modelica.Units.SI.Density rhoCO2 "CO2 density"; + Modelica.Units.SI.MassFlowRate mCO2OnePer_flow "Emission CO2 of one Person in kg/s"; - equation // ideal gas equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Examples/InternalGains/BaseClasses/Humans.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Examples/InternalGains/BaseClasses/Humans.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Examples/InternalGains/BaseClasses/Humans.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Examples/InternalGains/BaseClasses/Humans.mo" 2022-03-10 09:59:41.948159821 +0000 @@ -5,7 +5,7 @@ Modelica.Blocks.Sources.CombiTimeTable combiTimeTable(table=[0,0; 28740,0; 28800,1; 43200,1; 43260,0; 46800,0; 46860,1; 64800,1; 64860,0; 86400,0]) annotation(Placement(transformation(extent = {{-82, -26}, {-62, -6}}))); Modelica.Blocks.Sources.Sine sine( amplitude=2, - freqHz=1/(24*3600), +f =1/(24*3600), offset=273.15 + 20, phase(displayUnit="deg") = -3.1415926535898) annotation(Placement(transformation(extent={{-70,18},{-82,30}}))); Modelica.Thermal.HeatTransfer.Sensors.HeatFlowSensor heatFlowSensorConv annotation (Placement(transformation(extent={{38,12},{52,26}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Humans/BaseClasses/PartialHuman.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Humans/BaseClasses/PartialHuman.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Humans/BaseClasses/PartialHuman.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Humans/BaseClasses/PartialHuman.mo" 2022-03-10 09:59:41.896159815 +0000 @@ -8,8 +8,8 @@ parameter Real specificPersons(unit="1/(m.m)") = 0.05 "Specific persons per square metre room area" annotation(Dialog(descriptionLabel = true)); parameter Real ratioConvectiveHeat=0.5 "Ratio of convective heat from overall heat output" annotation(Dialog(descriptionLabel = true)); - parameter Modelica.SIunits.Area roomArea "Area of room" annotation(Dialog(descriptionLabel = true)); - parameter Modelica.SIunits.HeatFlowRate specificHeatPerPerson = 70 + parameter Modelica.Units.SI.Area roomArea "Area of room" annotation(Dialog(descriptionLabel = true)); + parameter Modelica.Units.SI.HeatFlowRate specificHeatPerPerson = 70 "Specific heat output per person"; Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor temperatureSensor @@ -22,8 +22,8 @@ "Air temperature in room" annotation(Placement(transformation(extent = {{-100, 80}, {-80, 100}}))); protected - parameter Modelica.SIunits.Area surfaceAreaOnePersion=2 "Human Surface (per person)"; - parameter Modelica.SIunits.HeatFlowRate heatPerPerson=70 + parameter Modelica.Units.SI.Area surfaceAreaOnePersion=2 "Human Surface (per person)"; + parameter Modelica.Units.SI.HeatFlowRate heatPerPerson=70 "Average Heat Flow per person taken from DIN V 18599-10" annotation(Dialog(descriptionLabel = true)); equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Humans/BaseClasses/TemperatureDependentHeatOutputSIA2024.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Humans/BaseClasses/TemperatureDependentHeatOutputSIA2024.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Humans/BaseClasses/TemperatureDependentHeatOutputSIA2024.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Humans/BaseClasses/TemperatureDependentHeatOutputSIA2024.mo" 2022-03-10 09:59:41.888159813 +0000 @@ -12,10 +12,10 @@ annotation (Placement(transformation(extent={{100,-10},{120,10}}))); protected constant Real HeatPerMet(unit="W/(m.m)") = 58 "Heat per m² for 1 met"; - constant Modelica.SIunits.Area BodySurface=1.8 "Body surface of one person"; + constant Modelica.Units.SI.Area BodySurface=1.8 "Body surface of one person"; constant Real TemperatureCoefficient(unit="1/K") = 0.025 "Parameter for temperature dependency"; - constant Modelica.SIunits.HeatFlowRate MinimumHeat=35 "Minimum heat output"; + constant Modelica.Units.SI.HeatFlowRate MinimumHeat=35 "Minimum heat output"; equation heatOutput =max(0, (0.865 - (TemperatureCoefficient*T))*(activityDegree* diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Humans/BaseClasses/TemperatureDependentMoistureOutputSIA2024.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Humans/BaseClasses/TemperatureDependentMoistureOutputSIA2024.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Humans/BaseClasses/TemperatureDependentMoistureOutputSIA2024.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Humans/BaseClasses/TemperatureDependentMoistureOutputSIA2024.mo" 2022-03-10 09:59:41.880159812 +0000 @@ -15,7 +15,7 @@ annotation (Placement(transformation(extent={{-74,32},{-54,52}}))); protected constant Real HeatPerMet(unit="W/(m.m)") = 58 "Heat per m² for 1 met"; - constant Modelica.SIunits.Area BodySurface=1.8 "Body surface of one person"; + constant Modelica.Units.SI.Area BodySurface=1.8 "Body surface of one person"; constant Real MoistGain(unit="g/h") = 10/7 "Gain for moisture output"; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Humans/HumanTotalHeatTemperatureDependent.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Humans/HumanTotalHeatTemperatureDependent.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Humans/HumanTotalHeatTemperatureDependent.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Humans/HumanTotalHeatTemperatureDependent.mo" 2022-03-10 09:59:41.864159811 +0000 @@ -23,12 +23,12 @@ "Latent heat per kg moisture" annotation (Placement(transformation(extent={{-88,14},{-68,34}}))); protected - constant Modelica.SIunits.SpecificHeatCapacity cp_steam= + constant Modelica.Units.SI.SpecificHeatCapacity cp_steam= AixLib.Utilities.Psychrometrics.Constants.cpSte "Specific heat capacity of steam"; - constant Modelica.SIunits.SpecificEnthalpy EnthalpyOfEvaporation=AixLib.Utilities.Psychrometrics.Constants.h_fg + constant Modelica.Units.SI.SpecificEnthalpy EnthalpyOfEvaporation=AixLib.Utilities.Psychrometrics.Constants.h_fg "Enthalpy of evaporation"; - constant Modelica.SIunits.SpecificEnergy h_fg= + constant Modelica.Units.SI.SpecificEnergy h_fg= Media.Air.enthalpyOfCondensingGas(273.15+37) "Latent heat of water vapor"; equation connect(to_degC.y, temperatureDependentMoistuerOutputSIA2024_1.T) annotation ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Lights/LightsAreaSpecific.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Lights/LightsAreaSpecific.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Lights/LightsAreaSpecific.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Lights/LightsAreaSpecific.mo" 2022-03-10 09:59:41.852159810 +0000 @@ -6,11 +6,11 @@ radConvertor(final A=max(Modelica.Constants.eps, areaSurfaceLightsTotal)), gain(final k=roomArea*lightingPowerRoomAreaSpecific), gainSurfaces(final k=areaSurfaceLightsTotal)); - parameter Modelica.SIunits.Area roomArea "Area of room" annotation(Dialog( descriptionLabel = true)); + parameter Modelica.Units.SI.Area roomArea "Area of room" annotation(Dialog( descriptionLabel = true)); parameter Real lightingPowerRoomAreaSpecific=10 "Lighting power per square meter room" annotation(Dialog( descriptionLabel = true)); - parameter Modelica.SIunits.Area areaSurfaceLightsTotal=0.01*roomArea "Surface of all lights in the room"; + parameter Modelica.Units.SI.Area areaSurfaceLightsTotal=0.01*roomArea "Surface of all lights in the room"; annotation (Icon(graphics={ Ellipse( extent={{-50,72},{50,-40}}, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Lights/LightsRelToMaxValue.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Lights/LightsRelToMaxValue.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Lights/LightsRelToMaxValue.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Lights/LightsRelToMaxValue.mo" 2022-03-10 09:59:41.844159809 +0000 @@ -3,9 +3,9 @@ extends BaseClasses.PartialInternalGain(emissivity=0.98, gainSurfaces(final k=areaSurfaceLightsTotal), gain(final k=maxHeatFlowAbsolute)); - parameter Modelica.SIunits.HeatFlowRate maxHeatFlowAbsolute "Maximal absolute heat flow due to lighting"; - parameter Modelica.SIunits.Area areaSurfaceLightsTotal=0.001*maxHeatFlowAbsolute "Surface of all lights in the room"; + parameter Modelica.Units.SI.HeatFlowRate maxHeatFlowAbsolute "Maximal absolute heat flow due to lighting"; + parameter Modelica.Units.SI.Area areaSurfaceLightsTotal=0.001*maxHeatFlowAbsolute "Surface of all lights in the room"; equation connect(radConvertor.radPort, radHeat) annotation (Line( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Machines/MachinesAreaSpecific.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Machines/MachinesAreaSpecific.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Machines/MachinesAreaSpecific.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Machines/MachinesAreaSpecific.mo" 2022-03-10 09:59:41.832159807 +0000 @@ -5,15 +5,15 @@ gain(final k=intGainsMachinesRoomAreaSpecific*roomArea), gainSurfaces(final k=areaSurfaceMachinesTotal)); - parameter Modelica.SIunits.HeatFlux intGainsMachinesRoomAreaSpecific=1.0 "Heat flow from machines per square meter room" annotation(Dialog(descriptionLabel = true)); - parameter Modelica.SIunits.Area areaSurfaceMachinesTotal=max( + parameter Modelica.Units.SI.HeatFlux intGainsMachinesRoomAreaSpecific=1.0 "Heat flow from machines per square meter room" annotation(Dialog(descriptionLabel = true)); + parameter Modelica.Units.SI.Area areaSurfaceMachinesTotal=max( 1e-4, surfaceMachine*intGainsMachinesRoomAreaSpecific*(1/ HeatPerMachine)*roomArea) "Total surface area of all machines (radiative heat source) (for a room in a single-family hous e.g. 2 m2)"; - parameter Modelica.SIunits.Area roomArea "Area of room" annotation(Dialog(descriptionLabel = true)); + parameter Modelica.Units.SI.Area roomArea "Area of room" annotation(Dialog(descriptionLabel = true)); protected - parameter Modelica.SIunits.HeatFlowRate HeatPerMachine = 100 "Average Heat Flow per machine taken from DIN V 18599-10" annotation(Dialog(descriptionLabel = true)); - parameter Modelica.SIunits.Area surfaceMachine = 2.0 "Surface area of one machine"; + parameter Modelica.Units.SI.HeatFlowRate HeatPerMachine = 100 "Average Heat Flow per machine taken from DIN V 18599-10" annotation(Dialog(descriptionLabel = true)); + parameter Modelica.Units.SI.Area surfaceMachine = 2.0 "Surface area of one machine"; annotation (Icon(graphics={ Text( extent={{-40,-20},{44,-62}}, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Machines/MachinesDIN18599.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Machines/MachinesDIN18599.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Machines/MachinesDIN18599.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Machines/MachinesDIN18599.mo" 2022-03-10 09:59:41.812159804 +0000 @@ -8,13 +8,13 @@ parameter Integer activityType=2 "Machine activity" annotation(Dialog( compact = true, descriptionLabel = true), choices(choice=1 "low", choice = 2 "middle", choice = 3 "high", radioButtons = true)); parameter Real nrPeople=1.0 "Number of people with machines" annotation(Dialog(descriptionLabel = true)); - parameter Modelica.SIunits.Area areaSurfaceMachinesTotal=max( + parameter Modelica.Units.SI.Area areaSurfaceMachinesTotal=max( 1e-4, surfaceMachine*nrPeople) "Total surface area of all machines (radiative heat source) (for a room in a single-family hous e.g. 2 m2)"; protected - parameter Modelica.SIunits.Area surfaceMachine = 2.0 "Surface area of one machine"; - Modelica.Blocks.Tables.CombiTable1D tableHeatOutput( + parameter Modelica.Units.SI.Area surfaceMachine = 2.0 "Surface area of one machine"; + Modelica.Blocks.Tables.CombiTable1Dv tableHeatOutput( smoothness=Modelica.Blocks.Types.Smoothness.LinearSegments, tableOnFile=false, table=[1,50; 2,100; 3,150], diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Machines/MachinesRelToMaxValue.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Machines/MachinesRelToMaxValue.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Machines/MachinesRelToMaxValue.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Machines/MachinesRelToMaxValue.mo" 2022-03-10 09:59:41.792159801 +0000 @@ -4,9 +4,9 @@ emissivity=0.98, gainSurfaces(final k=areaSurfaceMachinesTotal), gain(final k=maxHeatFlowAbsolute)); - parameter Modelica.SIunits.Area areaSurfaceMachinesTotal=0.02*maxHeatFlowAbsolute "Total surface area of all machines (radiative heat source) (for a room in a single-family hous e.g. 2 m2)"; - parameter Modelica.SIunits.HeatFlowRate maxHeatFlowAbsolute "Maximal absolute heat flow of machines"; + parameter Modelica.Units.SI.Area areaSurfaceMachinesTotal=0.02*maxHeatFlowAbsolute "Total surface area of all machines (radiative heat source) (for a room in a single-family hous e.g. 2 m2)"; + parameter Modelica.Units.SI.HeatFlowRate maxHeatFlowAbsolute "Maximal absolute heat flow of machines"; equation annotation ( Icon(graphics={ diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Moisture/MoistureGains.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Moisture/MoistureGains.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Moisture/MoistureGains.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/InternalGains/Moisture/MoistureGains.mo" 2022-03-10 09:59:41.760159797 +0000 @@ -4,7 +4,7 @@ parameter Real specificMoistureProduction(unit="g/(h.m.m)") = 0.5 "Specific moisture production without persons in the room due to plants, cooking, showering, etc."; - parameter Modelica.SIunits.Area roomArea=20 "Area of room"; + parameter Modelica.Units.SI.Area roomArea=20 "Area of room"; Modelica.Blocks.Interfaces.RealOutput QLat_flow "Latent heat of moisture gain" @@ -24,7 +24,7 @@ "Specific latent heat of moisture" annotation (Placement(transformation(extent={{56,-44},{36,-24}}))); protected - constant Modelica.SIunits.SpecificEnergy h_fg= + constant Modelica.Units.SI.SpecificEnergy h_fg= Media.Air.enthalpyOfCondensingGas(273.15+37) "Latent heat of water vapor"; equation connect(moistureGain.y, squareMetre.u) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SkyTemperature/BlackBody.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SkyTemperature/BlackBody.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SkyTemperature/BlackBody.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SkyTemperature/BlackBody.mo" 2022-03-10 09:59:41.740159795 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" 2022-03-10 09:59:41.672159786 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" 2022-03-10 09:59:41.656159785 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" 2022-03-10 09:59:41.640159782 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" 2022-03-10 09:59:41.588159776 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" 2022-03-10 09:59:41.572159773 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" 2022-03-10 09:59:41.568159774 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" 2022-03-10 09:59:41.536159770 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/ZenithAngle.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/ZenithAngle.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/ZenithAngle.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarGeometry/ZenithAngle.mo" 2022-03-10 09:59:41.528159769 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" 2022-03-10 09:59:41.504159766 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" 2022-03-10 09:59:41.496159764 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" 2022-03-10 09:59:41.444159757 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo" 2022-03-10 09:59:41.424159755 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" 2022-03-10 09:59:41.412159753 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" 2022-03-10 09:59:41.392159751 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" 2022-03-10 09:59:41.376159750 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" 2022-03-10 09:57:39.056144259 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" 2022-03-10 09:59:41.360159747 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/Validation/BESTEST/WD100.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/Validation/BESTEST/WD100.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/Validation/BESTEST/WD100.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/Validation/BESTEST/WD100.mo" 2022-03-10 09:59:41.328159743 +0000 @@ -2,11 +2,11 @@ model WD100 "Test model for BESTEST weather data: base case" extends Modelica.Icons.Example; - parameter Modelica.SIunits.Angle lat=0.6952170009469 + parameter Modelica.Units.SI.Angle lat=0.6952170009469 "Latitude angle"; parameter Real rho=0 "Ground reflectance"; - parameter Modelica.SIunits.Length alt=1650 + parameter Modelica.Units.SI.Length alt=1650 "Altitude"; WeatherData.ReaderTMY3 weaDatHHorIR( pAtmSou=AixLib.BoundaryConditions.Types.DataSource.File, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/Validation/IsotropicAndPerezDiffuseRadiation.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/Validation/IsotropicAndPerezDiffuseRadiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/Validation/IsotropicAndPerezDiffuseRadiation.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/Validation/IsotropicAndPerezDiffuseRadiation.mo" 2022-03-10 09:59:41.284159737 +0000 @@ -7,13 +7,13 @@ final unit="W/m2") "Radiation per unit area using Perez Model" annotation (Placement(transformation(extent={{100,-50},{120,-30}}))); - parameter Modelica.SIunits.Angle til( + parameter Modelica.Units.SI.Angle til( displayUnit="deg") "Surface tilt angle"; - parameter Modelica.SIunits.Angle lat( + parameter Modelica.Units.SI.Angle lat( displayUnit="deg") "Latitude angle"; - parameter Modelica.SIunits.Angle azi( + parameter Modelica.Units.SI.Angle azi( displayUnit="deg") "Azimuth angle"; parameter Real rho=0.2 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" 2022-03-10 09:59:41.260159734 +0000 @@ -3,9 +3,9 @@ "Check the validity of the black-body sky temperature data" extends Modelica.Blocks.Icons.Block; - 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"; Modelica.Blocks.Interfaces.RealInput TIn( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckCeilingHeight.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckCeilingHeight.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckCeilingHeight.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckCeilingHeight.mo" 2022-03-10 09:59:41.252159733 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckDewPointTemperature.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckDewPointTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckDewPointTemperature.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckDewPointTemperature.mo" 2022-03-10 09:59:41.188159726 +0000 @@ -13,11 +13,11 @@ displayUnit="degC") "Dew point 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 TDewPoi = TIn; assert(noEvent(TIn > TMin and TIn < TMax), "In " + getInstanceName() + diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckDryBulbTemperature.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckDryBulbTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckDryBulbTemperature.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckDryBulbTemperature.mo" 2022-03-10 09:59:41.184159724 +0000 @@ -13,11 +13,11 @@ displayUnit="degC") "Dry bulb 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 TDryBul = TIn; assert(noEvent(TIn > TMin and TIn < TMax), "In " + getInstanceName() + diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckIRRadiation.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckIRRadiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckIRRadiation.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckIRRadiation.mo" 2022-03-10 09:59:41.176159724 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" 2022-03-10 09:59:41.168159723 +0000 @@ -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 pAtm = PIn; assert(noEvent(PIn > PMin and PIn < PMax), "In " + getInstanceName() + diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckRadiation.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckRadiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckRadiation.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckRadiation.mo" 2022-03-10 09:59:41.164159722 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckTemperature.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckTemperature.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckTemperature.mo" 2022-03-10 09:59:41.148159720 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckWindSpeed.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckWindSpeed.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckWindSpeed.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/CheckWindSpeed.mo" 2022-03-10 09:59:41.140159719 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/ConvertRadiation.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/ConvertRadiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/ConvertRadiation.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/ConvertRadiation.mo" 2022-03-10 09:59:41.132159718 +0000 @@ -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="

diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" 2022-03-10 09:59:41.124159718 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" 2022-03-10 09:59:41.020159704 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3.mo" 2022-03-10 09:59:41.012159703 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3LongHeader.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3LongHeader.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3LongHeader.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3LongHeader.mo" 2022-03-10 09:59:41.004159703 +0000 @@ -7,7 +7,7 @@ "modelica://AixLib/Resources/Data/BoundaryConditions/WeatherData/BaseClasses/Examples/weatherWithLongHeader.mos") "Name of weather data file"; - 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"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" 2022-03-10 09:59:40.944159694 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/SourceSelectorRadiation.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/SourceSelectorRadiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/SourceSelectorRadiation.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/SourceSelectorRadiation.mo" 2022-03-10 09:59:40.908159691 +0000 @@ -86,7 +86,7 @@ protected 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"; // Conditional connectors Modelica.Blocks.Interfaces.RealInput HGloHor_in_internal( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo" 2022-03-10 09:59:40.840159682 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo" 2022-03-10 09:59:40.832159680 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/getTimeSpanTMY3.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/getTimeSpanTMY3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/getTimeSpanTMY3.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/getTimeSpanTMY3.mo" 2022-03-10 09:59:40.828159680 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo" 2022-03-10 09:59:40.820159679 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/Old/WeatherTRY/BaseClasses/Sun.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/Old/WeatherTRY/BaseClasses/Sun.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/Old/WeatherTRY/BaseClasses/Sun.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/Old/WeatherTRY/BaseClasses/Sun.mo" 2022-03-10 09:59:40.780159673 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/Old/WeatherTRY/RadiationOnTiltedSurface/BaseClasses/PartialRadOnTiltedSurf.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/Old/WeatherTRY/RadiationOnTiltedSurface/BaseClasses/PartialRadOnTiltedSurf.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/Old/WeatherTRY/RadiationOnTiltedSurface/BaseClasses/PartialRadOnTiltedSurf.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/Old/WeatherTRY/RadiationOnTiltedSurface/BaseClasses/PartialRadOnTiltedSurf.mo" 2022-03-10 09:59:40.748159669 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/Old/WeatherTRY/RadiationOnTiltedSurface/RadOnTiltedSurf_Liu.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/Old/WeatherTRY/RadiationOnTiltedSurface/RadOnTiltedSurf_Liu.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/Old/WeatherTRY/RadiationOnTiltedSurface/RadOnTiltedSurf_Liu.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/Old/WeatherTRY/RadiationOnTiltedSurface/RadOnTiltedSurf_Liu.mo" 2022-03-10 09:59:40.740159668 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/Old/WeatherTRY/RadiationOnTiltedSurface/RadOnTiltedSurf_Perez.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/Old/WeatherTRY/RadiationOnTiltedSurface/RadOnTiltedSurf_Perez.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/Old/WeatherTRY/RadiationOnTiltedSurface/RadOnTiltedSurf_Perez.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/Old/WeatherTRY/RadiationOnTiltedSurface/RadOnTiltedSurf_Perez.mo" 2022-03-10 09:59:40.724159666 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/Old/WeatherTRY/Weather.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/Old/WeatherTRY/Weather.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/Old/WeatherTRY/Weather.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/Old/WeatherTRY/Weather.mo" 2022-03-10 09:59:40.696159663 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/ReaderTMY3.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/ReaderTMY3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/ReaderTMY3.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/ReaderTMY3.mo" 2022-03-10 09:59:40.660159658 +0000 @@ -18,7 +18,7 @@ parameter AixLib.BoundaryConditions.Types.DataSource pAtmSou=AixLib.BoundaryConditions.Types.DataSource.Parameter "Atmospheric pressure" annotation (Evaluate=true, HideResult=true, Dialog(tab="Data source")); - parameter Modelica.SIunits.Pressure pAtm=101325 + parameter Modelica.Units.SI.Pressure pAtm=101325 "Atmospheric pressure (used if pAtmSou=Parameter)" annotation (Dialog(tab="Data source")); Modelica.Blocks.Interfaces.RealInput pAtm_in( @@ -34,7 +34,7 @@ parameter AixLib.BoundaryConditions.Types.DataSource TDryBulSou=AixLib.BoundaryConditions.Types.DataSource.File "Dry bulb temperature" annotation (Evaluate=true, HideResult=true, Dialog(tab="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(tab="Data source")); Modelica.Blocks.Interfaces.RealInput TDryBul_in( @@ -49,7 +49,7 @@ parameter AixLib.BoundaryConditions.Types.DataSource TDewPoiSou=AixLib.BoundaryConditions.Types.DataSource.File "Dew point temperature" annotation (Evaluate=true, HideResult=true, Dialog(tab="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(tab="Data source")); Modelica.Blocks.Interfaces.RealInput TDewPoi_in( @@ -63,7 +63,7 @@ // Black body sky temperature parameter AixLib.BoundaryConditions.Types.DataSource TBlaSkySou=AixLib.BoundaryConditions.Types.DataSource.File "Black-body sky temperature" annotation (Evaluate=true, HideResult=true, Dialog(tab="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(tab="Data source")); Modelica.Blocks.Interfaces.RealInput TBlaSky_in( @@ -94,7 +94,7 @@ // Wind speed parameter AixLib.BoundaryConditions.Types.DataSource winSpeSou=AixLib.BoundaryConditions.Types.DataSource.File "Wind speed" annotation (Evaluate=true, HideResult=true, Dialog(tab="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(tab="Data source")); Modelica.Blocks.Interfaces.RealInput winSpe_in( @@ -108,7 +108,7 @@ // Wind direction parameter AixLib.BoundaryConditions.Types.DataSource winDirSou=AixLib.BoundaryConditions.Types.DataSource.File "Wind direction" annotation (Evaluate=true, HideResult=true, Dialog(tab="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(tab="Data source")); Modelica.Blocks.Interfaces.RealInput winDir_in( @@ -122,7 +122,7 @@ // Infrared horizontal radiation parameter AixLib.BoundaryConditions.Types.DataSource HInfHorSou=AixLib.BoundaryConditions.Types.DataSource.File "Infrared horizontal radiation" annotation (Evaluate=true, HideResult=true, Dialog(tab="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(tab="Data source")); Modelica.Blocks.Interfaces.RealInput HInfHor_in( @@ -222,18 +222,18 @@ Evaluate=true, Dialog(tab="Advanced", group="Sky temperature")); - 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"; 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"; @@ -424,12 +424,13 @@ "Check black body sky temperature" annotation (Placement(transformation(extent={{240,-140},{260,-120}}))); + // 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", @@ -473,7 +474,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", @@ -513,7 +514,6 @@ ")); end Longitude; - equation connect(modTim.y, add30Min.u2) annotation (Line(points={{-139,0},{-128,0},{-128, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mo" 2022-03-10 09:59:40.524159642 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/AirHandling/FVUController.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/AirHandling/FVUController.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/AirHandling/FVUController.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/AirHandling/FVUController.mo" 2022-03-10 09:59:40.492159638 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/Examples/LimPID.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/Examples/LimPID.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/Examples/LimPID.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/Examples/LimPID.mo" 2022-03-10 09:59:40.428159630 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/Examples/NumberOfRequests.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/Examples/NumberOfRequests.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/Examples/NumberOfRequests.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/Examples/NumberOfRequests.mo" 2022-03-10 09:59:40.400159625 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/Examples/PIDHysteresis.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/Examples/PIDHysteresis.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/Examples/PIDHysteresis.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/Examples/PIDHysteresis.mo" 2022-03-10 09:59:40.388159624 +0000 @@ -24,7 +24,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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/Examples/PIDHysteresisTimer.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/Examples/PIDHysteresisTimer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/Examples/PIDHysteresisTimer.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/Examples/PIDHysteresisTimer.mo" 2022-03-10 09:59:40.380159623 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/Examples/SignalRanker.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/Examples/SignalRanker.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/Examples/SignalRanker.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/Examples/SignalRanker.mo" 2022-03-10 09:59:40.324159616 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/LimPID.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/LimPID.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/LimPID.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/LimPID.mo" 2022-03-10 09:59:40.320159616 +0000 @@ -9,11 +9,11 @@ parameter Modelica.Blocks.Types.SimpleController controllerType= Modelica.Blocks.Types.SimpleController.PI "Type of controller"; parameter Real k(min=0) = 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 reverseActing then 1 else -1 "Switch for sign for reverse or direct acting controller"; @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/OffTimer.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/OffTimer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/OffTimer.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/OffTimer.mo" 2022-03-10 09:59:40.268159608 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/PIDHysteresis.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/PIDHysteresis.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/PIDHysteresis.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/PIDHysteresis.mo" 2022-03-10 09:59:40.264159609 +0000 @@ -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 for reverse acting, or false for direct acting control action" 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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/PIDHysteresisTimer.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/PIDHysteresisTimer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/PIDHysteresisTimer.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/PIDHysteresisTimer.mo" 2022-03-10 09:59:40.248159606 +0000 @@ -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 for reverse acting, or false for direct acting control action" 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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/PITemp.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/PITemp.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/PITemp.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/PITemp.mo" 2022-03-10 09:59:40.208159602 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/Validation/LimPIDReset.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/Validation/LimPIDReset.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/Validation/LimPIDReset.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Continuous/Validation/LimPIDReset.mo" 2022-03-10 09:59:40.176159598 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Agents/Broker.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Agents/Broker.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Agents/Broker.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Agents/Broker.mo" 2022-03-10 09:59:40.128159591 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Agents/ColdProducerAgent.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Agents/ColdProducerAgent.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Agents/ColdProducerAgent.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Agents/ColdProducerAgent.mo" 2022-03-10 09:59:40.032159579 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Agents/ConsumerAgent.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Agents/ConsumerAgent.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Agents/ConsumerAgent.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Agents/ConsumerAgent.mo" 2022-03-10 09:59:39.956159569 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Agents/HeatProducerAgent.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Agents/HeatProducerAgent.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Agents/HeatProducerAgent.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Agents/HeatProducerAgent.mo" 2022-03-10 09:59:39.912159564 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Agents/IntermediateAgent.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Agents/IntermediateAgent.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Agents/IntermediateAgent.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Agents/IntermediateAgent.mo" 2022-03-10 09:59:39.852159557 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Agents/RoomAgent.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Agents/RoomAgent.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Agents/RoomAgent.mo" 2022-03-10 09:57:39.060144260 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Agents/RoomAgent.mo" 2022-03-10 09:59:39.772159546 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/CostFunctions/Economic/PV_Variable_Economic_Cost.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/CostFunctions/Economic/PV_Variable_Economic_Cost.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/CostFunctions/Economic/PV_Variable_Economic_Cost.mo" 2022-03-10 09:57:39.064144261 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/CostFunctions/Economic/PV_Variable_Economic_Cost.mo" 2022-03-10 09:59:39.608159525 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/CostFunctions/Exergy/HeatPump_ExergyDestruction_Cooling.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/CostFunctions/Exergy/HeatPump_ExergyDestruction_Cooling.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/CostFunctions/Exergy/HeatPump_ExergyDestruction_Cooling.mo" 2022-03-10 09:57:39.064144261 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/CostFunctions/Exergy/HeatPump_ExergyDestruction_Cooling.mo" 2022-03-10 09:59:39.572159520 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/CostFunctions/Exergy/HeatPump_ExergyDestruction_Heating.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/CostFunctions/Exergy/HeatPump_ExergyDestruction_Heating.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/CostFunctions/Exergy/HeatPump_ExergyDestruction_Heating.mo" 2022-03-10 09:57:39.064144261 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/CostFunctions/Exergy/HeatPump_ExergyDestruction_Heating.mo" 2022-03-10 09:59:39.548159517 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/CostFunctions/PrimaryExergy/HeatPump_PrimaryExergyDestruction_Cooling.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/CostFunctions/PrimaryExergy/HeatPump_PrimaryExergyDestruction_Cooling.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/CostFunctions/PrimaryExergy/HeatPump_PrimaryExergyDestruction_Cooling.mo" 2022-03-10 09:57:39.064144261 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/CostFunctions/PrimaryExergy/HeatPump_PrimaryExergyDestruction_Cooling.mo" 2022-03-10 09:59:39.460159507 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/CostFunctions/PrimaryExergy/HeatPump_PrimaryExergyDestruction_Heating.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/CostFunctions/PrimaryExergy/HeatPump_PrimaryExergyDestruction_Heating.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/CostFunctions/PrimaryExergy/HeatPump_PrimaryExergyDestruction_Heating.mo" 2022-03-10 09:57:39.064144261 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/CostFunctions/PrimaryExergy/HeatPump_PrimaryExergyDestruction_Heating.mo" 2022-03-10 09:59:39.436159504 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Examples/BookTrading/BookBuyerAgent.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Examples/BookTrading/BookBuyerAgent.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Examples/BookTrading/BookBuyerAgent.mo" 2022-03-10 09:57:39.064144261 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Examples/BookTrading/BookBuyerAgent.mo" 2022-03-10 09:59:39.388159497 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Examples/BookTrading/BookSellerAgent.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Examples/BookTrading/BookSellerAgent.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Examples/BookTrading/BookSellerAgent.mo" 2022-03-10 09:57:39.064144261 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Examples/BookTrading/BookSellerAgent.mo" 2022-03-10 09:59:39.332159490 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Examples/BookTrading/BookTrading.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Examples/BookTrading/BookTrading.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Examples/BookTrading/BookTrading.mo" 2022-03-10 09:57:39.064144261 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Examples/BookTrading/BookTrading.mo" 2022-03-10 09:59:39.304159487 +0000 @@ -2,7 +2,7 @@ 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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Examples/BuildingHeatingSystems/BuildingHeating.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Examples/BuildingHeatingSystems/BuildingHeating.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Examples/BuildingHeatingSystems/BuildingHeating.mo" 2022-03-10 09:57:39.064144261 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Examples/BuildingHeatingSystems/BuildingHeating.mo" 2022-03-10 09:59:39.280159483 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Examples/BuildingHeatingSystems/BuildingWithPV.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Examples/BuildingHeatingSystems/BuildingWithPV.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Examples/BuildingHeatingSystems/BuildingWithPV.mo" 2022-03-10 09:57:39.064144261 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HVACAgentBasedControl/Examples/BuildingHeatingSystems/BuildingWithPV.mo" 2022-03-10 09:59:39.200159473 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/AntiLegionella.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/AntiLegionella.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/AntiLegionella.mo" 2022-03-10 09:57:39.064144261 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/AntiLegionella.mo" 2022-03-10 09:59:39.060159455 +0000 @@ -1,10 +1,10 @@ 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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/BaseClasses/InverterControlledHP.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/BaseClasses/InverterControlledHP.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/BaseClasses/InverterControlledHP.mo" 2022-03-10 09:57:39.064144261 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/BaseClasses/InverterControlledHP.mo" 2022-03-10 09:59:39.036159454 +0000 @@ -15,7 +15,7 @@ annotation (Placement(transformation(extent={{14,38},{34,58}}))); parameter Real k=0.1 "Gain of controller" annotation (Dialog(group="PI Values")); - parameter Modelica.SIunits.Time Ti=30 "Time constant of Integrator block" + parameter Modelica.Units.SI.Time Ti=30 "Time constant of Integrator block" annotation (Dialog(group="PI Values")); equation connect(TSet, onOffController.reference) annotation (Line(points={{-116,60},{ diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/BaseClasses/PartialTSetToNSet.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/BaseClasses/PartialTSetToNSet.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/BaseClasses/PartialTSetToNSet.mo" 2022-03-10 09:57:39.064144261 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/BaseClasses/PartialTSetToNSet.mo" 2022-03-10 09:59:39.020159451 +0000 @@ -5,9 +5,9 @@ "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")); AixLib.Utilities.Logical.SmoothSwitch swiNullHP "If HP is off, zero is passed" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/Examples/HeatPumpController.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/Examples/HeatPumpController.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/Examples/HeatPumpController.mo" 2022-03-10 09:57:39.064144261 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/Examples/HeatPumpController.mo" 2022-03-10 09:59:39.004159448 +0000 @@ -33,7 +33,7 @@ rotation=0, origin={-70,-96}))); 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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/HPControl.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/HPControl.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/HPControl.mo" 2022-03-10 09:57:39.064144261 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/HPControl.mo" 2022-03-10 09:59:38.988159447 +0000 @@ -35,10 +35,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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/ModularHeatPumps/BaseClasses/PartialModularController.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/ModularHeatPumps/BaseClasses/PartialModularController.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/ModularHeatPumps/BaseClasses/PartialModularController.mo" 2022-03-10 09:57:39.064144261 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/ModularHeatPumps/BaseClasses/PartialModularController.mo" 2022-03-10 09:59:38.956159443 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/SafetyControls/AntiFreeze.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/SafetyControls/AntiFreeze.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/SafetyControls/AntiFreeze.mo" 2022-03-10 09:57:39.064144261 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/SafetyControls/AntiFreeze.mo" 2022-03-10 09:59:38.912159437 +0000 @@ -4,7 +4,7 @@ parameter Boolean use_antFre=true "True if anti freeze control is part of safety 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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/SafetyControls/BaseClasses/RunPerHouBoundary.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/SafetyControls/BaseClasses/RunPerHouBoundary.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/SafetyControls/BaseClasses/RunPerHouBoundary.mo" 2022-03-10 09:57:39.064144261 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/SafetyControls/BaseClasses/RunPerHouBoundary.mo" 2022-03-10 09:59:38.876159432 +0000 @@ -2,7 +2,7 @@ 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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/SafetyControls/BaseClasses/TimeControl.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/SafetyControls/BaseClasses/TimeControl.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/SafetyControls/BaseClasses/TimeControl.mo" 2022-03-10 09:57:39.064144261 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/SafetyControls/BaseClasses/TimeControl.mo" 2022-03-10 09:59:38.864159431 +0000 @@ -3,7 +3,7 @@ "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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/SafetyControls/DefrostControl.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/SafetyControls/DefrostControl.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/SafetyControls/DefrostControl.mo" 2022-03-10 09:57:39.064144261 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/SafetyControls/DefrostControl.mo" 2022-03-10 09:59:38.852159429 +0000 @@ -4,7 +4,7 @@ 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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/SafetyControls/OnOffControl.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/SafetyControls/OnOffControl.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/SafetyControls/OnOffControl.mo" 2022-03-10 09:57:39.064144261 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/SafetyControls/OnOffControl.mo" 2022-03-10 09:59:38.832159427 +0000 @@ -3,12 +3,12 @@ "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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/SafetyControls/SafetyControl.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/SafetyControls/SafetyControl.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/SafetyControls/SafetyControl.mo" 2022-03-10 09:57:39.064144261 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/HeatPump/SafetyControls/SafetyControl.mo" 2022-03-10 09:59:38.800159423 +0000 @@ -5,12 +5,12 @@ 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 safety 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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Interfaces/BoilerControlBus.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Interfaces/BoilerControlBus.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Interfaces/BoilerControlBus.mo" 2022-03-10 09:57:39.064144261 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Interfaces/BoilerControlBus.mo" 2022-03-10 09:59:38.764159419 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Interfaces/CHPControlBus.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Interfaces/CHPControlBus.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Interfaces/CHPControlBus.mo" 2022-03-10 09:57:39.064144261 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Interfaces/CHPControlBus.mo" 2022-03-10 09:59:38.756159417 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Interfaces/FVUControlBus.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Interfaces/FVUControlBus.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Interfaces/FVUControlBus.mo" 2022-03-10 09:57:39.064144261 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Interfaces/FVUControlBus.mo" 2022-03-10 09:59:38.740159416 +0000 @@ -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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Interfaces/ModularSensorControlBus.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Interfaces/ModularSensorControlBus.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Interfaces/ModularSensorControlBus.mo" 2022-03-10 09:57:39.064144261 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Controls/Interfaces/ModularSensorControlBus.mo" 2022-03-10 09:59:38.672159407 +0000 @@ -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="

")); + end kinematicViscosity; annotation(preferredView="info", Documentation(info=" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Media/Water.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Media/Water.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Media/Water.mo" 2022-03-10 09:57:39.116144267 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Media/Water.mo" 2022-03-10 09:59:19.804157019 +0000 @@ -18,7 +18,7 @@ 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.Density d=d_const "Density of medium"; + Modelica.Units.SI.Density d=d_const "Density of medium"; Temperature T(stateSelect= if preferredMediumStates then StateSelect.prefer else StateSelect.default) "Temperature of medium"; @@ -26,34 +26,34 @@ 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.MassFraction[nX] X={1} + 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"; - 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 h = cp_const*(T-reference_T); u = h; @@ -119,8 +119,8 @@ function enthalpyOfLiquid "Return the specific enthalpy of liquid" extends Modelica.Icons.Function; - input Modelica.SIunits.Temperature T "Temperature"; - output Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy"; + input Modelica.Units.SI.Temperature T "Temperature"; + output Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy"; algorithm h := cp_const*(T-reference_T); annotation ( @@ -141,6 +141,7 @@ ")); + end enthalpyOfLiquid; annotation(Documentation(info="

diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Fluid/HeatPumps/BaseClasses/CycleHP.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Fluid/HeatPumps/BaseClasses/CycleHP.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Fluid/HeatPumps/BaseClasses/CycleHP.mo" 2022-03-10 09:57:39.116144267 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Fluid/HeatPumps/BaseClasses/CycleHP.mo" 2022-03-10 09:59:19.700157006 +0000 @@ -1,7 +1,7 @@ -within AixLib.Obsolete.Year2019.Fluid.HeatPumps.BaseClasses; +within AixLib.Obsolete.Year2019.Fluid.HeatPumps.BaseClasses; model CycleHP extends AixLib.Obsolete.BaseClasses.ObsoleteModel; - import SI = Modelica.SIunits; + import Modelica.Units.SI; parameter Boolean HPctrlType = true "Capacity control type" annotation(Dialog(group = "Heat Pump cycle", compact = true, descriptionLabel = true), choices(choice=true "On/off heat pump",choice = false "Speed controlled heat pump", @@ -130,7 +130,7 @@ Modelica.Blocks.Sources.RealExpression realCoP(y=CoP) annotation (Placement( transformation(extent={{-32,-66},{-12,-46}}, rotation=0))); - Modelica.Blocks.Tables.CombiTable2D Qdot_ConTable( + Modelica.Blocks.Tables.CombiTable2Ds Qdot_ConTable( tableName="NoName", fileName="NoName", table=tableQdot_con, @@ -139,7 +139,7 @@ annotation (extent=[-60,40; -40,60], Placement(transformation(extent={{-40,20}, {-20,40}}))); - Modelica.Blocks.Tables.CombiTable2D P_eleTable( + Modelica.Blocks.Tables.CombiTable2Ds P_eleTable( tableName="NoName", fileName="NoName", table=tableP_ele, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Fluid/HeatPumps/Examples/HeatPumpDetailed.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Fluid/HeatPumps/Examples/HeatPumpDetailed.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Fluid/HeatPumps/Examples/HeatPumpDetailed.mo" 2022-03-10 09:57:39.116144267 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Fluid/HeatPumps/Examples/HeatPumpDetailed.mo" 2022-03-10 09:59:19.656157000 +0000 @@ -64,7 +64,7 @@ uHigh=273.15 + 40) annotation (Placement(transformation(extent={{64,50},{44,70}}))); Modelica.Blocks.Sources.Sine sine( - freqHz=1/3600, + f =1/3600, amplitude=3000, offset=3000) annotation (Placement(transformation(extent={{76,26},{84,34}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Fluid/HeatPumps/HeatPumpDetailed.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Fluid/HeatPumps/HeatPumpDetailed.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Fluid/HeatPumps/HeatPumpDetailed.mo" 2022-03-10 09:57:39.116144267 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Fluid/HeatPumps/HeatPumpDetailed.mo" 2022-03-10 09:59:19.632156997 +0000 @@ -1,8 +1,8 @@ -within AixLib.Obsolete.Year2019.Fluid.HeatPumps; +within AixLib.Obsolete.Year2019.Fluid.HeatPumps; model HeatPumpDetailed "Heat pump model with good level of detail. Mainly fed with manufacturing data." extends AixLib.Obsolete.BaseClasses.ObsoleteModel; - import SI = Modelica.SIunits; + import Modelica.Units.SI; parameter Boolean HPctrlType=true "Capacity control type" annotation (Dialog( group="Heat Pump cycle", compact=true, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Fluid/HeatPumps/HeatPumpSimple.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Fluid/HeatPumps/HeatPumpSimple.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Fluid/HeatPumps/HeatPumpSimple.mo" 2022-03-10 09:57:39.116144267 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Fluid/HeatPumps/HeatPumpSimple.mo" 2022-03-10 09:59:19.576156990 +0000 @@ -58,9 +58,9 @@ Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow HeatFlowEvaporator "Heat flow on the source side" annotation(Placement(transformation(extent={{4,-4},{ -4,4}}, origin={-46,-50}))); - Modelica.Blocks.Tables.CombiTable2D PowerTable(table = tablePower) + Modelica.Blocks.Tables.CombiTable2Ds PowerTable(table = tablePower) "Calculates electric power based on temperature in source and sink" annotation(Placement(transformation(extent = {{-52, 20}, {-32, 40}}))); - Modelica.Blocks.Tables.CombiTable2D HeatFlowCondenserTable(table = tableHeatFlowCondenser) + Modelica.Blocks.Tables.CombiTable2Ds HeatFlowCondenserTable(table = tableHeatFlowCondenser) "Calculates heat flow based on temperature in source and sink" annotation(Placement(transformation(extent = {{-52, -12}, {-32, 8}}))); Modelica.Blocks.Logical.Switch SwitchHeatFlowCondenser "Switch to deactivate heat flow when off" annotation(Placement(transformation(extent = {{14, -20}, {34, 0}}))); @@ -73,8 +73,8 @@ Modelica.Blocks.Math.Feedback feedbackHeatFlowEvaporator "Calculates evaporator heat flow with total energy balance" annotation(Placement(transformation(extent = {{10, -60}, {-10, -40}}))); Modelica.Blocks.Interfaces.RealOutput Power "Connector of Real output signal" annotation(Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 270, origin = {0, -90}))); - parameter Modelica.SIunits.Volume VolumeEvaporator = 0.01 "Volume im m3"; - parameter Modelica.SIunits.Volume VolumeCondenser = 0.01 "Volume im m3"; + parameter Modelica.Units.SI.Volume VolumeEvaporator = 0.01 "Volume im m3"; + parameter Modelica.Units.SI.Volume VolumeCondenser = 0.01 "Volume im m3"; parameter Real tablePower[:, :] = fill(0.0, 0, 2) "Table matrix (grid u1 = first column, grid u2 = first row; e.g., table=[0,0;0,1])"; parameter Real tableHeatFlowCondenser[:, :] = fill(0.0, 0, 2) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Fluid/Storage/StorageWall.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Fluid/Storage/StorageWall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Fluid/Storage/StorageWall.mo" 2022-03-10 09:57:39.116144267 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Fluid/Storage/StorageWall.mo" 2022-03-10 09:59:19.496156981 +0000 @@ -8,10 +8,10 @@ convOutside(hCon=hConOut, A=AOutside), loadIns(C=cIns*(rhoIns)*(AIns)*(sIns))); - parameter Modelica.SIunits.Length height=0.15 "Height of layer" annotation(Dialog(tab="Geometrical Parameters")); - parameter Modelica.SIunits.Area AIns=(D1+2*sWall)*Modelica.Constants.pi * height; - parameter Modelica.SIunits.Area AOutside=(D1+2*(sWall+sIns))*Modelica.Constants.pi * height; + parameter Modelica.Units.SI.Length height=0.15 "Height of layer" annotation(Dialog(tab="Geometrical Parameters")); + parameter Modelica.Units.SI.Area AIns=(D1+2*sWall)*Modelica.Constants.pi * height; + parameter Modelica.Units.SI.Area AOutside=(D1+2*(sWall+sIns))*Modelica.Constants.pi * height; equation annotation (obsolete = "Obsolete model - Almost same behavior as AixLib.Fluid.Storage.BaseClasses.StorageCover.", Diagram(graphics), diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Utilities/HeatTransfer/HeatToStar.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Utilities/HeatTransfer/HeatToStar.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Utilities/HeatTransfer/HeatToStar.mo" 2022-03-10 09:57:39.116144267 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Utilities/HeatTransfer/HeatToStar.mo" 2022-03-10 09:59:19.472156978 +0000 @@ -3,8 +3,8 @@ extends AixLib.Obsolete.BaseClasses.ObsoleteModel; Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a Therm annotation(Placement(transformation(extent = {{-102, -10}, {-82, 10}}))); AixLib.Utilities.Interfaces.RadPort Star annotation (Placement(transformation(extent={{81,-10},{101,10}}))); - parameter Modelica.SIunits.Area A(min=0) "Area of radiation exchange"; - parameter Modelica.SIunits.Emissivity eps = 0.95 "Emissivity"; + parameter Modelica.Units.SI.Area A(min=0) "Area of radiation exchange"; + parameter Modelica.Units.SI.Emissivity eps = 0.95 "Emissivity"; equation Therm.Q_flow + Star.Q_flow = 0; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Utilities/Sources/InternalGains/Humans/HumanSensibleHeatAreaSpecific.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Utilities/Sources/InternalGains/Humans/HumanSensibleHeatAreaSpecific.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Utilities/Sources/InternalGains/Humans/HumanSensibleHeatAreaSpecific.mo" 2022-03-10 09:57:39.116144267 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Utilities/Sources/InternalGains/Humans/HumanSensibleHeatAreaSpecific.mo" 2022-03-10 09:59:19.452156975 +0000 @@ -2,11 +2,11 @@ model HumanSensibleHeatAreaSpecific "Model for sensible heat output area specific" extends AixLib.Obsolete.BaseClasses.ObsoleteModel; //Internal Gains People - parameter Modelica.SIunits.HeatFlux InternalGainsPeopleSpecific = 1.0 "Specific Heat Flow from people to the environment" annotation(Dialog(descriptionLabel = true)); + parameter Modelica.Units.SI.HeatFlux InternalGainsPeopleSpecific = 1.0 "Specific Heat Flow from people to the environment" annotation(Dialog(descriptionLabel = true)); parameter Real RatioConvectiveHeat = 0.5 "Ratio of convective heat from overall heat output" annotation(Dialog(descriptionLabel = true)); - parameter Modelica.SIunits.Area RoomArea=20 "Area of room" annotation(Dialog(descriptionLabel = true)); - parameter Modelica.SIunits.Temperature T0 = Modelica.SIunits.Conversions.from_degC(22) + parameter Modelica.Units.SI.Area RoomArea=20 "Area of room" annotation(Dialog(descriptionLabel = true)); + parameter Modelica.Units.SI.Temperature T0 = Modelica.Units.Conversions.from_degC(22) "Initial temperature"; Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a ConvHeat annotation(Placement(transformation(extent = {{80, 40}, {100, 60}}))); AixLib.Utilities.HeatTransfer.HeatToRad RadiationConvertor(eps=Emissivity_Human, use_A_in=true) annotation (Placement(transformation(extent={{48,-22},{72,2}}))); @@ -29,9 +29,9 @@ "Divides total heat by the Heat Output per Person to get number of persons" annotation (Placement(transformation(extent={{-46,-54},{-34,-42}}))); protected - parameter Modelica.SIunits.Area SurfaceArea_Human = 2; + parameter Modelica.Units.SI.Area SurfaceArea_Human = 2; parameter Real Emissivity_Human = 0.98; - parameter Modelica.SIunits.HeatFlowRate HeatPerPerson = 70 "Average Heat Flow per person taken from DIN V 18599-10" annotation(Dialog(descriptionLabel = true)); + parameter Modelica.Units.SI.HeatFlowRate HeatPerPerson = 70 "Average Heat Flow per person taken from DIN V 18599-10" annotation(Dialog(descriptionLabel = true)); Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow ConvectiveHeat(T_ref = T0) annotation(Placement(transformation(extent = {{18, 20}, {42, 44}}))); Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow RadiativeHeat(T_ref = T0) annotation(Placement(transformation(extent = {{18, -20}, {42, 4}}))); equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Utilities/Sources/InternalGains/Humans/HumanSensibleHeat_VDI2078.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Utilities/Sources/InternalGains/Humans/HumanSensibleHeat_VDI2078.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Utilities/Sources/InternalGains/Humans/HumanSensibleHeat_VDI2078.mo" 2022-03-10 09:57:39.116144267 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Utilities/Sources/InternalGains/Humans/HumanSensibleHeat_VDI2078.mo" 2022-03-10 09:59:19.432156973 +0000 @@ -19,7 +19,7 @@ Modelica.Blocks.Math.Gain Nr_People(k = NrPeople) annotation(Placement(transformation(extent = {{-66, -26}, {-54, -14}}))); Modelica.Blocks.Math.Gain SurfaceArea_People(k = SurfaceArea_Human) annotation(Placement(transformation(extent={{16,-54}, {28,-42}}))); - parameter Modelica.SIunits.Temperature T0 = Modelica.SIunits.Conversions.from_degC(22) + parameter Modelica.Units.SI.Temperature T0 = Modelica.Units.Conversions.from_degC(22) "Initial temperature"; Modelica.Blocks.Nonlinear.Limiter limiter(uMax = 1e+23, uMin=1) annotation(Placement(transformation(extent={{-18,-58}, {2,-38}}))); @@ -31,12 +31,12 @@ rotation=90, origin={60,32}))); protected - parameter Modelica.SIunits.Area SurfaceArea_Human = 2; + parameter Modelica.Units.SI.Area SurfaceArea_Human = 2; parameter Real Emissivity_Human = 0.98; Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow ConvectiveHeat(T_ref = T0) annotation(Placement(transformation(extent={{18,20}, {42,44}}))); Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow RadiativeHeat(T_ref = T0) annotation(Placement(transformation(extent = {{18, -20}, {42, 4}}))); - Modelica.Blocks.Tables.CombiTable1D HeatOutput(table = [10, 100, 125, 155; 18, 100, 125, 155; 20, 95, 115, 140; 22, 90, 105, 120; 23, 85, 100, 115; 24, 75, 95, 110; 25, 75, 85, 105; 26, 70, 85, 95; 35, 70, 85, 95], smoothness = Modelica.Blocks.Types.Smoothness.LinearSegments, tableOnFile = false, columns = {ActivityType}) annotation(Placement(transformation(extent = {{-60, 40}, {-40, 60}}))); + Modelica.Blocks.Tables.CombiTable1Dv HeatOutput(table = [10, 100, 125, 155; 18, 100, 125, 155; 20, 95, 115, 140; 22, 90, 105, 120; 23, 85, 100, 115; 24, 75, 95, 110; 25, 75, 85, 105; 26, 70, 85, 95; 35, 70, 85, 95], smoothness = Modelica.Blocks.Types.Smoothness.LinearSegments, tableOnFile = false, columns = {ActivityType}) annotation(Placement(transformation(extent = {{-60, 40}, {-40, 60}}))); equation connect(RadiativeHeat.port, RadiationConvertor.convPort) annotation (Line( points={{42,-8},{44,-8},{44,-12},{48,-12},{48,-10},{48,-10}}, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Utilities/Sources/InternalGains/Humans/HumanTotalHeat_VDI2078.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Utilities/Sources/InternalGains/Humans/HumanTotalHeat_VDI2078.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Utilities/Sources/InternalGains/Humans/HumanTotalHeat_VDI2078.mo" 2022-03-10 09:57:39.116144267 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2019/Utilities/Sources/InternalGains/Humans/HumanTotalHeat_VDI2078.mo" 2022-03-10 09:59:19.412156969 +0000 @@ -12,14 +12,14 @@ Modelica.Blocks.Math.MultiProduct productLatentHeatOutput(nu=2) annotation (Placement(transformation(extent={{-26,42},{-6,62}}))); protected - Modelica.Blocks.Tables.CombiTable1D MoistureOutput( + Modelica.Blocks.Tables.CombiTable1Dv MoistureOutput( smoothness=Modelica.Blocks.Types.Smoothness.LinearSegments, tableOnFile=false, columns={ActivityType}, table=[10,35,95,165; 18,35,95,165; 20,35,110,185; 22,40,125,215; 23,50,135,225; 24,60,140,230; 25,60,145,240; 26,65,150,250; 35,65,150,250]) annotation (Placement(transformation(extent={{-60,70},{-40,90}}))); - Modelica.Blocks.Tables.CombiTable1D HeatOutputLatent( + Modelica.Blocks.Tables.CombiTable1Dv HeatOutputLatent( smoothness=Modelica.Blocks.Types.Smoothness.LinearSegments, tableOnFile=false, columns={ActivityType}, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2020/FastHVAC/Storage/HeatStorage.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2020/FastHVAC/Storage/HeatStorage.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2020/FastHVAC/Storage/HeatStorage.mo" 2022-03-10 09:57:39.116144267 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2020/FastHVAC/Storage/HeatStorage.mo" 2022-03-10 09:59:19.384156966 +0000 @@ -19,11 +19,11 @@ mediumHC2=AixLib.Obsolete.YearIndependent.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")); /* ******************************************************************* @@ -33,21 +33,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?" @@ -57,7 +57,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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2020/ThermalZones/HighOrder/Components/Walls/Wall_ASHRAE140.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2020/ThermalZones/HighOrder/Components/Walls/Wall_ASHRAE140.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2020/ThermalZones/HighOrder/Components/Walls/Wall_ASHRAE140.mo" 2022-03-10 09:57:39.120144269 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2020/ThermalZones/HighOrder/Components/Walls/Wall_ASHRAE140.mo" 2022-03-10 09:59:19.312156958 +0000 @@ -19,9 +19,9 @@ "Type of wall" annotation(Dialog(group = "Structure of wall layers"), choicesAllMatching = true, Placement(transformation(extent={{2,76},{22,96}}))); - parameter Modelica.SIunits.Length wall_length=2 "Length of wall" + parameter Modelica.Units.SI.Length wall_length=2 "Length of wall" annotation(Dialog(group="Room Geometry")); - parameter Modelica.SIunits.Height wall_height=2 "Height of wall" + parameter Modelica.Units.SI.Height wall_height=2 "Height of wall" annotation(Dialog(group="Room Geometry")); // Surface parameters @@ -38,7 +38,7 @@ choice=3 "Custom hCon (constant)", radioButtons=true)); - parameter Modelica.SIunits.CoefficientOfHeatTransfer hCon_const=25 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer hCon_const=25 "Custom convective heat transfer coefficient (just for manual selection, not recommended)" annotation(Dialog(tab="Surface Parameters", group= "Outside surface", enable= @@ -71,7 +71,7 @@ AixLib.DataBase.WindowsDoors.Simple.WindowSimple_EnEV2009() "Choose a window type from the database" annotation(Dialog( tab="Window", enable = withWindow and outside),choicesAllMatching= true); - parameter Modelica.SIunits.Area windowarea=2 "Area of window" annotation(Dialog( tab="Window", enable = withWindow and outside)); + parameter Modelica.Units.SI.Area windowarea=2 "Area of window" annotation(Dialog( tab="Window", enable = withWindow and outside)); parameter Boolean withSunblind = false "enable support of sunblinding?" annotation(Dialog(tab = "Window", enable = outside and withWindow)); parameter Real Blinding = 0 "blinding factor: 0 means total blocking of solar irradiation" annotation(Dialog(tab = "Window", enable = withWindow and outside and withSunblind)); @@ -79,26 +79,26 @@ "Minimum specific total solar radiation in W/m2 for blinding becoming active (see also TOutAirLimit)" annotation(Dialog(tab="Window", enable=withWindow and outside and withSunblind)); - parameter Modelica.SIunits.Temperature TOutAirLimit if withWindow and outside and withSunblind + parameter Modelica.Units.SI.Temperature TOutAirLimit if withWindow and outside and withSunblind "Temperature at which sunblind closes (see also LimitSolIrr)" annotation(Dialog(tab = "Window", enable = withWindow and outside and withSunblind)); // door parameters parameter Boolean withDoor = false "Choose if the wall has got a door" annotation(Dialog(tab="Door")); - parameter Modelica.SIunits.CoefficientOfHeatTransfer U_door=1.8 + parameter Modelica.Units.SI.CoefficientOfHeatTransfer U_door=1.8 "Thermal transmission coefficient of door" annotation (Dialog(tab="Door", enable = withDoor)); - parameter Modelica.SIunits.Emissivity eps_door = 0.9 + parameter Modelica.Units.SI.Emissivity eps_door = 0.9 "Solar emissivity of door material" annotation (Dialog(tab="Door", enable = withDoor)); - parameter Modelica.SIunits.Length door_height=2 annotation(Dialog(tab="Door", enable = withDoor)); - parameter Modelica.SIunits.Length door_width=1 annotation(Dialog( tab="Door", enable = withDoor)); + parameter Modelica.Units.SI.Length door_height=2 annotation(Dialog(tab="Door", enable = withDoor)); + parameter Modelica.Units.SI.Length door_width=1 annotation(Dialog( tab="Door", enable = withDoor)); // Calculation of clearance - final parameter Modelica.SIunits.Area clearance= + final parameter Modelica.Units.SI.Area clearance= if not (outside) and withDoor then door_height*door_width else if outside and withDoor and withWindow then (windowarea + door_height*door_width) else if outside and withWindow then windowarea else @@ -107,7 +107,7 @@ // Initial temperature - 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" annotation(Dialog(tab="Initialization")); // COMPONENT PART diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2020/ThermalZones/HighOrder/Rooms/MFD/CellarAttic/Attic_Ro2Lf1.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2020/ThermalZones/HighOrder/Rooms/MFD/CellarAttic/Attic_Ro2Lf1.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2020/ThermalZones/HighOrder/Rooms/MFD/CellarAttic/Attic_Ro2Lf1.mo" 2022-03-10 09:57:39.120144269 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2020/ThermalZones/HighOrder/Rooms/MFD/CellarAttic/Attic_Ro2Lf1.mo" 2022-03-10 09:59:19.240156948 +0000 @@ -11,15 +11,15 @@ "WSchV_1995", choice = 4 "WSchV_1984", radioButtons = true)); // Room geometry - parameter Modelica.SIunits.Length room_length = 10.24 "length" annotation(Dialog(group = "Room geometry", descriptionLabel = true)); - parameter Modelica.SIunits.Length room_width = 17.01 "width" annotation(Dialog(group = "Room geometry", descriptionLabel = true)); - parameter Modelica.SIunits.Length roof_width1 = 5.7 "wRO1" annotation(Dialog(group = "Room geometry", absoluteWidth = 25, joinNext = true, descriptionLabel = true)); - parameter Modelica.SIunits.Length roof_width2 = 5.7 "wRO2" annotation(Dialog(group = "Room geometry", absoluteWidth = 25, descriptionLabel = true)); - parameter Modelica.SIunits.Angle alfa = Modelica.SIunits.Conversions.from_deg(120) "alfa" annotation(Dialog(group = "Room geometry", descriptionLabel = true)); - parameter Modelica.SIunits.Temperature T0_air = 283.15 "Air" annotation(Dialog(tab = "Initial temperatures", descriptionLabel = true)); - parameter Modelica.SIunits.Temperature T0_RO1 = 282.15 "RO1" annotation(Dialog(tab = "Initial temperatures", descriptionLabel = true)); - parameter Modelica.SIunits.Temperature T0_RO2 = 282.15 "RO2" annotation(Dialog(tab = "Initial temperatures", descriptionLabel = true)); - parameter Modelica.SIunits.Temperature T0_FL = 284.15 "FL" annotation(Dialog(tab = "Initial temperatures", descriptionLabel = true)); + parameter Modelica.Units.SI.Length room_length = 10.24 "length" annotation(Dialog(group = "Room geometry", descriptionLabel = true)); + parameter Modelica.Units.SI.Length room_width = 17.01 "width" annotation(Dialog(group = "Room geometry", descriptionLabel = true)); + parameter Modelica.Units.SI.Length roof_width1 = 5.7 "wRO1" annotation(Dialog(group = "Room geometry", absoluteWidth = 25, joinNext = true, descriptionLabel = true)); + parameter Modelica.Units.SI.Length roof_width2 = 5.7 "wRO2" annotation(Dialog(group = "Room geometry", absoluteWidth = 25, descriptionLabel = true)); + parameter Modelica.Units.SI.Angle alfa = Modelica.Units.Conversions.from_deg(120) "alfa" annotation(Dialog(group = "Room geometry", descriptionLabel = true)); + parameter Modelica.Units.SI.Temperature T0_air = 283.15 "Air" annotation(Dialog(tab = "Initial temperatures", descriptionLabel = true)); + parameter Modelica.Units.SI.Temperature T0_RO1 = 282.15 "RO1" annotation(Dialog(tab = "Initial temperatures", descriptionLabel = true)); + parameter Modelica.Units.SI.Temperature T0_RO2 = 282.15 "RO2" annotation(Dialog(tab = "Initial temperatures", descriptionLabel = true)); + parameter Modelica.Units.SI.Temperature T0_FL = 284.15 "FL" annotation(Dialog(tab = "Initial temperatures", descriptionLabel = true)); // Outer walls properties parameter Real solar_absorptance_RO = 0.25 "Solar absoptance roof " annotation(Dialog(group = "Outer wall properties", descriptionLabel = true)); parameter Integer calcMethod=1 "Calculation method for convective heat transfer coefficient" annotation (Dialog( @@ -32,9 +32,9 @@ radioButtons=true)); // Windows and Doors parameter Boolean withWindow1 = false "Window 1 " annotation(Dialog(group = "Windows and Doors", joinNext = true, descriptionLabel = true), choices(checkBox = true)); - parameter Modelica.SIunits.Area windowarea_RO1 = 0 "Window area" annotation(Dialog(group = "Windows and Doors", naturalWidth = 10, descriptionLabel = true, enable = withWindow1)); + parameter Modelica.Units.SI.Area windowarea_RO1 = 0 "Window area" annotation(Dialog(group = "Windows and Doors", naturalWidth = 10, descriptionLabel = true, enable = withWindow1)); parameter Boolean withWindow2 = false "Window 2 " annotation(Dialog(group = "Windows and Doors", joinNext = true, descriptionLabel = true), choices(checkBox = true)); - parameter Modelica.SIunits.Area windowarea_RO2 = 0 "Window area" annotation(Dialog(group = "Windows and Doors", naturalWidth = 10, descriptionLabel = true, enable = withWindow2)); + parameter Modelica.Units.SI.Area windowarea_RO2 = 0 "Window area" annotation(Dialog(group = "Windows and Doors", naturalWidth = 10, descriptionLabel = true, enable = withWindow2)); // Sunblind parameter Boolean use_sunblind = false "Will sunblind become active automatically?" @@ -42,10 +42,10 @@ parameter Real ratioSunblind(min=0.0, max=1.0) = 0.8 "Sunblind factor. 1 means total blocking of irradiation, 0 no sunblind" annotation(Dialog(group = "Sunblind", enable=use_sunblind)); - parameter Modelica.SIunits.Irradiance solIrrThreshold(min=0.0) = 350 + parameter Modelica.Units.SI.Irradiance solIrrThreshold(min=0.0) = 350 "Threshold for global solar irradiation on this surface to enable sunblinding (see also TOutAirLimit)" annotation(Dialog(group = "Sunblind", enable=use_sunblind)); - parameter Modelica.SIunits.Temperature TOutAirLimit + parameter Modelica.Units.SI.Temperature TOutAirLimit "Temperature at which sunblind closes (see also solIrrThreshold)" annotation(Dialog(group = "Sunblind", enable=use_sunblind)); AixLib.ThermalZones.HighOrder.Components.Walls.Wall roof1( @@ -136,7 +136,7 @@ parameter AixLib.DataBase.Walls.WallBaseDataDefinition Type_RO = if TIR == 1 then AixLib.DataBase.Walls.EnEV2009.Ceiling.ROsaddleAttic_EnEV2009_SML() else if TIR == 2 then AixLib.DataBase.Walls.EnEV2002.Ceiling.ROsaddleAttic_EnEV2002_SML() else if TIR == 3 then AixLib.DataBase.Walls.WSchV1995.Ceiling.ROsaddleAttic_WSchV1995_SML() else AixLib.DataBase.Walls.WSchV1984.Ceiling.ROsaddleAttic_WSchV1984_SML() annotation(Dialog(tab = "Types")); //Window type parameter AixLib.DataBase.WindowsDoors.Simple.OWBaseDataDefinition_Simple Type_Win = if TIR == 1 then AixLib.DataBase.WindowsDoors.Simple.WindowSimple_EnEV2009() else if TIR == 2 then AixLib.DataBase.WindowsDoors.Simple.WindowSimple_EnEV2002() else if TIR == 3 then AixLib.DataBase.WindowsDoors.Simple.WindowSimple_WSchV1995() else AixLib.DataBase.WindowsDoors.Simple.WindowSimple_WSchV1984() annotation(Dialog(tab = "Types")); - parameter Modelica.SIunits.Volume room_V = roof_width1 * roof_width2 * sin(alfa) * 0.5 * room_width; + parameter Modelica.Units.SI.Volume room_V = roof_width1 * roof_width2 * sin(alfa) * 0.5 * room_width; equation // Connect-equation for ventilation/infiltration. If there are two windows, the ventilation rate is equally distributed between the two. the same with two door. // Be careful to set a given ventilation rate only for the windows, or for the doors, otherweise you will have double the ventilation rate. diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2020/ThermalZones/HighOrder/Rooms/MFD/CellarAttic/Cellar.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2020/ThermalZones/HighOrder/Rooms/MFD/CellarAttic/Cellar.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2020/ThermalZones/HighOrder/Rooms/MFD/CellarAttic/Cellar.mo" 2022-03-10 09:57:39.120144269 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2020/ThermalZones/HighOrder/Rooms/MFD/CellarAttic/Cellar.mo" 2022-03-10 09:59:19.200156943 +0000 @@ -9,11 +9,11 @@ "WSchV_1995", choice = 4 "WSchV_1984", radioButtons = true)); // Room geometry - parameter Modelica.SIunits.Length room_length = 10.24 "length" annotation(Dialog(group = "Room geometry", descriptionLabel = true)); - parameter Modelica.SIunits.Length room_width = 17.01 "width" annotation(Dialog(group = "Room geometry", descriptionLabel = true)); - parameter Modelica.SIunits.Height room_height = 2.5 "length" annotation(Dialog(group = "Room geometry", descriptionLabel = true)); + parameter Modelica.Units.SI.Length room_length = 10.24 "length" annotation(Dialog(group = "Room geometry", descriptionLabel = true)); + parameter Modelica.Units.SI.Length room_width = 17.01 "width" annotation(Dialog(group = "Room geometry", descriptionLabel = true)); + parameter Modelica.Units.SI.Height room_height = 2.5 "length" annotation(Dialog(group = "Room geometry", descriptionLabel = true)); // Outer walls properties - parameter Modelica.SIunits.Temperature T_Ground = 283.15 "GroundTemperature" annotation(Dialog(group = "Outer wall properties", descriptionLabel = true)); + parameter Modelica.Units.SI.Temperature T_Ground = 283.15 "GroundTemperature" annotation(Dialog(group = "Outer wall properties", descriptionLabel = true)); parameter Integer calcMethod=1 "Calculation method for convective heat transfer coefficient" annotation (Dialog( group="Outer wall properties", compact=true, @@ -23,9 +23,9 @@ choice=3 "Custom hCon (constant)", radioButtons=true)); //Initial temperatures - parameter Modelica.SIunits.Temperature T0_air = 285.15 "Air" annotation(Dialog(tab = "Initial temperatures", descriptionLabel = true)); - parameter Modelica.SIunits.Temperature T0_Walls = 284.95 "Walls" annotation(Dialog(tab = "Initial temperatures", descriptionLabel = true)); - parameter Modelica.SIunits.Temperature T0_Ceiling = 285.25 "Ceiling" annotation(Dialog(tab = "Initial temperatures", descriptionLabel = true)); + parameter Modelica.Units.SI.Temperature T0_air = 285.15 "Air" annotation(Dialog(tab = "Initial temperatures", descriptionLabel = true)); + parameter Modelica.Units.SI.Temperature T0_Walls = 284.95 "Walls" annotation(Dialog(tab = "Initial temperatures", descriptionLabel = true)); + parameter Modelica.Units.SI.Temperature T0_Ceiling = 285.25 "Ceiling" annotation(Dialog(tab = "Initial temperatures", descriptionLabel = true)); // Sunblind parameter Boolean use_sunblind = false "Will sunblind become active automatically?" @@ -33,10 +33,10 @@ parameter Real ratioSunblind(min=0.0, max=1.0) = 0.8 "Sunblind factor. 1 means total blocking of irradiation, 0 no sunblind" annotation(Dialog(group = "Sunblind", enable=use_sunblind)); - parameter Modelica.SIunits.Irradiance solIrrThreshold(min=0.0) = 350 + parameter Modelica.Units.SI.Irradiance solIrrThreshold(min=0.0) = 350 "Threshold for global solar irradiation on this surface to enable sunblinding (see also TOutAirLimit)" annotation(Dialog(group = "Sunblind", enable=use_sunblind)); - parameter Modelica.SIunits.Temperature TOutAirLimit + parameter Modelica.Units.SI.Temperature TOutAirLimit "Temperature at which sunblind closes (see also solIrrThreshold)" annotation(Dialog(group = "Sunblind", enable=use_sunblind)); AixLib.ThermalZones.HighOrder.Components.DryAir.Airload airload( @@ -155,7 +155,7 @@ parameter AixLib.DataBase.Walls.WallBaseDataDefinition Type_FL = if TIR == 1 then AixLib.DataBase.Walls.EnEV2009.Floor.FLground_EnEV2009_SML() else if TIR == 2 then AixLib.DataBase.Walls.EnEV2002.Floor.FLground_EnEV2002_SML() else if TIR == 3 then AixLib.DataBase.Walls.WSchV1995.Floor.FLground_WSchV1995_SML() else AixLib.DataBase.Walls.WSchV1984.Floor.FLground_WSchV1984_SML(); // Ceiling type parameter AixLib.DataBase.Walls.WallBaseDataDefinition Type_CE = if TIR == 1 then AixLib.DataBase.Walls.EnEV2009.Ceiling.CEcellar_EnEV2009_SML_loHalf() else if TIR == 2 then AixLib.DataBase.Walls.EnEV2002.Ceiling.CEcellar_EnEV2002_SML_loHalf() else if TIR == 3 then AixLib.DataBase.Walls.WSchV1995.Ceiling.CEcellar_WSchV1995_SML_loHalf() else AixLib.DataBase.Walls.WSchV1984.Ceiling.CEcellar_WSchV1984_SML_loHalf(); - parameter Modelica.SIunits.Volume room_V = room_length * room_width * room_height; + parameter Modelica.Units.SI.Volume room_V = room_length * room_width * room_height; equation connect(infiltrationRate.port_a, thermOutside) annotation(Line(points = {{-44, -87}, {-42, -87}, {-42, -90}, {-90, -90}}, color = {191, 0, 0})); connect(infiltrationRate.port_b, airload.port) annotation(Line(points={{-18,-87},{-2,-87},{-2,-64},{-54,-64},{-54,-24},{-12,-24},{-12,-4},{-28,-4}}, color = {191, 0, 0})); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2021/DataBase.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2021/DataBase.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2021/DataBase.mo" 2022-03-10 09:57:39.120144269 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2021/DataBase.mo" 2022-03-10 09:59:19.148156937 +0000 @@ -75,19 +75,19 @@ record PVBaseRecord extends AixLib.Obsolete.BaseClasses.ObsoleteModel; 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="

Overview

diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2021/Electrical/PVSystem.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2021/Electrical/PVSystem.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2021/Electrical/PVSystem.mo" 2022-03-10 09:57:39.120144269 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2021/Electrical/PVSystem.mo" 2022-03-10 09:59:19.124156934 +0000 @@ -119,15 +119,15 @@ AixLib.Obsolete.Year2021.Electrical.PVSystem.BaseClasses.PartialPVSystem; extends AixLib.Obsolete.BaseClasses.ObsoleteModel; - 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")); @@ -383,7 +383,7 @@ "Number of panels"; parameter AixLib.Obsolete.Year2021.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", @@ -433,7 +433,7 @@ model PVInverterRMS "Inverter model including system management" extends AixLib.Obsolete.BaseClasses.ObsoleteModel; - 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", @@ -529,23 +529,23 @@ model PVModuleDC "partial model for PV module" extends AixLib.Obsolete.BaseClasses.ObsoleteModel; - 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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2021/Fluid/Actuators/Valves/MixingValve.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2021/Fluid/Actuators/Valves/MixingValve.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2021/Fluid/Actuators/Valves/MixingValve.mo" 2022-03-10 09:57:39.120144269 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2021/Fluid/Actuators/Valves/MixingValve.mo" 2022-03-10 09:59:19.008156918 +0000 @@ -11,7 +11,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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2021/Fluid/Actuators/Valves/SimpleValve.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2021/Fluid/Actuators/Valves/SimpleValve.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2021/Fluid/Actuators/Valves/SimpleValve.mo" 2022-03-10 09:57:39.120144269 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2021/Fluid/Actuators/Valves/SimpleValve.mo" 2022-03-10 09:59:18.988156916 +0000 @@ -8,7 +8,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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2021/Fluid/Actuators/Valves/ThermostaticValve.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2021/Fluid/Actuators/Valves/ThermostaticValve.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2021/Fluid/Actuators/Valves/ThermostaticValve.mo" 2022-03-10 09:57:39.120144269 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2021/Fluid/Actuators/Valves/ThermostaticValve.mo" 2022-03-10 09:59:18.976156914 +0000 @@ -19,7 +19,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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2021/Fluid/Movers/Pump.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2021/Fluid/Movers/Pump.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2021/Fluid/Movers/Pump.mo" 2022-03-10 09:57:39.120144269 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/Year2021/Fluid/Movers/Pump.mo" 2022-03-10 09:59:18.960156912 +0000 @@ -8,16 +8,16 @@ "Head = f(V_flow) for minimal and maximal rotational speed" annotation(choicesAllMatching = true); parameter Integer ControlStrategy = 1 "Control Strategy" annotation(Dialog(group = "Control strategy"), choices(choice = 1 "dp-const", choice = 2 "dp-var", radioButtons = true)); - parameter Modelica.SIunits.Height Head_max = max(MinMaxCharacteristics.minMaxHead[:,3]) + parameter Modelica.Units.SI.Height Head_max = max(MinMaxCharacteristics.minMaxHead[:,3]) "Set head for the control strategy" annotation(Dialog(group = "Control strategy")); parameter Real V_flow_max(unit="m3/h") = max(MinMaxCharacteristics.minMaxHead[:,1]) "Vmax in m3/h for the control strategy" annotation(Dialog(group = "Control strategy", enable = if ControlStrategy == 2 then true else false)); - Modelica.SIunits.Height Head(start = 0, min = 0) "Pumping head"; + Modelica.Units.SI.Height Head(start = 0, min = 0) "Pumping head"; Modelica.Blocks.Tables.CombiTable1Ds table_minMaxCharacteristics(tableOnFile = false, columns = {2, 3}, table = MinMaxCharacteristics.minMaxHead) "Table with Head = f(V_flow) min amd max characteristics for the pump" annotation(Placement(transformation(extent = {{-10, -10}, {10, 10}}))); Modelica.Blocks.Interfaces.BooleanInput IsNight annotation(Placement(transformation(extent = {{-20, -20}, {20, 20}}, rotation = 270, origin = {-2, 100}), iconTransformation(extent = {{-10, -10}, {10, 10}}, rotation = 270, origin = {0, 102}))); - parameter Modelica.SIunits.MassFlowRate m_flowsPump[:] = MinMaxCharacteristics.minMaxHead[:,1]./3600.*rho_default "Convert VFlow in m3/h to kg/s"; - parameter Modelica.SIunits.PressureDifference dpsPump[:] = MinMaxCharacteristics.minMaxHead[:,3].*rho_default.*Modelica.Constants.g_n "Convert m of head to Pa"; + parameter Modelica.Units.SI.MassFlowRate m_flowsPump[:] = MinMaxCharacteristics.minMaxHead[:,1]./3600.*rho_default "Convert VFlow in m3/h to kg/s"; + parameter Modelica.Units.SI.PressureDifference dpsPump[:] = MinMaxCharacteristics.minMaxHead[:,3].*rho_default.*Modelica.Constants.g_n "Convert m of head to Pa"; protected final parameter Medium.ThermodynamicState state_default = Medium.setState_pTX( @@ -25,7 +25,7 @@ p=Medium.p_default, X=Medium.X_default[1:Medium.nXi]) "Medium state at default values"; // Density at medium default values, used to compute the size of control volumes - final parameter Modelica.SIunits.Density rho_default=Medium.density( + final parameter Modelica.Units.SI.Density rho_default=Medium.density( state=state_default) "Density, used to volume flow rate from mass flow rate"; equation // Enthalpie flow diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/BaseClasses/EvaporatorCondenserWithCapacity.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/BaseClasses/EvaporatorCondenserWithCapacity.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/BaseClasses/EvaporatorCondenserWithCapacity.mo" 2022-03-10 09:57:39.120144269 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/BaseClasses/EvaporatorCondenserWithCapacity.mo" 2022-03-10 09:59:18.920156908 +0000 @@ -1,4 +1,4 @@ -within AixLib.Obsolete.YearIndependent.FastHVAC.BaseClasses; +within AixLib.Obsolete.YearIndependent.FastHVAC.BaseClasses; model EvaporatorCondenserWithCapacity extends AixLib.Obsolete.YearIndependent.FastHVAC.Interfaces.TwoPortHeatMassExchanger( @@ -7,13 +7,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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/BaseClasses/WorkingFluid.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/BaseClasses/WorkingFluid.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/BaseClasses/WorkingFluid.mo" 2022-03-10 09:57:39.120144269 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/BaseClasses/WorkingFluid.mo" 2022-03-10 09:59:18.900156904 +0000 @@ -5,8 +5,8 @@ AixLib.Obsolete.YearIndependent.FastHVAC.Media.BaseClasses.MediumSimple medium=AixLib.Obsolete.YearIndependent.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.Obsolete.YearIndependent.FastHVAC.BaseClasses.EnergyBalance energyBalance annotation (Placement(transformation(extent={{-34,-30},{26,30}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/Components/Chiller/Chiller.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/Components/Chiller/Chiller.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/Components/Chiller/Chiller.mo" 2022-03-10 09:57:39.120144269 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/Components/Chiller/Chiller.mo" 2022-03-10 09:59:18.884156903 +0000 @@ -1,4 +1,4 @@ -within AixLib.Obsolete.YearIndependent.FastHVAC.Components.Chiller; +within AixLib.Obsolete.YearIndependent.FastHVAC.Components.Chiller; model Chiller "Base model of FastHVAC Chiller" import AixLib; extends AixLib.Obsolete.BaseClasses.ObsoleteModel; @@ -19,7 +19,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 vapour compression machine (HP: Heating; Chiller: Cooling)" annotation (Dialog(enable=use_autoCalc)); replaceable model PerDataMainChi = @@ -34,7 +34,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= @@ -43,12 +43,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")); @@ -56,25 +56,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")); @@ -82,15 +82,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)); @@ -105,15 +105,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 @@ -303,18 +303,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=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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/Components/HeatExchangers/BaseClasses/ML_thermal_delta.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/Components/HeatExchangers/BaseClasses/ML_thermal_delta.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/Components/HeatExchangers/BaseClasses/ML_thermal_delta.mo" 2022-03-10 09:57:39.120144269 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/Components/HeatExchangers/BaseClasses/ML_thermal_delta.mo" 2022-03-10 09:59:18.800156893 +0000 @@ -11,48 +11,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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/Components/HeatExchangers/BaseClasses/PseudoRadiator.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/Components/HeatExchangers/BaseClasses/PseudoRadiator.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/Components/HeatExchangers/BaseClasses/PseudoRadiator.mo" 2022-03-10 09:57:39.120144269 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/Components/HeatExchangers/BaseClasses/PseudoRadiator.mo" 2022-03-10 09:59:18.776156890 +0000 @@ -1,4 +1,4 @@ -within AixLib.Obsolete.YearIndependent.FastHVAC.Components.HeatExchangers.BaseClasses; +within AixLib.Obsolete.YearIndependent.FastHVAC.Components.HeatExchangers.BaseClasses; model PseudoRadiator /* ******************************************************************* Parameters diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/Components/HeatExchangers/DHWHeatExchanger.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/Components/HeatExchangers/DHWHeatExchanger.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/Components/HeatExchangers/DHWHeatExchanger.mo" 2022-03-10 09:57:39.120144269 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/Components/HeatExchangers/DHWHeatExchanger.mo" 2022-03-10 09:59:18.756156887 +0000 @@ -17,21 +17,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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/Components/HeatExchangers/MultiRadiator.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/Components/HeatExchangers/MultiRadiator.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/Components/HeatExchangers/MultiRadiator.mo" 2022-03-10 09:57:39.120144269 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/Components/HeatExchangers/MultiRadiator.mo" 2022-03-10 09:59:18.736156884 +0000 @@ -1,4 +1,4 @@ -within AixLib.Obsolete.YearIndependent.FastHVAC.Components.HeatExchangers; +within AixLib.Obsolete.YearIndependent.FastHVAC.Components.HeatExchangers; model MultiRadiator "Simple multi radiator model" extends AixLib.Obsolete.BaseClasses.ObsoleteModel; @@ -17,9 +17,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/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/Components/HeatExchangers/RadiatorMultiLayer.mo" "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/Components/HeatExchangers/RadiatorMultiLayer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/Components/HeatExchangers/RadiatorMultiLayer.mo" 2022-03-10 09:57:39.120144269 +0000 +++ "converted-libraries/.openmodelica/libraries/AixLib 1.0.0/Obsolete/YearIndependent/FastHVAC/Components/HeatExchangers/RadiatorMultiLayer.mo" 2022-03-10 09:59:18.712156882 +0000 @@ -1,263 +1,118 @@ -within AixLib.Obsolete.YearIndependent.FastHVAC.Components.HeatExchangers; -model RadiatorMultiLayer "Simple radiator multilayer model" -extends AixLib.Obsolete.BaseClasses.ObsoleteModel; - - import Modelica.SIunits; - import calcT = - AixLib.Fluid.HeatExchangers.Radiators.BaseClasses.CalcExcessTemp; - - parameter - AixLib.Obsolete.YearIndependent.FastHVAC.Media.BaseClasses.MediumSimple - medium=AixLib.Obsolete.YearIndependent.FastHVAC.Media.WaterSimple() - "Standard charastics for water (heat capacity, density, thermal conductivity)" - annotation (choicesAllMatching); +within AixLib.Obsolete.YearIndependent.FastHVAC.Components.HeatExchangers; +model RadiatorMultiLayer "Simple radiator multilayer model" + extends AixLib.Obsolete.BaseClasses.ObsoleteModel; + import Modelica.Units.SI; + import calcT = AixLib.Fluid.HeatExchangers.Radiators.BaseClasses.CalcExcessTemp; + parameter AixLib.Obsolete.YearIndependent.FastHVAC.Media.BaseClasses.MediumSimple medium = AixLib.Obsolete.YearIndependent.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 SI.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 SI.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 SI.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 SI.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 SI.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 SI.Temperature T0 = Modelica.Units.Conversions.from_degC(20) "Initial temperature, in degrees Celsius" annotation( + Dialog(group = "Miscellaneous")); + parameter SI.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"; - - SIunits.Temperature TV_1; - SIunits.Temperature TR_N; + // + // 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"; + SI.Temperature TV_1; + SI.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 SI.Volume vol_water = length * volumeWater / 1000 / N; + parameter SI.Volume vol_steel = length * massSteel / densitySteel / N annotation( + Dialog(tab = "Geometry and Material", group = "Geometry")); + parameter SI.Length d1 = 2 * (vol_water / Modelica.Constants.pi / length) ^ 0.5 "inner diameter of single layer"; + parameter SI.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 SI.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 SI.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="

+ 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 = "

Overview

@@ -859,8 +714,7 @@ \"AixLib.FastHVAC.Examples.HeatExchangers.RadiatorMultiLayer.ValidationRadiator\"> ValidationRadiator

-", -revisions="